From 8d59d32ce8e495d40cd13c3283f7441d9563c53c Mon Sep 17 00:00:00 2001
From: "b.ulrich" <b.ulrich@adito.de>
Date: Tue, 19 May 2020 14:21:31 +0200
Subject: [PATCH 001/309] =?UTF-8?q?[Projekt:=20Entwicklung=20-=20Neon][Tic?=
 =?UTF-8?q?ketNr.:=201056978][Automatische=20Adressbef=C3=BCllung=20=C3=BC?=
 =?UTF-8?q?berschreibt=20Stra=C3=9Fe]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 entity/Address_entity/Address_entity.aod                    | 2 --
 .../entityfields/address/displayValueProcess.js             | 6 ------
 entity/Address_entity/entityfields/address/valueProcess.js  | 6 ------
 .../Address_entity/entityfields/address_ws/valueProcess.js  | 4 +++-
 4 files changed, 3 insertions(+), 15 deletions(-)
 delete mode 100644 entity/Address_entity/entityfields/address/displayValueProcess.js
 delete mode 100644 entity/Address_entity/entityfields/address/valueProcess.js

diff --git a/entity/Address_entity/Address_entity.aod b/entity/Address_entity/Address_entity.aod
index 5e6122b276..c7543e4c99 100644
--- a/entity/Address_entity/Address_entity.aod
+++ b/entity/Address_entity/Address_entity.aod
@@ -15,8 +15,6 @@
       <mandatoryProcess>%aditoprj%/entity/Address_entity/entityfields/address/mandatoryProcess.js</mandatoryProcess>
       <textInputAllowed v="true" />
       <stateProcess>%aditoprj%/entity/Address_entity/entityfields/address/stateProcess.js</stateProcess>
-      <valueProcess>%aditoprj%/entity/Address_entity/entityfields/address/valueProcess.js</valueProcess>
-      <displayValueProcess>%aditoprj%/entity/Address_entity/entityfields/address/displayValueProcess.js</displayValueProcess>
       <onValueChange>%aditoprj%/entity/Address_entity/entityfields/address/onValueChange.js</onValueChange>
       <onValueChangeTypes>
         <element>MASK</element>
diff --git a/entity/Address_entity/entityfields/address/displayValueProcess.js b/entity/Address_entity/entityfields/address/displayValueProcess.js
deleted file mode 100644
index 18985f7a00..0000000000
--- a/entity/Address_entity/entityfields/address/displayValueProcess.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import("system.vars");
-import("system.result");
-
-// Needed for instant refresh if set by neon.setFieldValue
-// use the code if address webservice is active
-//result.string(vars.get("$field.ADDRESS"));
\ No newline at end of file
diff --git a/entity/Address_entity/entityfields/address/valueProcess.js b/entity/Address_entity/entityfields/address/valueProcess.js
deleted file mode 100644
index 2c9d496185..0000000000
--- a/entity/Address_entity/entityfields/address/valueProcess.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import("system.result");
-import("WsValidation_lib");
-import("system.vars");
-
-// use the code if address webservice is active
-//result.string(WsValidationUtils.valueFromJSON(vars.get("$this.value")));
\ No newline at end of file
diff --git a/entity/Address_entity/entityfields/address_ws/valueProcess.js b/entity/Address_entity/entityfields/address_ws/valueProcess.js
index 5ccdf5a99f..2c7449d49d 100644
--- a/entity/Address_entity/entityfields/address_ws/valueProcess.js
+++ b/entity/Address_entity/entityfields/address_ws/valueProcess.js
@@ -1,3 +1,5 @@
+import("system.vars");
 import("WsValidation_lib");
 
-WsValidationFieldUtils.wsValueProcess(WsValidationType.get().TYPE_STREET_NOMINATIM, "$field.ADDRESS");
\ No newline at end of file
+if(!vars.get("$this.value"))
+    WsValidationFieldUtils.wsValueProcess(WsValidationType.get().TYPE_STREET_NOMINATIM, "$field.ADDRESS");
\ No newline at end of file
-- 
GitLab


From b4422bf2e9565e97900629baae15e6baf40805e1 Mon Sep 17 00:00:00 2001
From: Tobias Feldmann <t.feldmann@adito.de>
Date: Tue, 16 Jun 2020 11:14:46 +0200
Subject: [PATCH 002/309] #1058836 AI_lib with bayes classifier added

---
 .../AISalesproject_lib/AISalesproject_lib.aod |   9 +
 process/AISalesproject_lib/process.js         | 157 +++++++++++++
 process/AI_lib/AI_lib.aod                     |   9 +
 process/AI_lib/process.js                     | 219 ++++++++++++++++++
 4 files changed, 394 insertions(+)
 create mode 100644 process/AISalesproject_lib/AISalesproject_lib.aod
 create mode 100644 process/AISalesproject_lib/process.js
 create mode 100644 process/AI_lib/AI_lib.aod
 create mode 100644 process/AI_lib/process.js

diff --git a/process/AISalesproject_lib/AISalesproject_lib.aod b/process/AISalesproject_lib/AISalesproject_lib.aod
new file mode 100644
index 0000000000..c109e9524b
--- /dev/null
+++ b/process/AISalesproject_lib/AISalesproject_lib.aod
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.1">
+  <name>AISalesproject_lib</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <process>%aditoprj%/process/AISalesproject_lib/process.js</process>
+  <variants>
+    <element>LIBRARY</element>
+  </variants>
+</process>
diff --git a/process/AISalesproject_lib/process.js b/process/AISalesproject_lib/process.js
new file mode 100644
index 0000000000..0521bd2d9e
--- /dev/null
+++ b/process/AISalesproject_lib/process.js
@@ -0,0 +1,157 @@
+import("AttributeRegistry_basic");
+import("KeywordRegistry_basic");
+import("Sql_lib");
+import("system.logging");
+import("system.db");
+import("system.result");
+import("system.vars");
+import("Keyword_lib");
+import("AI_lib");
+import("AISalesproject_lib");
+import("Attribute_lib");
+import("system.entities");
+import("DataCaching_lib");
+
+/**
+ * Provides static methods for artificial intelligence.<br>
+ * <b>Do not create an instance of this!</b>
+ * 
+ * @class
+ */
+function AISalesprojectUtil(){}
+
+
+AISalesprojectUtil.getTrainedModel = function()
+{
+    var cache = new CachedData("SalesprojectNBData", false);
+    return cache.load(function (pTranslationNecessary, pLocale){
+        var data = AISalesprojectUtil.train();
+        return data;
+    });
+};
+
+
+AISalesprojectUtil.train = function ()
+{
+    //Trainingdata  
+    var data = new NBDataSet();
+    
+    var loadConfig = entities.createConfigForLoadingRows()
+        .entity("Salesproject_entity")
+        .fields(["#UID", "CONTACT_ID", "PHASE", "STATUS", "VOLUME", "PROBABILITY"]);
+
+    var spRecords = entities.getRows(loadConfig).map(function (spRow)
+    {
+        if(spRow["STATUS"] == $KeywordRegistry.salesprojectState$lost() || spRow["STATUS"] == $KeywordRegistry.salesprojectState$order())
+        {
+            var attributes = [];
+            attributes.push(spRow["PHASE"]) //PHASE
+            if(spRow["VOLUME"] != null && parseFloat(spRow["VOLUME"]) > 0)
+                attributes.push(AISalesprojectUtil.getVolumeClassification(parseFloat(spRow["VOLUME"]))); //VOLUME
+            if(spRow["PROBABILITY"]  != null)
+                attributes.push(AISalesprojectUtil.getProbabilityValue(spRow["PROBABILITY"])); //PROBABILITY
+            var sectorSP = new AttributeRelationQuery(spRow["CONTACT_ID"], $AttributeRegistry.industry()).getSingleAttributeValue();
+            if(sectorSP != null)
+                attributes.push(sectorSP); //Sector       
+            var doc = new NBDocument(spRow["#UID"], attributes);
+
+            var loadCompConfig = entities.createConfigForLoadingRows()
+                .entity("Competition_entity")
+                .provider("Links")
+                .addParameter("ObjectType_param", "Salesproject")
+                .addParameter("ObjectRowId_param", spRow["#UID"])
+                .fields(["ORGANISATION_NAME"]);
+
+            var compRecords = entities.getRows(loadCompConfig).map(function (compRow)
+            {
+                doc.add(compRow["ORGANISATION_NAME"]); //competitors
+            });
+
+            data.add(spRow["STATUS"], [doc]); // train model with lost and order salesprojects        
+        }
+        
+    });
+
+    // an optimisation for working with small vocabularies
+    var options = {
+        applyInverse: true
+    };
+
+    // create a classifier
+    var classifier = new NBClassifier(options);
+
+    // train the classifier
+    classifier.train(data);
+
+    //logging.log('Classifier trained.');
+    //logging.log(JSON.stringify(classifier));
+    return JSON.stringify(classifier);
+
+};
+
+AISalesprojectUtil.classify = function (pSalesprojectId, pContactId, pPhase, pStatus, pVolume, pProb)
+{
+    
+    if(pSalesprojectId == null || pContactId == null)
+        return "--";
+    var testAttributes = [];   
+    testAttributes.push(pPhase) //PHASE
+    if(pVolume != null && parseFloat(pVolume) > 0)
+        testAttributes.push(AISalesprojectUtil.getVolumeClassification(parseFloat(pVolume))); //VOLUME
+    if(pProb != null)
+        testAttributes.push(AISalesprojectUtil.getProbabilityValue(pProb)); //PROBABILITY
+    if(pContactId != null) 
+    {
+        var sectorSP = new AttributeRelationQuery(pContactId, $AttributeRegistry.industry()).getSingleAttributeValue();
+        if(sectorSP != null)
+            testAttributes.push(sectorSP); //Sector    
+    }      
+    var loadCompConfig = entities.createConfigForLoadingRows()
+        .entity("Competition_entity")
+        .provider("Links")
+        .addParameter("ObjectType_param", "Salesproject")
+        .addParameter("ObjectRowId_param", pSalesprojectId)
+        .fields(["ORGANISATION_NAME"]);
+
+    var compRecords = entities.getRows(loadCompConfig).map(function (compRow) 
+    {
+        testAttributes.push(compRow["ORGANISATION_NAME"]); //competitors
+    });
+    
+    //logging.log("testdata");
+    //logging.log(JSON.stringify(testAttributes));
+    
+    var model = AISalesprojectUtil.getTrainedModel();
+    var classifier = new NBClassifier(JSON.parse(model));
+    
+    // test the classifier on a new test object
+    var testDoc = new NBDocument(pSalesprojectId, testAttributes);
+    var classifyResult = classifier.classify(testDoc);
+    //logging.log("result");
+    //logging.log(JSON.stringify(classifyResult));
+    if(classifyResult.probability == null || isNaN(classifyResult.probability))
+        return "--";
+    else
+        return Math.round(parseFloat((classifyResult.probability) * 100)) + "% / " + KeywordUtils.getViewValue($KeywordRegistry.salesprojectState(), classifyResult.category);   
+};
+
+AISalesprojectUtil.getVolumeClassification = function (pVolume)
+{
+    if(pVolume < 100000) 
+        return "low";
+    else if(pVolume >= 100000 && pVolume < 250000)
+        return "middle";
+    else
+        return "high";
+};
+
+AISalesprojectUtil.getProbabilityValue = function (pProbId)
+{
+    if(pProbId == "SALPROJPROB0" || pProbId == "SALPROJPROB25") 
+        return "negative";
+    else if(pProbId == "SALPROJPROB50")
+        return "neutral";
+    else if(pProbId == "SALPROJPROB75" || pProbId == "SALPROJPROB100")
+        return "positive";
+    return "";
+};
\ No newline at end of file
diff --git a/process/AI_lib/AI_lib.aod b/process/AI_lib/AI_lib.aod
new file mode 100644
index 0000000000..153e8fc6b6
--- /dev/null
+++ b/process/AI_lib/AI_lib.aod
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.1">
+  <name>AI_lib</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <process>%aditoprj%/process/AI_lib/process.js</process>
+  <variants>
+    <element>LIBRARY</element>
+  </variants>
+</process>
diff --git a/process/AI_lib/process.js b/process/AI_lib/process.js
new file mode 100644
index 0000000000..b0f8c0f063
--- /dev/null
+++ b/process/AI_lib/process.js
@@ -0,0 +1,219 @@
+import("system.logging");
+import("system.vars");
+import("AI_lib");
+
+/**
+ * Provides static methods for artificial intelligence.<br>
+ * <b>Do not create an instance of this!</b>
+ * 
+ * @class
+ */
+function AIUtil(){}
+
+
+function NBClassifier(options) {
+  options = options || {};
+  this.applyInverse = options.applyInverse || false;
+  this.probabilityThreshold = options.probabilityThreshold || 0.5;
+  this.defaultCategory = options.defaultCategory || null;
+  this.tokens = options.tokens || {};
+  this.categoryCounts = options.categoryCounts || {};
+  this.probabilities = options.probabilities || {};
+}
+
+
+NBClassifier.prototype = {
+  train: function (trainingSet) {
+    var categories = Object.keys(trainingSet.categorizedItems);
+    var i = 0, j = 0, k = 0, category = "";
+    // Iterate over each category in the training set
+    for (i = 0; i < categories.length; i++) {
+      category = categories[i];
+      var subSet = trainingSet.categorizedItems[category];
+      this.categoryCounts[category] = subSet.length;
+      // Iterate over each data item in the category
+      for (j = 0; j < subSet.length; j++) {
+        var item = subSet[j];
+        // for each token in the data item, increment the token:category counter
+        var tokenlist = item.tokens;
+        for (k = 0; k < tokenlist.length; k++) {
+          var token = tokenlist[k];
+          if (!this.tokens[token]) {
+            this.tokens[token] = {};
+          }
+          if (!this.tokens[token][category]) {
+            this.tokens[token][category] = 1;
+          } else {
+            this.tokens[token][category] = 1 + this.tokens[token][category];
+          }
+        }
+      }
+    }
+    //After counting occurences of tokens, calculate probabilities.
+    for (i = 0; i < categories.length; i++) {
+      category = categories[i];
+      for (k in this.tokens) {
+        if (this.tokens.hasOwnProperty(k)) {
+          var count = this.tokens[k][category] || 0;
+          var total = this.categoryCounts[category];
+          var percentage = count / total;
+          if (!this.probabilities[category]) {
+            this.probabilities[category] = {};
+          }
+          this.probabilities[category][k] = percentage;
+        }
+      }
+    }
+  },
+
+  validate: function (testSet) {
+    var total = 0;
+    var correctGuesses = 0;
+    var wrongGuesses = 0;
+    var wrongCategories = {};
+    var wrongItems = [];
+    var categories = testSet.categorizedItems;
+    var category;
+    for (category in categories) {
+      validateCategory(category);
+    }
+
+    function validateCategory(category) {
+      if (categories.hasOwnProperty(category)) {
+        var items = categories[category];
+        var item;
+        for (item in items) {
+          if (items.hasOwnProperty(item)) {
+            total += 1;
+            item = items[item];
+            var result1 = this.classify(item);
+            // if certainty is below probabilityThreshold, go with the default
+            if (result1.probability <= this.probabilityThreshold) {
+              result1.category = this.defaultCategory || result1.category;
+            }
+            if (result1.category === category) {
+              correctGuesses++;
+            } else {
+              wrongCategories[result1.category] = (wrongCategories[result1.category]) ? wrongCategories[result1.category]++ : 1;
+              wrongItems.push(item.id);
+              wrongGuesses++;
+            }
+          }
+        }
+      }
+    }
+
+    return {
+      'total': total,
+      'correct': correctGuesses,
+      'wrong': wrongGuesses,
+      'accuracy': (correctGuesses / (correctGuesses + wrongGuesses)),
+      'wrongCategories': wrongCategories,
+      'wrongItems': wrongItems
+    };
+  },
+
+  classify: function (item) {
+    // for each category
+    var category;
+    var learnedProbabilities = this.probabilities;
+    var itemProbabilities = {};
+    var itemTokens = item.tokens;
+    for (category in learnedProbabilities) {
+      if (learnedProbabilities.hasOwnProperty(category)) {
+        itemProbabilities[category] = 1;
+        var t;
+        var probs = learnedProbabilities[category];
+        for (t in probs) {
+          // iterate over the tokens
+          if (probs.hasOwnProperty(t)) {
+            // and take the product of all probabilities
+            if (itemTokens.indexOf(t) !== -1) {
+              itemProbabilities[category] = itemProbabilities[category] * probs[t];
+            } else if (this.applyInverse) {
+              itemProbabilities[category] = itemProbabilities[category] * (1 - probs[t]);
+            }
+          }
+        }
+      }
+    }
+
+    // Pick the highest two probabilities
+    function compareCategories(a, b) {
+      if (a.probability > b.probability) {
+        return -1;
+      }
+      if (a.probability < b.probability) {
+        return 1;
+      }
+      return 0;
+    }
+
+    var categoryScores = [];
+    var sumOfProbabilities = 0;
+    var k;
+    for (k in itemProbabilities) {
+      if (itemProbabilities.hasOwnProperty(k)) {
+        categoryScores.push({
+          category: k,
+          probability: itemProbabilities[k]
+        });
+        sumOfProbabilities += itemProbabilities[k];
+      }
+    }
+    categoryScores = categoryScores.sort(compareCategories);
+
+    var firstPlace = categoryScores[0];
+    var secondPlace = categoryScores[1];
+    var timesMoreLikely = firstPlace.probability / secondPlace.probability;
+    var probability = firstPlace.probability / sumOfProbabilities;
+
+    return ({
+      'category': firstPlace.category,
+      'probability': probability,
+      'timesMoreLikely': timesMoreLikely,
+      'secondCategory': secondPlace.category,
+      'probabilities': categoryScores
+    });
+  }
+};
+
+
+function NBDataSet() {
+  this.categorizedItems = {};
+}
+
+NBDataSet.prototype = {
+  add: function (label, items) {
+    var originalItems = this.categorizedItems[label] ||  [];
+    this.categorizedItems[label] = originalItems.concat(items);
+  }
+};
+
+
+
+function NBDocument(id, tokens) {
+  if (!id) {
+    logging.log('Document(id, tokens) requires an id string');
+  }
+  this.id = id;
+  this.tokens = tokens || [];
+}
+
+NBDocument.prototype = {
+  add: function (token, factor) {
+    if(factor == undefined)
+        factor = 1
+    if (Array.isArray(token)) { // array of tokens
+      for (var i = 0; i < token.length; i++) {
+        this.add(token[i], factor);
+      }
+      return;
+    }
+    if (typeof token === 'string') {
+        for (var j = 0; j < factor; j++) {
+            this.tokens.push(token);
+        }
+    }
+  }
+};
\ No newline at end of file
-- 
GitLab


From 90589c7a1a3b47cd6d9b26196fac25fa8caae57b Mon Sep 17 00:00:00 2001
From: "a.voegl" <a.voegl@adito.de>
Date: Tue, 16 Jun 2020 14:46:08 +0200
Subject: [PATCH 003/309] Order refactoring

---
 entity/Order_entity/Order_entity.aod          | 45 ++-----------------
 entity/Order_entity/contentTitleProcess.js    |  4 +-
 .../entityfields/cancellation/valueProcess.js | 12 +----
 .../entityfields/contact_id/valueProcess.js   |  7 ---
 .../entityfields/currency/valueProcess.js     |  8 +---
 .../deliveryaddress/valueProcess.js           | 10 -----
 .../deliveryterms/valueProcess.js             |  6 +--
 .../entityfields/footer/valueProcess.js       | 13 ++----
 .../fullordercode/valueProcess.js             |  9 ----
 .../entityfields/header/valueProcess.js       | 11 ++---
 .../entityfields/isolanguage/valueProcess.js  |  8 ----
 .../neworderversion/documentation.adoc        |  2 -
 .../neworderversion/onActionProcess.js        | 26 -----------
 .../entityfields/object_rowid/valueProcess.js |  7 ---
 .../entityfields/object_type/valueProcess.js  |  6 +--
 .../entityfields/offer_id/valueProcess.js     |  7 ---
 .../valueProcess.js                           |  8 ----
 .../entityfields/orderstatus/valueProcess.js  | 11 +----
 .../entityfields/ordertype/valueProcess.js    | 21 ++-------
 .../paymentaddress/valueProcess.js            | 10 -----
 .../entityfields/paymentterms/valueProcess.js |  6 +--
 .../entityfields/versnr/documentation.adoc    |  8 ----
 .../entityfields/versnr/valueProcess.js       | 12 -----
 .../recordcontainers/db/orderClauseProcess.js |  3 +-
 neonContext/Orderitem/Orderitem.aod           |  1 -
 neonView/OrderEdit_view/OrderEdit_view.aod    |  4 +-
 .../OrderFilter_view/OrderFilter_view.aod     |  2 +-
 .../OrderPreview_view/OrderPreview_view.aod   |  2 +-
 .../OrderitemFilter_view.aod                  |  8 ++--
 process/Order_lib/process.js                  | 41 +++++++++--------
 30 files changed, 58 insertions(+), 260 deletions(-)
 delete mode 100644 entity/Order_entity/entityfields/contact_id/valueProcess.js
 delete mode 100644 entity/Order_entity/entityfields/deliveryaddress/valueProcess.js
 delete mode 100644 entity/Order_entity/entityfields/fullordercode/valueProcess.js
 delete mode 100644 entity/Order_entity/entityfields/isolanguage/valueProcess.js
 delete mode 100644 entity/Order_entity/entityfields/neworderversion/documentation.adoc
 delete mode 100644 entity/Order_entity/entityfields/neworderversion/onActionProcess.js
 delete mode 100644 entity/Order_entity/entityfields/object_rowid/valueProcess.js
 delete mode 100644 entity/Order_entity/entityfields/offer_id/valueProcess.js
 delete mode 100644 entity/Order_entity/entityfields/ordercode_versnr_fieldgroup/valueProcess.js
 delete mode 100644 entity/Order_entity/entityfields/paymentaddress/valueProcess.js
 delete mode 100644 entity/Order_entity/entityfields/versnr/documentation.adoc
 delete mode 100644 entity/Order_entity/entityfields/versnr/valueProcess.js

diff --git a/entity/Order_entity/Order_entity.aod b/entity/Order_entity/Order_entity.aod
index 30c65d442d..5050ba9585 100644
--- a/entity/Order_entity/Order_entity.aod
+++ b/entity/Order_entity/Order_entity.aod
@@ -65,7 +65,6 @@
       <consumer>AnyContacts</consumer>
       <linkedContextProcess>%aditoprj%/entity/Order_entity/entityfields/contact_id/linkedContextProcess.js</linkedContextProcess>
       <mandatory v="true" />
-      <valueProcess>%aditoprj%/entity/Order_entity/entityfields/contact_id/valueProcess.js</valueProcess>
       <displayValueProcess>%aditoprj%/entity/Order_entity/entityfields/contact_id/displayValueProcess.js</displayValueProcess>
       <onValueChangeTypes>
         <element>MASK</element>
@@ -152,32 +151,13 @@
       <title>Language</title>
       <consumer>Languages</consumer>
       <mandatory v="true" />
-      <valueProcess>%aditoprj%/entity/Order_entity/entityfields/isolanguage/valueProcess.js</valueProcess>
       <displayValueProcess>%aditoprj%/entity/Order_entity/entityfields/isolanguage/displayValueProcess.js</displayValueProcess>
     </entityField>
-    <entityField>
-      <name>VERSNR</name>
-      <documentation>%aditoprj%/entity/Order_entity/entityfields/versnr/documentation.adoc</documentation>
-      <title>Vers. no.</title>
-      <state>READONLY</state>
-      <valueProcess>%aditoprj%/entity/Order_entity/entityfields/versnr/valueProcess.js</valueProcess>
-    </entityField>
     <entityField>
       <name>SALESORDER_ID</name>
       <documentation>%aditoprj%/entity/Order_entity/entityfields/salesorder_id/documentation.adoc</documentation>
       <title>SALESORDER_ID</title>
     </entityField>
-    <entityFieldGroup>
-      <name>OrderCode_VersNr_fieldgroup</name>
-      <valueProcess>%aditoprj%/entity/Order_entity/entityfields/ordercode_versnr_fieldgroup/valueProcess.js</valueProcess>
-      <title>Receipt number</title>
-      <description>Ordercode + VersNr</description>
-      <state>READONLY</state>
-      <fields>
-        <element>SALESORDERCODE</element>
-        <element>VERSNR</element>
-      </fields>
-    </entityFieldGroup>
     <entityParameter>
       <name>ContactId_param</name>
       <expose v="true" />
@@ -351,7 +331,6 @@
       <consumer>Offers</consumer>
       <linkedContext>Offer</linkedContext>
       <state>AUTO</state>
-      <valueProcess>%aditoprj%/entity/Order_entity/entityfields/offer_id/valueProcess.js</valueProcess>
       <displayValueProcess>%aditoprj%/entity/Order_entity/entityfields/offer_id/displayValueProcess.js</displayValueProcess>
     </entityField>
     <entityConsumer>
@@ -537,7 +516,6 @@
       <mandatory v="true" />
       <mandatoryProcess>%aditoprj%/entity/Order_entity/entityfields/object_rowid/mandatoryProcess.js</mandatoryProcess>
       <titleProcess>%aditoprj%/entity/Order_entity/entityfields/object_rowid/titleProcess.js</titleProcess>
-      <valueProcess>%aditoprj%/entity/Order_entity/entityfields/object_rowid/valueProcess.js</valueProcess>
       <displayValueProcess>%aditoprj%/entity/Order_entity/entityfields/object_rowid/displayValueProcess.js</displayValueProcess>
       <onValueChangeTypes>
         <element>MASK</element>
@@ -632,14 +610,12 @@
       <title>Delivery address</title>
       <contentType>LONG_TEXT</contentType>
       <mandatory v="true" />
-      <valueProcess>%aditoprj%/entity/Order_entity/entityfields/deliveryaddress/valueProcess.js</valueProcess>
     </entityField>
     <entityField>
       <name>PAYMENTADDRESS</name>
       <title>Payment address</title>
       <contentType>LONG_TEXT</contentType>
       <mandatory v="true" />
-      <valueProcess>%aditoprj%/entity/Order_entity/entityfields/paymentaddress/valueProcess.js</valueProcess>
     </entityField>
     <entityConsumer>
       <name>KeywordPaymentTerms</name>
@@ -835,11 +811,6 @@
       <expose v="true" />
       <description>PARAMETER</description>
     </entityParameter>
-    <entityField>
-      <name>FullOrderCode</name>
-      <title>Order number</title>
-      <valueProcess>%aditoprj%/entity/Order_entity/entityfields/fullordercode/valueProcess.js</valueProcess>
-    </entityField>
     <entityParameter>
       <name>OrderPaymentAddress_param</name>
       <expose v="true" />
@@ -852,14 +823,6 @@
       <documentation>%aditoprj%/entity/Order_entity/entityfields/orderdeliveryaddress_param/documentation.adoc</documentation>
       <description>PARAMETER</description>
     </entityParameter>
-    <entityActionField>
-      <name>newOrderVersion</name>
-      <documentation>%aditoprj%/entity/Order_entity/entityfields/neworderversion/documentation.adoc</documentation>
-      <title>New receipt version</title>
-      <onActionProcess>%aditoprj%/entity/Order_entity/entityfields/neworderversion/onActionProcess.js</onActionProcess>
-      <isObjectAction v="true" />
-      <iconId>VAADIN:DOLLAR</iconId>
-    </entityActionField>
     <entityActionField>
       <name>newOrder</name>
       <documentation>%aditoprj%/entity/Order_entity/entityfields/neworder/documentation.adoc</documentation>
@@ -978,6 +941,10 @@
         <fieldName>Contacts</fieldName>
       </dependency>
     </entityConsumer>
+    <entityParameter>
+      <name>Copy_param</name>
+      <expose v="true" />
+    </entityParameter>
   </entityFields>
   <recordContainers>
     <dbRecordContainer>
@@ -1055,10 +1022,6 @@
           <name>VAT.value</name>
           <recordfield>SALESORDER.VAT</recordfield>
         </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>VERSNR.value</name>
-          <recordfield>SALESORDER.VERSNR</recordfield>
-        </dbRecordFieldMapping>
         <dbRecordFieldMapping>
           <name>CONTACT_ID.value</name>
           <recordfield>SALESORDER.CONTACT_ID</recordfield>
diff --git a/entity/Order_entity/contentTitleProcess.js b/entity/Order_entity/contentTitleProcess.js
index 68e68c1f45..efca7174f4 100644
--- a/entity/Order_entity/contentTitleProcess.js
+++ b/entity/Order_entity/contentTitleProcess.js
@@ -1,5 +1,7 @@
+import("KeywordRegistry_basic");
+import("Keyword_lib");
 import("system.translate");
 import("system.vars");
 import("system.result");
 
-result.string(vars.get("$field.OrderCode_VersNr_fieldgroup"));
+result.string(KeywordUtils.getViewValue($KeywordRegistry.orderType(), vars.get("$field.ORDERTYPE")) +" - "+ vars.get("$field.SALESORDERCODE"));
diff --git a/entity/Order_entity/entityfields/cancellation/valueProcess.js b/entity/Order_entity/entityfields/cancellation/valueProcess.js
index 396d93a9c1..2baa7fdbc7 100644
--- a/entity/Order_entity/entityfields/cancellation/valueProcess.js
+++ b/entity/Order_entity/entityfields/cancellation/valueProcess.js
@@ -3,14 +3,6 @@ import("system.vars");
 import("system.result");
 
 
-if (vars.get("$this.value") == null) {
-    
-if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.get("$this.value") == null){
-    if (vars.exists("$param.OrderCancellation_param") && vars.get("$param.OrderCancellation_param")) 
-    {
-        result.string(vars.get("$param.OrderCancellation_param"));
-    }
-    else
+
+if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.get("$this.value") == null)
     result.string("0");
-}
-}
\ No newline at end of file
diff --git a/entity/Order_entity/entityfields/contact_id/valueProcess.js b/entity/Order_entity/entityfields/contact_id/valueProcess.js
deleted file mode 100644
index 1127220726..0000000000
--- a/entity/Order_entity/entityfields/contact_id/valueProcess.js
+++ /dev/null
@@ -1,7 +0,0 @@
-import("system.result");
-import("system.vars");
-
-if (vars.exists("$param.ContactId_param")) 
-{
-    result.string(vars.get("$param.ContactId_param"));
-}
\ No newline at end of file
diff --git a/entity/Order_entity/entityfields/currency/valueProcess.js b/entity/Order_entity/entityfields/currency/valueProcess.js
index 428b8d7716..317b5ce1ed 100644
--- a/entity/Order_entity/entityfields/currency/valueProcess.js
+++ b/entity/Order_entity/entityfields/currency/valueProcess.js
@@ -3,11 +3,5 @@ import("system.result");
 import("system.vars");
 import("KeywordRegistry_basic");
 
-if (vars.exists("$param.OrderCurrency_param") && vars.get("$param.OrderCurrency_param")) 
-{
-    result.string(vars.get("$param.OrderCurrency_param"));
-}
-else if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && !vars.get("$this.value"))
-{
+if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && !vars.get("$this.value"))
     result.string($KeywordRegistry.currency$eur());
-}
diff --git a/entity/Order_entity/entityfields/deliveryaddress/valueProcess.js b/entity/Order_entity/entityfields/deliveryaddress/valueProcess.js
deleted file mode 100644
index 10da985c56..0000000000
--- a/entity/Order_entity/entityfields/deliveryaddress/valueProcess.js
+++ /dev/null
@@ -1,10 +0,0 @@
-import("system.neon");
-import("system.result");
-import("system.vars");
-
-if (((vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW || vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT) && vars.get("$this.value") == null)){
-if (vars.get("$param.OrderDeliveryAddress_param")) 
-{
-    result.string(vars.get("$param.OrderDeliveryAddress_param"));
-}
-}
\ No newline at end of file
diff --git a/entity/Order_entity/entityfields/deliveryterms/valueProcess.js b/entity/Order_entity/entityfields/deliveryterms/valueProcess.js
index 99fd7d0b22..c6192e49d4 100644
--- a/entity/Order_entity/entityfields/deliveryterms/valueProcess.js
+++ b/entity/Order_entity/entityfields/deliveryterms/valueProcess.js
@@ -9,11 +9,7 @@ import("Contact_lib");
 
 
 
-if (vars.get("$param.OrderDeliveryTerm_param")) 
-{
-    result.string(vars.get("$param.OrderDeliveryTerm_param"));
-} 
-else if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.get("$this.value") == null)
+if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.get("$this.value") == null)
 {
     var presetValue = "";
     var contactIds = ContactUtils.getPersOrgIds(vars.getString("$field.CONTACT_ID"))
diff --git a/entity/Order_entity/entityfields/footer/valueProcess.js b/entity/Order_entity/entityfields/footer/valueProcess.js
index 7eebbf85cc..2351de155e 100644
--- a/entity/Order_entity/entityfields/footer/valueProcess.js
+++ b/entity/Order_entity/entityfields/footer/valueProcess.js
@@ -7,12 +7,7 @@ import("system.util");
 
 if (vars.get("$this.value") == null)
 {
-    if (vars.exists("$param.OrderFooter_param")) 
-    {
-        result.string(vars.get("$param.OrderFooter_param"));
-    }
-
-    else if(vars.get("$this.value"))
+    if(vars.get("$this.value"))
         result.string(vars.get("$this.value"));
 
     else if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
@@ -21,9 +16,9 @@ if (vars.get("$this.value") == null)
     if (vars.get("$field.ChosenTexFooter") != "")
     {
         var binaryId = newSelect("ID", SqlUtils.getBinariesAlias())
-                            .from("ASYS_BINARIES")
-                            .whereIfSet("ASYS_BINARIES.ROW_ID", "$field.ChosenTexFooter")
-                            .cell(true);
+        .from("ASYS_BINARIES")
+        .whereIfSet("ASYS_BINARIES.ROW_ID", "$field.ChosenTexFooter")
+        .cell(true);
                             
         if (binaryId)
             result.string(util.decodeBase64String(db.getBinaryContent(binaryId, SqlUtils.getBinariesAlias())));
diff --git a/entity/Order_entity/entityfields/fullordercode/valueProcess.js b/entity/Order_entity/entityfields/fullordercode/valueProcess.js
deleted file mode 100644
index 5a188eb0a4..0000000000
--- a/entity/Order_entity/entityfields/fullordercode/valueProcess.js
+++ /dev/null
@@ -1,9 +0,0 @@
-import("system.translate");
-import("system.result");
-import("system.vars");
-
-//a fieldGroup cannot be placed in a table (filter-view) at the moment and therefore a separate field is needed:
-if(!vars.get("$field.SALESORDERCODE") && !vars.get("$field.VERSNR"))
-    result.string(translate.text("Order"));
-else
-    result.string(vars.get("$field.SALESORDERCODE") + "-" + vars.get("$field.VERSNR"));
diff --git a/entity/Order_entity/entityfields/header/valueProcess.js b/entity/Order_entity/entityfields/header/valueProcess.js
index 0adc1563dd..6b045a0397 100644
--- a/entity/Order_entity/entityfields/header/valueProcess.js
+++ b/entity/Order_entity/entityfields/header/valueProcess.js
@@ -7,10 +7,7 @@ import("system.util");
 
 if (vars.get("$this.value") == null)
 {
-    if(vars.exists("$param.OrderHeader_param") && vars.get("$param.OrderHeader_param")) 
-        result.string(vars.get("$param.OrderHeader_param"));
-
-    else if(vars.get("$this.value"))
+    if(vars.get("$this.value"))
         result.string(vars.get("$this.value"));
 
     else if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
@@ -19,9 +16,9 @@ if (vars.get("$this.value") == null)
     if (vars.get("$field.ChosenTexHeader") != "")
     {
         var binaryId = newSelect("ID", SqlUtils.getBinariesAlias())
-                            .from("ASYS_BINARIES")
-                            .whereIfSet("ASYS_BINARIES.ROW_ID", "$field.ChosenTexHeader")
-                            .cell(true);
+        .from("ASYS_BINARIES")
+        .whereIfSet("ASYS_BINARIES.ROW_ID", "$field.ChosenTexHeader")
+        .cell(true);
                             
         if (binaryId)
             result.string(util.decodeBase64String(db.getBinaryContent(binaryId, SqlUtils.getBinariesAlias())));
diff --git a/entity/Order_entity/entityfields/isolanguage/valueProcess.js b/entity/Order_entity/entityfields/isolanguage/valueProcess.js
deleted file mode 100644
index 9ce0bbebd6..0000000000
--- a/entity/Order_entity/entityfields/isolanguage/valueProcess.js
+++ /dev/null
@@ -1,8 +0,0 @@
-import("system.result");
-import("system.vars");
-
-if ((vars.get("$this.value") == null || vars.get("$this.value") == undefined) 
-    && vars.exists("$param.OrderLanguage_param") && vars.get("$param.OrderLanguage_param")) 
-{
-    result.string(vars.get("$param.OrderLanguage_param"));
-}
diff --git a/entity/Order_entity/entityfields/neworderversion/documentation.adoc b/entity/Order_entity/entityfields/neworderversion/documentation.adoc
deleted file mode 100644
index 6bbf8c93b4..0000000000
--- a/entity/Order_entity/entityfields/neworderversion/documentation.adoc
+++ /dev/null
@@ -1,2 +0,0 @@
-== NEW ORDER VERSION
-* _New order version_: All values, orderitems included, are copied and inserted in a **new order version** (versnr. + _1_).
\ No newline at end of file
diff --git a/entity/Order_entity/entityfields/neworderversion/onActionProcess.js b/entity/Order_entity/entityfields/neworderversion/onActionProcess.js
deleted file mode 100644
index 7c40ce8cdb..0000000000
--- a/entity/Order_entity/entityfields/neworderversion/onActionProcess.js
+++ /dev/null
@@ -1,26 +0,0 @@
-import("system.vars");
-import("system.neon");
-import("Order_lib");
-
-var params = {
-    "ContactId_param" : vars.get("$field.CONTACT_ID"),
-    "ObjectType_param" : vars.get("$field.OBJECT_TYPE"),
-    "ObjectRowId_param" : vars.get("$field.OBJECT_ROWID"),
-    "OrderLanguage_param" : vars.get("$field.ISOLANGUAGE"),
-    "OfferId_param" : vars.get("$field.OFFER_ID"),
-    "OrderCode_param" : vars.get("$field.SALESORDERCODE"),
-    "OrderVersnr_param" : OrderUtils.getNextOrderVersionNumber(vars.get("$field.SALESORDERCODE")),
-    "OrderCurrency_param" : vars.get("$field.CURRENCY"),
-    "OrderPaymentAddress_param" : vars.get("$field.PAYMENTADDRESS"),
-    "OrderDeliveryAddress_param" : vars.get("$field.DELIVERYADDRESS"),
-    "OrderHeader_param" : vars.get("$field.HEADER"),
-    "OrderFooter_param" : vars.get("$field.FOOTER"),
-    "OrderDeliveryTerm_param" : vars.get("$field.DELIVERYTERMS"),
-    "OrderPaymentTerm_param" : vars.get("$field.PAYMENTTERMS"),
-    "OrderDunningDate_param" : vars.get("$field.DUNNINGDATE"),
-    "OrderDunningLevel_param" : vars.get("$field.DUNNINGLEVEL"),
-    "OrderType_param" : vars.get("$field.ORDERTYPE"),
-    "OrderCancellation_param" : vars.get("$field.CANCELLATION"),
-    "OrderStatus_param" : vars.get("$field.ORDERSTATUS")
-}
-neon.openContext("Order", null, null, neon.OPERATINGSTATE_NEW, params);
\ No newline at end of file
diff --git a/entity/Order_entity/entityfields/object_rowid/valueProcess.js b/entity/Order_entity/entityfields/object_rowid/valueProcess.js
deleted file mode 100644
index 4be89e30a9..0000000000
--- a/entity/Order_entity/entityfields/object_rowid/valueProcess.js
+++ /dev/null
@@ -1,7 +0,0 @@
-import("system.neon");
-import("system.vars");
-import("system.result");
-
-
-if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.exists("$param.ObjectRowId_param") && vars.get("$param.ObjectRowId_param"))
-    result.string(vars.get("$param.ObjectRowId_param"));
\ No newline at end of file
diff --git a/entity/Order_entity/entityfields/object_type/valueProcess.js b/entity/Order_entity/entityfields/object_type/valueProcess.js
index 55bd8cc69a..f8de4e0dc8 100644
--- a/entity/Order_entity/entityfields/object_type/valueProcess.js
+++ b/entity/Order_entity/entityfields/object_type/valueProcess.js
@@ -5,11 +5,7 @@ import("Context_lib")
 
 if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && !vars.get("$this.value"))
 {
-    if (vars.exists("$param.ObjectType_param") && vars.get("$param.ObjectType_param"))
-    {
-        result.string(vars.get("$param.ObjectType_param"));
-    }        
-    else if (vars.exists("$param.PossibleConnectionTypes") && vars.get("$param.PossibleConnectionTypes"))
+    if (vars.exists("$param.PossibleConnectionTypes") && vars.get("$param.PossibleConnectionTypes"))
     {
         var possible = JSON.parse(vars.getString("$param.PossibleConnectionTypes"));
         if (possible.length > 0)
diff --git a/entity/Order_entity/entityfields/offer_id/valueProcess.js b/entity/Order_entity/entityfields/offer_id/valueProcess.js
deleted file mode 100644
index aed6796329..0000000000
--- a/entity/Order_entity/entityfields/offer_id/valueProcess.js
+++ /dev/null
@@ -1,7 +0,0 @@
-import("system.result");
-import("system.vars");
-
-if (vars.exists("$param.OfferId_param")) 
-{
-    result.string(vars.get("$param.OfferId_param"));
-}
\ No newline at end of file
diff --git a/entity/Order_entity/entityfields/ordercode_versnr_fieldgroup/valueProcess.js b/entity/Order_entity/entityfields/ordercode_versnr_fieldgroup/valueProcess.js
deleted file mode 100644
index 7e065cc1c9..0000000000
--- a/entity/Order_entity/entityfields/ordercode_versnr_fieldgroup/valueProcess.js
+++ /dev/null
@@ -1,8 +0,0 @@
-import("system.translate");
-import("system.result");
-import("system.vars");
-
-if(!vars.get("$field.SALESORDERCODE") && !vars.get("$field.VERSNR"))
-    result.string(translate.text("Receipt"));
-else
-    result.string(vars.getString("$field.ORDERTYPE.displayValue") + " " + vars.get("$field.SALESORDERCODE") + "-" + vars.get("$field.VERSNR"));
diff --git a/entity/Order_entity/entityfields/orderstatus/valueProcess.js b/entity/Order_entity/entityfields/orderstatus/valueProcess.js
index f5ecd3b2f0..b9588e0511 100644
--- a/entity/Order_entity/entityfields/orderstatus/valueProcess.js
+++ b/entity/Order_entity/entityfields/orderstatus/valueProcess.js
@@ -3,14 +3,5 @@ import("system.vars");
 import("system.result");
 
 
-if (vars.get("$this.value") == null) {
-    
-if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.get("$this.value") == null){
-    if (vars.exists("$param.OrderStatus_param") && vars.get("$param.OrderStatus_param")) 
-    {
-        result.string(vars.get("$param.OrderStatus_param"));
-    }
-    else
+if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.get("$this.value") == null)
     result.string("0");
-}
-}
\ No newline at end of file
diff --git a/entity/Order_entity/entityfields/ordertype/valueProcess.js b/entity/Order_entity/entityfields/ordertype/valueProcess.js
index 1a8c788d82..76d59f30bb 100644
--- a/entity/Order_entity/entityfields/ordertype/valueProcess.js
+++ b/entity/Order_entity/entityfields/ordertype/valueProcess.js
@@ -1,23 +1,10 @@
-import("Keyword_lib");
 import("KeywordRegistry_basic");
-import("AttributeRegistry_basic");
-import("system.neon");
+import("Keyword_lib");
 import("system.result");
+import("system.neon");
 import("system.vars");
-import("Attribute_lib");
-import("Contact_lib");
-
 
-if (vars.get("$this.value") == null) {
-    if (vars.exists("$param.OrderType_param") && vars.get("$param.OrderType_param")) 
-    {
-        result.string(vars.get("$param.OrderType_param"));
-    }
 
-    
-    else if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.get("$this.value") == null)
-    {
-        result.string(KeywordUtils.getFirst($KeywordRegistry.orderType()));
-    }
 
-}
\ No newline at end of file
+if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.get("$this.value") == null)
+    result.string(KeywordUtils.getFirst($KeywordRegistry.orderType()));
\ No newline at end of file
diff --git a/entity/Order_entity/entityfields/paymentaddress/valueProcess.js b/entity/Order_entity/entityfields/paymentaddress/valueProcess.js
deleted file mode 100644
index 8bdbd2e1e8..0000000000
--- a/entity/Order_entity/entityfields/paymentaddress/valueProcess.js
+++ /dev/null
@@ -1,10 +0,0 @@
-import("system.neon");
-import("system.result");
-import("system.vars");
-
-if (((vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW || vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT) && vars.get("$this.value") == null)){
-if (vars.get("$param.OrderPaymentAddress_param")) 
-{
-    result.string(vars.get("$param.OrderPaymentAddress_param"));
-}
-}
\ No newline at end of file
diff --git a/entity/Order_entity/entityfields/paymentterms/valueProcess.js b/entity/Order_entity/entityfields/paymentterms/valueProcess.js
index 7f0d5a1cab..c35c563085 100644
--- a/entity/Order_entity/entityfields/paymentterms/valueProcess.js
+++ b/entity/Order_entity/entityfields/paymentterms/valueProcess.js
@@ -8,11 +8,7 @@ import("system.vars");
 import("Attribute_lib");
 
 if (vars.get("$this.value") == null) {
-    if (vars.get("$param.OrderPaymentTerm_param")) 
-    {
-        result.string(vars.get("$param.OrderPaymentTerm_param"));
-    }
-    else if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.get("$this.value") == null)
+    if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.get("$this.value") == null)
     {
         var presetValue = "";
         var contactIds = ContactUtils.getPersOrgIds(vars.getString("$field.CONTACT_ID"))
diff --git a/entity/Order_entity/entityfields/versnr/documentation.adoc b/entity/Order_entity/entityfields/versnr/documentation.adoc
deleted file mode 100644
index 9a71d9a905..0000000000
--- a/entity/Order_entity/entityfields/versnr/documentation.adoc
+++ /dev/null
@@ -1,8 +0,0 @@
-= VERSNR
-:hardbreaks:
-
-Additional to the ordercode there's a version number.
-By default it contains the value _1_.
-
-A new order version can be created over the action _newOrderVersion_.
-Then the new value is the old one incremented by _1_.
\ No newline at end of file
diff --git a/entity/Order_entity/entityfields/versnr/valueProcess.js b/entity/Order_entity/entityfields/versnr/valueProcess.js
deleted file mode 100644
index 6c5f491570..0000000000
--- a/entity/Order_entity/entityfields/versnr/valueProcess.js
+++ /dev/null
@@ -1,12 +0,0 @@
-import("system.vars");
-import("system.result");
-import("system.neon");
-import("Offer_lib");
-
-if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
-{
-    if (vars.exists("$param.OrderVersnr_param") && vars.get("$param.OrderVersnr_param"))
-        result.string(vars.get("$param.OrderVersnr_param"));
-    else
-        result.string( "1" );
-}
\ No newline at end of file
diff --git a/entity/Order_entity/recordcontainers/db/orderClauseProcess.js b/entity/Order_entity/recordcontainers/db/orderClauseProcess.js
index e214b63f10..f33113e0e3 100644
--- a/entity/Order_entity/recordcontainers/db/orderClauseProcess.js
+++ b/entity/Order_entity/recordcontainers/db/orderClauseProcess.js
@@ -2,6 +2,5 @@ import("system.result");
 import("system.db");
 
 result.object({
-    "SALESORDER.SALESORDERCODE": db.DESCENDING,
-    "SALESORDER.VERSNR": db.DESCENDING
+    "SALESORDER.SALESORDERCODE": db.DESCENDING
 });
\ No newline at end of file
diff --git a/neonContext/Orderitem/Orderitem.aod b/neonContext/Orderitem/Orderitem.aod
index 7317e72be6..7f83b02e3c 100644
--- a/neonContext/Orderitem/Orderitem.aod
+++ b/neonContext/Orderitem/Orderitem.aod
@@ -4,7 +4,6 @@
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <filterView>OrderitemFilter_view</filterView>
   <editView>OrderitemEdit_view</editView>
-  <previewView>OrderitemPreview_view</previewView>
   <entity>Orderitem_entity</entity>
   <references>
     <neonViewReference>
diff --git a/neonView/OrderEdit_view/OrderEdit_view.aod b/neonView/OrderEdit_view/OrderEdit_view.aod
index 7a97e3b7bd..e11f3390c8 100644
--- a/neonView/OrderEdit_view/OrderEdit_view.aod
+++ b/neonView/OrderEdit_view/OrderEdit_view.aod
@@ -17,8 +17,8 @@
       <entityField>#ENTITY</entityField>
       <fields>
         <entityFieldLink>
-          <name>17536f17-4160-4027-8486-07321692147d</name>
-          <entityField>OrderCode_VersNr_fieldgroup</entityField>
+          <name>fa86e5bf-464c-4875-8ae7-630eca39888e</name>
+          <entityField>SALESORDERCODE</entityField>
         </entityFieldLink>
         <entityFieldLink>
           <name>0f63ee93-c4bb-41e9-a38d-c52bb07f5a11</name>
diff --git a/neonView/OrderFilter_view/OrderFilter_view.aod b/neonView/OrderFilter_view/OrderFilter_view.aod
index a2e78f0e5b..7e2ac7bbb1 100644
--- a/neonView/OrderFilter_view/OrderFilter_view.aod
+++ b/neonView/OrderFilter_view/OrderFilter_view.aod
@@ -67,7 +67,7 @@
         </neonTableColumn>
         <neonTableColumn>
           <name>60b83daa-9349-4bef-94d8-5f1fc350da59</name>
-          <entityField>FullOrderCode</entityField>
+          <entityField>SALESORDERCODE</entityField>
         </neonTableColumn>
         <neonTableColumn>
           <name>dba5604f-cc1b-4083-8115-7bbe1ba07bf4</name>
diff --git a/neonView/OrderPreview_view/OrderPreview_view.aod b/neonView/OrderPreview_view/OrderPreview_view.aod
index d75cf66b97..d9d8b6ee2d 100644
--- a/neonView/OrderPreview_view/OrderPreview_view.aod
+++ b/neonView/OrderPreview_view/OrderPreview_view.aod
@@ -12,7 +12,7 @@
     <cardViewTemplate>
       <name>Header</name>
       <iconField>IMAGE</iconField>
-      <titleField>OrderCode_VersNr_fieldgroup</titleField>
+      <titleField>SALESORDERCODE</titleField>
       <descriptionField>CONTACT_ID</descriptionField>
       <favoriteAction1>newActivity</favoriteAction1>
       <entityField>#ENTITY</entityField>
diff --git a/neonView/OrderitemFilter_view/OrderitemFilter_view.aod b/neonView/OrderitemFilter_view/OrderitemFilter_view.aod
index 0e3ad84321..704cf8c7ac 100644
--- a/neonView/OrderitemFilter_view/OrderitemFilter_view.aod
+++ b/neonView/OrderitemFilter_view/OrderitemFilter_view.aod
@@ -47,14 +47,14 @@
           <name>89fd18d0-f6ee-4323-9277-464dee6da625</name>
           <entityField>OPTIONAL</entityField>
         </neonTableColumn>
-        <neonTableColumn>
-          <name>03a15cab-67d9-4e9d-b911-0d5599c87671</name>
-          <entityField>INFO</entityField>
-        </neonTableColumn>
         <neonTableColumn>
           <name>eecc066d-e380-4fe7-9e9b-99d80842981d</name>
           <entityField>TotalPrice</entityField>
         </neonTableColumn>
+        <neonTableColumn>
+          <name>03a15cab-67d9-4e9d-b911-0d5599c87671</name>
+          <entityField>INFO</entityField>
+        </neonTableColumn>
       </columns>
     </tableViewTemplate>
   </children>
diff --git a/process/Order_lib/process.js b/process/Order_lib/process.js
index b9d4815ae0..ecac0704d5 100644
--- a/process/Order_lib/process.js
+++ b/process/Order_lib/process.js
@@ -95,25 +95,30 @@ OrderUtils.createNewOrder = function(pContextId, pRowId, pRelationId)
 //TODO refactor function to minimize the params and only give an object that contains the data
 OrderUtils.copyOrder = function (pSourceOfferId, pContactId, pOrderType, pLanguage, pCurrency, pHeader, pFooter, pDeliveryTerm, pPaymentTerm, pPaymentAddress, pDeliveryAddress, pObjectType, pRowId, pDunningDate, pDunningLevel, pCancellation, pOrderStatus)
 {
-    var params = {
-        "ContactId_param" : pContactId,
-        "OrderType_param" : pOrderType,
-        "OrderLanguage_param" : pLanguage,
-        "OfferId_param" : pSourceOfferId,
-        "OrderCurrency_param" : pCurrency || "",
-        "OrderHeader_param" : pHeader || "",
-        "OrderFooter_param" : pFooter || "",
-        "OrderDeliveryTerm_param" : pDeliveryTerm || "",
-        "OrderPaymentTerm_param" : pPaymentTerm || "",
-        "OrderPaymentAddress_param" : pPaymentAddress || "",
-        "OrderDeliveryAddress_param" : pDeliveryAddress || "",
-        "ObjectType_param" : pObjectType || "",
-        "ObjectRowId_param" : pRowId || "",
-        "OrderDunningDate_param" : pDunningDate || "",
-        "OrderDunningLevel_param" : pDunningLevel || "",
-        "OrderCancellation_param" : pCancellation || "",
-        "OrderStatus_param" : pOrderStatus || ""
+    
+    var fieldparams = {
+        "$field.CONTACT_ID" : pContactId,
+        "$field.ORDERTYPE" : pOrderType,
+        "$field.ISOLANGUAGE" : pLanguage,
+        "$field.OFFER_ID" : pSourceOfferId,
+        "$field.CURRENCY" : pCurrency || "",
+        "$field.HEADER" : pHeader || "",
+        "$field.FOOTER" : pFooter || "",
+        "$field.DELIVERYTERMS" : pDeliveryTerm || "",
+        "$field.PAYMENTTERMS" : pPaymentTerm || "",
+        "$field.PAYMENTADDRESS" : pPaymentAddress || "",
+        "$field.DELIVERYADDRESS" : pDeliveryAddress || "",
+        "$field.OBJECT_TYPE" : pObjectType || "",
+        "$field.OBJECT_ROWID" : pRowId || "",
+        "$field.DUNNINGDATE" : pDunningDate || "",
+        "$field.DUNNINGLEVEL" : pDunningLevel || "",
+        "$field.CANCELLATION" : pCancellation || "",
+        "$field.ORDERSTATUS" : pOrderStatus || ""
     };
+    
+    var params = {}
+    params["Copy_param"] = JSON.stringify(fieldparams);
+    
     neon.openContext("Order", null, null, neon.OPERATINGSTATE_NEW, params);
 }
 
-- 
GitLab


From cd2ff65ea021c58321e2d6ce4b8483ef1e7d91c7 Mon Sep 17 00:00:00 2001
From: Tobias Feldmann <t.feldmann@adito.de>
Date: Tue, 16 Jun 2020 16:48:26 +0200
Subject: [PATCH 004/309] #1058838 salesproject probability calculation with ai

---
 entity/Salesproject_entity/Salesproject_entity.aod    |  6 ++++++
 .../entityfields/probability_ai/valueProcess.js       | 11 +++++++++++
 .../SalesprojectFilter_view.aod                       |  4 ++++
 .../SalesprojectPreview_view.aod                      |  4 ++++
 process/AttributeRegistry_basic/process.js            |  1 +
 5 files changed, 26 insertions(+)
 create mode 100644 entity/Salesproject_entity/entityfields/probability_ai/valueProcess.js

diff --git a/entity/Salesproject_entity/Salesproject_entity.aod b/entity/Salesproject_entity/Salesproject_entity.aod
index 44bc9ab626..05d6ee3e48 100644
--- a/entity/Salesproject_entity/Salesproject_entity.aod
+++ b/entity/Salesproject_entity/Salesproject_entity.aod
@@ -740,6 +740,12 @@
       <iconId>VAADIN:PLAY</iconId>
       <stateProcess>%aditoprj%/entity/Salesproject_entity/entityfields/startworkflow/stateProcess.js</stateProcess>
     </entityActionField>
+    <entityField>
+      <name>PROBABILITY_AI</name>
+      <title>Wahrscheinlichkeit KI</title>
+      <state>READONLY</state>
+      <valueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/probability_ai/valueProcess.js</valueProcess>
+    </entityField>
   </entityFields>
   <recordContainers>
     <dbRecordContainer>
diff --git a/entity/Salesproject_entity/entityfields/probability_ai/valueProcess.js b/entity/Salesproject_entity/entityfields/probability_ai/valueProcess.js
new file mode 100644
index 0000000000..fc2d20ec68
--- /dev/null
+++ b/entity/Salesproject_entity/entityfields/probability_ai/valueProcess.js
@@ -0,0 +1,11 @@
+import("system.vars");
+import("system.logging");
+import("system.result");
+import("AISalesproject_lib");
+
+result.string(AISalesprojectUtil.classify(vars.getString("$field.SALESPROJECTID"), 
+                                          vars.getString("$field.CONTACT_ID"), 
+                                          vars.getString("$field.PHASE"), 
+                                          vars.getString("$field.STATUS"), 
+                                          vars.getString("$field.VOLUME"),
+                                          vars.getString("$field.PROBABILITY")));
\ No newline at end of file
diff --git a/neonView/SalesprojectFilter_view/SalesprojectFilter_view.aod b/neonView/SalesprojectFilter_view/SalesprojectFilter_view.aod
index fabe25804f..eb772b2550 100644
--- a/neonView/SalesprojectFilter_view/SalesprojectFilter_view.aod
+++ b/neonView/SalesprojectFilter_view/SalesprojectFilter_view.aod
@@ -77,6 +77,10 @@
           <name>9f6b967e-5140-420f-84ca-2273920221bd</name>
           <entityField>PROJECTTITLE</entityField>
         </neonTableColumn>
+        <neonTableColumn>
+          <name>20f132ef-161e-4b84-b6ae-1f4daf016d16</name>
+          <entityField>PROBABILITY_AI</entityField>
+        </neonTableColumn>
         <neonTableColumn>
           <name>fec843c3-f7c0-42c7-8295-50386651edb2</name>
           <entityField>STARTDATE</entityField>
diff --git a/neonView/SalesprojectPreview_view/SalesprojectPreview_view.aod b/neonView/SalesprojectPreview_view/SalesprojectPreview_view.aod
index 393660ef8a..f1a8ad6a31 100644
--- a/neonView/SalesprojectPreview_view/SalesprojectPreview_view.aod
+++ b/neonView/SalesprojectPreview_view/SalesprojectPreview_view.aod
@@ -53,6 +53,10 @@
           <name>0ba7dcb5-9606-4d74-8455-3423a16fd98a</name>
           <entityField>PROBABILITY</entityField>
         </entityFieldLink>
+        <entityFieldLink>
+          <name>bee2acfb-20ac-485e-be6c-c9c6a25e6013</name>
+          <entityField>PROBABILITY_AI</entityField>
+        </entityFieldLink>
         <entityFieldLink>
           <name>950d21a3-c0f9-4df5-9810-fa027a6fdb4a</name>
           <entityField>VOLUME</entityField>
diff --git a/process/AttributeRegistry_basic/process.js b/process/AttributeRegistry_basic/process.js
index cacb5a18c5..0d5b68b1c7 100644
--- a/process/AttributeRegistry_basic/process.js
+++ b/process/AttributeRegistry_basic/process.js
@@ -18,6 +18,7 @@ $AttributeRegistry.targetGroup$competitior = function(){return "1d30d0ab-6103-49
 $AttributeRegistry.departments = function(){return "87d4ff5b-0ab6-4534-be26-76c6ef486072";};
 $AttributeRegistry.salesprojectType = function(){return "fd3963bc-8e60-411a-9911-b97eb73e5cf7";};
 $AttributeRegistry.responsibleADsupervisor = function(){return "c0b26482-c0aa-413d-a9c3-f44c56bd04a9";};
+$AttributeRegistry.industry = function(){return "7e9927a4-41e4-426f-bddd-c3e9ee3b093e";};
 
 $AttributeRegistry.visitPlanFrequency = function(){return "547b8b9d-88ba-4590-9e01-34d2a58116cc";};
 $AttributeRegistry.visitPlanFrequency$monthly = function(){return "8c100817-1d2b-4fc7-8fdd-fd0370e19385";};
-- 
GitLab


From 3ec65f92ae6b00a3251d48f94cceebece2221bbc Mon Sep 17 00:00:00 2001
From: Tobias Feldmann <t.feldmann@adito.de>
Date: Wed, 17 Jun 2020 09:27:57 +0200
Subject: [PATCH 005/309] #1058838 enable ai salesproject probability in custom
 project preferences

---
 entity/Salesproject_entity/Salesproject_entity.aod         | 1 +
 .../entityfields/probability_ai/stateProcess.js            | 7 +++++++
 .../_____PREFERENCES_PROJECT/_____PREFERENCES_PROJECT.aod  | 5 +++++
 3 files changed, 13 insertions(+)
 create mode 100644 entity/Salesproject_entity/entityfields/probability_ai/stateProcess.js

diff --git a/entity/Salesproject_entity/Salesproject_entity.aod b/entity/Salesproject_entity/Salesproject_entity.aod
index 05d6ee3e48..a31ef81019 100644
--- a/entity/Salesproject_entity/Salesproject_entity.aod
+++ b/entity/Salesproject_entity/Salesproject_entity.aod
@@ -744,6 +744,7 @@
       <name>PROBABILITY_AI</name>
       <title>Wahrscheinlichkeit KI</title>
       <state>READONLY</state>
+      <stateProcess>%aditoprj%/entity/Salesproject_entity/entityfields/probability_ai/stateProcess.js</stateProcess>
       <valueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/probability_ai/valueProcess.js</valueProcess>
     </entityField>
   </entityFields>
diff --git a/entity/Salesproject_entity/entityfields/probability_ai/stateProcess.js b/entity/Salesproject_entity/entityfields/probability_ai/stateProcess.js
new file mode 100644
index 0000000000..fd3f09b8d6
--- /dev/null
+++ b/entity/Salesproject_entity/entityfields/probability_ai/stateProcess.js
@@ -0,0 +1,7 @@
+import("system.result");
+import("system.project");
+
+if(!JSON.parse(project.getPreferenceValue("custom.ai.salesprojectProbability", "false")))
+{
+    result.string("INVISIBLE");
+}
\ No newline at end of file
diff --git a/preferences/_____PREFERENCES_PROJECT/_____PREFERENCES_PROJECT.aod b/preferences/_____PREFERENCES_PROJECT/_____PREFERENCES_PROJECT.aod
index cb973daa80..4559d69c44 100644
--- a/preferences/_____PREFERENCES_PROJECT/_____PREFERENCES_PROJECT.aod
+++ b/preferences/_____PREFERENCES_PROJECT/_____PREFERENCES_PROJECT.aod
@@ -102,6 +102,11 @@
       <description></description>
       <property>http://localhost:8080/flowable-modeler/#/processes</property>
     </customStringProperty>
+    <customBooleanProperty>
+      <name>ai.salesprojectProbability</name>
+      <description></description>
+      <property v="false" />
+    </customBooleanProperty>
   </customProperties>
   <customConfigProperties>
     <customBooleanProperty>
-- 
GitLab


From 742cc8d6385506b3e2b16644faef5ab24b17ed08 Mon Sep 17 00:00:00 2001
From: "a.voegl" <a.voegl@adito.de>
Date: Wed, 17 Jun 2020 09:37:42 +0200
Subject: [PATCH 006/309] OrderRefactoring

---
 entity/Order_entity/Order_entity.aod          | 82 +------------------
 entity/Order_entity/afterUiInit.js            |  4 +
 .../entityfields/dunningtext/valueProcess.js  |  9 +-
 .../documentation.adoc                        |  1 -
 .../orderlanguage_param/valueProcess.js       |  8 --
 .../documentation.adoc                        |  1 -
 .../entityfields/paydate/valueProcess.js      |  7 ++
 .../salesordercode/valueProcess.js            |  7 +-
 process/Offer_lib/process.js                  | 30 ++++---
 process/Order_lib/process.js                  | 13 ++-
 10 files changed, 42 insertions(+), 120 deletions(-)
 delete mode 100644 entity/Order_entity/entityfields/orderdeliveryaddress_param/documentation.adoc
 delete mode 100644 entity/Order_entity/entityfields/orderlanguage_param/valueProcess.js
 delete mode 100644 entity/Order_entity/entityfields/orderpaymentaddress_param/documentation.adoc
 create mode 100644 entity/Order_entity/entityfields/paydate/valueProcess.js

diff --git a/entity/Order_entity/Order_entity.aod b/entity/Order_entity/Order_entity.aod
index 5050ba9585..e725eb70ed 100644
--- a/entity/Order_entity/Order_entity.aod
+++ b/entity/Order_entity/Order_entity.aod
@@ -269,25 +269,6 @@
         </entityParameter>
       </children>
     </entityConsumer>
-    <entityParameter>
-      <name>OrderCurrency_param</name>
-      <expose v="true" />
-      <mandatory v="false" />
-      <description>PARAMETER</description>
-    </entityParameter>
-    <entityParameter>
-      <name>OrderLanguage_param</name>
-      <valueProcess>%aditoprj%/entity/Order_entity/entityfields/orderlanguage_param/valueProcess.js</valueProcess>
-      <expose v="true" />
-      <mandatory v="false" />
-      <description>PARAMETER</description>
-    </entityParameter>
-    <entityParameter>
-      <name>OrderHeader_param</name>
-      <expose v="true" />
-      <mandatory v="false" />
-      <description>PARAMETER</description>
-    </entityParameter>
     <entityConsumer>
       <name>Languages</name>
       <dependency>
@@ -469,6 +450,7 @@
       <contentType>DATE</contentType>
       <resolution>DAY</resolution>
       <stateProcess>%aditoprj%/entity/Order_entity/entityfields/paydate/stateProcess.js</stateProcess>
+      <valueProcess>%aditoprj%/entity/Order_entity/entityfields/paydate/valueProcess.js</valueProcess>
     </entityField>
     <entityField>
       <name>PAYDUEDATE</name>
@@ -673,16 +655,6 @@
       <stateProcess>%aditoprj%/entity/Order_entity/entityfields/dunningtext/stateProcess.js</stateProcess>
       <valueProcess>%aditoprj%/entity/Order_entity/entityfields/dunningtext/valueProcess.js</valueProcess>
     </entityField>
-    <entityParameter>
-      <name>OrderPaymentTerm_param</name>
-      <expose v="true" />
-      <description>PARAMETER</description>
-    </entityParameter>
-    <entityParameter>
-      <name>OrderDeliveryTerm_param</name>
-      <expose v="true" />
-      <description>PARAMETER</description>
-    </entityParameter>
     <entityConsumer>
       <name>Offers</name>
       <dependency>
@@ -743,31 +715,6 @@
       <title>Choose Footer</title>
       <consumer>DocumentTemplateTexFooter</consumer>
     </entityField>
-    <entityParameter>
-      <name>OrderFooter_param</name>
-      <expose v="true" />
-      <description>PARAMETER</description>
-    </entityParameter>
-    <entityParameter>
-      <name>OrderDunningDate_param</name>
-      <expose v="true" />
-      <description>PARAMETER</description>
-    </entityParameter>
-    <entityParameter>
-      <name>OrderDunningLevel_param</name>
-      <expose v="true" />
-      <description>PARAMETER</description>
-    </entityParameter>
-    <entityParameter>
-      <name>OrderType_param</name>
-      <expose v="true" />
-      <description>PARAMETER</description>
-    </entityParameter>
-    <entityParameter>
-      <name>OrderCancellation_param</name>
-      <expose v="true" />
-      <description>PARAMETER</description>
-    </entityParameter>
     <entityField>
       <name>ChosenPaymentAddress</name>
       <documentation>%aditoprj%/entity/Order_entity/entityfields/chosenpaymentaddress/documentation.adoc</documentation>
@@ -796,33 +743,6 @@
         <element>PROCESS_SETVALUE</element>
       </onValueChangeTypes>
     </entityField>
-    <entityParameter>
-      <name>OrderCode_param</name>
-      <expose v="true" />
-      <description>PARAMETER</description>
-    </entityParameter>
-    <entityParameter>
-      <name>OrderStatus_param</name>
-      <expose v="true" />
-      <description>PARAMETER</description>
-    </entityParameter>
-    <entityParameter>
-      <name>OrderVersnr_param</name>
-      <expose v="true" />
-      <description>PARAMETER</description>
-    </entityParameter>
-    <entityParameter>
-      <name>OrderPaymentAddress_param</name>
-      <expose v="true" />
-      <documentation>%aditoprj%/entity/Order_entity/entityfields/orderpaymentaddress_param/documentation.adoc</documentation>
-      <description>PARAMETER</description>
-    </entityParameter>
-    <entityParameter>
-      <name>OrderDeliveryAddress_param</name>
-      <expose v="true" />
-      <documentation>%aditoprj%/entity/Order_entity/entityfields/orderdeliveryaddress_param/documentation.adoc</documentation>
-      <description>PARAMETER</description>
-    </entityParameter>
     <entityActionField>
       <name>newOrder</name>
       <documentation>%aditoprj%/entity/Order_entity/entityfields/neworder/documentation.adoc</documentation>
diff --git a/entity/Order_entity/afterUiInit.js b/entity/Order_entity/afterUiInit.js
index e30b0b283b..8170933d28 100644
--- a/entity/Order_entity/afterUiInit.js
+++ b/entity/Order_entity/afterUiInit.js
@@ -6,4 +6,8 @@ import("Attribute_lib");
 if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
 {
     AttributeRelationUtils.presetMandatoryAttributes(ContextUtils.getCurrentContextId(), "Attributes");
+
+    if(vars.get("$param.Copy_param"))
+        neon.setFieldValues(JSON.parse(vars.get("$param.Copy_param")))
 }
+
diff --git a/entity/Order_entity/entityfields/dunningtext/valueProcess.js b/entity/Order_entity/entityfields/dunningtext/valueProcess.js
index 6ceea69e5f..4751e50c64 100644
--- a/entity/Order_entity/entityfields/dunningtext/valueProcess.js
+++ b/entity/Order_entity/entityfields/dunningtext/valueProcess.js
@@ -4,12 +4,5 @@ import("system.result");
 import("system.neon");
 import("Date_lib");
 
-
-if (vars.get("$this.value") == null){
-
-if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && !vars.get("$this.value")|| neon.OPERATINGSTATE_NEW ){
-    
+if((vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW || neon.OPERATINGSTATE_NEW) && vars.get("$this.value") == null)
     result.string(translate.text("Please pay the outstanding amount,this is you first/second reminder."))
-}
-    
-}
\ No newline at end of file
diff --git a/entity/Order_entity/entityfields/orderdeliveryaddress_param/documentation.adoc b/entity/Order_entity/entityfields/orderdeliveryaddress_param/documentation.adoc
deleted file mode 100644
index b50a32de3d..0000000000
--- a/entity/Order_entity/entityfields/orderdeliveryaddress_param/documentation.adoc
+++ /dev/null
@@ -1 +0,0 @@
-Carries the delivery address of the receipt. Can also be set from the offer if a receipt is to be created from a specified offer.
\ No newline at end of file
diff --git a/entity/Order_entity/entityfields/orderlanguage_param/valueProcess.js b/entity/Order_entity/entityfields/orderlanguage_param/valueProcess.js
deleted file mode 100644
index 28676a75ca..0000000000
--- a/entity/Order_entity/entityfields/orderlanguage_param/valueProcess.js
+++ /dev/null
@@ -1,8 +0,0 @@
-import("system.logging");
-import("system.vars");
-import("system.db");
-import("system.result");
-
-var salesorderid = vars.get("$field.SALESORDERID")
-if(salesorderid)
-result.string(db.cell("select ISOLANGUAGE from SALESORDER where SALESORDERID = '" + salesorderid + "'"))
\ No newline at end of file
diff --git a/entity/Order_entity/entityfields/orderpaymentaddress_param/documentation.adoc b/entity/Order_entity/entityfields/orderpaymentaddress_param/documentation.adoc
deleted file mode 100644
index 43cd09315c..0000000000
--- a/entity/Order_entity/entityfields/orderpaymentaddress_param/documentation.adoc
+++ /dev/null
@@ -1 +0,0 @@
-Carries the main address of the receipt. Can also be set from the offer if a receipt is to be created from a specified offer.
\ No newline at end of file
diff --git a/entity/Order_entity/entityfields/paydate/valueProcess.js b/entity/Order_entity/entityfields/paydate/valueProcess.js
new file mode 100644
index 0000000000..2b9e872981
--- /dev/null
+++ b/entity/Order_entity/entityfields/paydate/valueProcess.js
@@ -0,0 +1,7 @@
+import("system.logging");
+import("system.neon");
+import("system.vars");
+import("system.result");
+    
+if(vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_EDIT && vars.get("$this.value") == "")//we need "", because we are in EditMode
+    result.string(vars.get("$sys.date"));
\ No newline at end of file
diff --git a/entity/Order_entity/entityfields/salesordercode/valueProcess.js b/entity/Order_entity/entityfields/salesordercode/valueProcess.js
index ccfc41b24a..1282b4c915 100644
--- a/entity/Order_entity/entityfields/salesordercode/valueProcess.js
+++ b/entity/Order_entity/entityfields/salesordercode/valueProcess.js
@@ -4,9 +4,4 @@ import("system.neon");
 import("Order_lib");
 
 if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
-{
-    if (vars.exists("$param.OrderCode_param") && vars.get("$param.OrderCode_param"))
-        result.string(vars.get("$param.OrderCode_param"));
-    else
-        result.string(OrderUtils.getNextOrderNumber());
-}
\ No newline at end of file
+    result.string(OrderUtils.getNextOrderNumber());
diff --git a/process/Offer_lib/process.js b/process/Offer_lib/process.js
index 8b12e56fdb..0c256379c1 100644
--- a/process/Offer_lib/process.js
+++ b/process/Offer_lib/process.js
@@ -387,18 +387,24 @@ OfferUtils.copyOfferItems = function (pSourceOfferId, pTargetOfferId)
  * @param pHeader {String} [header=""]
  */
 OfferUtils.copyToOrder = function (pOfferId, pContextId, pRowId, pContactId, pLanguage, pCurrency, pAddress, pHeader)
-{
-    var params = {
-        "ContactId_param" : pContactId,
-        "ObjectRowId_param" : pRowId,
-        "ObjectType_param" : pContextId,
-        "OrderLanguage_param" : pLanguage,
-        "OfferId_param" : pOfferId,
-        "OrderCurrency_param" : pCurrency || "",
-        "OrderPaymentAddress_param" : pAddress || "",
-        "OrderHeader_param" : pHeader || ""
-    };
-    neon.openContext("Order", null, null, neon.OPERATINGSTATE_NEW, params);
+{  
+        var fieldparams = 
+        {
+        "$field.CONTACT_ID" : pContactId,
+        "$field.ISOLANGUAGE" : pLanguage,
+        "$field.OFFER_ID" : pOfferId,
+        "$field.CURRENCY" : pCurrency || "",
+        "$field.HEADER" : pHeader || "",
+        "$field.PAYMENTADDRESS" : pAddress || "",
+        "$field.OBJECT_TYPE" : pContextId || "",
+        "$field.OBJECT_ROWID" : pRowId || ""
+        };
+    
+    var params = {};
+    params["Copy_param"] = JSON.stringify(fieldparams);
+    params["OfferId_param"] = pOfferId;
+    
+    neon.openContext("Order", null, null, neon.OPERATINGSTATE_NEW, params);  
 }
 
 /**
diff --git a/process/Order_lib/process.js b/process/Order_lib/process.js
index ecac0704d5..22e824f24d 100644
--- a/process/Order_lib/process.js
+++ b/process/Order_lib/process.js
@@ -79,15 +79,20 @@ OrderUtils.isDeletable = function(status) {
 OrderUtils.createNewOrder = function(pContextId, pRowId, pRelationId)
 {
     var params = {};
+    var fieldparams = {};
     
      if (pRowId && pContextId)
     {
-        params["ObjectRowId_param"] = pRowId;
-        params["ObjectType_param"] = pContextId;
+        fieldparams["$field.OBJECT_TYPE"] = pContextId || "",
+        fieldparams["$field.OBJECT_ROWID"] = pRowId || ""
     }
     
     if (pRelationId)
+    { 
+        fieldparams["$field.CONTACT_ID"] = pRelationId;
         params["ContactId_param"] = pRelationId;
+    }
+    params["Copy_param"] = JSON.stringify(fieldparams);
     
     neon.openContext("Order", null, null, neon.OPERATINGSTATE_NEW, params);
 }
@@ -116,8 +121,9 @@ OrderUtils.copyOrder = function (pSourceOfferId, pContactId, pOrderType, pLangua
         "$field.ORDERSTATUS" : pOrderStatus || ""
     };
     
-    var params = {}
+    var params = {};
     params["Copy_param"] = JSON.stringify(fieldparams);
+    params["OfferId_param"] = pSourceOfferId;
     
     neon.openContext("Order", null, null, neon.OPERATINGSTATE_NEW, params);
 }
@@ -441,6 +447,7 @@ OrderUtils.buildReminderReport = function (pOrderID)
                         
     orderData[7] = datetime.toDate(orderData[7], translate.text("dd.MM.yyyy", language));
     orderData[18] = datetime.toDate(orderData[18], translate.text("dd.MM.yyyy", language));
+    orderData[19] = KeywordUtils.getViewValue("DunningLevel", orderData[19]);
     
     var orderItemFields = [
         "SALESORDERITEM.INFO", 
-- 
GitLab


From f673b6025df65b0dffcbe068214ca75e0c8194cc Mon Sep 17 00:00:00 2001
From: "a.voegl" <a.voegl@adito.de>
Date: Wed, 17 Jun 2020 10:23:38 +0200
Subject: [PATCH 007/309] Orderrework

---
 .../Data_alias/basic/2020.1.0/changelog.xml   |  2 +
 .../basic/2020.1.0/drop_salesorder_unpaid.xml |  8 ++++
 .../basic/2020.1.0/drop_salesorder_versnr.xml |  8 ++++
 .../_demoData/generatedData/salesorder.xml    | 17 --------
 .liquibase/Data_alias/changelog.xml           |  2 +-
 entity/Order_entity/Order_entity.aod          |  4 --
 .../entityfields/unpaid/valueProcess.js       |  7 ----
 neonContext/Order/Order.aod                   |  4 --
 .../OrderClassification_view.aod              | 39 -------------------
 .../OrderDetail_view/OrderDetail_view.aod     |  4 ++
 10 files changed, 23 insertions(+), 72 deletions(-)
 create mode 100644 .liquibase/Data_alias/basic/2020.1.0/drop_salesorder_unpaid.xml
 create mode 100644 .liquibase/Data_alias/basic/2020.1.0/drop_salesorder_versnr.xml
 delete mode 100644 entity/Order_entity/entityfields/unpaid/valueProcess.js
 delete mode 100644 neonView/OrderClassification_view/OrderClassification_view.aod

diff --git a/.liquibase/Data_alias/basic/2020.1.0/changelog.xml b/.liquibase/Data_alias/basic/2020.1.0/changelog.xml
index 1a5cbcf126..9ff22e7eea 100644
--- a/.liquibase/Data_alias/basic/2020.1.0/changelog.xml
+++ b/.liquibase/Data_alias/basic/2020.1.0/changelog.xml
@@ -11,4 +11,6 @@
     <include relativeToChangelogFile="true" file="add_WorkflowSignal_variables.xml"/>
     <include relativeToChangelogFile="true" file="AlterTablesForTranslation/changelog.xml"/>
     <include relativeToChangelogFile="true" file="update_Salutation_headline.xml"/>
+    <include relativeToChangelogFile="true" file="drop_salesorder_unpaid.xml"/>
+    <include relativeToChangelogFile="true" file="drop_salesorder_versnr.xml"/>
 </databaseChangeLog>
diff --git a/.liquibase/Data_alias/basic/2020.1.0/drop_salesorder_unpaid.xml b/.liquibase/Data_alias/basic/2020.1.0/drop_salesorder_unpaid.xml
new file mode 100644
index 0000000000..0f1f60e4c2
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2020.1.0/drop_salesorder_unpaid.xml
@@ -0,0 +1,8 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+    <changeSet author="a.voegl" id="6d0c57b1-309f-4d60-a801-2107b3c2480e">
+        <dropColumn tableName="SALESORDER">
+            <column name="UNPAID"/>
+        </dropColumn>
+    </changeSet>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/2020.1.0/drop_salesorder_versnr.xml b/.liquibase/Data_alias/basic/2020.1.0/drop_salesorder_versnr.xml
new file mode 100644
index 0000000000..7e385b320c
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2020.1.0/drop_salesorder_versnr.xml
@@ -0,0 +1,8 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+    <changeSet author="a.voegl" id="97c84d76-8c2d-4db7-8151-8ef5d70fd7d4">
+        <dropColumn tableName="SALESORDER">
+            <column name="VERSNR"/>
+        </dropColumn>
+    </changeSet>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/_demoData/generatedData/salesorder.xml b/.liquibase/Data_alias/basic/_demoData/generatedData/salesorder.xml
index d7fcac18bb..224f7fea66 100644
--- a/.liquibase/Data_alias/basic/_demoData/generatedData/salesorder.xml
+++ b/.liquibase/Data_alias/basic/_demoData/generatedData/salesorder.xml
@@ -24,7 +24,6 @@
       <column name="SALESORDERDATE" valueDate="2019-05-22T02:00:00"/>
       <column name="SALESORDERID" value="1b9bd530-f45b-4074-872f-b8362cfc5ed0"/>
       <column name="VAT" valueNumeric="0.00"/>
-      <column name="VERSNR" valueNumeric="1"/>
     </insert>
     <insert tableName="salesorder">
       <column name="CANCELLATION" valueNumeric="0"/>
@@ -42,7 +41,6 @@
       <column name="SALESORDERDATE" valueDate="2017-11-21T01:00:00"/>
       <column name="SALESORDERID" value="2e661772-951f-47bc-a862-5aa3c5aa2731"/>
       <column name="VAT" valueNumeric="39.90"/>
-      <column name="VERSNR" valueNumeric="1"/>
     </insert>
     <insert tableName="salesorder">
       <column name="CANCELLATION" valueNumeric="1"/>
@@ -61,7 +59,6 @@
       <column name="SALESORDERDATE" valueDate="2016-06-14T02:00:00"/>
       <column name="SALESORDERID" value="373f28a5-a812-433b-8196-a6bf8bdd5656"/>
       <column name="VAT" valueNumeric="119.70"/>
-      <column name="VERSNR" valueNumeric="1"/>
     </insert>
     <insert tableName="salesorder">
       <column name="CANCELLATION" valueNumeric="1"/>
@@ -80,7 +77,6 @@
       <column name="SALESORDERDATE" valueDate="2018-08-12T02:00:00"/>
       <column name="SALESORDERID" value="3ce30718-ecc6-4543-95c8-1b25e1b6db43"/>
       <column name="VAT" valueNumeric="79.80"/>
-      <column name="VERSNR" valueNumeric="1"/>
     </insert>
     <insert tableName="salesorder">
       <column name="CANCELLATION" valueNumeric="0"/>
@@ -102,7 +98,6 @@
       <column name="SALESORDERDATE" valueDate="2018-08-12T02:00:00"/>
       <column name="SALESORDERID" value="41197800-027b-47f5-923a-f1004d09a969"/>
       <column name="VAT" valueNumeric="79.80"/>
-      <column name="VERSNR" valueNumeric="1"/>
     </insert>
     <insert tableName="salesorder">
       <column name="CANCELLATION" valueNumeric="0"/>
@@ -120,7 +115,6 @@
       <column name="SALESORDERDATE" valueDate="2018-08-23T02:00:00"/>
       <column name="SALESORDERID" value="4b0e2423-d09d-47fc-b274-5a9fde013b64"/>
       <column name="VAT" valueNumeric="79.80"/>
-      <column name="VERSNR" valueNumeric="1"/>
     </insert>
     <insert tableName="salesorder">
       <column name="CANCELLATION" valueNumeric="0"/>
@@ -143,7 +137,6 @@
       <column name="SALESORDERDATE" valueDate="2018-09-11T12:00:00"/>
       <column name="SALESORDERID" value="50c64e0f-6a21-4842-ab41-b27c70d0939a"/>
       <column name="VAT" valueNumeric="10070.00"/>
-      <column name="VERSNR" valueNumeric="1"/>
     </insert>
     <insert tableName="salesorder">
       <column name="CANCELLATION" valueNumeric="0"/>
@@ -162,7 +155,6 @@
       <column name="SALESORDERDATE" valueDate="2017-05-09T02:00:00"/>
       <column name="SALESORDERID" value="545ffd81-cfa5-4be6-b62c-df269909dcd4"/>
       <column name="VAT" valueNumeric="79.80"/>
-      <column name="VERSNR" valueNumeric="1"/>
     </insert>
     <insert tableName="salesorder">
       <column name="CANCELLATION" valueNumeric="0"/>
@@ -181,7 +173,6 @@
       <column name="SALESORDERDATE" valueDate="2018-08-23T02:00:00"/>
       <column name="SALESORDERID" value="5a34f4a2-13b2-46ec-8f61-939fe27ba484"/>
       <column name="VAT" valueNumeric="79.80"/>
-      <column name="VERSNR" valueNumeric="1"/>
     </insert>
     <insert tableName="salesorder">
       <column name="CANCELLATION" valueNumeric="0"/>
@@ -208,7 +199,6 @@
       <column name="SALESORDERDATE" valueDate="2017-10-10T12:00:00"/>
       <column name="SALESORDERID" value="5e082fe5-99d4-43be-aaad-e596f844fa8a"/>
       <column name="VAT" valueNumeric="10165.00"/>
-      <column name="VERSNR" valueNumeric="1"/>
     </insert>
     <insert tableName="salesorder">
       <column name="CANCELLATION" valueNumeric="1"/>
@@ -231,7 +221,6 @@
       <column name="SALESORDERDATE" valueDate="2019-05-22T02:00:00"/>
       <column name="SALESORDERID" value="9069d098-7237-4fed-a365-ad2e60bf740f"/>
       <column name="VAT" valueNumeric="0.00"/>
-      <column name="VERSNR" valueNumeric="1"/>
     </insert>
     <insert tableName="salesorder">
       <column name="CANCELLATION" valueNumeric="0"/>
@@ -252,7 +241,6 @@
       <column name="SALESORDERDATE" valueDate="2019-05-17T02:00:00"/>
       <column name="SALESORDERID" value="a846d596-b9ce-4a73-a842-e9084ebf612a"/>
       <column name="VAT" valueNumeric="0.00"/>
-      <column name="VERSNR" valueNumeric="1"/>
     </insert>
     <insert tableName="salesorder">
       <column name="CANCELLATION" valueNumeric="0"/>
@@ -271,7 +259,6 @@
       <column name="SALESORDERDATE" valueDate="2017-11-21T01:00:00"/>
       <column name="SALESORDERID" value="de09c9c2-7560-4f3f-9284-853ad1341cf9"/>
       <column name="VAT" valueNumeric="39.90"/>
-      <column name="VERSNR" valueNumeric="1"/>
     </insert>
     <insert tableName="salesorder">
       <column name="CANCELLATION" valueNumeric="0"/>
@@ -290,7 +277,6 @@
       <column name="SALESORDERDATE" valueDate="2017-05-09T02:00:00"/>
       <column name="SALESORDERID" value="f5cf5ef9-ce09-4885-bcb0-421cd9cfac69"/>
       <column name="VAT" valueNumeric="79.80"/>
-      <column name="VERSNR" valueNumeric="1"/>
     </insert>
     <insert tableName="salesorder">
       <column name="CANCELLATION" valueNumeric="0"/>
@@ -312,7 +298,6 @@
       <column name="SALESORDERDATE" valueDate="2016-06-14T02:00:00"/>
       <column name="SALESORDERID" value="fae74315-d7ac-4757-b952-cc71ae83f4b5"/>
       <column name="VAT" valueNumeric="119.70"/>
-      <column name="VERSNR" valueNumeric="1"/>
     </insert>
     <insert tableName="salesorder">
       <column name="CANCELLATION" valueNumeric="0"/>
@@ -338,7 +323,6 @@
       <column name="SALESORDERDATE" valueDate="2019-05-22T02:00:00"/>
       <column name="SALESORDERID" value="fc691949-4f61-485c-8e97-8f3d0d3d3962"/>
       <column name="VAT" valueNumeric="0.00"/>
-      <column name="VERSNR" valueNumeric="1"/>
     </insert>
     <insert tableName="salesorder">
       <column name="CANCELLATION" valueNumeric="0"/>
@@ -362,7 +346,6 @@
       <column name="SALESORDERDATE" valueDate="2019-11-15T12:00:00"/>
       <column name="SALESORDERID" value="ff049e6e-06ef-4c27-bcce-5b5b244e4054"/>
       <column name="VAT" valueNumeric="0.00"/>
-      <column name="VERSNR" valueNumeric="1"/>
     </insert>
   </changeSet>
 </databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/changelog.xml b/.liquibase/Data_alias/changelog.xml
index eee29581d9..da270f1732 100644
--- a/.liquibase/Data_alias/changelog.xml
+++ b/.liquibase/Data_alias/changelog.xml
@@ -14,5 +14,5 @@
     <include relativeToChangelogFile="true" file="basic/2020.1.0/changelog.xml"/>
     
     <!--enable this only when you definetly want to overwrite the existing data with demo records:--> 
-    <!--<include relativeToChangelogFile="true" file="basic/_demoData/changelog.xml" context="example"/>-->
+    <include relativeToChangelogFile="true" file="basic/_demoData/changelog.xml" context="example"/>
 </databaseChangeLog>
\ No newline at end of file
diff --git a/entity/Order_entity/Order_entity.aod b/entity/Order_entity/Order_entity.aod
index e725eb70ed..7e1fda9c71 100644
--- a/entity/Order_entity/Order_entity.aod
+++ b/entity/Order_entity/Order_entity.aod
@@ -416,10 +416,6 @@
       <stateProcess>%aditoprj%/entity/Order_entity/entityfields/paid/stateProcess.js</stateProcess>
       <displayValueProcess>%aditoprj%/entity/Order_entity/entityfields/paid/displayValueProcess.js</displayValueProcess>
     </entityField>
-    <entityField>
-      <name>Unpaid</name>
-      <valueProcess>%aditoprj%/entity/Order_entity/entityfields/unpaid/valueProcess.js</valueProcess>
-    </entityField>
     <entityField>
       <name>CANCELLATION</name>
       <documentation>%aditoprj%/entity/Order_entity/entityfields/cancellation/documentation.adoc</documentation>
diff --git a/entity/Order_entity/entityfields/unpaid/valueProcess.js b/entity/Order_entity/entityfields/unpaid/valueProcess.js
deleted file mode 100644
index 1439939a0c..0000000000
--- a/entity/Order_entity/entityfields/unpaid/valueProcess.js
+++ /dev/null
@@ -1,7 +0,0 @@
-import("system.result");
-import("system.vars");
-import("system.eMath");
-
-result.string(eMath.subDec(
-        vars.get("$field.TotalGross"),
-        vars.get("$field.PAID")));
\ No newline at end of file
diff --git a/neonContext/Order/Order.aod b/neonContext/Order/Order.aod
index ea7e701bba..d3f8ba0860 100644
--- a/neonContext/Order/Order.aod
+++ b/neonContext/Order/Order.aod
@@ -35,10 +35,6 @@
       <name>ac222647-40b8-43e3-a054-edfc3d69106b</name>
       <view>OrderLink_view</view>
     </neonViewReference>
-    <neonViewReference>
-      <name>e8fb5f3b-e166-4ee3-9752-e20d9aec0e75</name>
-      <view>OrderClassification_view</view>
-    </neonViewReference>
     <neonViewReference>
       <name>cea44230-2a80-4a3e-9dc4-3d199f8f6edc</name>
       <view>OrderDunning_view</view>
diff --git a/neonView/OrderClassification_view/OrderClassification_view.aod b/neonView/OrderClassification_view/OrderClassification_view.aod
deleted file mode 100644
index d5b6896eeb..0000000000
--- a/neonView/OrderClassification_view/OrderClassification_view.aod
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.6">
-  <name>OrderClassification_view</name>
-  <title>Classifications</title>
-  <majorModelMode>DISTRIBUTED</majorModelMode>
-  <layout>
-    <boxLayout>
-      <name>layout</name>
-    </boxLayout>
-  </layout>
-  <children>
-    <genericViewTemplate>
-      <name>Classifications</name>
-      <entityField>#ENTITY</entityField>
-      <fields>
-        <entityFieldLink>
-          <name>6c01c691-c587-438c-9c92-77682c4fd34e</name>
-          <entityField>PAYMENTTERMS</entityField>
-        </entityFieldLink>
-        <entityFieldLink>
-          <name>16f9e458-eab5-4ed1-954c-0f2f8cb474e3</name>
-          <entityField>DELIVERYTERMS</entityField>
-        </entityFieldLink>
-        <entityFieldLink>
-          <name>aed251c9-caa6-462f-9b22-6a87f5998b4e</name>
-          <entityField>PAYMENTADDRESS</entityField>
-        </entityFieldLink>
-        <entityFieldLink>
-          <name>52dd0767-3a92-4d13-9f72-1bd9e7745b79</name>
-          <entityField>DELIVERYADDRESS</entityField>
-        </entityFieldLink>
-        <entityFieldLink>
-          <name>7c486c49-22e2-4d61-ac86-b599adbf9522</name>
-          <entityField>NOTICE</entityField>
-        </entityFieldLink>
-      </fields>
-    </genericViewTemplate>
-  </children>
-</neonView>
diff --git a/neonView/OrderDetail_view/OrderDetail_view.aod b/neonView/OrderDetail_view/OrderDetail_view.aod
index 9e876a6e5c..44791968d0 100644
--- a/neonView/OrderDetail_view/OrderDetail_view.aod
+++ b/neonView/OrderDetail_view/OrderDetail_view.aod
@@ -27,6 +27,10 @@
           <name>6c1b2311-f15f-4d03-9301-0839b504d24a</name>
           <entityField>DUNNINGTEXT</entityField>
         </entityFieldLink>
+        <entityFieldLink>
+          <name>a488b7cc-bd0e-404a-bb7a-057410a1466d</name>
+          <entityField>NOTICE</entityField>
+        </entityFieldLink>
       </fields>
     </genericViewTemplate>
   </children>
-- 
GitLab


From eea788d5ca27c07a3e6b7c432b0a9aaf89bdc6e8 Mon Sep 17 00:00:00 2001
From: "a.voegl" <a.voegl@adito.de>
Date: Wed, 17 Jun 2020 11:07:29 +0200
Subject: [PATCH 008/309] OrderReports

---
 process/Order_lib/process.js              | 28 ++++++++++-------------
 report/Offer_report/reportData.jrxml      |  5 ++--
 report/Salesorder_report/reportData.jrxml |  6 ++---
 3 files changed, 17 insertions(+), 22 deletions(-)

diff --git a/process/Order_lib/process.js b/process/Order_lib/process.js
index 22e824f24d..a6f465eb84 100644
--- a/process/Order_lib/process.js
+++ b/process/Order_lib/process.js
@@ -39,7 +39,7 @@ OrderUtils.getNextOrderNumber = function() {
  * @return {String} orderCode next valid order version number
  */
 OrderUtils.getNextOrderVersionNumber = function(orderCode) {
-    return NumberSequencingUtils.getNextUniqueNumber("VERSNR", "SALESORDER", 1, "SALESORDERCODE = " + orderCode);
+    return NumberSequencingUtils.getNextUniqueNumber("SALESORDERCODE", "SALESORDER", 1, "SALESORDERCODE = " + orderCode);
 }
     
 /**
@@ -198,7 +198,6 @@ OrderUtils.buildOrderReport = function (pOrderID)
         "SALESORDERDATE", 
         "HEADER", //8
         "VAT", 
-        sqlUtil.isNull("VERSNR", "0"),
         sqlUtil.isNull("SALESORDERCODE", "0"), 
         "OBJECT_TYPE", //12
         "OBJECT_ROWID", //13
@@ -289,11 +288,10 @@ OrderUtils.buildOrderReport = function (pOrderID)
             item[5],        //itemposition
             item[6],        //productcode
             orderData[8],   //header 
-            orderData[14],   //footer 
+            orderData[13],   //footer 
             text.formatDouble(item[9], "#,##0", true),          //quantity
             text.formatDouble(item[10], "#,##0.00", true),      //price
             text.formatDouble(item[11], "0.00", true),          //discount
-            orderData[10],  //versnr
             orderData[5],   //offercode
             text.formatDouble(orderData[9], "#,##0.00", true),      //vat
             text.formatDouble(itemSum, "#,##0.00", true),       //itemsum
@@ -373,7 +371,6 @@ OrderUtils.buildOrderReport = function (pOrderID)
             "QUANTITY", 
             "PRICE", 
             "ORDERITEM.DISCOUNT", //13
-            "SALESORDER_VERSNR", 
             "ORDERCODE", 
             "SALESORDER.VAT", 
             "ITEMSUM", // 17
@@ -422,7 +419,6 @@ OrderUtils.buildReminderReport = function (pOrderID)
         "SALESORDERDATE", 
         "HEADER", //8
         "VAT", 
-        sqlUtil.isNull("VERSNR", "0"),
         sqlUtil.isNull("SALESORDERCODE", "0"), 
         "OBJECT_TYPE", //12
         "OBJECT_ROWID", //13
@@ -446,8 +442,8 @@ OrderUtils.buildReminderReport = function (pOrderID)
                         .cell();
                         
     orderData[7] = datetime.toDate(orderData[7], translate.text("dd.MM.yyyy", language));
-    orderData[18] = datetime.toDate(orderData[18], translate.text("dd.MM.yyyy", language));
-    orderData[19] = KeywordUtils.getViewValue("DunningLevel", orderData[19]);
+    orderData[17] = datetime.toDate(orderData[17], translate.text("dd.MM.yyyy", language));
+    orderData[18] = KeywordUtils.getViewValue("DunningLevel", orderData[18]);
     
     var orderItemFields = [
         "SALESORDERITEM.INFO", 
@@ -485,8 +481,8 @@ OrderUtils.buildReminderReport = function (pOrderID)
     var sums = [];
     var vatsum = 0;
     var printDiscount = false;
-    var brutto=eMath.addDec(orderData[17], orderData[9]);
-    var offen=eMath.subDec(brutto, orderData[16]);
+    var brutto=eMath.addDec(orderData[16], orderData[9]);
+    var offen=eMath.subDec(brutto, orderData[15]);
     itemData = itemData.map(function (item)
     {
         //quantity * price
@@ -510,18 +506,18 @@ OrderUtils.buildReminderReport = function (pOrderID)
             printDiscount = true;
         
         return [
-            orderData[16],        //payed
+            orderData[15],        //payed
             pOrderID,   //relationid
             orderData[6],   //currency
             orderData[7],   //orderdate
             text.formatDouble(orderData[9], "#,##0.00", true), //vat
-            orderData[11], //ordercode
-            orderData[17],       //net      
+            orderData[10], //ordercode
+            orderData[16],       //net      
             text.formatDouble(brutto, "#,##0.00", true),//brutto
             text.formatDouble(offen, "#,##0.00", true),//offen
-            orderData[18], //due date
-            orderData[20], //dunning text
-            orderData[19]  //dunninglevel
+            orderData[17], //due date
+            orderData[19], //dunning text
+            orderData[18]  //dunninglevel
            
         ];
     });
diff --git a/report/Offer_report/reportData.jrxml b/report/Offer_report/reportData.jrxml
index 54ef644c16..eddca65354 100644
--- a/report/Offer_report/reportData.jrxml
+++ b/report/Offer_report/reportData.jrxml
@@ -24,7 +24,7 @@
 	<parameter name="OfferDeliveryTerm" class="java.lang.String"/>
 	<parameter name="responsible" class="java.lang.String"/>
 	<parameter name="SUBREPORT_DIR" class="java.lang.String" isForPrompting="false">
-		<defaultValueExpression><![CDATA["C:\\Entwicklung\\0.0\\project\\basic2\\report\\Offer_report\\"]]></defaultValueExpression>
+		<defaultValueExpression><![CDATA["C:\\Users\\a.voegl\\Documents\\AditoProjects\\xrmBasicTest\\report\\Offer_report\\"]]></defaultValueExpression>
 	</parameter>
 	<parameter name="adito.datasource.subdata" class="java.lang.Object"/>
 	<parameter name="SUMITEMSUM" class="java.lang.Double"/>
@@ -52,7 +52,6 @@
 	<field name="PRODUCT_PRODUCTCODE" class="java.lang.String"/>
 	<field name="OFFER_HEADER" class="java.lang.String"/>
 	<field name="ITEMSUM" class="java.lang.String"/>
-	<field name="OFFER_VERSNR" class="java.lang.String"/>
 	<field name="OFFER_FOOTER" class="java.lang.String"/>
 	<sortField name="OFFER_OFFERID"/>
 	<group name="OFFERID" isStartNewPage="true">
@@ -106,7 +105,7 @@
 					<textElement textAlignment="Right">
 						<font size="8"/>
 					</textElement>
-					<textFieldExpression><![CDATA[$F{OFFER_OFFERCODE} + "-" + $F{OFFER_VERSNR}]]></textFieldExpression>
+					<textFieldExpression><![CDATA[$F{OFFER_OFFERCODE}]]></textFieldExpression>
 				</textField>
 				<textField>
 					<reportElement x="372" y="35" width="183" height="15" uuid="9f7aeac2-3844-43ee-bc8b-b11f8701b83e">
diff --git a/report/Salesorder_report/reportData.jrxml b/report/Salesorder_report/reportData.jrxml
index 028bf1f2db..6a5aa4badd 100644
--- a/report/Salesorder_report/reportData.jrxml
+++ b/report/Salesorder_report/reportData.jrxml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="Beleg" pageWidth="595" pageHeight="842" columnWidth="555" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" uuid="e7a916c8-3f9a-497d-84bb-3909b15271ea">
-	<property name="ireport.zoom" value="1.5"/>
+	<property name="ireport.zoom" value="1.0"/>
 	<property name="ireport.x" value="0"/>
-	<property name="ireport.y" value="63"/>
+	<property name="ireport.y" value="0"/>
 	<parameter name="myAddr" class="java.lang.String"/>
 	<parameter name="Artikelbezeichnung" class="java.lang.String"/>
 	<parameter name="Artikel-Nr" class="java.lang.String"/>
@@ -27,7 +27,7 @@
 	<parameter name="SUMITEMSUM" class="java.lang.Double"/>
 	<parameter name="TOTAL" class="java.lang.String"/>
 	<parameter name="SUBREPORT_DIR" class="java.lang.String" isForPrompting="false">
-		<defaultValueExpression><![CDATA["C:\\Entwicklung\\stable2019\\project\\basic\\report\\Salesorder_report\\"]]></defaultValueExpression>
+		<defaultValueExpression><![CDATA["C:\\Users\\a.voegl\\Documents\\AditoProjects\\xrmBasicTest\\report\\Salesorder_report\\"]]></defaultValueExpression>
 	</parameter>
 	<parameter name="adito.datasource.subdata" class="java.lang.Object" isForPrompting="false"/>
 	<parameter name="adito.image.myLogo" class="java.lang.String"/>
-- 
GitLab


From d93ad0510890c6902c6b9b407dca58f1752fc61c Mon Sep 17 00:00:00 2001
From: "a.voegl" <a.voegl@adito.de>
Date: Wed, 17 Jun 2020 11:57:15 +0200
Subject: [PATCH 009/309] remove InlineEdit

---
 neonView/OrderFilter_view/OrderFilter_view.aod         | 2 +-
 neonView/OrderitemFilter_view/OrderitemFilter_view.aod | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/neonView/OrderFilter_view/OrderFilter_view.aod b/neonView/OrderFilter_view/OrderFilter_view.aod
index 7e2ac7bbb1..6d60bbb472 100644
--- a/neonView/OrderFilter_view/OrderFilter_view.aod
+++ b/neonView/OrderFilter_view/OrderFilter_view.aod
@@ -51,7 +51,7 @@
   <children>
     <tableViewTemplate>
       <name>Orders</name>
-      <inlineEdit v="true" />
+      <inlineEdit v="false" />
       <iconField>IMAGE</iconField>
       <titleField>SALESORDERCODE</titleField>
       <subtitleField>STATUS</subtitleField>
diff --git a/neonView/OrderitemFilter_view/OrderitemFilter_view.aod b/neonView/OrderitemFilter_view/OrderitemFilter_view.aod
index 704cf8c7ac..855d9d4ec4 100644
--- a/neonView/OrderitemFilter_view/OrderitemFilter_view.aod
+++ b/neonView/OrderitemFilter_view/OrderitemFilter_view.aod
@@ -11,7 +11,7 @@
   <children>
     <tableViewTemplate>
       <name>Orderitems</name>
-      <inlineEdit v="true" />
+      <inlineEdit v="false" />
       <entityField>#ENTITY</entityField>
       <autoNewRow v="true" />
       <columns>
-- 
GitLab


From 9750ab5d5d84c08c6f0dd08f7c42bdb3d7221693 Mon Sep 17 00:00:00 2001
From: "a.voegl" <a.voegl@adito.de>
Date: Wed, 17 Jun 2020 13:43:33 +0200
Subject: [PATCH 010/309] treeTable & groupable

---
 entity/Order_entity/Order_entity.aod          |  8 ++++
 .../ordertype.displayvalue/expression.js      |  5 ++
 .../OrderFilter_view/OrderFilter_view.aod     | 46 ++++++++++++++++++-
 3 files changed, 57 insertions(+), 2 deletions(-)
 create mode 100644 entity/Order_entity/recordcontainers/db/recordfieldmappings/ordertype.displayvalue/expression.js

diff --git a/entity/Order_entity/Order_entity.aod b/entity/Order_entity/Order_entity.aod
index 7e1fda9c71..57a75025cb 100644
--- a/entity/Order_entity/Order_entity.aod
+++ b/entity/Order_entity/Order_entity.aod
@@ -32,6 +32,7 @@
       <name>CURRENCY</name>
       <title>Currency</title>
       <consumer>KeywordCurrencies</consumer>
+      <groupable v="true" />
       <valueProcess>%aditoprj%/entity/Order_entity/entityfields/currency/valueProcess.js</valueProcess>
       <displayValueProcess>%aditoprj%/entity/Order_entity/entityfields/currency/displayValueProcess.js</displayValueProcess>
     </entityField>
@@ -150,6 +151,7 @@
       <name>ISOLANGUAGE</name>
       <title>Language</title>
       <consumer>Languages</consumer>
+      <groupable v="true" />
       <mandatory v="true" />
       <displayValueProcess>%aditoprj%/entity/Order_entity/entityfields/isolanguage/displayValueProcess.js</displayValueProcess>
     </entityField>
@@ -169,6 +171,7 @@
       <name>CONTACT_ORG_ID</name>
       <title>Company</title>
       <consumer>Organisations</consumer>
+      <groupable v="true" />
     </entityField>
     <entityField>
       <name>CONTACT_PERSON_ID</name>
@@ -394,6 +397,7 @@
       <documentation>%aditoprj%/entity/Order_entity/entityfields/ordertype/documentation.adoc</documentation>
       <title>Order Type</title>
       <consumer>KeywordOrderTypes</consumer>
+      <groupable v="true" />
       <mandatory v="true" />
       <usePermissions v="true" />
       <valueProcess>%aditoprj%/entity/Order_entity/entityfields/ordertype/valueProcess.js</valueProcess>
@@ -1071,6 +1075,10 @@
           <name>ISOLANGUAGE.displayValue</name>
           <expression>%aditoprj%/entity/Order_entity/recordcontainers/db/recordfieldmappings/isolanguage.displayvalue/expression.js</expression>
         </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>ORDERTYPE.displayValue</name>
+          <expression>%aditoprj%/entity/Order_entity/recordcontainers/db/recordfieldmappings/ordertype.displayvalue/expression.js</expression>
+        </dbRecordFieldMapping>
       </recordFieldMappings>
     </dbRecordContainer>
     <indexRecordContainer>
diff --git a/entity/Order_entity/recordcontainers/db/recordfieldmappings/ordertype.displayvalue/expression.js b/entity/Order_entity/recordcontainers/db/recordfieldmappings/ordertype.displayvalue/expression.js
new file mode 100644
index 0000000000..5c5d8cb5e2
--- /dev/null
+++ b/entity/Order_entity/recordcontainers/db/recordfieldmappings/ordertype.displayvalue/expression.js
@@ -0,0 +1,5 @@
+import("KeywordRegistry_basic");
+import("system.result");
+import("Keyword_lib");
+
+result.string(KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.orderType(), "SALESORDER.ORDERTYPE"))
\ No newline at end of file
diff --git a/neonView/OrderFilter_view/OrderFilter_view.aod b/neonView/OrderFilter_view/OrderFilter_view.aod
index 6d60bbb472..673aaf7027 100644
--- a/neonView/OrderFilter_view/OrderFilter_view.aod
+++ b/neonView/OrderFilter_view/OrderFilter_view.aod
@@ -44,9 +44,9 @@
     </neonDashletConfiguration>
   </dashletConfigurations>
   <layout>
-    <boxLayout>
+    <groupLayout>
       <name>layout</name>
-    </boxLayout>
+    </groupLayout>
   </layout>
   <children>
     <tableViewTemplate>
@@ -99,5 +99,47 @@
         </neonTableColumn>
       </columns>
     </tableViewTemplate>
+    <treeTableViewTemplate>
+      <name>tree</name>
+      <entityField>#ENTITY</entityField>
+      <columns>
+        <neonTreeTableColumn>
+          <name>b55edb3a-ecbc-4d4c-958e-6e491777895b</name>
+          <entityField>IMAGE</entityField>
+        </neonTreeTableColumn>
+        <neonTreeTableColumn>
+          <name>61a86526-8928-4e85-979a-ca875730c913</name>
+          <entityField>SALESORDERCODE</entityField>
+        </neonTreeTableColumn>
+        <neonTreeTableColumn>
+          <name>d85c081c-d45a-4b58-bfff-e393ca2d8ab9</name>
+          <entityField>ORDERTYPE</entityField>
+        </neonTreeTableColumn>
+        <neonTreeTableColumn>
+          <name>a3e7168a-ea54-43da-9d88-943eba021d8c</name>
+          <entityField>CONTACT_ORG_ID</entityField>
+        </neonTreeTableColumn>
+        <neonTreeTableColumn>
+          <name>3ca66671-86ec-44bd-882b-ecd726a2a432</name>
+          <entityField>CONTACT_PERSON_ID</entityField>
+        </neonTreeTableColumn>
+        <neonTreeTableColumn>
+          <name>f3505b7d-4733-4b8b-a1ac-bd4c4b8ef6fe</name>
+          <entityField>ORDERSTATUS</entityField>
+        </neonTreeTableColumn>
+        <neonTreeTableColumn>
+          <name>93ace207-5c26-46ba-9cfc-2958a43e6c29</name>
+          <entityField>SALESORDERDATE</entityField>
+        </neonTreeTableColumn>
+        <neonTreeTableColumn>
+          <name>9935b80c-fc62-4bd5-a26c-efbd53a6f438</name>
+          <entityField>CANCELLATION</entityField>
+        </neonTreeTableColumn>
+        <neonTreeTableColumn>
+          <name>7873c2f2-0dc4-4c54-814a-df970eddea65</name>
+          <entityField>NET</entityField>
+        </neonTreeTableColumn>
+      </columns>
+    </treeTableViewTemplate>
   </children>
 </neonView>
-- 
GitLab


From 1d3bba0b18bd1c25731c4bd9ec446e6ab16a30d3 Mon Sep 17 00:00:00 2001
From: "a.voegl" <a.voegl@adito.de>
Date: Wed, 17 Jun 2020 14:11:07 +0200
Subject: [PATCH 011/309] Preset date

---
 .liquibase/Data_alias/changelog.xml                        | 2 +-
 entity/Order_entity/Order_entity.aod                       | 1 +
 .../Order_entity/entityfields/dunningdate/valueProcess.js  | 7 +++++++
 entity/Order_entity/entityfields/paydate/valueProcess.js   | 2 +-
 4 files changed, 10 insertions(+), 2 deletions(-)
 create mode 100644 entity/Order_entity/entityfields/dunningdate/valueProcess.js

diff --git a/.liquibase/Data_alias/changelog.xml b/.liquibase/Data_alias/changelog.xml
index da270f1732..eee29581d9 100644
--- a/.liquibase/Data_alias/changelog.xml
+++ b/.liquibase/Data_alias/changelog.xml
@@ -14,5 +14,5 @@
     <include relativeToChangelogFile="true" file="basic/2020.1.0/changelog.xml"/>
     
     <!--enable this only when you definetly want to overwrite the existing data with demo records:--> 
-    <include relativeToChangelogFile="true" file="basic/_demoData/changelog.xml" context="example"/>
+    <!--<include relativeToChangelogFile="true" file="basic/_demoData/changelog.xml" context="example"/>-->
 </databaseChangeLog>
\ No newline at end of file
diff --git a/entity/Order_entity/Order_entity.aod b/entity/Order_entity/Order_entity.aod
index 57a75025cb..a38155223e 100644
--- a/entity/Order_entity/Order_entity.aod
+++ b/entity/Order_entity/Order_entity.aod
@@ -435,6 +435,7 @@
       <contentType>DATE</contentType>
       <resolution>DAY</resolution>
       <stateProcess>%aditoprj%/entity/Order_entity/entityfields/dunningdate/stateProcess.js</stateProcess>
+      <valueProcess>%aditoprj%/entity/Order_entity/entityfields/dunningdate/valueProcess.js</valueProcess>
     </entityField>
     <entityField>
       <name>DUNNINGLEVEL</name>
diff --git a/entity/Order_entity/entityfields/dunningdate/valueProcess.js b/entity/Order_entity/entityfields/dunningdate/valueProcess.js
new file mode 100644
index 0000000000..d5ae1be32b
--- /dev/null
+++ b/entity/Order_entity/entityfields/dunningdate/valueProcess.js
@@ -0,0 +1,7 @@
+import("system.logging");
+import("system.neon");
+import("system.vars");
+import("system.result");
+    
+if(vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_EDIT && vars.get("$this.value") == "")
+    result.string(vars.get("$sys.date"));
\ No newline at end of file
diff --git a/entity/Order_entity/entityfields/paydate/valueProcess.js b/entity/Order_entity/entityfields/paydate/valueProcess.js
index 2b9e872981..d5ae1be32b 100644
--- a/entity/Order_entity/entityfields/paydate/valueProcess.js
+++ b/entity/Order_entity/entityfields/paydate/valueProcess.js
@@ -3,5 +3,5 @@ import("system.neon");
 import("system.vars");
 import("system.result");
     
-if(vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_EDIT && vars.get("$this.value") == "")//we need "", because we are in EditMode
+if(vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_EDIT && vars.get("$this.value") == "")
     result.string(vars.get("$sys.date"));
\ No newline at end of file
-- 
GitLab


From 8ca3d1b5d67bc417c52b3840875e35f5d27f49a0 Mon Sep 17 00:00:00 2001
From: "a.voegl" <a.voegl@adito.de>
Date: Thu, 18 Jun 2020 14:49:23 +0200
Subject: [PATCH 012/309] Bugfixes

---
 entity/Order_entity/afterUiInit.js                            | 2 +-
 .../Order_entity/entityfields/deliveryterms/valueProcess.js   | 2 +-
 entity/Order_entity/entityfields/paymentterms/valueProcess.js | 2 +-
 .../recordfieldmappings/ordertype.displayvalue/expression.js  | 2 +-
 process/Order_lib/process.js                                  | 4 ++--
 report/Salesorder_report/reportData.jrxml                     | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/entity/Order_entity/afterUiInit.js b/entity/Order_entity/afterUiInit.js
index 8170933d28..fb24b7ec60 100644
--- a/entity/Order_entity/afterUiInit.js
+++ b/entity/Order_entity/afterUiInit.js
@@ -8,6 +8,6 @@ if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
     AttributeRelationUtils.presetMandatoryAttributes(ContextUtils.getCurrentContextId(), "Attributes");
 
     if(vars.get("$param.Copy_param"))
-        neon.setFieldValues(JSON.parse(vars.get("$param.Copy_param")))
+        neon.setFieldValues(JSON.parse(vars.get("$param.Copy_param")));
 }
 
diff --git a/entity/Order_entity/entityfields/deliveryterms/valueProcess.js b/entity/Order_entity/entityfields/deliveryterms/valueProcess.js
index c6192e49d4..8e6fb1be5b 100644
--- a/entity/Order_entity/entityfields/deliveryterms/valueProcess.js
+++ b/entity/Order_entity/entityfields/deliveryterms/valueProcess.js
@@ -12,7 +12,7 @@ import("Contact_lib");
 if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.get("$this.value") == null)
 {
     var presetValue = "";
-    var contactIds = ContactUtils.getPersOrgIds(vars.getString("$field.CONTACT_ID"))
+    var contactIds = ContactUtils.getPersOrgIds(vars.getString("$field.CONTACT_ID"));
     if (contactIds.length >= 3 && contactIds[2])
     {
         var orgContactId = ContactUtils.getOrgContactId(contactIds[2]);
diff --git a/entity/Order_entity/entityfields/paymentterms/valueProcess.js b/entity/Order_entity/entityfields/paymentterms/valueProcess.js
index c35c563085..7501b966d1 100644
--- a/entity/Order_entity/entityfields/paymentterms/valueProcess.js
+++ b/entity/Order_entity/entityfields/paymentterms/valueProcess.js
@@ -11,7 +11,7 @@ if (vars.get("$this.value") == null) {
     if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.get("$this.value") == null)
     {
         var presetValue = "";
-        var contactIds = ContactUtils.getPersOrgIds(vars.getString("$field.CONTACT_ID"))
+        var contactIds = ContactUtils.getPersOrgIds(vars.getString("$field.CONTACT_ID"));
         if (contactIds.length >= 3 && contactIds[2])
         {
             var orgContactId = ContactUtils.getOrgContactId(contactIds[2]);
diff --git a/entity/Order_entity/recordcontainers/db/recordfieldmappings/ordertype.displayvalue/expression.js b/entity/Order_entity/recordcontainers/db/recordfieldmappings/ordertype.displayvalue/expression.js
index 5c5d8cb5e2..c4de4de938 100644
--- a/entity/Order_entity/recordcontainers/db/recordfieldmappings/ordertype.displayvalue/expression.js
+++ b/entity/Order_entity/recordcontainers/db/recordfieldmappings/ordertype.displayvalue/expression.js
@@ -2,4 +2,4 @@ import("KeywordRegistry_basic");
 import("system.result");
 import("Keyword_lib");
 
-result.string(KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.orderType(), "SALESORDER.ORDERTYPE"))
\ No newline at end of file
+result.string(KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.orderType(), "SALESORDER.ORDERTYPE"));
\ No newline at end of file
diff --git a/process/Order_lib/process.js b/process/Order_lib/process.js
index a6f465eb84..2656a54498 100644
--- a/process/Order_lib/process.js
+++ b/process/Order_lib/process.js
@@ -83,8 +83,8 @@ OrderUtils.createNewOrder = function(pContextId, pRowId, pRelationId)
     
      if (pRowId && pContextId)
     {
-        fieldparams["$field.OBJECT_TYPE"] = pContextId || "",
-        fieldparams["$field.OBJECT_ROWID"] = pRowId || ""
+        fieldparams["$field.OBJECT_TYPE"] = pContextId || "";
+        fieldparams["$field.OBJECT_ROWID"] = pRowId || "";
     }
     
     if (pRelationId)
diff --git a/report/Salesorder_report/reportData.jrxml b/report/Salesorder_report/reportData.jrxml
index 6a5aa4badd..496fcde2e9 100644
--- a/report/Salesorder_report/reportData.jrxml
+++ b/report/Salesorder_report/reportData.jrxml
@@ -27,7 +27,7 @@
 	<parameter name="SUMITEMSUM" class="java.lang.Double"/>
 	<parameter name="TOTAL" class="java.lang.String"/>
 	<parameter name="SUBREPORT_DIR" class="java.lang.String" isForPrompting="false">
-		<defaultValueExpression><![CDATA["C:\\Users\\a.voegl\\Documents\\AditoProjects\\xrmBasicTest\\report\\Salesorder_report\\"]]></defaultValueExpression>
+		<defaultValueExpression><![CDATA["C:\\Entwicklung\\stable2019\\project\\basic\\report\\Salesorder_report\\"]]></defaultValueExpression>
 	</parameter>
 	<parameter name="adito.datasource.subdata" class="java.lang.Object" isForPrompting="false"/>
 	<parameter name="adito.image.myLogo" class="java.lang.String"/>
-- 
GitLab


From 41d8088fc1bb9dd4f62aa13851c7d454cc237559 Mon Sep 17 00:00:00 2001
From: "a.voegl" <a.voegl@adito.de>
Date: Thu, 18 Jun 2020 14:50:29 +0200
Subject: [PATCH 013/309] OfferReport

---
 report/Offer_report/reportData.jrxml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/report/Offer_report/reportData.jrxml b/report/Offer_report/reportData.jrxml
index eddca65354..f2afe82751 100644
--- a/report/Offer_report/reportData.jrxml
+++ b/report/Offer_report/reportData.jrxml
@@ -24,7 +24,7 @@
 	<parameter name="OfferDeliveryTerm" class="java.lang.String"/>
 	<parameter name="responsible" class="java.lang.String"/>
 	<parameter name="SUBREPORT_DIR" class="java.lang.String" isForPrompting="false">
-		<defaultValueExpression><![CDATA["C:\\Users\\a.voegl\\Documents\\AditoProjects\\xrmBasicTest\\report\\Offer_report\\"]]></defaultValueExpression>
+		<defaultValueExpression><![CDATA["C:\\Entwicklung\\0.0\\project\\basic2\\report\\Offer_report\\"]]></defaultValueExpression>
 	</parameter>
 	<parameter name="adito.datasource.subdata" class="java.lang.Object"/>
 	<parameter name="SUMITEMSUM" class="java.lang.Double"/>
-- 
GitLab


From 529a5dd65a7c4bafc924d9284e95ef01c3c8e910 Mon Sep 17 00:00:00 2001
From: "a.voegl" <a.voegl@adito.de>
Date: Thu, 18 Jun 2020 15:03:40 +0200
Subject: [PATCH 014/309] Comment

---
 process/Order_lib/process.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/process/Order_lib/process.js b/process/Order_lib/process.js
index 2656a54498..73b3a8ff6f 100644
--- a/process/Order_lib/process.js
+++ b/process/Order_lib/process.js
@@ -97,7 +97,6 @@ OrderUtils.createNewOrder = function(pContextId, pRowId, pRelationId)
     neon.openContext("Order", null, null, neon.OPERATINGSTATE_NEW, params);
 }
 
-//TODO refactor function to minimize the params and only give an object that contains the data
 OrderUtils.copyOrder = function (pSourceOfferId, pContactId, pOrderType, pLanguage, pCurrency, pHeader, pFooter, pDeliveryTerm, pPaymentTerm, pPaymentAddress, pDeliveryAddress, pObjectType, pRowId, pDunningDate, pDunningLevel, pCancellation, pOrderStatus)
 {
     
-- 
GitLab


From f72d406fc7715a71ad38739cdd8762dfe89c9901 Mon Sep 17 00:00:00 2001
From: "b.ulrich" <b.ulrich@adito.de>
Date: Thu, 18 Jun 2020 15:14:47 +0200
Subject: [PATCH 015/309] =?UTF-8?q?[Projekt:=20Entwicklung=20-=20Neon][Tic?=
 =?UTF-8?q?ketNr.:=201059176][Fehler=20beim=20Hinzuf=C3=BCgen=20einer=20ne?=
 =?UTF-8?q?uen=20Kampagnenstufe,=20wenn=20Kampagne=20ge=C3=A4ndert=20wird]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../entityfields/campaign_id/valueProcess.js                    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/entity/CampaignStep_entity/entityfields/campaign_id/valueProcess.js b/entity/CampaignStep_entity/entityfields/campaign_id/valueProcess.js
index b91c3634ae..04d8b224fd 100644
--- a/entity/CampaignStep_entity/entityfields/campaign_id/valueProcess.js
+++ b/entity/CampaignStep_entity/entityfields/campaign_id/valueProcess.js
@@ -3,5 +3,5 @@ import("system.result");
 import("system.vars");
 
 //For creation of new Step in CampaignMainView
-if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.exists("$param.campaignId_param") && vars.get("$param.campaignId_param"))
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.exists("$param.campaignId_param") && vars.get("$param.campaignId_param") && !vars.get("$this.value"))
     result.string(vars.get("$param.campaignId_param"));
\ No newline at end of file
-- 
GitLab


From cf90d863f1c35c60ee88cf747ce59d5666c0098b Mon Sep 17 00:00:00 2001
From: "b.ulrich" <b.ulrich@adito.de>
Date: Fri, 19 Jun 2020 11:43:49 +0200
Subject: [PATCH 016/309] =?UTF-8?q?[Projekt:=20Entwicklung=20-=20Neon][Tic?=
 =?UTF-8?q?ketNr.:=201059627][LEADIMPORT=20-=20=C3=9Cbersetzung=20von=20Sc?=
 =?UTF-8?q?hl=C3=BCsselwort=20"Zip"=20fehlt]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 language/_____LANGUAGE_de/_____LANGUAGE_de.aod | 1 +
 1 file changed, 1 insertion(+)

diff --git a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
index fa13543e38..70f0ab3d2a 100644
--- a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
+++ b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
@@ -8562,6 +8562,7 @@ Bitte Datumseingabe prüfen</value>
     </entry>
     <entry>
       <key>Zip</key>
+      <value>PLZ</value>
     </entry>
     <entry>
       <key>type</key>
-- 
GitLab


From fa42403bd1462fc6cf8c439735b6207f8bb68e3b Mon Sep 17 00:00:00 2001
From: "b.ulrich" <b.ulrich@adito.de>
Date: Fri, 19 Jun 2020 13:08:03 +0200
Subject: [PATCH 017/309] [Projekt: Entwicklung - Neon][TicketNr.:
 1058681][OfferitemPreview_view: Header und Footer nicht gesetzt]

---
 neonView/OfferitemPreview_view/OfferitemPreview_view.aod | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/neonView/OfferitemPreview_view/OfferitemPreview_view.aod b/neonView/OfferitemPreview_view/OfferitemPreview_view.aod
index 244e22d007..3805f9a712 100644
--- a/neonView/OfferitemPreview_view/OfferitemPreview_view.aod
+++ b/neonView/OfferitemPreview_view/OfferitemPreview_view.aod
@@ -3,9 +3,9 @@
   <name>OfferitemPreview_view</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <layout>
-    <headerFooterLayout>
+    <boxLayout>
       <name>layout</name>
-    </headerFooterLayout>
+    </boxLayout>
   </layout>
   <children>
     <genericViewTemplate>
-- 
GitLab


From 0999411258765cbfe4c11c506dd04c25f00c4ef0 Mon Sep 17 00:00:00 2001
From: Tobias Feldmann <t.feldmann@adito.de>
Date: Mon, 22 Jun 2020 15:53:08 +0200
Subject: [PATCH 018/309] #1058838 added salesproject classification values to
 the training data

---
 .../AISalesproject_lib/AISalesproject_lib.aod |  1 +
 process/AISalesproject_lib/process.js         | 61 +++++++++++++++++--
 2 files changed, 58 insertions(+), 4 deletions(-)

diff --git a/process/AISalesproject_lib/AISalesproject_lib.aod b/process/AISalesproject_lib/AISalesproject_lib.aod
index c109e9524b..13b8a275db 100644
--- a/process/AISalesproject_lib/AISalesproject_lib.aod
+++ b/process/AISalesproject_lib/AISalesproject_lib.aod
@@ -3,6 +3,7 @@
   <name>AISalesproject_lib</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <process>%aditoprj%/process/AISalesproject_lib/process.js</process>
+  <alias>Data_alias</alias>
   <variants>
     <element>LIBRARY</element>
   </variants>
diff --git a/process/AISalesproject_lib/process.js b/process/AISalesproject_lib/process.js
index 0521bd2d9e..c1a63392f2 100644
--- a/process/AISalesproject_lib/process.js
+++ b/process/AISalesproject_lib/process.js
@@ -48,12 +48,30 @@ AISalesprojectUtil.train = function ()
             attributes.push(spRow["PHASE"]) //PHASE
             if(spRow["VOLUME"] != null && parseFloat(spRow["VOLUME"]) > 0)
                 attributes.push(AISalesprojectUtil.getVolumeClassification(parseFloat(spRow["VOLUME"]))); //VOLUME
-            if(spRow["PROBABILITY"]  != null)
+            if(spRow["PROBABILITY"] != null)
                 attributes.push(AISalesprojectUtil.getProbabilityValue(spRow["PROBABILITY"])); //PROBABILITY
             var sectorSP = new AttributeRelationQuery(spRow["CONTACT_ID"], $AttributeRegistry.industry()).getSingleAttributeValue();
             if(sectorSP != null)
                 attributes.push(sectorSP); //Sector       
             var doc = new NBDocument(spRow["#UID"], attributes);
+            
+            //Classification
+            
+            //Department
+            var department = AISalesprojectUtil.getClassificationValues("SALESPROJ", "Salesproject", spRow["#UID"], "ScoreDepartment");
+            if(department)
+                attributes.push(department);
+            
+            //Standard
+            var standard = AISalesprojectUtil.getClassificationValues("SALESPROJ", "Salesproject", spRow["#UID"], "ScoreStandard");
+            if(standard)
+                attributes.push(standard);
+
+            //Users
+            var users = AISalesprojectUtil.getClassificationValues("SALESPROJ", "Salesproject", spRow["#UID"], "ScoreUsers");
+            if(users)
+                attributes.push(users);
+
 
             var loadCompConfig = entities.createConfigForLoadingRows()
                 .entity("Competition_entity")
@@ -67,7 +85,9 @@ AISalesprojectUtil.train = function ()
                 doc.add(compRow["ORGANISATION_NAME"]); //competitors
             });
 
-            data.add(spRow["STATUS"], [doc]); // train model with lost and order salesprojects        
+            data.add(spRow["STATUS"], [doc]); // train model with lost and order salesprojects    
+            //logging.log("data:");
+            //logging.log(JSON.stringify(doc));
         }
         
     });
@@ -105,7 +125,25 @@ AISalesprojectUtil.classify = function (pSalesprojectId, pContactId, pPhase, pSt
         var sectorSP = new AttributeRelationQuery(pContactId, $AttributeRegistry.industry()).getSingleAttributeValue();
         if(sectorSP != null)
             testAttributes.push(sectorSP); //Sector    
-    }      
+    }
+    
+    //Classification
+    
+    //Department
+    var department = AISalesprojectUtil.getClassificationValues("SALESPROJ", "Salesproject", pSalesprojectId, "ScoreDepartment");
+    if(department)
+        testAttributes.push(department);
+          
+    //Standard      
+    var standard = AISalesprojectUtil.getClassificationValues("SALESPROJ", "Salesproject", pSalesprojectId, "ScoreStandard");
+    if(standard)
+        testAttributes.push(standard);
+
+    //Users
+    var users = AISalesprojectUtil.getClassificationValues("SALESPROJ", "Salesproject", pSalesprojectId, "ScoreUsers");
+    if(users)
+        testAttributes.push(users);    
+    
     var loadCompConfig = entities.createConfigForLoadingRows()
         .entity("Competition_entity")
         .provider("Links")
@@ -154,4 +192,19 @@ AISalesprojectUtil.getProbabilityValue = function (pProbId)
     else if(pProbId == "SALPROJPROB75" || pProbId == "SALPROJPROB100")
         return "positive";
     return "";
-};
\ No newline at end of file
+};
+
+AISalesprojectUtil.getClassificationValues = function (pClassificationType, pObjectType, pObjectRowid, pScoreType)
+{
+    var value = newSelect("TITLE")
+        .from("CLASSIFICATIONTYPE")
+        .leftJoin("CLASSIFICATION", newWhere("CLASSIFICATIONTYPEID = CLASSIFICATIONTYPE_ID")
+            .and("CLASSIFICATION.OBJECT_TYPE", pObjectType)
+            .and("CLASSIFICATION.OBJECT_ROWID", pObjectRowid))
+        .leftJoin("CLASSIFICATIONSCORE", "CLASSIFICATIONSCORE_ID = CLASSIFICATIONSCOREID")
+        .where("CLASSIFICATIONTYPE.CLASSIFICATIONTYPE", pClassificationType)
+        .andIfSet("CLASSIFICATIONTYPE.SCORETYPE", pScoreType)
+        .cell()
+
+    return value;
+};
-- 
GitLab


From 0e6223ca4d350d1ee2523db45868f0f9336e0148 Mon Sep 17 00:00:00 2001
From: Tobias Feldmann <t.feldmann@adito.de>
Date: Mon, 22 Jun 2020 16:03:28 +0200
Subject: [PATCH 019/309] #1058838 calc salesproject ai probability only if
 example is active

---
 .../entityfields/probability_ai/valueProcess.js          | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/entity/Salesproject_entity/entityfields/probability_ai/valueProcess.js b/entity/Salesproject_entity/entityfields/probability_ai/valueProcess.js
index fc2d20ec68..844f60472a 100644
--- a/entity/Salesproject_entity/entityfields/probability_ai/valueProcess.js
+++ b/entity/Salesproject_entity/entityfields/probability_ai/valueProcess.js
@@ -2,10 +2,15 @@ import("system.vars");
 import("system.logging");
 import("system.result");
 import("AISalesproject_lib");
+import("system.project");
 
-result.string(AISalesprojectUtil.classify(vars.getString("$field.SALESPROJECTID"), 
+if(JSON.parse(project.getPreferenceValue("custom.ai.salesprojectProbability", "false")))
+{
+    result.string(AISalesprojectUtil.classify(vars.getString("$field.SALESPROJECTID"), 
                                           vars.getString("$field.CONTACT_ID"), 
                                           vars.getString("$field.PHASE"), 
                                           vars.getString("$field.STATUS"), 
                                           vars.getString("$field.VOLUME"),
-                                          vars.getString("$field.PROBABILITY")));
\ No newline at end of file
+                                          vars.getString("$field.PROBABILITY"))); 
+ 
+}
\ No newline at end of file
-- 
GitLab


From e191a16730b0612eb7e864e8cd1b7156214dd110 Mon Sep 17 00:00:00 2001
From: "s.pongratz" <s.pongratz@adito.de>
Date: Tue, 23 Jun 2020 09:34:04 +0200
Subject: [PATCH 020/309] #1057226-ObjectTree_Bugfix Revert Nummern vertauscht

---
 .../ObjectTree_entity/recordcontainers/jdito/contentProcess.js  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/entity/ObjectTree_entity/recordcontainers/jdito/contentProcess.js b/entity/ObjectTree_entity/recordcontainers/jdito/contentProcess.js
index 55ac5773b3..4ea71164c3 100644
--- a/entity/ObjectTree_entity/recordcontainers/jdito/contentProcess.js
+++ b/entity/ObjectTree_entity/recordcontainers/jdito/contentProcess.js
@@ -234,7 +234,7 @@ function _getEntryData(pObjectId, pDirection, pRelationType1, pRelationType2, pP
     if (pRelationType1 == undefined || pRelationType2 == undefined) 
         return [];
     
-    var [myNum, otherNum] = pDirection == "normal" ? [2, 1] : [1, 2];
+    var [myNum, otherNum] = pDirection == "normal" ? [1, 2] : [2, 1];
     
     onConditionForRelationTypeJoin = newWhere("AB_OBJECTRELATIONTYPEID = AB_OBJECTRELATIONTYPE" + myNum)
         .and("AB_OBJECTRELATION.AB_OBJECTRELATIONTYPE1", pRelationType1)
-- 
GitLab


From 58bf0706bc7872b77203d5c6cf54ae9007deb99e Mon Sep 17 00:00:00 2001
From: "s.pongratz" <s.pongratz@adito.de>
Date: Wed, 24 Jun 2020 17:56:18 +0200
Subject: [PATCH 021/309] #1058741-WriteEntityIntegration QuickEntry

---
 .../recordcontainers/jdito/onInsert.js        | 119 +++++++-----------
 1 file changed, 46 insertions(+), 73 deletions(-)

diff --git a/entity/QuickEntry_entity/recordcontainers/jdito/onInsert.js b/entity/QuickEntry_entity/recordcontainers/jdito/onInsert.js
index e0891f1fe6..99c0207712 100644
--- a/entity/QuickEntry_entity/recordcontainers/jdito/onInsert.js
+++ b/entity/QuickEntry_entity/recordcontainers/jdito/onInsert.js
@@ -1,91 +1,64 @@
+import("system.logging");
+import("system.entities");
 import("Sql_lib");
 import("system.db");
 import("system.vars");
 import("KeywordRegistry_basic");
 
-//TODO: use writeEntity when available
 //TODO: duplicate check
 
 var rowdata = vars.get("$local.rowdata");
-var organisationId = rowdata["ORGANISATION_ID.value"];
+var organisationId = "0";
 var userNew = rowdata["USER_NEW.value"];
 var dateNew = rowdata["DATE_NEW.value"];
 
-var contactCols = [
-    "CONTACTID",
-    "ORGANISATION_ID",
-    "PERSON_ID",
-    "STATUS",
-    "ISOLANGUAGE",
-    "ADDRESS_ID",
-    "USER_NEW",
-    "DATE_NEW"
-];
-var contactVals = [
-    rowdata["UID.value"],
-    organisationId,
-    "",
-    $KeywordRegistry.contactStatus$active(),
-    rowdata["ISOLANGUAGE.value"],
-    "",
-    userNew,
-    dateNew
-];
-
 if (rowdata["ORGANISATION_NAME.value"])
 {
-    var orgCols = [
-        "ORGANISATIONID",
-        "NAME",
-        "USER_NEW",
-        "DATE_NEW"
-    ];
-    var orgVals = [
-        organisationId,
-        rowdata["ORGANISATION_NAME.value"],
-        userNew,
-        dateNew
-    ];
-    db.insertData("ORGANISATION", orgCols, null, orgVals);
-
-    db.insertData("CONTACT", contactCols, null, contactVals);
-}
-else
-{
-    contactVals[1] = "0"; //"private" if no company is given
+    let configOrg = entities.createConfigForAddingRows();
+    organisationId = rowdata["ORGANISATION_ID.value"];
+    configOrg.entity("Organisation_entity");
+    configOrg.fieldValues({
+        "ORGANISATIONID": organisationId,
+        "ORGANISATION_ID": organisationId,
+        "CONTACTID" : rowdata["UID.value"],
+        "NAME": rowdata["ORGANISATION_NAME.value"],
+        "USER_NEW": userNew,
+        "DATE_NEW": dateNew,
+        "USER_NEW_CONTACT": userNew,
+        "DATE_NEW_CONTACT" : dateNew,
+        "STATUS" : $KeywordRegistry.contactStatus$active(),
+        "ISOLANGUAGE" : "deu"
+    });
+    
+    entities.createRow(configOrg);
 }
 
 if (rowdata["LASTNAME.value"])
 {
-    var personCols = [
-        "PERSONID",
-        "FIRSTNAME",
-        "LASTNAME",
-        "SALUTATION",
-        "TITLE",
-        "GENDER",
-        "USER_NEW",
-        "DATE_NEW"
-    ];
-    var gender = newSelect("SEX")
-                    .from("SALUTATION")
-                    .whereIfSet("SALUTATION.SALUTATION", rowdata["PERSON_SALUTATION.value"])
-                    .cell(true);
-
-    var personVals = [
-        rowdata["PERSON_ID.value"],
-        rowdata["FIRSTNAME.value"] || "",
-        rowdata["LASTNAME.value"],
-        rowdata["PERSON_SALUTATION.value"] || "",
-        rowdata["PERSON_TITLE.value"] || "",
-        gender,
-        userNew,
-        dateNew
-    ];
-    db.insertData("PERSON", personCols, null, personVals);
-
-    contactVals[0] = rowdata["PERSON_CONTACT_ID.value"];
-    contactVals[2] = rowdata["PERSON_ID.value"];
-
-    db.insertData("CONTACT", contactCols, null, contactVals);
+    let gender = newSelect("SEX")
+    .from("SALUTATION")
+    .whereIfSet("SALUTATION.SALUTATION", rowdata["PERSON_SALUTATION.value"])
+    .cell(true);
+    
+    let configPer = entities.createConfigForAddingRows();
+    configPer.entity("Person_entity");
+    configPer.fieldValues({
+        "PERSON_ID" : rowdata["PERSON_ID.value"],
+        "PERSONID": rowdata["PERSON_ID.value"],
+        "FIRSTNAME": rowdata["FIRSTNAME.value"] || "",
+        "LASTNAME" : rowdata["LASTNAME.value"],
+        "SALUTATION": rowdata["PERSON_SALUTATION.value"] || "",
+        "TITLE": rowdata["PERSON_TITLE.value"] || "",
+        "GENDER": gender,
+        "USER_NEW": userNew,
+        "DATE_NEW": dateNew,
+        "USER_NEW_CONTACT": userNew,
+        "DATE_NEW_CONTACT" : dateNew,
+        "CONTACTID": rowdata["PERSON_CONTACT_ID.value"],
+        "ORGANISATION_ID": organisationId,
+        "STATUS" : $KeywordRegistry.contactStatus$active(),
+        "ISOLANGUAGE": rowdata["ISOLANGUAGE.value"]
+    });
+    
+    entities.createRow(configPer);
 }
\ No newline at end of file
-- 
GitLab


From 5e5f5fb7930abcdd7e15d0eb2b94bb20e4a97f55 Mon Sep 17 00:00:00 2001
From: "s.pongratz" <s.pongratz@adito.de>
Date: Wed, 24 Jun 2020 17:58:34 +0200
Subject: [PATCH 022/309] #1058741-WriteEntityIntegration ISO-Wert auslesen

---
 entity/QuickEntry_entity/recordcontainers/jdito/onInsert.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/entity/QuickEntry_entity/recordcontainers/jdito/onInsert.js b/entity/QuickEntry_entity/recordcontainers/jdito/onInsert.js
index 99c0207712..928c9c01f8 100644
--- a/entity/QuickEntry_entity/recordcontainers/jdito/onInsert.js
+++ b/entity/QuickEntry_entity/recordcontainers/jdito/onInsert.js
@@ -27,7 +27,7 @@ if (rowdata["ORGANISATION_NAME.value"])
         "USER_NEW_CONTACT": userNew,
         "DATE_NEW_CONTACT" : dateNew,
         "STATUS" : $KeywordRegistry.contactStatus$active(),
-        "ISOLANGUAGE" : "deu"
+        "ISOLANGUAGE" : rowdata["ISOLANGUAGE.value"]
     });
     
     entities.createRow(configOrg);
-- 
GitLab


From af192a15dfc7b6328e059247ad5b6151e7ea3af7 Mon Sep 17 00:00:00 2001
From: "s.pongratz" <s.pongratz@adito.de>
Date: Thu, 25 Jun 2020 08:14:33 +0200
Subject: [PATCH 023/309] =?UTF-8?q?#1058741-WriteEntityIntefration=20Entfe?=
 =?UTF-8?q?rnen=20von=20unn=C3=B6tigen=20imports?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 entity/QuickEntry_entity/recordcontainers/jdito/onInsert.js | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/entity/QuickEntry_entity/recordcontainers/jdito/onInsert.js b/entity/QuickEntry_entity/recordcontainers/jdito/onInsert.js
index 928c9c01f8..aa0f51c76f 100644
--- a/entity/QuickEntry_entity/recordcontainers/jdito/onInsert.js
+++ b/entity/QuickEntry_entity/recordcontainers/jdito/onInsert.js
@@ -1,9 +1,7 @@
-import("system.logging");
-import("system.entities");
 import("Sql_lib");
-import("system.db");
-import("system.vars");
 import("KeywordRegistry_basic");
+import("system.entities");
+import("system.vars");
 
 //TODO: duplicate check
 
-- 
GitLab


From 56f5f38d7a91c09ba71b7bbebf6c94a3a433e8a5 Mon Sep 17 00:00:00 2001
From: "s.pongratz" <s.pongratz@adito.de>
Date: Fri, 26 Jun 2020 10:16:53 +0200
Subject: [PATCH 024/309] =?UTF-8?q?#1059474-BerechtigungsIcons=20Icons=20h?=
 =?UTF-8?q?inzugef=C3=BCgt?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 entity/PermissionCalendar_entity/PermissionCalendar_entity.aod | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/entity/PermissionCalendar_entity/PermissionCalendar_entity.aod b/entity/PermissionCalendar_entity/PermissionCalendar_entity.aod
index 8bd374fd34..10c194267d 100644
--- a/entity/PermissionCalendar_entity/PermissionCalendar_entity.aod
+++ b/entity/PermissionCalendar_entity/PermissionCalendar_entity.aod
@@ -96,6 +96,7 @@
           <isMenuAction v="true" />
           <isObjectAction v="false" />
           <isSelectionAction v="false" />
+          <iconId>VAADIN:USER</iconId>
           <state>AUTO</state>
           <tooltip></tooltip>
         </entityActionField>
@@ -104,6 +105,7 @@
           <title>Add new Department Permission</title>
           <onActionProcess>%aditoprj%/entity/PermissionCalendar_entity/entityfields/addactions/children/addnewdepartmentpermissiondealteraction/onActionProcess.js</onActionProcess>
           <isObjectAction v="false" />
+          <iconId>VAADIN:GROUP</iconId>
           <state>AUTO</state>
         </entityActionField>
       </children>
-- 
GitLab


From 733a75141816bdf679f0ea36b485ec428f2bdb5c Mon Sep 17 00:00:00 2001
From: "b.ulrich" <b.ulrich@adito.de>
Date: Tue, 30 Jun 2020 13:34:51 +0200
Subject: [PATCH 025/309] =?UTF-8?q?[Projekt:=20Entwicklung=20-=20Neon][Tic?=
 =?UTF-8?q?ketNr.:=201059555][Aktivit=C3=A4t=20-=20Edit=5FView=20-=20Dokum?=
 =?UTF-8?q?ent:=20Toggelbutton=20hat=20keine=20Beschriftung]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 entity/Document_entity/Document_entity.aod                    | 1 +
 .../entityfields/is_main_document/placeholderProcess.js       | 4 ++++
 2 files changed, 5 insertions(+)
 create mode 100644 entity/Document_entity/entityfields/is_main_document/placeholderProcess.js

diff --git a/entity/Document_entity/Document_entity.aod b/entity/Document_entity/Document_entity.aod
index 9c5bab5bdb..a7cac40508 100644
--- a/entity/Document_entity/Document_entity.aod
+++ b/entity/Document_entity/Document_entity.aod
@@ -117,6 +117,7 @@
       <name>IS_MAIN_DOCUMENT</name>
       <title>Main document</title>
       <contentType>BOOLEAN</contentType>
+      <placeholderProcess>%aditoprj%/entity/Document_entity/entityfields/is_main_document/placeholderProcess.js</placeholderProcess>
       <dropDownProcess>%aditoprj%/entity/Document_entity/entityfields/is_main_document/dropDownProcess.js</dropDownProcess>
       <valueProcess>%aditoprj%/entity/Document_entity/entityfields/is_main_document/valueProcess.js</valueProcess>
       <onValueChange>%aditoprj%/entity/Document_entity/entityfields/is_main_document/onValueChange.js</onValueChange>
diff --git a/entity/Document_entity/entityfields/is_main_document/placeholderProcess.js b/entity/Document_entity/entityfields/is_main_document/placeholderProcess.js
new file mode 100644
index 0000000000..8b541d6a62
--- /dev/null
+++ b/entity/Document_entity/entityfields/is_main_document/placeholderProcess.js
@@ -0,0 +1,4 @@
+import("system.translate");
+import("system.result");
+
+result.string(translate.text("Main document"));
\ No newline at end of file
-- 
GitLab


From 877d745e321a19f7f1b7fb52e4580b4f35c44367 Mon Sep 17 00:00:00 2001
From: "s.pongratz" <s.pongratz@adito.de>
Date: Tue, 30 Jun 2020 16:24:03 +0200
Subject: [PATCH 026/309] #1058737-DublettenKonfiguration scan_pattern change
 type to FILTER_TREE

---
 .../DuplicateScanner_entity.aod               |  5 ++-
 .../entity_to_scan_name/onValueChange.js      |  7 ++++
 .../entityfields/scan_pattern/stateProcess.js |  9 +++++
 .../Organisation_entity.aod                   |  4 +++
 entity/Person_entity/Person_entity.aod        |  4 +++
 .../DuplicateScannerEdit_view.aod             |  2 +-
 process/DuplicateScanner_lib/process.js       | 35 +++++++++++++++++--
 7 files changed, 62 insertions(+), 4 deletions(-)
 create mode 100644 entity/DuplicateScanner_entity/entityfields/entity_to_scan_name/onValueChange.js
 create mode 100644 entity/DuplicateScanner_entity/entityfields/scan_pattern/stateProcess.js

diff --git a/entity/DuplicateScanner_entity/DuplicateScanner_entity.aod b/entity/DuplicateScanner_entity/DuplicateScanner_entity.aod
index b7116402fb..3334ff8a07 100644
--- a/entity/DuplicateScanner_entity/DuplicateScanner_entity.aod
+++ b/entity/DuplicateScanner_entity/DuplicateScanner_entity.aod
@@ -14,6 +14,7 @@
     <entityField>
       <name>ENTITY_TO_SCAN_NAME</name>
       <title>Target Entity</title>
+      <onValueChange>%aditoprj%/entity/DuplicateScanner_entity/entityfields/entity_to_scan_name/onValueChange.js</onValueChange>
     </entityField>
     <entityField>
       <name>UID</name>
@@ -64,7 +65,9 @@
     <entityField>
       <name>SCAN_PATTERN</name>
       <title>Scan pattern</title>
-      <contentType>LONG_TEXT</contentType>
+      <contentType>FILTER_TREE</contentType>
+      <state>AUTO</state>
+      <stateProcess>%aditoprj%/entity/DuplicateScanner_entity/entityfields/scan_pattern/stateProcess.js</stateProcess>
     </entityField>
     <entityConsumer>
       <name>ScannerResultFieldsConfig_Consumer</name>
diff --git a/entity/DuplicateScanner_entity/entityfields/entity_to_scan_name/onValueChange.js b/entity/DuplicateScanner_entity/entityfields/entity_to_scan_name/onValueChange.js
new file mode 100644
index 0000000000..b696837f0f
--- /dev/null
+++ b/entity/DuplicateScanner_entity/entityfields/entity_to_scan_name/onValueChange.js
@@ -0,0 +1,7 @@
+import("system.neon");
+import("system.vars");
+
+if (vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_NEW) {
+    var entity = vars.get("$this.value");
+    vars.set("$field.SCAN_PATTERN", JSON.stringify({entity: "" + entity + "", provider: "indexP", filter: {type: "group", operator: "AND", childs: []}}));
+}
\ No newline at end of file
diff --git a/entity/DuplicateScanner_entity/entityfields/scan_pattern/stateProcess.js b/entity/DuplicateScanner_entity/entityfields/scan_pattern/stateProcess.js
new file mode 100644
index 0000000000..256afd274d
--- /dev/null
+++ b/entity/DuplicateScanner_entity/entityfields/scan_pattern/stateProcess.js
@@ -0,0 +1,9 @@
+import("system.neon");
+import("system.result");
+import("system.vars");
+
+if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW) {
+    result.string(neon.COMPONENTSTATE_INVISIBLE);
+} else {
+    result.string(neon.COMPONENTSTATE_EDITABLE);
+}
\ No newline at end of file
diff --git a/entity/Organisation_entity/Organisation_entity.aod b/entity/Organisation_entity/Organisation_entity.aod
index 875ad026d6..6f12a862c9 100644
--- a/entity/Organisation_entity/Organisation_entity.aod
+++ b/entity/Organisation_entity/Organisation_entity.aod
@@ -1102,6 +1102,10 @@
       <onActionProcess>%aditoprj%/entity/Organisation_entity/entityfields/openlocation/onActionProcess.js</onActionProcess>
       <iconId>NEON:TACKED</iconId>
     </entityActionField>
+    <entityProvider>
+      <name>indexP</name>
+      <recordContainer>index</recordContainer>
+    </entityProvider>
   </entityFields>
   <recordContainers>
     <dbRecordContainer>
diff --git a/entity/Person_entity/Person_entity.aod b/entity/Person_entity/Person_entity.aod
index 446f310d7b..1a797dcd49 100644
--- a/entity/Person_entity/Person_entity.aod
+++ b/entity/Person_entity/Person_entity.aod
@@ -1266,6 +1266,10 @@
         </entityParameter>
       </children>
     </entityProvider>
+    <entityProvider>
+      <name>indexP</name>
+      <recordContainer>index</recordContainer>
+    </entityProvider>
   </entityFields>
   <recordContainers>
     <dbRecordContainer>
diff --git a/neonView/DuplicateScannerEdit_view/DuplicateScannerEdit_view.aod b/neonView/DuplicateScannerEdit_view/DuplicateScannerEdit_view.aod
index 267ca200f7..684c65d5dc 100644
--- a/neonView/DuplicateScannerEdit_view/DuplicateScannerEdit_view.aod
+++ b/neonView/DuplicateScannerEdit_view/DuplicateScannerEdit_view.aod
@@ -23,7 +23,7 @@
           <entityField>ENTITY_TO_SCAN_NAME</entityField>
         </entityFieldLink>
         <entityFieldLink>
-          <name>a0eefe38-cd65-432e-819b-e108f44db7f2</name>
+          <name>840dda8e-0a7a-4c09-80d1-f7cec15b49fc</name>
           <entityField>ID_FIELD_NAME</entityField>
         </entityFieldLink>
         <entityFieldLink>
diff --git a/process/DuplicateScanner_lib/process.js b/process/DuplicateScanner_lib/process.js
index ed3ef2cce6..dfa1552a09 100644
--- a/process/DuplicateScanner_lib/process.js
+++ b/process/DuplicateScanner_lib/process.js
@@ -883,15 +883,46 @@ _DuplicateScannerUtils._buildUpdateResetStandardCommunications = function(pSourc
  */
 _DuplicateScannerUtils._loadIndexPattern = function(pScannerName, pTargetEntity)
 {
-    let scanPattern = newSelect("SCAN_PATTERN")
+    let scanPattern = _DuplicateScannerUtils._filterToScanPattern( newSelect("SCAN_PATTERN")
                             .from("DUPLICATESCANNER")
                             .where("DUPLICATESCANNER.FILTER_NAME", pScannerName)
                             .and("DUPLICATESCANNER.ENTITY_TO_SCAN_NAME", pTargetEntity)
-                            .cell();
+                            .cell());
     scanPattern = scanPattern.trim();
     return scanPattern;
 }
 
+
+_DuplicateScannerUtils._filterToScanPattern = function(filterString) {
+    let filter = JSON.parse(filterString);
+    return _DuplicateScannerUtils._filterChildsToScanPattern(filter.filter.childs, filter.filter.operator);
+}
+
+_DuplicateScannerUtils._filterChildsToScanPattern = function(childs, operator) {
+    let group = "";
+    for (let i = 0; i < childs.length; i++) {
+        if (group != ""){
+            group = group + " " + operator+ " ";
+        }
+        if (childs[i].type == "row"){
+            group =  group + _DuplicateScannerUtils._filterChildsRowToScanPattern(childs[i].name, childs[i].operator, childs[i].value);
+        } else if (childs[i].type == "group") {
+            group = group + "("  + _DuplicateScannerUtils._filterChildsToScanPattern(childs[i].childs, childs[i].operator) + ")";
+        }
+    }
+    return group;
+}
+
+_DuplicateScannerUtils._filterChildsRowToScanPattern = function (name, operator, value) {
+    let row = "";
+    row = row + name.toLowerCase() + ':({"entityfield":"' + name + '"';
+    if (operator == "NOT_EQUAL") {
+        row = row + '"exclude":' + JSON.parse(value);
+    }
+    row = row + '})';
+    return row;
+}
+
 _DuplicateScannerUtils._loadEntityFieldConfigsFromPattern = function(indexPattern)
 {
     return indexPattern.match(/[^{}]+(?=\})/g);
-- 
GitLab


From 275d6db3b7ebad5e3451e2d56283194da3007b23 Mon Sep 17 00:00:00 2001
From: "s.pongratz" <s.pongratz@adito.de>
Date: Wed, 1 Jul 2020 10:05:02 +0200
Subject: [PATCH 027/309] =?UTF-8?q?#1058737-DublettenKonfiguration=20Demod?=
 =?UTF-8?q?aten=20ge=C3=A4ndert=20und=20anpassungen=20am=20EntityToScanNam?=
 =?UTF-8?q?e?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../generatedData/duplicates/duplicatescanner.xml        | 4 ++--
 .../DuplicateScanner_entity/DuplicateScanner_entity.aod  | 4 +++-
 .../entityfields/entity_to_scan_name/onValueChange.js    | 7 -------
 .../entityfields/entity_to_scan_name/stateProcess.js     | 9 +++++++++
 .../recordcontainers/dbrecordcontainer/onDBInsert.js     | 7 +++++++
 .../recordcontainers/dbrecordcontainer/onDBUpdate.js     | 8 ++++++++
 .../PermissionDetail_entity/PermissionDetail_entity.aod  | 5 -----
 7 files changed, 29 insertions(+), 15 deletions(-)
 delete mode 100644 entity/DuplicateScanner_entity/entityfields/entity_to_scan_name/onValueChange.js
 create mode 100644 entity/DuplicateScanner_entity/entityfields/entity_to_scan_name/stateProcess.js
 create mode 100644 entity/DuplicateScanner_entity/recordcontainers/dbrecordcontainer/onDBInsert.js
 create mode 100644 entity/DuplicateScanner_entity/recordcontainers/dbrecordcontainer/onDBUpdate.js

diff --git a/.liquibase/Data_alias/basic/_demoData/generatedData/duplicates/duplicatescanner.xml b/.liquibase/Data_alias/basic/_demoData/generatedData/duplicates/duplicatescanner.xml
index f45f6f3a08..6a8af1e611 100644
--- a/.liquibase/Data_alias/basic/_demoData/generatedData/duplicates/duplicatescanner.xml
+++ b/.liquibase/Data_alias/basic/_demoData/generatedData/duplicates/duplicatescanner.xml
@@ -8,7 +8,7 @@
             <column name="FILTER_NAME" value="PersonDuplicates" />
             <column name="EXTERNAL_SERVICE_USAGE_ALLOWED" valueNumeric="0" />
             <column name="ID_FIELD_NAME" value="CONTACTID" />
-            <column name="SCAN_PATTERN" value="firstname:({&quot;entityfield&quot;: &quot;FIRSTNAME&quot;}) AND lastname:({&quot;entityfield&quot;: &quot;LASTNAME&quot;})" />
+            <column name="SCAN_PATTERN" value="{&quot;entity&quot;:&quot;Person_entity&quot;,&quot;provider&quot;:&quot;indexP&quot;,&quot;filter&quot;:{&quot;type&quot;:&quot;group&quot;,&quot;operator&quot;:&quot;AND&quot;,&quot;childs&quot;:[{&quot;type&quot;:&quot;row&quot;,&quot;name&quot;:&quot;FIRSTNAME&quot;,&quot;operator&quot;:&quot;ISNOTNULL&quot;,&quot;value&quot;:&quot;&quot;,&quot;key&quot;:&quot;&quot;,&quot;contenttype&quot;:&quot;TEXT&quot;},{&quot;type&quot;:&quot;row&quot;,&quot;name&quot;:&quot;LASTNAME&quot;,&quot;operator&quot;:&quot;ISNOTNULL&quot;,&quot;value&quot;:&quot;&quot;,&quot;key&quot;:&quot;&quot;,&quot;contenttype&quot;:&quot;TEXT&quot;}]}}" />
             <column name="USER_NEW" value="Admin" />
             <column name="DATE_NEW" valueDate="2019-07-19" />
             <column name="USER_EDIT" value="Admin" />
@@ -20,7 +20,7 @@
             <column name="FILTER_NAME" value="OrganisationDuplicates" />
             <column name="EXTERNAL_SERVICE_USAGE_ALLOWED" valueNumeric="0" />
             <column name="ID_FIELD_NAME" value="CONTACTID" />
-            <column name="SCAN_PATTERN" value="name:({&quot;entityfield&quot;: &quot;NAME&quot;, &quot;exclude&quot;: [&quot;gmbh&quot;, &quot;co&quot;, &quot;kg&quot;, &quot;ag&quot;, &quot;bank&quot;, &quot;deutsche&quot;, &quot;van&quot;, &quot;software&quot;, &quot;medien&quot;, &quot;print&quot;] }) AND city:({&quot;entityfield&quot;: &quot;STANDARD_CITY&quot;})" />
+            <column name="SCAN_PATTERN" value="{&quot;entity&quot;:&quot;Organisation_entity&quot;,&quot;provider&quot;:&quot;indexP&quot;,&quot;filter&quot;:{&quot;type&quot;:&quot;group&quot;,&quot;operator&quot;:&quot;AND&quot;,&quot;childs&quot;:[{&quot;type&quot;:&quot;row&quot;,&quot;name&quot;:&quot;NAME&quot;,&quot;operator&quot;:&quot;CONTAINSNOT&quot;,&quot;value&quot;:&quot;[\&quot;gmbh\&quot;, \&quot;co\&quot;, \&quot;kg\&quot;, \&quot;ag\&quot;, \&quot;bank\&quot;, \&quot;deutsche\&quot;, \&quot;van\&quot;, \&quot;software\&quot;, \&quot;medien\&quot;, \&quot;print\&quot;]&quot;,&quot;key&quot;:&quot;[\&quot;gmbh\&quot;, \&quot;co\&quot;, \&quot;kg\&quot;, \&quot;ag\&quot;, \&quot;bank\&quot;, \&quot;deutsche\&quot;, \&quot;van\&quot;, \&quot;software\&quot;, \&quot;medien\&quot;, \&quot;print\&quot;]&quot;,&quot;contenttype&quot;:&quot;LONG_TEXT&quot;},{&quot;type&quot;:&quot;row&quot;,&quot;name&quot;:&quot;STANDARD_CITY&quot;,&quot;operator&quot;:&quot;ISNOTNULL&quot;,&quot;value&quot;:&quot;&quot;,&quot;key&quot;:&quot;&quot;,&quot;contenttype&quot;:&quot;TEXT&quot;}]}}" />
             <column name="USER_NEW" value="Admin" />
             <column name="DATE_NEW" valueDate="2019-07-19" />
             <column name="USER_EDIT" value="Admin" />
diff --git a/entity/DuplicateScanner_entity/DuplicateScanner_entity.aod b/entity/DuplicateScanner_entity/DuplicateScanner_entity.aod
index 3334ff8a07..655421fb7b 100644
--- a/entity/DuplicateScanner_entity/DuplicateScanner_entity.aod
+++ b/entity/DuplicateScanner_entity/DuplicateScanner_entity.aod
@@ -14,7 +14,7 @@
     <entityField>
       <name>ENTITY_TO_SCAN_NAME</name>
       <title>Target Entity</title>
-      <onValueChange>%aditoprj%/entity/DuplicateScanner_entity/entityfields/entity_to_scan_name/onValueChange.js</onValueChange>
+      <stateProcess>%aditoprj%/entity/DuplicateScanner_entity/entityfields/entity_to_scan_name/stateProcess.js</stateProcess>
     </entityField>
     <entityField>
       <name>UID</name>
@@ -103,6 +103,8 @@
     <dbRecordContainer>
       <name>DBRecordContainer</name>
       <alias>Data_alias</alias>
+      <onDBInsert>%aditoprj%/entity/DuplicateScanner_entity/recordcontainers/dbrecordcontainer/onDBInsert.js</onDBInsert>
+      <onDBUpdate>%aditoprj%/entity/DuplicateScanner_entity/recordcontainers/dbrecordcontainer/onDBUpdate.js</onDBUpdate>
       <onDBDelete>%aditoprj%/entity/DuplicateScanner_entity/recordcontainers/dbrecordcontainer/onDBDelete.js</onDBDelete>
       <linkInformation>
         <linkInformation>
diff --git a/entity/DuplicateScanner_entity/entityfields/entity_to_scan_name/onValueChange.js b/entity/DuplicateScanner_entity/entityfields/entity_to_scan_name/onValueChange.js
deleted file mode 100644
index b696837f0f..0000000000
--- a/entity/DuplicateScanner_entity/entityfields/entity_to_scan_name/onValueChange.js
+++ /dev/null
@@ -1,7 +0,0 @@
-import("system.neon");
-import("system.vars");
-
-if (vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_NEW) {
-    var entity = vars.get("$this.value");
-    vars.set("$field.SCAN_PATTERN", JSON.stringify({entity: "" + entity + "", provider: "indexP", filter: {type: "group", operator: "AND", childs: []}}));
-}
\ No newline at end of file
diff --git a/entity/DuplicateScanner_entity/entityfields/entity_to_scan_name/stateProcess.js b/entity/DuplicateScanner_entity/entityfields/entity_to_scan_name/stateProcess.js
new file mode 100644
index 0000000000..07c220ad58
--- /dev/null
+++ b/entity/DuplicateScanner_entity/entityfields/entity_to_scan_name/stateProcess.js
@@ -0,0 +1,9 @@
+import("system.neon");
+import("system.result");
+import("system.vars");
+
+if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW) {
+    result.string(neon.COMPONENTSTATE_EDITABLE);
+} else {
+    result.string(neon.COMPONENTSTATE_READONLY);
+}
\ No newline at end of file
diff --git a/entity/DuplicateScanner_entity/recordcontainers/dbrecordcontainer/onDBInsert.js b/entity/DuplicateScanner_entity/recordcontainers/dbrecordcontainer/onDBInsert.js
new file mode 100644
index 0000000000..07ccfd896b
--- /dev/null
+++ b/entity/DuplicateScanner_entity/recordcontainers/dbrecordcontainer/onDBInsert.js
@@ -0,0 +1,7 @@
+import("Sql_lib");
+import("system.neon");
+import("system.vars");
+
+var entity = vars.get("$field.ENTITY_TO_SCAN_NAME");
+newWhere("DUPLICATESCANNER.ID", vars.get("$field.UID"))
+.updateFields({"DUPLICATESCANNER.SCAN_PATTERN" : JSON.stringify({entity: "" + entity + "", provider: "indexP", filter: {type: "group", operator: "AND", childs: []}})}, "DUPLICATESCANNER");
\ No newline at end of file
diff --git a/entity/DuplicateScanner_entity/recordcontainers/dbrecordcontainer/onDBUpdate.js b/entity/DuplicateScanner_entity/recordcontainers/dbrecordcontainer/onDBUpdate.js
new file mode 100644
index 0000000000..f91f2dea7d
--- /dev/null
+++ b/entity/DuplicateScanner_entity/recordcontainers/dbrecordcontainer/onDBUpdate.js
@@ -0,0 +1,8 @@
+import("system.vars");
+
+let scanPattern = JSON.stringify(vars.get("$field.SCAN_PATTERN"));
+if (scanPattern.provider == undefined) 
+{ 
+    scanPattern.provider = "indexP";
+    vars.set("$field.SCAN_PATTERN", JSON.stringify(scanPattern));
+}
\ No newline at end of file
diff --git a/entity/PermissionDetail_entity/PermissionDetail_entity.aod b/entity/PermissionDetail_entity/PermissionDetail_entity.aod
index 8b2a82d124..d6e9a449d7 100644
--- a/entity/PermissionDetail_entity/PermissionDetail_entity.aod
+++ b/entity/PermissionDetail_entity/PermissionDetail_entity.aod
@@ -131,11 +131,6 @@
         <entityName>PermissionMetaData_entity</entityName>
         <fieldName>MetaData</fieldName>
       </dependency>
-      <children>
-        <entityParameter>
-          <name>EntityName_param</name>
-        </entityParameter>
-      </children>
     </entityConsumer>
     <entityParameter>
       <name>EntityTitle_param</name>
-- 
GitLab


From d52c5eec15adafa6cb5d19c0a63ab0753e9b7795 Mon Sep 17 00:00:00 2001
From: "s.pongratz" <s.pongratz@adito.de>
Date: Wed, 1 Jul 2020 11:08:41 +0200
Subject: [PATCH 028/309] =?UTF-8?q?#1058737-DublettenKonfiguration=20Hinzu?=
 =?UTF-8?q?f=C3=BCgen=20von=20empty?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../recordcontainers/dbrecordcontainer/onDBUpdate.js       | 2 +-
 process/DuplicateScanner_lib/process.js                    | 7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/entity/DuplicateScanner_entity/recordcontainers/dbrecordcontainer/onDBUpdate.js b/entity/DuplicateScanner_entity/recordcontainers/dbrecordcontainer/onDBUpdate.js
index f91f2dea7d..f7c88a0b02 100644
--- a/entity/DuplicateScanner_entity/recordcontainers/dbrecordcontainer/onDBUpdate.js
+++ b/entity/DuplicateScanner_entity/recordcontainers/dbrecordcontainer/onDBUpdate.js
@@ -1,6 +1,6 @@
 import("system.vars");
 
-let scanPattern = JSON.stringify(vars.get("$field.SCAN_PATTERN"));
+let scanPattern = JSON.parse(vars.get("$field.SCAN_PATTERN"));
 if (scanPattern.provider == undefined) 
 { 
     scanPattern.provider = "indexP";
diff --git a/process/DuplicateScanner_lib/process.js b/process/DuplicateScanner_lib/process.js
index dfa1552a09..92dee1a9b0 100644
--- a/process/DuplicateScanner_lib/process.js
+++ b/process/DuplicateScanner_lib/process.js
@@ -916,8 +916,11 @@ _DuplicateScannerUtils._filterChildsToScanPattern = function(childs, operator) {
 _DuplicateScannerUtils._filterChildsRowToScanPattern = function (name, operator, value) {
     let row = "";
     row = row + name.toLowerCase() + ':({"entityfield":"' + name + '"';
-    if (operator == "NOT_EQUAL") {
-        row = row + '"exclude":' + JSON.parse(value);
+    switch (operator){
+        case 'NOT_EQUAL':
+            row = row + ', "exclude":' + JSON.parse(value);
+        case 'ISNOTNULL':
+            row = row + ', "empty":' + false;
     }
     row = row + '})';
     return row;
-- 
GitLab


From 3e25f85d12019ddf39fc867d3025f08434035945 Mon Sep 17 00:00:00 2001
From: "b.ulrich" <b.ulrich@adito.de>
Date: Wed, 1 Jul 2020 15:02:43 +0200
Subject: [PATCH 029/309] =?UTF-8?q?[Projekt:=20Entwicklung=20-=20Neon][Tic?=
 =?UTF-8?q?ketNr.:=201059167][Kontakt/Firma:=20Kontakt=20mit=20mehreren=20?=
 =?UTF-8?q?funktionen=20wird=20komplett=20gel=C3=B6scht,=20wenn=20bei=20ei?=
 =?UTF-8?q?ner=20Funktion=20entfernt]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 entity/Person_entity/grantDeleteProcess.js | 36 +++++++++++++++-------
 1 file changed, 25 insertions(+), 11 deletions(-)

diff --git a/entity/Person_entity/grantDeleteProcess.js b/entity/Person_entity/grantDeleteProcess.js
index 7b130d228f..2c8fe13800 100644
--- a/entity/Person_entity/grantDeleteProcess.js
+++ b/entity/Person_entity/grantDeleteProcess.js
@@ -1,20 +1,34 @@
+import("Sql_lib");
 import("Entity_lib");
 import("Employee_lib");
 import("Context_lib");
 import("system.vars");
 import("system.result");
 
-var contactId = vars.get("$field.CONTACTID");
-var currentContext = ContextUtils.getCurrentContextId();
+var canDelete = false;
+var personId = vars.get("$field.PERSONID");
+var personCount = newSelect("count(*)")
+                        .from("CONTACT")
+                        .join("PERSON", "PERSON.PERSONID = CONTACT.PERSON_ID")
+                        .where("PERSON.PERSONID", personId)
+                        .cell()
+//only delete when the contact doesnt have any functions, because that would currently lead to the person and all his functions being deleted,
+// since there is only one person contact behind all the contacts.
+//ToDo: come back to this and implement the solution for deleting a function (#1059167) once it'S decided how that's being implemented
+if(personCount == 1) 
+{
+    var contactId = vars.get("$field.CONTACTID");
+    var currentContext = ContextUtils.getCurrentContextId();
 
-var canDelete = new HasLinkedObjectTester()
-    .andNoEntityRows("Activity_entity", "LinkedObjects", {ObjectId_param : currentContext, RowId_param : contactId}) //Activities
-    .andNoEntityRows("Task_entity", "Tasks", {ObjectId_param : currentContext, RowId_param : contactId}) //Tasks
-    .andNoEntityRows("Document_entity", "Documents", {AssignmentTable_param : "CONTACT", AssignmentRowId_param : contactId}) //Documents
-    .and(function () {return !EmployeeUtils.isUser(contactId);})
-    .andNoEntityRows("Offer_entity", "ContactOffers", {ContactId_param : contactId}) //Offers
-    .andNoEntityRows("Contract_entity", "Contracts", {ContactId_param : contactId}) //Contracts
-    .andNoEntityRows("ObjectTree_entity", "TreeProvider", {ObjectIds_param : JSON.stringify([contactId, vars.get("$field.PERSON_ID")]), ObjectTypes_param : JSON.stringify([currentContext, "PrivatePerson"])})
-    .validate();
+    canDelete = new HasLinkedObjectTester()
+        .andNoEntityRows("Activity_entity", "LinkedObjects", {ObjectId_param : currentContext, RowId_param : contactId}) //Activities
+        .andNoEntityRows("Task_entity", "Tasks", {ObjectId_param : currentContext, RowId_param : contactId}) //Tasks
+        .andNoEntityRows("Document_entity", "Documents", {AssignmentTable_param : "CONTACT", AssignmentRowId_param : contactId}) //Documents
+        .and(function () {return !EmployeeUtils.isUser(contactId);})
+        .andNoEntityRows("Offer_entity", "ContactOffers", {ContactId_param : contactId}) //Offers
+        .andNoEntityRows("Contract_entity", "Contracts", {ContactId_param : contactId}) //Contracts
+        .andNoEntityRows("ObjectTree_entity", "TreeProvider", {ObjectIds_param : JSON.stringify([contactId, vars.get("$field.PERSON_ID")]), ObjectTypes_param : JSON.stringify([currentContext, "PrivatePerson"])})
+        .validate();
+}
 
 result.string(canDelete);
-- 
GitLab


From aeab974be1ce0904719c0db1418bec664b15394e Mon Sep 17 00:00:00 2001
From: "b.ulrich" <b.ulrich@adito.de>
Date: Fri, 3 Jul 2020 08:37:16 +0200
Subject: [PATCH 030/309] [Projekt: Entwicklung - Neon][TicketNr.:
 1059952][db.getColumnTypes im xRM nicht mehr verwenden]

---
 .../Activity_entity/recordcontainers/db/onDBInsert.js  |  3 +--
 .../entityfields/load_data/onActionProcess.js          |  6 ++----
 entity/Prod2prod_entity/onInsert.js                    |  4 +---
 .../recordcontainers/dummyjdito/onUpdate.js            |  3 +--
 .../children/newappointment/onActionProcess.js         | 10 +++-------
 .../recordcontainers/jdito/onInsert.js                 |  9 ++-------
 .../recordcontainers/jdito/onUpdate.js                 |  4 +---
 .../recordcontainers/jdito/onInsert.js                 |  4 +---
 process/ActivityTask_lib/process.js                    |  5 ++---
 process/Attribute_lib/process.js                       |  3 +--
 process/Communication_lib/process.js                   |  5 ++---
 process/EwsClient_lib/process.js                       |  6 ++----
 .../documentation.adoc                                 |  3 +--
 process/Leadimport_lib/process.js                      |  3 +--
 process/OfferOrder_lib/process.js                      |  6 ++----
 process/StandardObject_lib/process.js                  |  4 ++--
 16 files changed, 25 insertions(+), 53 deletions(-)

diff --git a/entity/Activity_entity/recordcontainers/db/onDBInsert.js b/entity/Activity_entity/recordcontainers/db/onDBInsert.js
index ce851e0d44..c50343f5ee 100644
--- a/entity/Activity_entity/recordcontainers/db/onDBInsert.js
+++ b/entity/Activity_entity/recordcontainers/db/onDBInsert.js
@@ -28,9 +28,8 @@ if(vars.exists("$param.VisitPlanEntryId_param") && vars.get("$param.VisitPlanEnt
 {    
     var values = [$KeywordRegistry.visitPlanEntryStatus$Visitreportcreated()];
     var columns = ["STATUS"];
-    var columnTypes = db.getColumnTypes("VISITPLANENTRY", columns, db.getCurrentAlias());
     var update = newWhere("VISITPLANENTRY.VISITPLANENTRYID", vars.get("$param.VisitPlanEntryId_param"))
-                            .updateData(true, "VISITPLANENTRY", columns, columnTypes, values);
+                            .updateData(true, "VISITPLANENTRY", columns, null, values);
 }
 
 if (vars.exists("$param.InsertLinks_param") && vars.get("$param.InsertLinks_param"))
diff --git a/entity/Leadimport_entity/entityfields/load_data/onActionProcess.js b/entity/Leadimport_entity/entityfields/load_data/onActionProcess.js
index b5d208a6e8..578e9f6edf 100644
--- a/entity/Leadimport_entity/entityfields/load_data/onActionProcess.js
+++ b/entity/Leadimport_entity/entityfields/load_data/onActionProcess.js
@@ -34,7 +34,6 @@ if (binMetadatas.length > 0)
 
     var insertTable = "LEADTEMP";
     var insertCols = LeadImportUtils.leadTempColumns();
-    var insertTypes = db.getColumnTypes(insertTable, insertCols);
     var insertVals = [];
 
     var toInsert = [];
@@ -53,7 +52,7 @@ if (binMetadatas.length > 0)
         }
 
         insertVals.push(importDate, util.getNewUUID(), importName, i.toString(), assignmentRowId);//push other necessary data for the insert
-        toInsert.push([insertTable, insertCols, insertTypes, insertVals]);
+        toInsert.push([insertTable, insertCols, null, insertVals]);
     }
 
     db.inserts(toInsert); 
@@ -62,9 +61,8 @@ if (binMetadatas.length > 0)
 
     var updTable = "LEADIMPORT";
     var updCols = ["STATUS"];
-    var updTypes = db.getColumnTypes(updTable, updCols);
 
-    db.updateData(updTable, updCols, updTypes, [$KeywordRegistry.importStatus$loaded()], newWhere([updTable, "LEADIMPORTID"], assignmentRowId).build());
+    db.updateData(updTable, updCols, null, [$KeywordRegistry.importStatus$loaded()], newWhere([updTable, "LEADIMPORTID"], assignmentRowId).build());
 
     neon.refreshAll();
 
diff --git a/entity/Prod2prod_entity/onInsert.js b/entity/Prod2prod_entity/onInsert.js
index af42dcad8f..d11203f624 100644
--- a/entity/Prod2prod_entity/onInsert.js
+++ b/entity/Prod2prod_entity/onInsert.js
@@ -16,6 +16,4 @@ var vals = [ vars.get("$field.UID")
            , vars.get("$field.OPTIONAL")
            , vars.get("$field.TAKEPRICE") ];
 
-var colTypes = db.getColumnTypes("PROD2PROD", cols);
-
-db.insertData("PROD2PROD", cols, colTypes, vals);
\ No newline at end of file
+db.insertData("PROD2PROD", cols, null, vals);
\ No newline at end of file
diff --git a/entity/UnlinkedMailMappingWrapper_entity/recordcontainers/dummyjdito/onUpdate.js b/entity/UnlinkedMailMappingWrapper_entity/recordcontainers/dummyjdito/onUpdate.js
index f6cc9442f3..1910f49394 100644
--- a/entity/UnlinkedMailMappingWrapper_entity/recordcontainers/dummyjdito/onUpdate.js
+++ b/entity/UnlinkedMailMappingWrapper_entity/recordcontainers/dummyjdito/onUpdate.js
@@ -16,7 +16,6 @@ var changedRows = vars.get("$field.UnlinkedMailMappingLinks.insertedRows");
 
 var communicationsToInsert = [];
 var communicationCols = ["COMMUNICATIONID", "ADDR", "CONTACT_ID", "ISSTANDARD", "MEDIUM_ID", "USER_NEW", "DATE_NEW"];
-var communicationTypes = db.getColumnTypes("COMMUNICATION", communicationCols);
 
 if (changedRows.length > 0)
 {
@@ -51,7 +50,7 @@ if (changedRows.length > 0)
         {
             var standardFlag = contactRows[i]["STANDARD_EMAIL_COMMUNICATION"] ? "0" : "1";//when no standard mail exists already: set it
             var vals = [util.getNewUUID(), emailAddrToAdd, contactId, standardFlag, $KeywordRegistry.communicationMedium$mail(), vars.get("$sys.user"), datetime.date()];
-            communicationsToInsert.push(["COMMUNICATION", communicationCols, communicationTypes, vals]);
+            communicationsToInsert.push(["COMMUNICATION", communicationCols, null, vals]);
             //TODO: insert the COMM via a entities.***-method when available
         }
     }
diff --git a/entity/VisitPlanEntry_entity/entityfields/entityactiongroup/children/newappointment/onActionProcess.js b/entity/VisitPlanEntry_entity/entityfields/entityactiongroup/children/newappointment/onActionProcess.js
index e9a7e5846d..eaa79fcc35 100644
--- a/entity/VisitPlanEntry_entity/entityfields/entityactiongroup/children/newappointment/onActionProcess.js
+++ b/entity/VisitPlanEntry_entity/entityfields/entityactiongroup/children/newappointment/onActionProcess.js
@@ -28,7 +28,6 @@ var mailAffectedUser = [];
 var uidAppointment;
 var values;
 var columns;
-var columnTypes;
 var update;
 var i;
 
@@ -99,27 +98,24 @@ columns = ["AB_APPOINTMENTLINK_ID",
             "APPOINTMENT_ID",
             "OBJECT_TYPE",
             "OBJECT_ROWID"]
-            
-columnTypes = db.getColumnTypes("AB_APPOINTMENTLINK", columns, db.getCurrentAlias());
     
 values = [util.getNewUUID(),
           uidAppointment[0],
           "Organisation",
           organisation_id]
-insert = db.insertData("AB_APPOINTMENTLINK", columns, columnTypes, values)
+insert = db.insertData("AB_APPOINTMENTLINK", columns, null, values)
     
 values = [util.getNewUUID(),
           uidAppointment[0],
           "Person",
           contact_id]
-insert = db.insertData("AB_APPOINTMENTLINK", columns, columnTypes, values)
+insert = db.insertData("AB_APPOINTMENTLINK", columns, null, values)
     
 values = [$KeywordRegistry.visitPlanEntryStatus$Appointmentarranged(), uidAppointment[0]];
 columns = ["STATUS", "APPOINTMENT_ID"];
-columnTypes = db.getColumnTypes("VISITPLANENTRY", columns, db.getCurrentAlias());
     
 update = newWhere("VISITPLANENTRY.VISITPLANENTRYID", uid)
-                        .updateData(true, "VISITPLANENTRY", columns, columnTypes, values);
+                        .updateData(true, "VISITPLANENTRY", columns, null, values);
 
 neon.setFieldValue("$field.STATUS", $KeywordRegistry.visitPlanEntryStatus$Appointmentarranged());
 neon.refreshAll();
\ No newline at end of file
diff --git a/entity/VisitPlanEntry_entity/recordcontainers/jdito/onInsert.js b/entity/VisitPlanEntry_entity/recordcontainers/jdito/onInsert.js
index c0f1048f29..7e0fd095e4 100644
--- a/entity/VisitPlanEntry_entity/recordcontainers/jdito/onInsert.js
+++ b/entity/VisitPlanEntry_entity/recordcontainers/jdito/onInsert.js
@@ -42,10 +42,8 @@ else
             "VISITPLAN_YEAR",
             "CONTACT_ID",
         ];
-
-        var columnTypesWeek = db.getColumnTypes("VISITPLANEMPLOYEEWEEK", columnsWeek, db.getCurrentAlias());
         
-        insertData.push(["VISITPLANEMPLOYEEWEEK", columnsWeek, columnTypesWeek, valuesWeek]);
+        insertData.push(["VISITPLANEMPLOYEEWEEK", columnsWeek, null, valuesWeek]);
 
         visitPlanEmployeeWeekID = newWeekId;
     }    
@@ -75,9 +73,6 @@ var columnsEntry = [
     "STATUS"
 ];
 
-
-var columnTypesEntry = db.getColumnTypes("VISITPLANENTRY", columnsEntry, db.getCurrentAlias());
-
-insertData.push(["VISITPLANENTRY", columnsEntry, columnTypesEntry, valuesEntry])
+insertData.push(["VISITPLANENTRY", columnsEntry, null, valuesEntry])
 
 db.inserts(insertData);
diff --git a/entity/VisitPlanEntry_entity/recordcontainers/jdito/onUpdate.js b/entity/VisitPlanEntry_entity/recordcontainers/jdito/onUpdate.js
index 412b364410..527e279547 100644
--- a/entity/VisitPlanEntry_entity/recordcontainers/jdito/onUpdate.js
+++ b/entity/VisitPlanEntry_entity/recordcontainers/jdito/onUpdate.js
@@ -22,8 +22,6 @@ var columns = [
     "STATUS"
 ];
 
-var columnTypes = db.getColumnTypes("VISITPLANENTRY", columns, db.getCurrentAlias());
-
 var cond = newWhere("VISITPLANENTRY.VISITPLANENTRYID", vars.get("$field.UID")).toString();
 
-db.updateData("VISITPLANENTRY", columns, columnTypes, values, cond);
+db.updateData("VISITPLANENTRY", columns, null, values, cond);
diff --git a/entity/VisitRecommendation_entity/recordcontainers/jdito/onInsert.js b/entity/VisitRecommendation_entity/recordcontainers/jdito/onInsert.js
index f362c1d033..1da186c5ef 100644
--- a/entity/VisitRecommendation_entity/recordcontainers/jdito/onInsert.js
+++ b/entity/VisitRecommendation_entity/recordcontainers/jdito/onInsert.js
@@ -24,6 +24,4 @@ var columns = [
     "INFO"
 ];
 
-var columnTypes = db.getColumnTypes("VISITRECOMMENDATION", columns, db.getCurrentAlias());
-
-db.insertData("VISITRECOMMENDATION", columns, columnTypes, values);
\ No newline at end of file
+db.insertData("VISITRECOMMENDATION", columns, null, values);
\ No newline at end of file
diff --git a/process/ActivityTask_lib/process.js b/process/ActivityTask_lib/process.js
index 0e23cd7b6c..b3b2b927cb 100644
--- a/process/ActivityTask_lib/process.js
+++ b/process/ActivityTask_lib/process.js
@@ -89,17 +89,16 @@ ActivityUtils.insertNewActivity = function(pDataPreset, pActivityLinks, pDocumen
     _addActivityCol("RESPONSIBLE", dataPreset.responsibleContactId);
     _addActivityCol("SUBJECT", dataPreset.subject);
     
-    insertStatements.push(["ACTIVITY", activityColumns, db.getColumnTypes("ACTIVITY", activityColumns, dbAlias), activityValues]);
+    insertStatements.push(["ACTIVITY", activityColumns, null, activityValues]);
 
     if (pActivityLinks)
     {
         var activityLinkColumns = ["ACTIVITYLINKID", "ACTIVITY_ID", "DATE_NEW", "USER_NEW", "OBJECT_TYPE", "OBJECT_ROWID"];
-        var activityLinkColumnTypes = db.getColumnTypes("ACTIVITYLINK", activityLinkColumns, dbAlias);
         var activityLinkValues;
         for (var i = 0, l = pActivityLinks.length; i < l; i++)
         {
             activityLinkValues = [util.getNewUUID(), activityId, creationDate, creationUser, pActivityLinks[i][0], pActivityLinks[i][1]];
-            insertStatements.push(["ACTIVITYLINK", activityLinkColumns, activityLinkColumnTypes, activityLinkValues]);
+            insertStatements.push(["ACTIVITYLINK", activityLinkColumns, null, activityLinkValues]);
         }
     }
     
diff --git a/process/Attribute_lib/process.js b/process/Attribute_lib/process.js
index 40eed67b87..a2f2095464 100644
--- a/process/Attribute_lib/process.js
+++ b/process/Attribute_lib/process.js
@@ -1224,7 +1224,6 @@ AttributeUsageUtil.insertChildrenUsages = function (pAttributeId, pObjectType)
         return;
     var table = "AB_ATTRIBUTEUSAGE";
     var columns = ["AB_ATTRIBUTEUSAGEID", "AB_ATTRIBUTE_ID", "OBJECT_TYPE", "MAX_COUNT"];
-    var types = db.getColumnTypes(table, columns);
     
     var inserts = [];
     _addInserts(pAttributeId, pObjectType);
@@ -1250,7 +1249,7 @@ AttributeUsageUtil.insertChildrenUsages = function (pAttributeId, pObjectType)
                     ? "1"
                     : "";
                 let values = [util.getNewUUID(), row[0], pObjectType, maxCount];
-                inserts.push([table, columns, types, values]);
+                inserts.push([table, columns, null, values]);
             }
             _addInserts(row[0], pObjectType);
         });
diff --git a/process/Communication_lib/process.js b/process/Communication_lib/process.js
index c9f1422579..055813cf36 100644
--- a/process/Communication_lib/process.js
+++ b/process/Communication_lib/process.js
@@ -70,14 +70,13 @@ CommUtil.setStandardForCategory = function(pAffectedRowId, pNewStandardCommId, p
     
     var statements = [];
     var cols = ["ISSTANDARD"];
-    var types = db.getColumnTypes("COMMUNICATION", cols);
     
     //set current standard comm-record as non-standard
     var cond = newWhere("ISSTANDARD = 1")
                 .and("COMMUNICATION.CONTACT_ID", pAffectedRowId)
                 .and("COMMUNICATION.MEDIUM_ID", mediumIds, SqlBuilder.IN());
     
-     statements.push(["COMMUNICATION", cols, types, ["0"], cond.build()]);
+     statements.push(["COMMUNICATION", cols, null, ["0"], cond.build()]);
 
     //pNewStandardCommId can be an empty string if the standard has to only be removed
     if (pNewStandardCommId != "")
@@ -88,7 +87,7 @@ CommUtil.setStandardForCategory = function(pAffectedRowId, pNewStandardCommId, p
             .and("COMMUNICATION.CONTACT_ID", pAffectedRowId)
             .and("COMMUNICATION.MEDIUM_ID", mediumIds, SqlBuilder.IN());
             
-        statements.push(["COMMUNICATION", cols, types, ["1"], cond.build()]);
+        statements.push(["COMMUNICATION", cols, null, ["1"], cond.build()]);
     }
     
     count = db.updates(statements);
diff --git a/process/EwsClient_lib/process.js b/process/EwsClient_lib/process.js
index 41e53a9c9a..2de3addde4 100644
--- a/process/EwsClient_lib/process.js
+++ b/process/EwsClient_lib/process.js
@@ -290,10 +290,8 @@ EwsClientCalendarPermissionUtils.writePermissions = function(pExchangeAliasName)
     
     var dbChangeUser = "server";//vars.get("$sys.user") does not work on the serverside (executing from the manager) //todo: check if this is a bug
     var updateCalCols = new Array("USER_EDIT", "DATE_EDIT", "PERMISSION");
-    var updateCalTypes = db.getColumnTypes("AB_PERMISSIONCALENDAR", updateCalCols);
     var insertCalCols = new Array("AB_PERMISSIONCALENDARID", "DATE_NEW","USER_NEW",
         "PERMISSIONPROCURER_ROWID", "PERMISSIONPROCURER_TYPE", "PERMISSIONDEALER_ROWID", "PERMISSIONDEALER_TYPE", "PERMISSION");
-    var insertCalTypes = db.getColumnTypes("AB_PERMISSIONCALENDAR", insertCalCols);
     var vals;
     var right;
     
@@ -332,14 +330,14 @@ EwsClientCalendarPermissionUtils.writePermissions = function(pExchangeAliasName)
                 {
                     vals = [dbChangeUser, datetime.date(), right];
                     newWhere("AB_PERMISSIONCALENDAR.AB_PERMISSIONCALENDARID", existingPermission[0])
-                        .updateData(true, "AB_PERMISSIONCALENDAR", updateCalCols, updateCalTypes, vals);
+                        .updateData(true, "AB_PERMISSIONCALENDAR", updateCalCols, null, vals);
                 }
             }
             else
             {
                 vals = [util.getNewUUID(), datetime.date(), dbChangeUser, exchangeUserMap[qualified], $KeywordRegistry.permissionCalendarType$user(), 
                     exchangeUserMap[owner], $KeywordRegistry.permissionCalendarType$user(), right];
-                db.insertData("AB_PERMISSIONCALENDAR", insertCalCols, insertCalTypes, vals);
+                db.insertData("AB_PERMISSIONCALENDAR", insertCalCols, null, vals);
             }
         }
     }
diff --git a/process/ImporterCustomMappingFunctions_lib/documentation.adoc b/process/ImporterCustomMappingFunctions_lib/documentation.adoc
index d7b37a3ee8..79b5fa0c4b 100644
--- a/process/ImporterCustomMappingFunctions_lib/documentation.adoc
+++ b/process/ImporterCustomMappingFunctions_lib/documentation.adoc
@@ -94,11 +94,10 @@ function iUpdateContact(pObject)
     { 
         var alias = this.Config.AliasTo; //this gets the selected alias
         var columns = ["STATUS"];
-        var types = db.getColumnTypes("CONTACT", columns, alias); 
         var values = ["CONTACTSTATREVIEW                 "]; 
         var condition = "CONTACTID = '" + pObject.contactID + "'";
         
-        this.updateData("CONTACT", columns, types, values, condition, alias);
+        this.updateData("CONTACT", columns, null, values, condition, alias);
     } 
     catch(ex) //If it fails it will not update but continue the rest
     { 
diff --git a/process/Leadimport_lib/process.js b/process/Leadimport_lib/process.js
index bfc4a50283..9e8c67db43 100644
--- a/process/Leadimport_lib/process.js
+++ b/process/Leadimport_lib/process.js
@@ -92,7 +92,6 @@ LeadImportUtils.loadImportFile = function(pBinId, pFieldSep, pFieldLimit, pRecor
     var toInsert = [];
     var insertTable = "IMPORTFIELD";
     var insertCols = ["IMPORTFIELDID", "FIELDNAME", "LEADIMPORT_ID", "DATE_NEW", "USER_NEW", "FIELDNUMBER"];
-    var insertTypes = db.getColumnTypes(insertTable, insertCols);
     var insertVals = [];
     var sentenceSeparator = ExportTemplateUtils.getSentenceSeparator(pRecordSep);
     var fieldSeparator = ExportTemplateUtils.getFieldSeparator(pFieldSep);
@@ -117,7 +116,7 @@ LeadImportUtils.loadImportFile = function(pBinId, pFieldSep, pFieldLimit, pRecor
                 for (i = 0; i < table[0].length; i++)
                 {
                     insertVals =  [util.getNewUUID(), table[0][i], pLeadImportId, vars.getString("$sys.date"), vars.getString("$sys.user"), i.toString()];
-                    toInsert.push([insertTable, insertCols, insertTypes, insertVals]);
+                    toInsert.push([insertTable, insertCols, null, insertVals]);
                 }
                 db.inserts(toInsert);
             }
diff --git a/process/OfferOrder_lib/process.js b/process/OfferOrder_lib/process.js
index fe3e80e78f..f33eba68fa 100644
--- a/process/OfferOrder_lib/process.js
+++ b/process/OfferOrder_lib/process.js
@@ -75,7 +75,6 @@ function ItemUtils(pOfferOrderId, pTableName) {
     this._updateReOrgItemChangesInDB = function(compTree) {
         var statements = [];
         var cols = ["ITEMSORT", "ITEMPOSITION"];
-        var colTypes = db.getColumnTypes(this.tableName + "ITEM", cols);
 
         var oiTree = this.ItemTree;
         for (var oiid in compTree) {
@@ -83,7 +82,7 @@ function ItemUtils(pOfferOrderId, pTableName) {
                 //check if itemsort/pos has been changed
                 if (oiTree[oiid].itemsort != compTree[oiid].itemsort || oiTree[oiid].pos != compTree[oiid].pos) {
                     var vals = [compTree[oiid].itemsort, compTree[oiid].pos];
-                    statements.push([this.tableName + "ITEM", cols, colTypes, vals, newWhere([this.tableName + "ITEM", this.tableName + "ITEMID"], oiid).build()]);
+                    statements.push([this.tableName + "ITEM", cols, null, vals, newWhere([this.tableName + "ITEM", this.tableName + "ITEMID"], oiid).build()]);
                 }
             }
         }
@@ -221,7 +220,6 @@ ItemUtils.prototype.insertPartsList = function(columns, productId, assignedTo, c
 
         columns = columns.concat(additionalProductInfo.map(function(item) {return item[0][1]}));
 
-        var colTypes = db.getColumnTypes(table, columns);
         
         if (partsList.root != undefined) // if product has a parts list
         {
@@ -273,7 +271,7 @@ ItemUtils.prototype.insertPartsList = function(columns, productId, assignedTo, c
                     // add aditional details
                     .concat(additionalProductInfo.map(function(item) {return ProductDetails[item[1][0]]}));
             
-            statements.push([table, columns, colTypes, vals]);
+            statements.push([table, columns, null, vals]);
             insertedItemIds.push(newid);
             
             __itemInsertStatement(partsList[p2pid], newid);
diff --git a/process/StandardObject_lib/process.js b/process/StandardObject_lib/process.js
index 6eaf4aa07b..59729e43a4 100644
--- a/process/StandardObject_lib/process.js
+++ b/process/StandardObject_lib/process.js
@@ -219,7 +219,7 @@ StandardObject.prototype._setContactStandardAddress = function (pAddressID, pCon
     db.updateData(
         "CONTACT", 
         ["ADDRESS_ID"], 
-        db.getColumnTypes("CONTACT", ["ADDRESS_ID"]), 
+        null, 
         [pAddressID], 
         newWhere("CONTACT.CONTACTID", pContactID).build());
 }
@@ -288,7 +288,7 @@ StandardObject.prototype._setStandardCommunication = function (pCommunicationID,
     db.updateData(
         "COMMUNICATION", 
         ["ISSTANDARD"], 
-        db.getColumnTypes("COMMUNICATION", ["ISSTANDARD"]), 
+        null, 
         [pValue], 
         newWhere("COMMUNICATION.COMMUNICATIONID", pCommunicationID).build());
 }
-- 
GitLab


From c235a9a55de63c818327a33ad39fa392e1fc28f8 Mon Sep 17 00:00:00 2001
From: "a.schindlbeck" <a.schindlbeck@adito.de>
Date: Fri, 3 Jul 2020 10:00:27 +0200
Subject: [PATCH 031/309] #1059269 Liquibase struct skript update for
 ASYS_NOTIFICATIONCONTENTS due to Column change

---
 .../basic/init/struct/create_asys_notificationcontents.xml    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.liquibase/_____SYSTEMALIAS/basic/init/struct/create_asys_notificationcontents.xml b/.liquibase/_____SYSTEMALIAS/basic/init/struct/create_asys_notificationcontents.xml
index d045c99388..8da1987f7f 100644
--- a/.liquibase/_____SYSTEMALIAS/basic/init/struct/create_asys_notificationcontents.xml
+++ b/.liquibase/_____SYSTEMALIAS/basic/init/struct/create_asys_notificationcontents.xml
@@ -7,11 +7,11 @@
         </column>
         <column name="BACKPACK" type="CLOB"/>
         <column name="CAPTION" type="VARCHAR(512)"/>
-        <column name="CREATIONDATE" type="BIGINT"/>
+        <column name="CREATEDATE" type="TIMESTAMP"/>
+        <column name="DELETEDATE" type="TIMESTAMP"/>
         <column name="DESCRIPTION" type="VARCHAR(1023)"/>
         <column name="FORCEDPRIORITY" type="VARCHAR(15)"/>
         <column name="ICON_INFO" type="VARCHAR(1023)"/>
-        <column name="LIFETIME" type="BIGINT"/>
         <column name="LINK_INFO" type="VARCHAR(1023)"/>
         <column name="ORIGINATORNAME" type="VARCHAR(63)"/>
         <column name="RECIPIENTUSERIDS" type="CLOB"/>
-- 
GitLab


From fe3c351da0fcecaf45e89b3acb7de2acd1d2f362 Mon Sep 17 00:00:00 2001
From: "a.schindlbeck" <a.schindlbeck@adito.de>
Date: Tue, 7 Jul 2020 11:11:44 +0200
Subject: [PATCH 032/309] #1060640 Favorites: add liquibase scripts

---
 .liquibase/_____SYSTEMALIAS/basic/init/init.xml     |  2 ++
 .../basic/init/struct/create_asys_record.xml        | 13 +++++++++++++
 .../basic/init/struct/create_asys_recordgroup.xml   | 13 +++++++++++++
 3 files changed, 28 insertions(+)
 create mode 100644 .liquibase/_____SYSTEMALIAS/basic/init/struct/create_asys_record.xml
 create mode 100644 .liquibase/_____SYSTEMALIAS/basic/init/struct/create_asys_recordgroup.xml

diff --git a/.liquibase/_____SYSTEMALIAS/basic/init/init.xml b/.liquibase/_____SYSTEMALIAS/basic/init/init.xml
index ec3bbf339d..540e5ac077 100644
--- a/.liquibase/_____SYSTEMALIAS/basic/init/init.xml
+++ b/.liquibase/_____SYSTEMALIAS/basic/init/init.xml
@@ -23,6 +23,8 @@
     <include relativeToChangelogFile="true" file="struct/create_asys_roles.xml"/>
     <include relativeToChangelogFile="true" file="struct/create_asys_roles_children.xml"/>
     <include relativeToChangelogFile="true" file="struct/create_asys_usertoken.xml"/>
+    <include relativeToChangelogFile="true" file="struct/create_asys_record.xml"/>
+    <include relativeToChangelogFile="true" file="struct/create_asys_recordgroup.xml"/>
     <include relativeToChangelogFile="true" file="data/insert_asys_aliasconfig.xml"/>
     <include relativeToChangelogFile="true" file="data/insert_asys_system.xml"/>
     <include relativeToChangelogFile="true" file="data/insert_asys_permissionset.xml"/>
diff --git a/.liquibase/_____SYSTEMALIAS/basic/init/struct/create_asys_record.xml b/.liquibase/_____SYSTEMALIAS/basic/init/struct/create_asys_record.xml
new file mode 100644
index 0000000000..8d6a080ec2
--- /dev/null
+++ b/.liquibase/_____SYSTEMALIAS/basic/init/struct/create_asys_record.xml
@@ -0,0 +1,13 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+<changeSet author="a.schindlbeck" id="55fc4812-a4b7-4a53-a369-8b644ec78cae">
+    <createTable tableName="ASYS_RECORD">
+        <column name="ID" type="CHAR(36)">
+            <constraints primaryKey="true" primaryKeyName="PK_ASYS_RECORD_ID"/>
+        </column>
+        <column name="OBJECT_TYPE" type="VARCHAR(64)"/>
+        <column name="ROW_ID" type="CHAR(36)"/>
+        <column name="RECORDGROUP_ID" type="CHAR(36)"/>
+    </createTable>
+</changeSet>
+</databaseChangeLog>
diff --git a/.liquibase/_____SYSTEMALIAS/basic/init/struct/create_asys_recordgroup.xml b/.liquibase/_____SYSTEMALIAS/basic/init/struct/create_asys_recordgroup.xml
new file mode 100644
index 0000000000..e3c58c269f
--- /dev/null
+++ b/.liquibase/_____SYSTEMALIAS/basic/init/struct/create_asys_recordgroup.xml
@@ -0,0 +1,13 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+<changeSet author="a.schindlbeck" id="56a34dfc-3c0d-48e1-8890-31c0c93f1942">
+    <createTable tableName="ASYS_RECORDGROUP">
+        <column name="ID" type="CHAR(36)">
+            <constraints primaryKey="true" primaryKeyName="PK_ASYS_RECORD_GROUP_ID"/>
+        </column>
+        <column name="USER_CONTACT_ID" type="CHAR(36)"/>
+        <column name="TITLE" type="VARCHAR(256)"/>
+        <column name="GROUP_TYPE" type="VARCHAR(64)"/>
+    </createTable>
+</changeSet>
+</databaseChangeLog>
-- 
GitLab


From 9765d7baa4c28088a434a6c05c47a748b62dccb4 Mon Sep 17 00:00:00 2001
From: "a.schindlbeck" <a.schindlbeck@adito.de>
Date: Wed, 8 Jul 2020 14:19:27 +0200
Subject: [PATCH 033/309] #1060640 favorites: db column name-change liquibase

---
 .../basic/init/struct/create_asys_recordgroup.xml               | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.liquibase/_____SYSTEMALIAS/basic/init/struct/create_asys_recordgroup.xml b/.liquibase/_____SYSTEMALIAS/basic/init/struct/create_asys_recordgroup.xml
index e3c58c269f..054cff89d6 100644
--- a/.liquibase/_____SYSTEMALIAS/basic/init/struct/create_asys_recordgroup.xml
+++ b/.liquibase/_____SYSTEMALIAS/basic/init/struct/create_asys_recordgroup.xml
@@ -5,7 +5,7 @@
         <column name="ID" type="CHAR(36)">
             <constraints primaryKey="true" primaryKeyName="PK_ASYS_RECORD_GROUP_ID"/>
         </column>
-        <column name="USER_CONTACT_ID" type="CHAR(36)"/>
+        <column name="USER_ID" type="CHAR(36)"/>
         <column name="TITLE" type="VARCHAR(256)"/>
         <column name="GROUP_TYPE" type="VARCHAR(64)"/>
     </createTable>
-- 
GitLab


From 5fbd018220fa7a34d5d6977717bacce1132b24d8 Mon Sep 17 00:00:00 2001
From: "a.schindlbeck" <a.schindlbeck@adito.de>
Date: Thu, 9 Jul 2020 09:37:51 +0200
Subject: [PATCH 034/309] #1060640 Favoriten: liquibase changes

---
 .../basic/init/struct/create_asys_recordgroup.xml               | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.liquibase/_____SYSTEMALIAS/basic/init/struct/create_asys_recordgroup.xml b/.liquibase/_____SYSTEMALIAS/basic/init/struct/create_asys_recordgroup.xml
index 054cff89d6..636831594c 100644
--- a/.liquibase/_____SYSTEMALIAS/basic/init/struct/create_asys_recordgroup.xml
+++ b/.liquibase/_____SYSTEMALIAS/basic/init/struct/create_asys_recordgroup.xml
@@ -5,7 +5,7 @@
         <column name="ID" type="CHAR(36)">
             <constraints primaryKey="true" primaryKeyName="PK_ASYS_RECORD_GROUP_ID"/>
         </column>
-        <column name="USER_ID" type="CHAR(36)"/>
+        <column name="USER_ID" type="CHAR(64)"/>
         <column name="TITLE" type="VARCHAR(256)"/>
         <column name="GROUP_TYPE" type="VARCHAR(64)"/>
     </createTable>
-- 
GitLab


From fd9e01605bd274ab03713ed777ae4766a4cc15e1 Mon Sep 17 00:00:00 2001
From: "s.pongratz" <s.pongratz@adito.de>
Date: Thu, 9 Jul 2020 11:40:44 +0200
Subject: [PATCH 035/309] #1060544-VergabeBerechtigungen Neue
 Benutzer-Berechtigung vergeben

---
 .../PermissionCalendar_entity.aod             | 19 ++++++++++++
 .../onActionProcess.js                        |  9 ++++++
 .../stateProcess.js                           |  7 +++--
 .../valueProcess.js                           |  8 +++++
 .../permissionprocurer_rowid/valueProcess.js  |  2 +-
 .../permissionprocurer_type/valueProcess.js   |  2 +-
 .../displayValueProcess.js                    |  9 ++++++
 .../onValueChange.js                          |  9 ++++++
 .../_____LANGUAGE_EXTRA.aod                   | 18 +++++++++++
 .../_____LANGUAGE_de/_____LANGUAGE_de.aod     | 10 ++++++
 .../_____LANGUAGE_en/_____LANGUAGE_en.aod     | 18 +++++++++++
 .../PermissionCalendar/PermissionCalendar.aod |  4 +++
 .../PermissionCalendarEditReverse_view.aod    | 31 +++++++++++++++++++
 .../PermissionCalendarFilterReverse_view.aod  |  1 +
 14 files changed, 143 insertions(+), 4 deletions(-)
 create mode 100644 entity/PermissionCalendar_entity/entityfields/addactionsreverse/children/addnewuserpermissionprocureraction/onActionProcess.js
 create mode 100644 entity/PermissionCalendar_entity/entityfields/permissiondealer_user_rowid/valueProcess.js
 create mode 100644 entity/PermissionCalendar_entity/entityfields/permissionprocurer_user_rowid/displayValueProcess.js
 create mode 100644 entity/PermissionCalendar_entity/entityfields/permissionprocurer_user_rowid/onValueChange.js
 create mode 100644 neonView/PermissionCalendarEditReverse_view/PermissionCalendarEditReverse_view.aod

diff --git a/entity/PermissionCalendar_entity/PermissionCalendar_entity.aod b/entity/PermissionCalendar_entity/PermissionCalendar_entity.aod
index 8bd374fd34..ffffa204d1 100644
--- a/entity/PermissionCalendar_entity/PermissionCalendar_entity.aod
+++ b/entity/PermissionCalendar_entity/PermissionCalendar_entity.aod
@@ -56,6 +56,7 @@
       <mandatoryProcess>%aditoprj%/entity/PermissionCalendar_entity/entityfields/permissiondealer_user_rowid/mandatoryProcess.js</mandatoryProcess>
       <textInputAllowed v="false" />
       <stateProcess>%aditoprj%/entity/PermissionCalendar_entity/entityfields/permissiondealer_user_rowid/stateProcess.js</stateProcess>
+      <valueProcess>%aditoprj%/entity/PermissionCalendar_entity/entityfields/permissiondealer_user_rowid/valueProcess.js</valueProcess>
       <displayValueProcess>%aditoprj%/entity/PermissionCalendar_entity/entityfields/permissiondealer_user_rowid/displayValueProcess.js</displayValueProcess>
       <onValueChange>%aditoprj%/entity/PermissionCalendar_entity/entityfields/permissiondealer_user_rowid/onValueChange.js</onValueChange>
     </entityField>
@@ -197,6 +198,24 @@
       <name>PermissionDealer_param</name>
       <expose v="true" />
     </entityParameter>
+    <entityField>
+      <name>permissionProcurer_User_RowId</name>
+      <title>Permission Procurer User</title>
+      <consumer>User</consumer>
+      <displayValueProcess>%aditoprj%/entity/PermissionCalendar_entity/entityfields/permissionprocurer_user_rowid/displayValueProcess.js</displayValueProcess>
+      <onValueChange>%aditoprj%/entity/PermissionCalendar_entity/entityfields/permissionprocurer_user_rowid/onValueChange.js</onValueChange>
+    </entityField>
+    <entityActionGroup>
+      <name>AddActionsReverse</name>
+      <children>
+        <entityActionField>
+          <name>addNewUserPermissionProcurerAction</name>
+          <title>Grant new User Permission</title>
+          <onActionProcess>%aditoprj%/entity/PermissionCalendar_entity/entityfields/addactionsreverse/children/addnewuserpermissionprocureraction/onActionProcess.js</onActionProcess>
+          <iconId>VAADIN:USER</iconId>
+        </entityActionField>
+      </children>
+    </entityActionGroup>
   </entityFields>
   <recordContainers>
     <dbRecordContainer>
diff --git a/entity/PermissionCalendar_entity/entityfields/addactionsreverse/children/addnewuserpermissionprocureraction/onActionProcess.js b/entity/PermissionCalendar_entity/entityfields/addactionsreverse/children/addnewuserpermissionprocureraction/onActionProcess.js
new file mode 100644
index 0000000000..b19d4ef7af
--- /dev/null
+++ b/entity/PermissionCalendar_entity/entityfields/addactionsreverse/children/addnewuserpermissionprocureraction/onActionProcess.js
@@ -0,0 +1,9 @@
+import("KeywordRegistry_basic");
+import("PermissionCalendar_lib");
+import("system.vars");
+import("system.neon");
+
+var params = {};
+params["PermissionDealerType_param"] = $KeywordRegistry.permissionCalendarType$user();
+params["PermissionDealer_param"] = vars.get("$param.PermissionDealer_param");
+neon.openContext("PermissionCalendar", "PermissionCalendarEditReverse_view", null, neon.OPERATINGSTATE_NEW, params);
\ No newline at end of file
diff --git a/entity/PermissionCalendar_entity/entityfields/permissiondealer_user_rowid/stateProcess.js b/entity/PermissionCalendar_entity/entityfields/permissiondealer_user_rowid/stateProcess.js
index 6176f62e41..d1da690a3e 100644
--- a/entity/PermissionCalendar_entity/entityfields/permissiondealer_user_rowid/stateProcess.js
+++ b/entity/PermissionCalendar_entity/entityfields/permissiondealer_user_rowid/stateProcess.js
@@ -6,8 +6,11 @@ import("system.neon");
 
 if(vars.getString("$field.PERMISSIONDEALER_TYPE") == $KeywordRegistry.permissionCalendarType$user())
     if(vars.getString("$sys.recordstate") == neon.OPERATINGSTATE_EDIT)
-        result.string("READONLY")
+        result.string("READONLY");
     else
-        result.string("EDITABLE");
+        if (vars.getString("$param.PermissionDealer_param"))
+            result.string("READONLY");
+        else
+            result.string("EDITABLE");
 else
     result.string("INVISIBLE");
\ No newline at end of file
diff --git a/entity/PermissionCalendar_entity/entityfields/permissiondealer_user_rowid/valueProcess.js b/entity/PermissionCalendar_entity/entityfields/permissiondealer_user_rowid/valueProcess.js
new file mode 100644
index 0000000000..a742ec0c4c
--- /dev/null
+++ b/entity/PermissionCalendar_entity/entityfields/permissiondealer_user_rowid/valueProcess.js
@@ -0,0 +1,8 @@
+import("Employee_lib");
+import("system.result");
+import("system.neon");
+import("system.vars");
+
+
+if(vars.get("$this.value") == null && vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.get("$param.PermissionDealer_param"))
+    result.string(EmployeeUtils.sliceUserId(vars.get("$param.PermissionDealer_param")));
\ No newline at end of file
diff --git a/entity/PermissionCalendar_entity/entityfields/permissionprocurer_rowid/valueProcess.js b/entity/PermissionCalendar_entity/entityfields/permissionprocurer_rowid/valueProcess.js
index a8593c8536..0990ee8210 100644
--- a/entity/PermissionCalendar_entity/entityfields/permissionprocurer_rowid/valueProcess.js
+++ b/entity/PermissionCalendar_entity/entityfields/permissionprocurer_rowid/valueProcess.js
@@ -4,5 +4,5 @@ import("system.neon");
 import("system.vars");
 
 
-if(vars.get("$this.value") == null && vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
+if(vars.get("$this.value") == null && vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.get("$param.PermissionProcurer_param"))
     result.string(EmployeeUtils.sliceUserId(vars.get("$param.PermissionProcurer_param")));
\ No newline at end of file
diff --git a/entity/PermissionCalendar_entity/entityfields/permissionprocurer_type/valueProcess.js b/entity/PermissionCalendar_entity/entityfields/permissionprocurer_type/valueProcess.js
index 61f70f8df4..2cb573dc51 100644
--- a/entity/PermissionCalendar_entity/entityfields/permissionprocurer_type/valueProcess.js
+++ b/entity/PermissionCalendar_entity/entityfields/permissionprocurer_type/valueProcess.js
@@ -4,5 +4,5 @@ import("system.result");
 import("system.neon");
 import("system.vars");
 
-if(vars.get("$this.value") == null && vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
+if(vars.get("$this.value") == null && vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.get("$param.PermissionProcurer_param"))
     result.string(PermissionCalendar.getObjectType(vars.get("$param.PermissionProcurer_param")));
\ No newline at end of file
diff --git a/entity/PermissionCalendar_entity/entityfields/permissionprocurer_user_rowid/displayValueProcess.js b/entity/PermissionCalendar_entity/entityfields/permissionprocurer_user_rowid/displayValueProcess.js
new file mode 100644
index 0000000000..4aed107595
--- /dev/null
+++ b/entity/PermissionCalendar_entity/entityfields/permissionprocurer_user_rowid/displayValueProcess.js
@@ -0,0 +1,9 @@
+import("KeywordRegistry_basic");
+import("system.result");
+import("system.vars");
+import("PermissionCalendar_lib");
+
+let permissionProcurerUserDisplay = PermissionCalendar.getNameDisplay(vars.getString("$this.value"), $KeywordRegistry.permissionCalendarType$user());
+
+if (permissionProcurerUserDisplay != "undefined")
+    result.string(permissionProcurerUserDisplay);
diff --git a/entity/PermissionCalendar_entity/entityfields/permissionprocurer_user_rowid/onValueChange.js b/entity/PermissionCalendar_entity/entityfields/permissionprocurer_user_rowid/onValueChange.js
new file mode 100644
index 0000000000..03e9dfdfd7
--- /dev/null
+++ b/entity/PermissionCalendar_entity/entityfields/permissionprocurer_user_rowid/onValueChange.js
@@ -0,0 +1,9 @@
+import("KeywordRegistry_basic");
+import("system.neon");
+import("system.vars");
+
+if (vars.get("$this.value") != null && vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
+{
+    vars.set("$field.PERMISSIONPROCURER_ROWID", vars.get("$this.value"));
+    vars.set("$field.PERMISSIONPROCURER_TYPE", $KeywordRegistry.permissionCalendarType$user());
+}
\ No newline at end of file
diff --git a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
index f32d5f97f0..63ba21d8ce 100644
--- a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
+++ b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
@@ -6833,6 +6833,24 @@
     <entry>
       <key>send mail</key>
     </entry>
+    <entry>
+      <key>and open modeler</key>
+    </entry>
+    <entry>
+      <key>Create model</key>
+    </entry>
+    <entry>
+      <key>Edit workflow</key>
+    </entry>
+    <entry>
+      <key>Permission Procurer User</key>
+    </entry>
+    <entry>
+      <key>Grant new User Permission</key>
+    </entry>
+    <entry>
+      <key>Workflow Model</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 7d8ec08a7b..23532c5d74 100644
--- a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
+++ b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
@@ -8769,6 +8769,16 @@ Bitte Datumseingabe prüfen</value>
       <key>send mail</key>
       <value>E-Mail losschicken</value>
     </entry>
+    <entry>
+      <key>Permission Procurer User</key>
+    </entry>
+    <entry>
+      <key>Grant new User Permission</key>
+      <value>Neue Benutzer-Berechtigung vergeben</value>
+    </entry>
+    <entry>
+      <key>Workflow Model</key>
+    </entry>
   </keyValueMap>
   <font name="Dialog" style="0" size="11" />
 </language>
diff --git a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
index 40c367a50d..48dca7bfd8 100644
--- a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
+++ b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
@@ -6899,6 +6899,24 @@
     <entry>
       <key>send mail</key>
     </entry>
+    <entry>
+      <key>and open modeler</key>
+    </entry>
+    <entry>
+      <key>Create model</key>
+    </entry>
+    <entry>
+      <key>Edit workflow</key>
+    </entry>
+    <entry>
+      <key>Permission Procurer User</key>
+    </entry>
+    <entry>
+      <key>Grant new User Permission</key>
+    </entry>
+    <entry>
+      <key>Workflow Model</key>
+    </entry>
   </keyValueMap>
   <font name="Dialog" style="0" size="11" />
 </language>
diff --git a/neonContext/PermissionCalendar/PermissionCalendar.aod b/neonContext/PermissionCalendar/PermissionCalendar.aod
index 01c68cf39a..2a143ec693 100644
--- a/neonContext/PermissionCalendar/PermissionCalendar.aod
+++ b/neonContext/PermissionCalendar/PermissionCalendar.aod
@@ -27,5 +27,9 @@
       <name>e0b5c183-3f5c-48ad-ba6c-60ae1a0c3b85</name>
       <view>PermissionCalendarFilterDrawer_view</view>
     </neonViewReference>
+    <neonViewReference>
+      <name>dd1363e0-d7ba-44d3-b587-e243b760d9e4</name>
+      <view>PermissionCalendarEditReverse_view</view>
+    </neonViewReference>
   </references>
 </neonContext>
diff --git a/neonView/PermissionCalendarEditReverse_view/PermissionCalendarEditReverse_view.aod b/neonView/PermissionCalendarEditReverse_view/PermissionCalendarEditReverse_view.aod
new file mode 100644
index 0000000000..3fca170746
--- /dev/null
+++ b/neonView/PermissionCalendarEditReverse_view/PermissionCalendarEditReverse_view.aod
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.6">
+  <name>PermissionCalendarEditReverse_view</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <layout>
+    <noneLayout>
+      <name>layout</name>
+    </noneLayout>
+  </layout>
+  <children>
+    <genericViewTemplate>
+      <name>PermissionCalendarEditReverseGeneric</name>
+      <editMode v="true" />
+      <entityField>#ENTITY</entityField>
+      <fields>
+        <entityFieldLink>
+          <name>c40a7708-1983-4848-a93c-92b873104095</name>
+          <entityField>PERMISSION</entityField>
+        </entityFieldLink>
+        <entityFieldLink>
+          <name>8da9a2ae-f338-4342-b762-125e972d4980</name>
+          <entityField>permissionProcurer_User_RowId</entityField>
+        </entityFieldLink>
+        <entityFieldLink>
+          <name>7ce1d83a-9d5c-4c36-81a8-2e832448eaaf</name>
+          <entityField>PERMISSIONDEALER_USER_ROWID</entityField>
+        </entityFieldLink>
+      </fields>
+    </genericViewTemplate>
+  </children>
+</neonView>
diff --git a/neonView/PermissionCalendarFilterReverse_view/PermissionCalendarFilterReverse_view.aod b/neonView/PermissionCalendarFilterReverse_view/PermissionCalendarFilterReverse_view.aod
index df480a219c..41f27fe542 100644
--- a/neonView/PermissionCalendarFilterReverse_view/PermissionCalendarFilterReverse_view.aod
+++ b/neonView/PermissionCalendarFilterReverse_view/PermissionCalendarFilterReverse_view.aod
@@ -13,6 +13,7 @@
   <children>
     <tableViewTemplate>
       <name>PermissionCalendarFilterReverseTable</name>
+      <favoriteActionGroup1>AddActionsReverse</favoriteActionGroup1>
       <entityField>#ENTITY</entityField>
       <isCreatable v="false" />
       <isDeletable v="false" />
-- 
GitLab


From 2e142812a5e95755ab31ef586f89dcb8bbfca7f5 Mon Sep 17 00:00:00 2001
From: "s.pongratz" <s.pongratz@adito.de>
Date: Thu, 9 Jul 2020 13:35:52 +0200
Subject: [PATCH 036/309] =?UTF-8?q?#1061243-Bugfix=5FL=C3=B6schenAllerDate?=
 =?UTF-8?q?ns=C3=A4tze=20Verwendung=20des=20Alias?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../entityfields/leadimportreset/onActionProcess.js             | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/entity/Leadimport_entity/entityfields/leadimportreset/onActionProcess.js b/entity/Leadimport_entity/entityfields/leadimportreset/onActionProcess.js
index c7b4f0fdf7..e3ab27e0a1 100644
--- a/entity/Leadimport_entity/entityfields/leadimportreset/onActionProcess.js
+++ b/entity/Leadimport_entity/entityfields/leadimportreset/onActionProcess.js
@@ -46,7 +46,7 @@ function _deleteData (pTableName, pleadimportId, pdateADayBefor)
 {
     let uTableName = pTableName.charAt(0);
     newWhere(pTableName + "." + pTableName + "ID", 
-        newSelect(pTableName + "." + pTableName + "ID")
+        newSelect(uTableName + "." + pTableName + "ID")
         .from(pTableName, uTableName)
         .join("LEADLOG", "LEADLOG.DATE_NEW = " + uTableName + ".DATE_NEW")
         .where(uTableName + ".USER_NEW = LEADLOG.USER_NEW")
-- 
GitLab


From 94625ba74bc2c7973edf127fa94fedcab192c83d Mon Sep 17 00:00:00 2001
From: "s.pongratz" <s.pongratz@adito.de>
Date: Thu, 9 Jul 2020 17:44:47 +0200
Subject: [PATCH 037/309] =?UTF-8?q?#1060544-VergabeBerechtigungen=20Action?=
 =?UTF-8?q?s=20hinzugef=C3=BCgt=20mit=20Auslese?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../PermissionCalendar_entity.aod             | 22 +++++++++++++
 .../onActionProcess.js                        |  9 ++++++
 .../onActionProcess.js                        |  4 +--
 .../mandatoryProcess.js                       |  2 +-
 .../stateProcess.js                           |  8 ++---
 .../valueProcess.js                           |  0
 .../permissiondealer_type/valueProcess.js     | 13 ++++++--
 .../mandatoryProcess.js                       |  2 +-
 .../stateProcess.js                           | 11 +++----
 .../displayValueProcess.js                    |  6 ++++
 .../mandatoryProcess.js                       |  9 ++++++
 .../onValueChange.js                          |  9 ++++++
 .../stateProcess.js                           | 13 ++++++++
 .../permissionprocurer_type/valueProcess.js   | 15 ++++++---
 .../displayValueProcess.js                    | 11 +++----
 .../mandatoryProcess.js                       |  9 ++++++
 .../stateProcess.js                           | 13 ++++++++
 .../permissioncalendardb/conditionProcess.js  |  3 +-
 .../_____LANGUAGE_EXTRA.aod                   |  6 ++++
 .../_____LANGUAGE_de/_____LANGUAGE_de.aod     |  9 ++++++
 .../_____LANGUAGE_en/_____LANGUAGE_en.aod     |  6 ++++
 .../PermissionCalendar/PermissionCalendar.aod |  4 ---
 .../PermissionCalendarEditReverse_view.aod    | 31 -------------------
 .../PermissionCalendarEdit_view.aod           |  8 +++++
 .../PermissionCalendarFilterReverse_view.aod  |  3 +-
 process/PermissionCalendar_lib/process.js     |  1 +
 26 files changed, 160 insertions(+), 67 deletions(-)
 create mode 100644 entity/PermissionCalendar_entity/entityfields/addactionsreverse/children/addnewdepartmentpermissionprocureraction/onActionProcess.js
 rename entity/PermissionCalendar_entity/entityfields/{permissiondealer_user_rowid => permissiondealer_rowid}/valueProcess.js (100%)
 create mode 100644 entity/PermissionCalendar_entity/entityfields/permissionprocurer_department_rowid/displayValueProcess.js
 create mode 100644 entity/PermissionCalendar_entity/entityfields/permissionprocurer_department_rowid/mandatoryProcess.js
 create mode 100644 entity/PermissionCalendar_entity/entityfields/permissionprocurer_department_rowid/onValueChange.js
 create mode 100644 entity/PermissionCalendar_entity/entityfields/permissionprocurer_department_rowid/stateProcess.js
 create mode 100644 entity/PermissionCalendar_entity/entityfields/permissionprocurer_user_rowid/mandatoryProcess.js
 create mode 100644 entity/PermissionCalendar_entity/entityfields/permissionprocurer_user_rowid/stateProcess.js
 delete mode 100644 neonView/PermissionCalendarEditReverse_view/PermissionCalendarEditReverse_view.aod

diff --git a/entity/PermissionCalendar_entity/PermissionCalendar_entity.aod b/entity/PermissionCalendar_entity/PermissionCalendar_entity.aod
index ffffa204d1..6fabd72427 100644
--- a/entity/PermissionCalendar_entity/PermissionCalendar_entity.aod
+++ b/entity/PermissionCalendar_entity/PermissionCalendar_entity.aod
@@ -173,6 +173,7 @@
     <entityField>
       <name>permissionDealer_rowId</name>
       <title>Permission Dealer</title>
+      <valueProcess>%aditoprj%/entity/PermissionCalendar_entity/entityfields/permissiondealer_rowid/valueProcess.js</valueProcess>
       <displayValueProcess>%aditoprj%/entity/PermissionCalendar_entity/entityfields/permissiondealer_rowid/displayValueProcess.js</displayValueProcess>
     </entityField>
     <entityField>
@@ -202,6 +203,8 @@
       <name>permissionProcurer_User_RowId</name>
       <title>Permission Procurer User</title>
       <consumer>User</consumer>
+      <mandatoryProcess>%aditoprj%/entity/PermissionCalendar_entity/entityfields/permissionprocurer_user_rowid/mandatoryProcess.js</mandatoryProcess>
+      <stateProcess>%aditoprj%/entity/PermissionCalendar_entity/entityfields/permissionprocurer_user_rowid/stateProcess.js</stateProcess>
       <displayValueProcess>%aditoprj%/entity/PermissionCalendar_entity/entityfields/permissionprocurer_user_rowid/displayValueProcess.js</displayValueProcess>
       <onValueChange>%aditoprj%/entity/PermissionCalendar_entity/entityfields/permissionprocurer_user_rowid/onValueChange.js</onValueChange>
     </entityField>
@@ -214,8 +217,27 @@
           <onActionProcess>%aditoprj%/entity/PermissionCalendar_entity/entityfields/addactionsreverse/children/addnewuserpermissionprocureraction/onActionProcess.js</onActionProcess>
           <iconId>VAADIN:USER</iconId>
         </entityActionField>
+        <entityActionField>
+          <name>addNewDepartmentPermissionProcurerAction</name>
+          <title>Grant new Department Permission</title>
+          <onActionProcess>%aditoprj%/entity/PermissionCalendar_entity/entityfields/addactionsreverse/children/addnewdepartmentpermissionprocureraction/onActionProcess.js</onActionProcess>
+          <iconId>VAADIN:GROUP</iconId>
+        </entityActionField>
       </children>
     </entityActionGroup>
+    <entityField>
+      <name>permissionProcurer_Department_RowId</name>
+      <title>Permission Procurer Department</title>
+      <consumer>Departments</consumer>
+      <mandatoryProcess>%aditoprj%/entity/PermissionCalendar_entity/entityfields/permissionprocurer_department_rowid/mandatoryProcess.js</mandatoryProcess>
+      <stateProcess>%aditoprj%/entity/PermissionCalendar_entity/entityfields/permissionprocurer_department_rowid/stateProcess.js</stateProcess>
+      <displayValueProcess>%aditoprj%/entity/PermissionCalendar_entity/entityfields/permissionprocurer_department_rowid/displayValueProcess.js</displayValueProcess>
+      <onValueChange>%aditoprj%/entity/PermissionCalendar_entity/entityfields/permissionprocurer_department_rowid/onValueChange.js</onValueChange>
+    </entityField>
+    <entityParameter>
+      <name>PermissionProcurerType_param</name>
+      <expose v="true" />
+    </entityParameter>
   </entityFields>
   <recordContainers>
     <dbRecordContainer>
diff --git a/entity/PermissionCalendar_entity/entityfields/addactionsreverse/children/addnewdepartmentpermissionprocureraction/onActionProcess.js b/entity/PermissionCalendar_entity/entityfields/addactionsreverse/children/addnewdepartmentpermissionprocureraction/onActionProcess.js
new file mode 100644
index 0000000000..1d2df49b67
--- /dev/null
+++ b/entity/PermissionCalendar_entity/entityfields/addactionsreverse/children/addnewdepartmentpermissionprocureraction/onActionProcess.js
@@ -0,0 +1,9 @@
+import("KeywordRegistry_basic");
+import("PermissionCalendar_lib");
+import("system.vars");
+import("system.neon");
+
+var params = {};
+params["PermissionProcurerType_param"] = $KeywordRegistry.permissionCalendarType$department();
+params["PermissionDealer_param"] = vars.get("$param.PermissionDealer_param");
+neon.openContext("PermissionCalendar", null, null, neon.OPERATINGSTATE_NEW, params);
\ No newline at end of file
diff --git a/entity/PermissionCalendar_entity/entityfields/addactionsreverse/children/addnewuserpermissionprocureraction/onActionProcess.js b/entity/PermissionCalendar_entity/entityfields/addactionsreverse/children/addnewuserpermissionprocureraction/onActionProcess.js
index b19d4ef7af..f2036f9dd0 100644
--- a/entity/PermissionCalendar_entity/entityfields/addactionsreverse/children/addnewuserpermissionprocureraction/onActionProcess.js
+++ b/entity/PermissionCalendar_entity/entityfields/addactionsreverse/children/addnewuserpermissionprocureraction/onActionProcess.js
@@ -4,6 +4,6 @@ import("system.vars");
 import("system.neon");
 
 var params = {};
-params["PermissionDealerType_param"] = $KeywordRegistry.permissionCalendarType$user();
+params["PermissionProcurerType_param"] = $KeywordRegistry.permissionCalendarType$user();
 params["PermissionDealer_param"] = vars.get("$param.PermissionDealer_param");
-neon.openContext("PermissionCalendar", "PermissionCalendarEditReverse_view", null, neon.OPERATINGSTATE_NEW, params);
\ No newline at end of file
+neon.openContext("PermissionCalendar", null, null, neon.OPERATINGSTATE_NEW, params);
\ No newline at end of file
diff --git a/entity/PermissionCalendar_entity/entityfields/permissiondealer_department_rowid/mandatoryProcess.js b/entity/PermissionCalendar_entity/entityfields/permissiondealer_department_rowid/mandatoryProcess.js
index b0dd49473c..ce5b287666 100644
--- a/entity/PermissionCalendar_entity/entityfields/permissiondealer_department_rowid/mandatoryProcess.js
+++ b/entity/PermissionCalendar_entity/entityfields/permissiondealer_department_rowid/mandatoryProcess.js
@@ -3,7 +3,7 @@ import("system.vars");
 import("system.result");
 import("PermissionCalendar_lib");
 
-if(vars.getString("$field.PERMISSIONDEALER_TYPE") == $KeywordRegistry.permissionCalendarType$department())
+if(vars.getString("$field.PERMISSIONDEALER_TYPE") == $KeywordRegistry.permissionCalendarType$department()&& vars.getString("$param.PermissionProcurer_param"))
     result.string(true);
 else
     result.string(false);
\ No newline at end of file
diff --git a/entity/PermissionCalendar_entity/entityfields/permissiondealer_department_rowid/stateProcess.js b/entity/PermissionCalendar_entity/entityfields/permissiondealer_department_rowid/stateProcess.js
index 9d47dab7c4..3d2ee67a3d 100644
--- a/entity/PermissionCalendar_entity/entityfields/permissiondealer_department_rowid/stateProcess.js
+++ b/entity/PermissionCalendar_entity/entityfields/permissiondealer_department_rowid/stateProcess.js
@@ -4,10 +4,10 @@ import("system.result");
 import("PermissionCalendar_lib");
 import("system.neon");
 
-if(vars.getString("$field.PERMISSIONDEALER_TYPE") == $KeywordRegistry.permissionCalendarType$department())
+if(vars.getString("$field.PERMISSIONDEALER_TYPE") == $KeywordRegistry.permissionCalendarType$department()&& vars.getString("$param.PermissionProcurer_param"))
     if(vars.getString("$sys.recordstate") == neon.OPERATINGSTATE_EDIT)
-        result.string("READONLY")
+        result.string(neon.COMPONENTSTATE_READONLY)
     else
-        result.string("EDITABLE");
+        result.string(neon.COMPONENTSTATE_EDITABLE);
 else
-    result.string("INVISIBLE");
\ No newline at end of file
+    result.string(neon.COMPONENTSTATE_INVISIBLE);
\ No newline at end of file
diff --git a/entity/PermissionCalendar_entity/entityfields/permissiondealer_user_rowid/valueProcess.js b/entity/PermissionCalendar_entity/entityfields/permissiondealer_rowid/valueProcess.js
similarity index 100%
rename from entity/PermissionCalendar_entity/entityfields/permissiondealer_user_rowid/valueProcess.js
rename to entity/PermissionCalendar_entity/entityfields/permissiondealer_rowid/valueProcess.js
diff --git a/entity/PermissionCalendar_entity/entityfields/permissiondealer_type/valueProcess.js b/entity/PermissionCalendar_entity/entityfields/permissiondealer_type/valueProcess.js
index c02d458db6..de18eafdc4 100644
--- a/entity/PermissionCalendar_entity/entityfields/permissiondealer_type/valueProcess.js
+++ b/entity/PermissionCalendar_entity/entityfields/permissiondealer_type/valueProcess.js
@@ -1,8 +1,15 @@
+import("system.neon");
+import("PermissionCalendar_lib");
 import("system.result");
 import("system.vars");
 
 
-let permissionDealerType = vars.get("$param.PermissionDealerType_param");
+let permissionProcurerType = vars.get("$param.PermissionDealerType_param");
 
-if (vars.get("$this.value") == null && permissionDealerType)
-    result.string(permissionDealerType);
\ No newline at end of file
+if(vars.get("$this.value") == null && vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW) 
+{
+    if (permissionProcurerType)
+        result.string(permissionProcurerType);
+    else
+        result.string(PermissionCalendar.getObjectType(vars.get("$param.PermissionDealer_param")));
+}
\ No newline at end of file
diff --git a/entity/PermissionCalendar_entity/entityfields/permissiondealer_user_rowid/mandatoryProcess.js b/entity/PermissionCalendar_entity/entityfields/permissiondealer_user_rowid/mandatoryProcess.js
index 20c989da57..e21c5a274d 100644
--- a/entity/PermissionCalendar_entity/entityfields/permissiondealer_user_rowid/mandatoryProcess.js
+++ b/entity/PermissionCalendar_entity/entityfields/permissiondealer_user_rowid/mandatoryProcess.js
@@ -3,7 +3,7 @@ import("system.vars");
 import("system.result");
 import("PermissionCalendar_lib");
 
-if(vars.getString("$field.PERMISSIONDEALER_TYPE") == $KeywordRegistry.permissionCalendarType$user())
+if(vars.getString("$field.PERMISSIONDEALER_TYPE") == $KeywordRegistry.permissionCalendarType$user() && vars.getString("$param.PermissionProcurer_param"))
     result.string(true);
 else
     result.string(false);
\ No newline at end of file
diff --git a/entity/PermissionCalendar_entity/entityfields/permissiondealer_user_rowid/stateProcess.js b/entity/PermissionCalendar_entity/entityfields/permissiondealer_user_rowid/stateProcess.js
index d1da690a3e..e17b225d17 100644
--- a/entity/PermissionCalendar_entity/entityfields/permissiondealer_user_rowid/stateProcess.js
+++ b/entity/PermissionCalendar_entity/entityfields/permissiondealer_user_rowid/stateProcess.js
@@ -4,13 +4,10 @@ import("system.result");
 import("PermissionCalendar_lib");
 import("system.neon");
 
-if(vars.getString("$field.PERMISSIONDEALER_TYPE") == $KeywordRegistry.permissionCalendarType$user())
+if(vars.getString("$field.PERMISSIONDEALER_TYPE") == $KeywordRegistry.permissionCalendarType$user() && vars.getString("$param.PermissionProcurer_param"))
     if(vars.getString("$sys.recordstate") == neon.OPERATINGSTATE_EDIT)
-        result.string("READONLY");
+        result.string(neon.COMPONENTSTATE_READONLY)
     else
-        if (vars.getString("$param.PermissionDealer_param"))
-            result.string("READONLY");
-        else
-            result.string("EDITABLE");
+        result.string(neon.COMPONENTSTATE_EDITABLE);
 else
-    result.string("INVISIBLE");
\ No newline at end of file
+    result.string(neon.COMPONENTSTATE_INVISIBLE);
\ No newline at end of file
diff --git a/entity/PermissionCalendar_entity/entityfields/permissionprocurer_department_rowid/displayValueProcess.js b/entity/PermissionCalendar_entity/entityfields/permissionprocurer_department_rowid/displayValueProcess.js
new file mode 100644
index 0000000000..d5a26f0a31
--- /dev/null
+++ b/entity/PermissionCalendar_entity/entityfields/permissionprocurer_department_rowid/displayValueProcess.js
@@ -0,0 +1,6 @@
+import("system.vars");
+import("system.result");
+
+let display = vars.get("$field.PERMISSIONPROCURER_ROWID.displayValue");
+if(display != "undefined")
+    result.string(vars.get("$field.PERMISSIONPROCURER_ROWID.displayValue"));
\ No newline at end of file
diff --git a/entity/PermissionCalendar_entity/entityfields/permissionprocurer_department_rowid/mandatoryProcess.js b/entity/PermissionCalendar_entity/entityfields/permissionprocurer_department_rowid/mandatoryProcess.js
new file mode 100644
index 0000000000..6736c4a5ec
--- /dev/null
+++ b/entity/PermissionCalendar_entity/entityfields/permissionprocurer_department_rowid/mandatoryProcess.js
@@ -0,0 +1,9 @@
+import("KeywordRegistry_basic");
+import("system.vars");
+import("system.result");
+import("PermissionCalendar_lib");
+
+if(vars.getString("$field.PERMISSIONPROCURER_TYPE") == $KeywordRegistry.permissionCalendarType$department() && vars.getString("$param.PermissionDealer_param"))
+    result.string(true);
+else
+    result.string(false);
\ No newline at end of file
diff --git a/entity/PermissionCalendar_entity/entityfields/permissionprocurer_department_rowid/onValueChange.js b/entity/PermissionCalendar_entity/entityfields/permissionprocurer_department_rowid/onValueChange.js
new file mode 100644
index 0000000000..a10a281ce5
--- /dev/null
+++ b/entity/PermissionCalendar_entity/entityfields/permissionprocurer_department_rowid/onValueChange.js
@@ -0,0 +1,9 @@
+import("KeywordRegistry_basic");
+import("system.neon");
+import("system.vars");
+
+if (vars.get("$this.value") != null && vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
+{
+    vars.set("$field.PERMISSIONPROCURER_ROWID", vars.get("$this.value"));
+    vars.set("$field.PERMISSIONPROCURER_TYPE", $KeywordRegistry.permissionCalendarType$department());
+}
\ No newline at end of file
diff --git a/entity/PermissionCalendar_entity/entityfields/permissionprocurer_department_rowid/stateProcess.js b/entity/PermissionCalendar_entity/entityfields/permissionprocurer_department_rowid/stateProcess.js
new file mode 100644
index 0000000000..69ad9d69c7
--- /dev/null
+++ b/entity/PermissionCalendar_entity/entityfields/permissionprocurer_department_rowid/stateProcess.js
@@ -0,0 +1,13 @@
+import("KeywordRegistry_basic");
+import("system.vars");
+import("system.result");
+import("PermissionCalendar_lib");
+import("system.neon");
+
+if(vars.getString("$field.PERMISSIONPROCURER_TYPE") == $KeywordRegistry.permissionCalendarType$department() && vars.getString("$param.PermissionDealer_param"))
+    if(vars.getString("$sys.recordstate") == neon.OPERATINGSTATE_EDIT)
+        result.string(neon.COMPONENTSTATE_READONLY)
+    else
+        result.string(neon.COMPONENTSTATE_EDITABLE);
+else
+    result.string(neon.COMPONENTSTATE_INVISIBLE);
\ No newline at end of file
diff --git a/entity/PermissionCalendar_entity/entityfields/permissionprocurer_type/valueProcess.js b/entity/PermissionCalendar_entity/entityfields/permissionprocurer_type/valueProcess.js
index 2cb573dc51..7d609bbc47 100644
--- a/entity/PermissionCalendar_entity/entityfields/permissionprocurer_type/valueProcess.js
+++ b/entity/PermissionCalendar_entity/entityfields/permissionprocurer_type/valueProcess.js
@@ -1,8 +1,15 @@
+import("system.neon");
 import("PermissionCalendar_lib");
-import("Employee_lib");
 import("system.result");
-import("system.neon");
 import("system.vars");
 
-if(vars.get("$this.value") == null && vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.get("$param.PermissionProcurer_param"))
-    result.string(PermissionCalendar.getObjectType(vars.get("$param.PermissionProcurer_param")));
\ No newline at end of file
+
+let permissionProcurerType = vars.get("$param.PermissionProcurerType_param");
+
+if(vars.get("$this.value") == null && vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW) 
+{
+    if (permissionProcurerType)
+        result.string(permissionProcurerType);
+    else
+        result.string(PermissionCalendar.getObjectType(vars.get("$param.PermissionProcurer_param")));
+}
\ No newline at end of file
diff --git a/entity/PermissionCalendar_entity/entityfields/permissionprocurer_user_rowid/displayValueProcess.js b/entity/PermissionCalendar_entity/entityfields/permissionprocurer_user_rowid/displayValueProcess.js
index 4aed107595..d5a26f0a31 100644
--- a/entity/PermissionCalendar_entity/entityfields/permissionprocurer_user_rowid/displayValueProcess.js
+++ b/entity/PermissionCalendar_entity/entityfields/permissionprocurer_user_rowid/displayValueProcess.js
@@ -1,9 +1,6 @@
-import("KeywordRegistry_basic");
-import("system.result");
 import("system.vars");
-import("PermissionCalendar_lib");
-
-let permissionProcurerUserDisplay = PermissionCalendar.getNameDisplay(vars.getString("$this.value"), $KeywordRegistry.permissionCalendarType$user());
+import("system.result");
 
-if (permissionProcurerUserDisplay != "undefined")
-    result.string(permissionProcurerUserDisplay);
+let display = vars.get("$field.PERMISSIONPROCURER_ROWID.displayValue");
+if(display != "undefined")
+    result.string(vars.get("$field.PERMISSIONPROCURER_ROWID.displayValue"));
\ No newline at end of file
diff --git a/entity/PermissionCalendar_entity/entityfields/permissionprocurer_user_rowid/mandatoryProcess.js b/entity/PermissionCalendar_entity/entityfields/permissionprocurer_user_rowid/mandatoryProcess.js
new file mode 100644
index 0000000000..c958afbcaa
--- /dev/null
+++ b/entity/PermissionCalendar_entity/entityfields/permissionprocurer_user_rowid/mandatoryProcess.js
@@ -0,0 +1,9 @@
+import("KeywordRegistry_basic");
+import("system.vars");
+import("system.result");
+import("PermissionCalendar_lib");
+
+if(vars.getString("$field.PERMISSIONPROCURER_TYPE") == $KeywordRegistry.permissionCalendarType$user() && vars.getString("$param.PermissionDealer_param"))
+    result.string(true);
+else
+    result.string(false);
\ No newline at end of file
diff --git a/entity/PermissionCalendar_entity/entityfields/permissionprocurer_user_rowid/stateProcess.js b/entity/PermissionCalendar_entity/entityfields/permissionprocurer_user_rowid/stateProcess.js
new file mode 100644
index 0000000000..1af2036a8c
--- /dev/null
+++ b/entity/PermissionCalendar_entity/entityfields/permissionprocurer_user_rowid/stateProcess.js
@@ -0,0 +1,13 @@
+import("KeywordRegistry_basic");
+import("system.vars");
+import("system.result");
+import("PermissionCalendar_lib");
+import("system.neon");
+
+if(vars.getString("$field.PERMISSIONPROCURER_TYPE") == $KeywordRegistry.permissionCalendarType$user() && vars.getString("$param.PermissionDealer_param"))
+    if(vars.getString("$sys.recordstate") == neon.OPERATINGSTATE_EDIT)
+        result.string(neon.COMPONENTSTATE_READONLY)
+    else
+        result.string(neon.COMPONENTSTATE_EDITABLE);
+else
+    result.string(neon.COMPONENTSTATE_INVISIBLE);
\ No newline at end of file
diff --git a/entity/PermissionCalendar_entity/recordcontainers/permissioncalendardb/conditionProcess.js b/entity/PermissionCalendar_entity/recordcontainers/permissioncalendardb/conditionProcess.js
index 80d6ae15b8..82af1af206 100644
--- a/entity/PermissionCalendar_entity/recordcontainers/permissioncalendardb/conditionProcess.js
+++ b/entity/PermissionCalendar_entity/recordcontainers/permissioncalendardb/conditionProcess.js
@@ -9,7 +9,8 @@ let permissionDealer = vars.getString("$param.PermissionDealer_param");
 var cond = new SqlBuilder();
 if (permissionProcurer) 
 {
-    cond.whereIfSet("AB_PERMISSIONCALENDAR.PERMISSIONPROCURER_ROWID", EmployeeUtils.sliceUserId(permissionProcurer));
+    cond.whereIfSet("AB_PERMISSIONCALENDAR.PERMISSIONPROCURER_ROWID", EmployeeUtils.sliceUserId(permissionProcurer))
+    .orIfSet("AB_PERMISSIONCALENDAR.PERMISSIONPROCURER_ROWID", PermissionCalendar.getAllParents(permissionProcurer) , SqlBuilder.IN());
 } 
 else if (permissionDealer)  
 {
diff --git a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
index 63ba21d8ce..754ed5d700 100644
--- a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
+++ b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
@@ -6851,6 +6851,12 @@
     <entry>
       <key>Workflow Model</key>
     </entry>
+    <entry>
+      <key>Permission Procurer Department</key>
+    </entry>
+    <entry>
+      <key>Grant new Department Permission</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 23532c5d74..093846f329 100644
--- a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
+++ b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
@@ -8771,6 +8771,7 @@ Bitte Datumseingabe prüfen</value>
     </entry>
     <entry>
       <key>Permission Procurer User</key>
+      <value>Rechteempfänger Benutzer</value>
     </entry>
     <entry>
       <key>Grant new User Permission</key>
@@ -8779,6 +8780,14 @@ Bitte Datumseingabe prüfen</value>
     <entry>
       <key>Workflow Model</key>
     </entry>
+    <entry>
+      <key>Permission Procurer Department</key>
+      <value>Rechteempfänger Abteilung</value>
+    </entry>
+    <entry>
+      <key>Grant new Department Permission</key>
+      <value>Neue Abteilungs-Berechtigung vergeben</value>
+    </entry>
   </keyValueMap>
   <font name="Dialog" style="0" size="11" />
 </language>
diff --git a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
index 48dca7bfd8..a2eaa32042 100644
--- a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
+++ b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
@@ -6917,6 +6917,12 @@
     <entry>
       <key>Workflow Model</key>
     </entry>
+    <entry>
+      <key>Permission Procurer Department</key>
+    </entry>
+    <entry>
+      <key>Grant new Department Permission</key>
+    </entry>
   </keyValueMap>
   <font name="Dialog" style="0" size="11" />
 </language>
diff --git a/neonContext/PermissionCalendar/PermissionCalendar.aod b/neonContext/PermissionCalendar/PermissionCalendar.aod
index 2a143ec693..01c68cf39a 100644
--- a/neonContext/PermissionCalendar/PermissionCalendar.aod
+++ b/neonContext/PermissionCalendar/PermissionCalendar.aod
@@ -27,9 +27,5 @@
       <name>e0b5c183-3f5c-48ad-ba6c-60ae1a0c3b85</name>
       <view>PermissionCalendarFilterDrawer_view</view>
     </neonViewReference>
-    <neonViewReference>
-      <name>dd1363e0-d7ba-44d3-b587-e243b760d9e4</name>
-      <view>PermissionCalendarEditReverse_view</view>
-    </neonViewReference>
   </references>
 </neonContext>
diff --git a/neonView/PermissionCalendarEditReverse_view/PermissionCalendarEditReverse_view.aod b/neonView/PermissionCalendarEditReverse_view/PermissionCalendarEditReverse_view.aod
deleted file mode 100644
index 3fca170746..0000000000
--- a/neonView/PermissionCalendarEditReverse_view/PermissionCalendarEditReverse_view.aod
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.6">
-  <name>PermissionCalendarEditReverse_view</name>
-  <majorModelMode>DISTRIBUTED</majorModelMode>
-  <layout>
-    <noneLayout>
-      <name>layout</name>
-    </noneLayout>
-  </layout>
-  <children>
-    <genericViewTemplate>
-      <name>PermissionCalendarEditReverseGeneric</name>
-      <editMode v="true" />
-      <entityField>#ENTITY</entityField>
-      <fields>
-        <entityFieldLink>
-          <name>c40a7708-1983-4848-a93c-92b873104095</name>
-          <entityField>PERMISSION</entityField>
-        </entityFieldLink>
-        <entityFieldLink>
-          <name>8da9a2ae-f338-4342-b762-125e972d4980</name>
-          <entityField>permissionProcurer_User_RowId</entityField>
-        </entityFieldLink>
-        <entityFieldLink>
-          <name>7ce1d83a-9d5c-4c36-81a8-2e832448eaaf</name>
-          <entityField>PERMISSIONDEALER_USER_ROWID</entityField>
-        </entityFieldLink>
-      </fields>
-    </genericViewTemplate>
-  </children>
-</neonView>
diff --git a/neonView/PermissionCalendarEdit_view/PermissionCalendarEdit_view.aod b/neonView/PermissionCalendarEdit_view/PermissionCalendarEdit_view.aod
index 9e557d4f2e..60c76072d2 100644
--- a/neonView/PermissionCalendarEdit_view/PermissionCalendarEdit_view.aod
+++ b/neonView/PermissionCalendarEdit_view/PermissionCalendarEdit_view.aod
@@ -27,6 +27,14 @@
           <name>bf110421-8305-47c4-8bab-d859b14c7bd4</name>
           <entityField>PERMISSIONDEALER_USER_ROWID</entityField>
         </entityFieldLink>
+        <entityFieldLink>
+          <name>687b28e4-ea71-40d9-92b4-c771c5c04132</name>
+          <entityField>permissionProcurer_Department_RowId</entityField>
+        </entityFieldLink>
+        <entityFieldLink>
+          <name>413799e6-1f74-43c9-a947-6b5423b75aa2</name>
+          <entityField>permissionProcurer_User_RowId</entityField>
+        </entityFieldLink>
       </fields>
     </genericViewTemplate>
   </children>
diff --git a/neonView/PermissionCalendarFilterReverse_view/PermissionCalendarFilterReverse_view.aod b/neonView/PermissionCalendarFilterReverse_view/PermissionCalendarFilterReverse_view.aod
index 41f27fe542..e3ac3b974a 100644
--- a/neonView/PermissionCalendarFilterReverse_view/PermissionCalendarFilterReverse_view.aod
+++ b/neonView/PermissionCalendarFilterReverse_view/PermissionCalendarFilterReverse_view.aod
@@ -16,8 +16,7 @@
       <favoriteActionGroup1>AddActionsReverse</favoriteActionGroup1>
       <entityField>#ENTITY</entityField>
       <isCreatable v="false" />
-      <isDeletable v="false" />
-      <isEditable v="false" />
+      <isEditable v="true" />
       <title></title>
       <columns>
         <neonTableColumn>
diff --git a/process/PermissionCalendar_lib/process.js b/process/PermissionCalendar_lib/process.js
index 453eced128..25a29b8bd5 100644
--- a/process/PermissionCalendar_lib/process.js
+++ b/process/PermissionCalendar_lib/process.js
@@ -415,6 +415,7 @@ PermissionCalendar.getPermissions = function(pCurrentUser)
     .select("AB_PERMISSIONCALENDARID, PERMISSIONDEALER_ROWID, PERMISSIONDEALER_TYPE, PERMISSIONPROCURER_ROWID, PERMISSION")
     .from("AB_PERMISSIONCALENDAR")
     .where("AB_PERMISSIONCALENDAR.PERMISSIONPROCURER_ROWID", pCurrentUser)
+    .orIfSet("AB_PERMISSIONCALENDAR.PERMISSIONPROCURER_ROWID", PermissionCalendar.getAllParents(EmployeeUtils.prefixUserId(pCurrentUser)) , SqlBuilder.IN())
     .orderBy("PERMISSIONDEALER_ROWID ASC")
     .table();
 };
-- 
GitLab


From eda5f4dd8a7c97cdf64b894e47cb5a517e4d4ba2 Mon Sep 17 00:00:00 2001
From: "s.pongratz" <s.pongratz@adito.de>
Date: Fri, 10 Jul 2020 16:58:13 +0200
Subject: [PATCH 038/309] #1060627-LeadimportMappingassistent

---
 .../LeadimportMappingAssistant/changelog.xml  |   5 +
 .../create_leadimportMappingAssistant.xml     |  23 +++
 .../Data_alias/basic/2020.1.2/changelog.xml   |   1 +
 .liquibase/Data_alias/changelog.xml           |   1 +
 aliasDefinition/Data_alias/Data_alias.aod     | 146 ++++++++++++++++++
 .../KeywordEntry_entity.aod                   |   6 +
 .../LeadimportMappingAssistant_entity.aod     | 137 ++++++++++++++++
 .../entityfields/date_edit/valueProcess.js    |   6 +
 .../entityfields/date_new/valueProcess.js     |   6 +
 .../fieldname/displayValueProcess.js          |   6 +
 .../containername_param/valueProcess.js       |   4 +
 .../leadimport_id/valueProcess.js             |   6 +
 .../entityfields/user_edit/valueProcess.js    |   6 +
 .../entityfields/user_new/valueProcess.js     |   6 +
 .../recordcontainers/db/conditionProcess.js   |   4 +
 .../recordcontainers/db/orderClauseProcess.js |   4 +
 .../Leadimport_entity/Leadimport_entity.aod   |  14 ++
 .../leadimport_id_param/valueProcess.js       |   4 +
 .../LeadimportMappingAssistant.aod            |  18 +++
 .../LeadimportMain_view.aod                   |   5 +
 .../LeadimportMappingAssistantFilter_view.aod |  27 ++++
 21 files changed, 435 insertions(+)
 create mode 100644 .liquibase/Data_alias/basic/2020.1.2/LeadimportMappingAssistant/changelog.xml
 create mode 100644 .liquibase/Data_alias/basic/2020.1.2/LeadimportMappingAssistant/create_leadimportMappingAssistant.xml
 create mode 100644 entity/LeadimportMappingAssistant_entity/LeadimportMappingAssistant_entity.aod
 create mode 100644 entity/LeadimportMappingAssistant_entity/entityfields/date_edit/valueProcess.js
 create mode 100644 entity/LeadimportMappingAssistant_entity/entityfields/date_new/valueProcess.js
 create mode 100644 entity/LeadimportMappingAssistant_entity/entityfields/fieldname/displayValueProcess.js
 create mode 100644 entity/LeadimportMappingAssistant_entity/entityfields/keywordimportfields/children/containername_param/valueProcess.js
 create mode 100644 entity/LeadimportMappingAssistant_entity/entityfields/leadimport_id/valueProcess.js
 create mode 100644 entity/LeadimportMappingAssistant_entity/entityfields/user_edit/valueProcess.js
 create mode 100644 entity/LeadimportMappingAssistant_entity/entityfields/user_new/valueProcess.js
 create mode 100644 entity/LeadimportMappingAssistant_entity/recordcontainers/db/conditionProcess.js
 create mode 100644 entity/LeadimportMappingAssistant_entity/recordcontainers/db/orderClauseProcess.js
 create mode 100644 entity/Leadimport_entity/entityfields/leadimportmappings/children/leadimport_id_param/valueProcess.js
 create mode 100644 neonContext/LeadimportMappingAssistant/LeadimportMappingAssistant.aod
 create mode 100644 neonView/LeadimportMappingAssistantFilter_view/LeadimportMappingAssistantFilter_view.aod

diff --git a/.liquibase/Data_alias/basic/2020.1.2/LeadimportMappingAssistant/changelog.xml b/.liquibase/Data_alias/basic/2020.1.2/LeadimportMappingAssistant/changelog.xml
new file mode 100644
index 0000000000..0afc65858e
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2020.1.2/LeadimportMappingAssistant/changelog.xml
@@ -0,0 +1,5 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+                   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+    <include file="create_leadimportMappingAssistant.xml" relativeToChangelogFile="true" />
+</databaseChangeLog>
diff --git a/.liquibase/Data_alias/basic/2020.1.2/LeadimportMappingAssistant/create_leadimportMappingAssistant.xml b/.liquibase/Data_alias/basic/2020.1.2/LeadimportMappingAssistant/create_leadimportMappingAssistant.xml
new file mode 100644
index 0000000000..2a94138e9a
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2020.1.2/LeadimportMappingAssistant/create_leadimportMappingAssistant.xml
@@ -0,0 +1,23 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+    <changeSet author="s.pongratz" id="546f84b4-b9d5-4b73-a9ea-40b1b8597170">
+         <createTable tableName="LEADIMPORTMAPPINGASSISTANT">
+            <column name="LEADIMPORTMAPPINGASSISTANTID" type="CHAR(36)">
+                <constraints primaryKey="true" primaryKeyName="PK_LEADIMPORTMAPPINGASSISTANTID"/>
+            </column>
+            <column name="USER_NEW" type="NVARCHAR(50)">
+                <constraints nullable="false"/>
+            </column>
+            <column name="DATE_NEW" type="DATETIME">
+                <constraints nullable="false"/>
+            </column>
+            <column name="USER_EDIT" type="NVARCHAR(50)" />
+            <column name="DATE_EDIT" type="DATETIME"/>
+            
+            <column name="FIELDNAME" type="CHAR(36)"/>
+            <column name="INPUTVALUE" type="VARCHAR(300)"/>
+            <column name="OUTPUTVALUE" type="VARCHAR(300)"/>
+            <column name="LEADIMPORT_ID" type="CHAR(36)"/>
+        </createTable>
+    </changeSet>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/2020.1.2/changelog.xml b/.liquibase/Data_alias/basic/2020.1.2/changelog.xml
index 29f7efdfa2..2502954b55 100644
--- a/.liquibase/Data_alias/basic/2020.1.2/changelog.xml
+++ b/.liquibase/Data_alias/basic/2020.1.2/changelog.xml
@@ -2,4 +2,5 @@
 <databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
                    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
     <include file="AlterDocumentTemplatePlaceOfUseDatatype/changelog.xml" relativeToChangelogFile="true"/>
+    <include file="LeadimportMappingAssistant/changelog.xml" relativeToChangelogFile="true" />
 </databaseChangeLog>
diff --git a/.liquibase/Data_alias/changelog.xml b/.liquibase/Data_alias/changelog.xml
index 50c63b65a6..a8cc53b406 100644
--- a/.liquibase/Data_alias/changelog.xml
+++ b/.liquibase/Data_alias/changelog.xml
@@ -13,6 +13,7 @@
     <include relativeToChangelogFile="true" file="basic/2020.0.3/changelog.xml"/>
     <include relativeToChangelogFile="true" file="basic/2020.1.0/changelog.xml"/>
     <include relativeToChangelogFile="true" file="basic/2020.1.1/changelog.xml"/>
+    <include relativeToChangelogFile="true" file="basic/2020.1.2/changelog.xml"/>
     
     <!--enable this only when you definetly want to overwrite the existing data with demo records:--> 
     <!--<include relativeToChangelogFile="true" file="basic/_demoData/changelog.xml" context="example"/>-->
diff --git a/aliasDefinition/Data_alias/Data_alias.aod b/aliasDefinition/Data_alias/Data_alias.aod
index 80c4686210..5c9cc32cb1 100644
--- a/aliasDefinition/Data_alias/Data_alias.aod
+++ b/aliasDefinition/Data_alias/Data_alias.aod
@@ -14947,6 +14947,152 @@
               </entityFieldDb>
             </entityFields>
           </entityDb>
+          <entityDb>
+            <name>LEADIMPORTMAPPINGASSISTANT</name>
+            <dbName></dbName>
+            <idColumn>LEADIMPORTMAPPINGASSISTANTID</idColumn>
+            <idGeneratorType v="0" />
+            <idGeneratorInterval v="1" />
+            <documentation></documentation>
+            <title></title>
+            <description></description>
+            <auditSyncConfig>
+              <name>auditSyncConfig</name>
+              <auditMode v="0" />
+              <syncActive v="false" />
+              <syncComplete v="true" />
+              <syncDirection v="1" />
+              <syncIds></syncIds>
+            </auditSyncConfig>
+            <entityFields>
+              <entityFieldDb>
+                <name>LEADIMPORTMAPPINGASSISTANTID</name>
+                <dbName></dbName>
+                <primaryKey v="true" />
+                <columnType v="1" />
+                <size v="36" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="true" />
+                <index v="true" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>DATE_EDIT</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="93" />
+                <size v="29" />
+                <scale v="9" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>FIELDNAME</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>DATE_NEW</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="93" />
+                <size v="29" />
+                <scale v="9" />
+                <notNull v="true" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>INPUTVALUE</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="300" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>OUTPUTVALUE</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="300" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>USER_NEW</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="50" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>LEADIMPORT_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>USER_EDIT</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="50" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+            </entityFields>
+          </entityDb>
         </entities>
       </entityGroup>
     </aliasDefDb>
diff --git a/entity/KeywordEntry_entity/KeywordEntry_entity.aod b/entity/KeywordEntry_entity/KeywordEntry_entity.aod
index 1d23aa80c1..04ee90390b 100644
--- a/entity/KeywordEntry_entity/KeywordEntry_entity.aod
+++ b/entity/KeywordEntry_entity/KeywordEntry_entity.aod
@@ -577,6 +577,12 @@
           <fieldName>KeywordVisitRecommendationPriority</fieldName>
           <isConsumer v="false" />
         </entityDependency>
+        <entityDependency>
+          <name>d1769b5e-db2a-445b-bb79-c72ac757038b</name>
+          <entityName>LeadimportMappingAssistant_entity</entityName>
+          <fieldName>KeywordImportFields</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
       </dependencies>
       <children>
         <entityParameter>
diff --git a/entity/LeadimportMappingAssistant_entity/LeadimportMappingAssistant_entity.aod b/entity/LeadimportMappingAssistant_entity/LeadimportMappingAssistant_entity.aod
new file mode 100644
index 0000000000..b2a0dd6a13
--- /dev/null
+++ b/entity/LeadimportMappingAssistant_entity/LeadimportMappingAssistant_entity.aod
@@ -0,0 +1,137 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
+  <name>LeadimportMappingAssistant_entity</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <title>Mapping</title>
+  <titlePlural>Mappings</titlePlural>
+  <recordContainer>db</recordContainer>
+  <entityFields>
+    <entityProvider>
+      <name>#PROVIDER</name>
+    </entityProvider>
+    <entityField>
+      <name>FIELDNAME</name>
+      <title>Fieldname</title>
+      <consumer>KeywordImportFields</consumer>
+      <displayValueProcess>%aditoprj%/entity/LeadimportMappingAssistant_entity/entityfields/fieldname/displayValueProcess.js</displayValueProcess>
+    </entityField>
+    <entityField>
+      <name>LEADIMPORTMAPPINGASSISTANTID</name>
+    </entityField>
+    <entityField>
+      <name>LEADIMPORT_ID</name>
+      <valueProcess>%aditoprj%/entity/LeadimportMappingAssistant_entity/entityfields/leadimport_id/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>INPUTVALUE</name>
+      <title>Input value</title>
+    </entityField>
+    <entityField>
+      <name>OUTPUTVALUE</name>
+      <title>Output value</title>
+    </entityField>
+    <entityField>
+      <name>USER_NEW</name>
+      <valueProcess>%aditoprj%/entity/LeadimportMappingAssistant_entity/entityfields/user_new/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>USER_EDIT</name>
+      <valueProcess>%aditoprj%/entity/LeadimportMappingAssistant_entity/entityfields/user_edit/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>DATE_NEW</name>
+      <contentType>DATE</contentType>
+      <valueProcess>%aditoprj%/entity/LeadimportMappingAssistant_entity/entityfields/date_new/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>DATE_EDIT</name>
+      <contentType>DATE</contentType>
+      <valueProcess>%aditoprj%/entity/LeadimportMappingAssistant_entity/entityfields/date_edit/valueProcess.js</valueProcess>
+    </entityField>
+    <entityProvider>
+      <name>LeadimportMapping</name>
+      <dependencies>
+        <entityDependency>
+          <name>89a94a8b-9447-47a6-94c7-240e25aff7a8</name>
+          <entityName>Leadimport_entity</entityName>
+          <fieldName>LeadimportMappings</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+      </dependencies>
+    </entityProvider>
+    <entityParameter>
+      <name>Leadimport_ID_param</name>
+      <expose v="true" />
+      <mandatory v="true" />
+    </entityParameter>
+    <entityConsumer>
+      <name>KeywordImportFields</name>
+      <dependency>
+        <name>dependency</name>
+        <entityName>KeywordEntry_entity</entityName>
+        <fieldName>SpecificContainerKeywords</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>ContainerName_param</name>
+          <valueProcess>%aditoprj%/entity/LeadimportMappingAssistant_entity/entityfields/keywordimportfields/children/containername_param/valueProcess.js</valueProcess>
+        </entityParameter>
+      </children>
+    </entityConsumer>
+  </entityFields>
+  <recordContainers>
+    <dbRecordContainer>
+      <name>db</name>
+      <alias>Data_alias</alias>
+      <conditionProcess>%aditoprj%/entity/LeadimportMappingAssistant_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
+      <orderClauseProcess>%aditoprj%/entity/LeadimportMappingAssistant_entity/recordcontainers/db/orderClauseProcess.js</orderClauseProcess>
+      <linkInformation>
+        <linkInformation>
+          <name>61a456d3-b7b5-4042-ae4c-6245d420da3b</name>
+          <tableName>LEADIMPORTMAPPINGASSISTANT</tableName>
+          <primaryKey>LEADIMPORTMAPPINGASSISTANTID</primaryKey>
+          <isUIDTable v="true" />
+          <readonly v="false" />
+        </linkInformation>
+      </linkInformation>
+      <recordFieldMappings>
+        <dbRecordFieldMapping>
+          <name>DATE_EDIT.value</name>
+          <recordfield>LEADIMPORTMAPPINGASSISTANT.DATE_EDIT</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>DATE_NEW.value</name>
+          <recordfield>LEADIMPORTMAPPINGASSISTANT.DATE_NEW</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>FIELDNAME.value</name>
+          <recordfield>LEADIMPORTMAPPINGASSISTANT.FIELDNAME</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>INPUTVALUE.value</name>
+          <recordfield>LEADIMPORTMAPPINGASSISTANT.INPUTVALUE</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>LEADIMPORT_ID.value</name>
+          <recordfield>LEADIMPORTMAPPINGASSISTANT.LEADIMPORT_ID</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>LEADIMPORTMAPPINGASSISTANTID.value</name>
+          <recordfield>LEADIMPORTMAPPINGASSISTANT.LEADIMPORTMAPPINGASSISTANTID</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>OUTPUTVALUE.value</name>
+          <recordfield>LEADIMPORTMAPPINGASSISTANT.OUTPUTVALUE</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>USER_EDIT.value</name>
+          <recordfield>LEADIMPORTMAPPINGASSISTANT.USER_EDIT</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>USER_NEW.value</name>
+          <recordfield>LEADIMPORTMAPPINGASSISTANT.USER_NEW</recordfield>
+        </dbRecordFieldMapping>
+      </recordFieldMappings>
+    </dbRecordContainer>
+  </recordContainers>
+</entity>
diff --git a/entity/LeadimportMappingAssistant_entity/entityfields/date_edit/valueProcess.js b/entity/LeadimportMappingAssistant_entity/entityfields/date_edit/valueProcess.js
new file mode 100644
index 0000000000..8d41a64d69
--- /dev/null
+++ b/entity/LeadimportMappingAssistant_entity/entityfields/date_edit/valueProcess.js
@@ -0,0 +1,6 @@
+import("system.result");
+import("system.neon");
+import("system.vars");
+
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT)
+    result.string(vars.get("$sys.date"));
\ No newline at end of file
diff --git a/entity/LeadimportMappingAssistant_entity/entityfields/date_new/valueProcess.js b/entity/LeadimportMappingAssistant_entity/entityfields/date_new/valueProcess.js
new file mode 100644
index 0000000000..8ee28e84ed
--- /dev/null
+++ b/entity/LeadimportMappingAssistant_entity/entityfields/date_new/valueProcess.js
@@ -0,0 +1,6 @@
+import("system.result");
+import("system.neon");
+import("system.vars");
+
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
+    result.string(vars.get("$sys.date"));
\ No newline at end of file
diff --git a/entity/LeadimportMappingAssistant_entity/entityfields/fieldname/displayValueProcess.js b/entity/LeadimportMappingAssistant_entity/entityfields/fieldname/displayValueProcess.js
new file mode 100644
index 0000000000..eef0406796
--- /dev/null
+++ b/entity/LeadimportMappingAssistant_entity/entityfields/fieldname/displayValueProcess.js
@@ -0,0 +1,6 @@
+import("system.result");
+import("system.vars");
+import("KeywordRegistry_basic");
+import("Keyword_lib");
+
+result.string(KeywordUtils.getViewValue($KeywordRegistry.importFields(), vars.get("$field.FIELDNAME")));
\ No newline at end of file
diff --git a/entity/LeadimportMappingAssistant_entity/entityfields/keywordimportfields/children/containername_param/valueProcess.js b/entity/LeadimportMappingAssistant_entity/entityfields/keywordimportfields/children/containername_param/valueProcess.js
new file mode 100644
index 0000000000..44130c6f89
--- /dev/null
+++ b/entity/LeadimportMappingAssistant_entity/entityfields/keywordimportfields/children/containername_param/valueProcess.js
@@ -0,0 +1,4 @@
+import("system.result");
+import("Keyword_lib");
+import("KeywordRegistry_basic");
+result.string($KeywordRegistry.importFields());
\ No newline at end of file
diff --git a/entity/LeadimportMappingAssistant_entity/entityfields/leadimport_id/valueProcess.js b/entity/LeadimportMappingAssistant_entity/entityfields/leadimport_id/valueProcess.js
new file mode 100644
index 0000000000..3f14336360
--- /dev/null
+++ b/entity/LeadimportMappingAssistant_entity/entityfields/leadimport_id/valueProcess.js
@@ -0,0 +1,6 @@
+import("system.result");
+import("system.vars");
+if (vars.get("$this.value") == null)
+{
+    result.string(vars.get("$param.Leadimport_ID_param"));
+}
\ No newline at end of file
diff --git a/entity/LeadimportMappingAssistant_entity/entityfields/user_edit/valueProcess.js b/entity/LeadimportMappingAssistant_entity/entityfields/user_edit/valueProcess.js
new file mode 100644
index 0000000000..90383c0713
--- /dev/null
+++ b/entity/LeadimportMappingAssistant_entity/entityfields/user_edit/valueProcess.js
@@ -0,0 +1,6 @@
+import("system.result");
+import("system.neon");
+import("system.vars");
+
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT)
+    result.string(vars.get("$sys.user"));
\ No newline at end of file
diff --git a/entity/LeadimportMappingAssistant_entity/entityfields/user_new/valueProcess.js b/entity/LeadimportMappingAssistant_entity/entityfields/user_new/valueProcess.js
new file mode 100644
index 0000000000..dda83cfd00
--- /dev/null
+++ b/entity/LeadimportMappingAssistant_entity/entityfields/user_new/valueProcess.js
@@ -0,0 +1,6 @@
+import("system.result");
+import("system.neon");
+import("system.vars");
+
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
+    result.string(vars.get("$sys.user"));
\ No newline at end of file
diff --git a/entity/LeadimportMappingAssistant_entity/recordcontainers/db/conditionProcess.js b/entity/LeadimportMappingAssistant_entity/recordcontainers/db/conditionProcess.js
new file mode 100644
index 0000000000..1856100040
--- /dev/null
+++ b/entity/LeadimportMappingAssistant_entity/recordcontainers/db/conditionProcess.js
@@ -0,0 +1,4 @@
+import("system.result");
+import("Sql_lib");
+
+result.string(newWhere("LEADIMPORTMAPPINGASSISTANT.LEADIMPORT_ID", "$param.Leadimport_ID_param").toString());
\ No newline at end of file
diff --git a/entity/LeadimportMappingAssistant_entity/recordcontainers/db/orderClauseProcess.js b/entity/LeadimportMappingAssistant_entity/recordcontainers/db/orderClauseProcess.js
new file mode 100644
index 0000000000..9b1cf90519
--- /dev/null
+++ b/entity/LeadimportMappingAssistant_entity/recordcontainers/db/orderClauseProcess.js
@@ -0,0 +1,4 @@
+import("system.result");
+import("system.db");
+
+result.object({"LEADIMPORTMAPPINGASSISTANT.FIELDNAME": db.ASCENDING});
\ No newline at end of file
diff --git a/entity/Leadimport_entity/Leadimport_entity.aod b/entity/Leadimport_entity/Leadimport_entity.aod
index b794f161e4..71343cce63 100644
--- a/entity/Leadimport_entity/Leadimport_entity.aod
+++ b/entity/Leadimport_entity/Leadimport_entity.aod
@@ -313,6 +313,20 @@
       <state>INVISIBLE</state>
       <stateProcess>%aditoprj%/entity/Leadimport_entity/entityfields/leadimportreset/stateProcess.js</stateProcess>
     </entityActionField>
+    <entityConsumer>
+      <name>LeadimportMappings</name>
+      <dependency>
+        <name>dependency</name>
+        <entityName>LeadimportMappingAssistant_entity</entityName>
+        <fieldName>LeadimportMapping</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>Leadimport_ID_param</name>
+          <valueProcess>%aditoprj%/entity/Leadimport_entity/entityfields/leadimportmappings/children/leadimport_id_param/valueProcess.js</valueProcess>
+        </entityParameter>
+      </children>
+    </entityConsumer>
   </entityFields>
   <recordContainers>
     <dbRecordContainer>
diff --git a/entity/Leadimport_entity/entityfields/leadimportmappings/children/leadimport_id_param/valueProcess.js b/entity/Leadimport_entity/entityfields/leadimportmappings/children/leadimport_id_param/valueProcess.js
new file mode 100644
index 0000000000..11eb7d9117
--- /dev/null
+++ b/entity/Leadimport_entity/entityfields/leadimportmappings/children/leadimport_id_param/valueProcess.js
@@ -0,0 +1,4 @@
+import("system.vars");
+import("system.result");
+
+result.string(vars.get("$field.LEADIMPORTID"));
\ No newline at end of file
diff --git a/neonContext/LeadimportMappingAssistant/LeadimportMappingAssistant.aod b/neonContext/LeadimportMappingAssistant/LeadimportMappingAssistant.aod
new file mode 100644
index 0000000000..2877b87630
--- /dev/null
+++ b/neonContext/LeadimportMappingAssistant/LeadimportMappingAssistant.aod
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<neonContext xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonContext/1.1.1">
+  <name>LeadimportMappingAssistant</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <filterView>LeadimportMappingAssistantFilter_view</filterView>
+  <devices>
+    <element>MOBILE</element>
+    <element>TABLET</element>
+    <element>DESKTOP</element>
+  </devices>
+  <entity>LeadimportMappingAssistant_entity</entity>
+  <references>
+    <neonViewReference>
+      <name>bc357365-04aa-4c3b-8448-9992fdb363f8</name>
+      <view>LeadimportMappingAssistantFilter_view</view>
+    </neonViewReference>
+  </references>
+</neonContext>
diff --git a/neonView/LeadimportMain_view/LeadimportMain_view.aod b/neonView/LeadimportMain_view/LeadimportMain_view.aod
index 5dfdbbc4f8..3cbee3d28b 100644
--- a/neonView/LeadimportMain_view/LeadimportMain_view.aod
+++ b/neonView/LeadimportMain_view/LeadimportMain_view.aod
@@ -24,6 +24,11 @@
       <entityField>ImportFieldID</entityField>
       <view>ImportFieldFilterMapping_view</view>
     </neonViewReference>
+    <neonViewReference>
+      <name>6382569f-b680-4d1e-9e5e-0198b71ebed7</name>
+      <entityField>LeadimportMappings</entityField>
+      <view>LeadimportMappingAssistantFilter_view</view>
+    </neonViewReference>
     <neonViewReference>
       <name>5a6123d2-a2a4-416d-a138-fac6cdc5fb82</name>
       <entityField>#ENTITY</entityField>
diff --git a/neonView/LeadimportMappingAssistantFilter_view/LeadimportMappingAssistantFilter_view.aod b/neonView/LeadimportMappingAssistantFilter_view/LeadimportMappingAssistantFilter_view.aod
new file mode 100644
index 0000000000..0a32f33679
--- /dev/null
+++ b/neonView/LeadimportMappingAssistantFilter_view/LeadimportMappingAssistantFilter_view.aod
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.6">
+  <name>LeadimportMappingAssistantFilter_view</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <layout>
+    <boxLayout>
+      <name>layout</name>
+    </boxLayout>
+  </layout>
+  <children>
+    <titledListViewTemplate>
+      <name>TitledList</name>
+      <titleField>FIELDNAME</titleField>
+      <entityField>#ENTITY</entityField>
+      <columns>
+        <neonTitledListTableColumn>
+          <name>6319d5a7-4155-46c7-acee-288abf282b72</name>
+          <entityField>INPUTVALUE</entityField>
+        </neonTitledListTableColumn>
+        <neonTitledListTableColumn>
+          <name>8736ffce-6731-4135-be61-60c986c5b564</name>
+          <entityField>OUTPUTVALUE</entityField>
+        </neonTitledListTableColumn>
+      </columns>
+    </titledListViewTemplate>
+  </children>
+</neonView>
-- 
GitLab


From bb3036ae238cc687e5fc4e53201e29af94746350 Mon Sep 17 00:00:00 2001
From: "s.pongratz" <s.pongratz@adito.de>
Date: Mon, 13 Jul 2020 10:51:08 +0200
Subject: [PATCH 039/309] #1060627-LeadimportMappingassistent Ersetzen der
 Values

---
 process/Leadimport_lib/process.js | 29 ++++++++++++++++++++++++++++-
 1 file changed, 28 insertions(+), 1 deletion(-)

diff --git a/process/Leadimport_lib/process.js b/process/Leadimport_lib/process.js
index bfc4a50283..c64553038d 100644
--- a/process/Leadimport_lib/process.js
+++ b/process/Leadimport_lib/process.js
@@ -153,6 +153,8 @@ LeadImportUtils.loadImportFile = function(pBinId, pFieldSep, pFieldLimit, pRecor
  */
 LeadImportUtils.importData = function(pDataFields, pDataTypes, pFieldDef, pFieldValues, pImportDefID, pAttrObject, pSource, pUser, pDate)
 {
+    LeadImportUtils.mapping = LeadImportUtils.getMapping(pImportDefID);
+    
     var LeadValues = LeadImportUtils.setValues(pDataFields["LEAD"], pFieldDef, pFieldValues); // set the Lead values
     
     var orgid = "";
@@ -220,6 +222,22 @@ LeadImportUtils.importData = function(pDataFields, pDataTypes, pFieldDef, pField
     return [leadId, persForDubCheck, orgsForDubCheck];
 }
 
+LeadImportUtils.getMapping = function(pleadimportId) 
+{
+    let tempData = {};
+    newSelect(["LEADIMPORTMAPPINGASSISTANT.FIELDNAME", "LEADIMPORTMAPPINGASSISTANT.INPUTVALUE", "LEADIMPORTMAPPINGASSISTANT.OUTPUTVALUE"])
+    .from("LEADIMPORTMAPPINGASSISTANT")
+    .where("LEADIMPORTMAPPINGASSISTANT.LEADIMPORT_ID", pleadimportId)
+    .table().forEach(function (d) { 
+        d[0] = d[0].trim();
+        if (tempData[d[0]] == undefined	)
+            tempData[d[0]] =  {} //[[d[1], d[2]]]
+        tempData[d[0]][d[1]] = d[2];
+    });
+    return tempData;
+    
+}
+
 /**
  * adds two arrays
  *
@@ -302,8 +320,17 @@ LeadImportUtils.setValues  = function(pFields, pFieldDef, pFieldValues)
     {
         try
         {
-            if (pFieldValues[ pFieldDef[i][0]] != undefined)
+            if (pFieldValues[ pFieldDef[i][0]] != undefined) 
+            {
+                if (LeadImportUtils.mapping != undefined && 
+                    LeadImportUtils.mapping[pFieldDef[i][1]] != undefined && 
+                    LeadImportUtils.mapping[pFieldDef[i][1]][pFieldValues[pFieldDef[i][0]]] != undefined) 
+                {
+                    pFieldValues[pFieldDef[i][0]] = LeadImportUtils.mapping[pFieldDef[i][1]][pFieldValues[pFieldDef[i][0]]];
+                }
+                    
                 DataValues[pFieldDef[i][1]] = pFieldValues[pFieldDef[i][0]];
+            }
         }
         catch(ex)
         {
-- 
GitLab


From 595be8f6570c02eb76b12682a1657ac188d86d58 Mon Sep 17 00:00:00 2001
From: "s.pongratz" <s.pongratz@adito.de>
Date: Mon, 13 Jul 2020 11:19:46 +0200
Subject: [PATCH 040/309] #1060627-LeadimportMappingassistent Anpassungen am
 Datentyp

---
 .../create_leadimportMappingAssistant.xml                     | 2 +-
 aliasDefinition/Data_alias/Data_alias.aod                     | 4 ++--
 process/Leadimport_lib/process.js                             | 3 +--
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/.liquibase/Data_alias/basic/2020.1.2/LeadimportMappingAssistant/create_leadimportMappingAssistant.xml b/.liquibase/Data_alias/basic/2020.1.2/LeadimportMappingAssistant/create_leadimportMappingAssistant.xml
index 2a94138e9a..a9e22a51b9 100644
--- a/.liquibase/Data_alias/basic/2020.1.2/LeadimportMappingAssistant/create_leadimportMappingAssistant.xml
+++ b/.liquibase/Data_alias/basic/2020.1.2/LeadimportMappingAssistant/create_leadimportMappingAssistant.xml
@@ -14,7 +14,7 @@
             <column name="USER_EDIT" type="NVARCHAR(50)" />
             <column name="DATE_EDIT" type="DATETIME"/>
             
-            <column name="FIELDNAME" type="CHAR(36)"/>
+            <column name="FIELDNAME" type="VARCHAR(100)"/>
             <column name="INPUTVALUE" type="VARCHAR(300)"/>
             <column name="OUTPUTVALUE" type="VARCHAR(300)"/>
             <column name="LEADIMPORT_ID" type="CHAR(36)"/>
diff --git a/aliasDefinition/Data_alias/Data_alias.aod b/aliasDefinition/Data_alias/Data_alias.aod
index 5c9cc32cb1..ae4162ae31 100644
--- a/aliasDefinition/Data_alias/Data_alias.aod
+++ b/aliasDefinition/Data_alias/Data_alias.aod
@@ -14997,8 +14997,8 @@
                 <name>FIELDNAME</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="1" />
-                <size v="36" />
+                <columnType v="12" />
+                <size v="100" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
diff --git a/process/Leadimport_lib/process.js b/process/Leadimport_lib/process.js
index c64553038d..6b5411de5e 100644
--- a/process/Leadimport_lib/process.js
+++ b/process/Leadimport_lib/process.js
@@ -228,8 +228,7 @@ LeadImportUtils.getMapping = function(pleadimportId)
     newSelect(["LEADIMPORTMAPPINGASSISTANT.FIELDNAME", "LEADIMPORTMAPPINGASSISTANT.INPUTVALUE", "LEADIMPORTMAPPINGASSISTANT.OUTPUTVALUE"])
     .from("LEADIMPORTMAPPINGASSISTANT")
     .where("LEADIMPORTMAPPINGASSISTANT.LEADIMPORT_ID", pleadimportId)
-    .table().forEach(function (d) { 
-        d[0] = d[0].trim();
+    .table().forEach(function (d) {
         if (tempData[d[0]] == undefined	)
             tempData[d[0]] =  {} //[[d[1], d[2]]]
         tempData[d[0]][d[1]] = d[2];
-- 
GitLab


From b4a0e9fad7a0e40d8aaa5237478de2c5a2209be4 Mon Sep 17 00:00:00 2001
From: "s.pongratz" <s.pongratz@adito.de>
Date: Mon, 13 Jul 2020 11:33:45 +0200
Subject: [PATCH 041/309] #1060627-LeadimportMappingassistent Lib Documentation

---
 process/Leadimport_lib/process.js | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/process/Leadimport_lib/process.js b/process/Leadimport_lib/process.js
index 6b5411de5e..66db58645e 100644
--- a/process/Leadimport_lib/process.js
+++ b/process/Leadimport_lib/process.js
@@ -153,6 +153,7 @@ LeadImportUtils.loadImportFile = function(pBinId, pFieldSep, pFieldLimit, pRecor
  */
 LeadImportUtils.importData = function(pDataFields, pDataTypes, pFieldDef, pFieldValues, pImportDefID, pAttrObject, pSource, pUser, pDate)
 {
+    // set the mappings
     LeadImportUtils.mapping = LeadImportUtils.getMapping(pImportDefID);
     
     var LeadValues = LeadImportUtils.setValues(pDataFields["LEAD"], pFieldDef, pFieldValues); // set the Lead values
@@ -222,6 +223,14 @@ LeadImportUtils.importData = function(pDataFields, pDataTypes, pFieldDef, pField
     return [leadId, persForDubCheck, orgsForDubCheck];
 }
 
+
+/**
+ * get all Mapping to a Leadimport
+ *
+ * @param {String} pleadimportId the ID of a Leadimport
+ * 
+ * @return {Object} an associative array in format arr[fieldname][inputvalue] --> outputvalue
+ */
 LeadImportUtils.getMapping = function(pleadimportId) 
 {
     let tempData = {};
@@ -230,7 +239,7 @@ LeadImportUtils.getMapping = function(pleadimportId)
     .where("LEADIMPORTMAPPINGASSISTANT.LEADIMPORT_ID", pleadimportId)
     .table().forEach(function (d) {
         if (tempData[d[0]] == undefined	)
-            tempData[d[0]] =  {} //[[d[1], d[2]]]
+            tempData[d[0]] =  {}
         tempData[d[0]][d[1]] = d[2];
     });
     return tempData;
@@ -325,6 +334,7 @@ LeadImportUtils.setValues  = function(pFields, pFieldDef, pFieldValues)
                     LeadImportUtils.mapping[pFieldDef[i][1]] != undefined && 
                     LeadImportUtils.mapping[pFieldDef[i][1]][pFieldValues[pFieldDef[i][0]]] != undefined) 
                 {
+                    // mapping is available and is set
                     pFieldValues[pFieldDef[i][0]] = LeadImportUtils.mapping[pFieldDef[i][1]][pFieldValues[pFieldDef[i][0]]];
                 }
                     
-- 
GitLab


From 44f95568ff8f2e2c4bf20e9a9d8cd33977b0d7b8 Mon Sep 17 00:00:00 2001
From: "s.pongratz" <s.pongratz@adito.de>
Date: Mon, 13 Jul 2020 13:05:21 +0200
Subject: [PATCH 042/309] =?UTF-8?q?#1060627-LeadimportMappingassistent=20L?=
 =?UTF-8?q?=C3=B6schen=20der=20Mappings=20bei=20L=C3=B6schung=20des=20Lead?=
 =?UTF-8?q?imports?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 entity/Leadimport_entity/recordcontainers/db/onDBDelete.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/entity/Leadimport_entity/recordcontainers/db/onDBDelete.js b/entity/Leadimport_entity/recordcontainers/db/onDBDelete.js
index 7fc0b527fd..76cb3729e7 100644
--- a/entity/Leadimport_entity/recordcontainers/db/onDBDelete.js
+++ b/entity/Leadimport_entity/recordcontainers/db/onDBDelete.js
@@ -22,12 +22,13 @@ newSelect("LEADLOGID")
                 binMetadata = binMetadata.concat(db.getBinaryMetadata("LEADLOG", "ERRORLOG", leadLogId, false, SqlUtils.getBinariesAlias(), ""));
             });
 
-if(leadImportId != "")//delete the connected importfields
+if(leadImportId != "")//delete the connected importfields und der Mappings
 {
     newWhere("IMPORTFIELD.LEADIMPORT_ID", leadImportId).deleteData();
     newWhere("LEADTEMP.ROW_ID", leadImportId).deleteData();
     newWhere("LEAD.LEADIMPORT_ID", leadImportId).deleteData();
     newWhere("LEADLOG.LEADIMPORT_ID", leadImportId).deleteData();
+    newWhere("LEADIMPORTMAPPINGASSISTANT.LEADIMPORT_ID", leadImportId).deleteData();
 }
 
 binMetadata.forEach(function(pMeta) 
-- 
GitLab


From 3a6418d3867f5415c2888b07ea6d09c8cac39c3a Mon Sep 17 00:00:00 2001
From: "s.pongratz" <s.pongratz@adito.de>
Date: Mon, 13 Jul 2020 13:13:47 +0200
Subject: [PATCH 043/309] #1060627-LeadimportMappingassistent Doku Entity

---
 .../LeadimportMappingAssistant_entity.aod        |  1 +
 .../documentation.adoc                           | 16 ++++++++++++++++
 entity/Leadimport_entity/documentation.adoc      |  1 +
 3 files changed, 18 insertions(+)
 create mode 100644 entity/LeadimportMappingAssistant_entity/documentation.adoc

diff --git a/entity/LeadimportMappingAssistant_entity/LeadimportMappingAssistant_entity.aod b/entity/LeadimportMappingAssistant_entity/LeadimportMappingAssistant_entity.aod
index b2a0dd6a13..6a1f6c7311 100644
--- a/entity/LeadimportMappingAssistant_entity/LeadimportMappingAssistant_entity.aod
+++ b/entity/LeadimportMappingAssistant_entity/LeadimportMappingAssistant_entity.aod
@@ -2,6 +2,7 @@
 <entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
   <name>LeadimportMappingAssistant_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
+  <documentation>%aditoprj%/entity/LeadimportMappingAssistant_entity/documentation.adoc</documentation>
   <title>Mapping</title>
   <titlePlural>Mappings</titlePlural>
   <recordContainer>db</recordContainer>
diff --git a/entity/LeadimportMappingAssistant_entity/documentation.adoc b/entity/LeadimportMappingAssistant_entity/documentation.adoc
new file mode 100644
index 0000000000..56f2b18264
--- /dev/null
+++ b/entity/LeadimportMappingAssistant_entity/documentation.adoc
@@ -0,0 +1,16 @@
+= LeadimportMappingAssistant_entity
+
+This Entity is for the mapping of Values of the Leadimport and the actual value, which will be imported into the System.
+
+== Example
+
+The Gender would be imported as a numbered System:
+
+- 0 = female
+- 1 = male
+- 2 = various
+
+But in ADITO would save only f, m and v. So you can map each other and it would save right.
+
+== Relational entities
+Leadimport_entity
diff --git a/entity/Leadimport_entity/documentation.adoc b/entity/Leadimport_entity/documentation.adoc
index 3e934155d2..8628a2be9c 100644
--- a/entity/Leadimport_entity/documentation.adoc
+++ b/entity/Leadimport_entity/documentation.adoc
@@ -4,4 +4,5 @@ Is for the Import of Data from a CSV-Format File. Important of this is, that the
 
 == Relational entities
 ImportField_entity
+LeadimportMappingAssistant_entity
 Lead_entity
-- 
GitLab


From 38333c16880770581eabb0600effbcea19ebe63e Mon Sep 17 00:00:00 2001
From: "a.schindlbeck" <a.schindlbeck@adito.de>
Date: Mon, 13 Jul 2020 13:31:13 +0200
Subject: [PATCH 044/309] #1060640 Favorites: ASYS_RECORDGROUP column length
 change

---
 .../basic/init/struct/create_asys_recordgroup.xml               | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.liquibase/_____SYSTEMALIAS/basic/init/struct/create_asys_recordgroup.xml b/.liquibase/_____SYSTEMALIAS/basic/init/struct/create_asys_recordgroup.xml
index 636831594c..189f0040b1 100644
--- a/.liquibase/_____SYSTEMALIAS/basic/init/struct/create_asys_recordgroup.xml
+++ b/.liquibase/_____SYSTEMALIAS/basic/init/struct/create_asys_recordgroup.xml
@@ -5,7 +5,7 @@
         <column name="ID" type="CHAR(36)">
             <constraints primaryKey="true" primaryKeyName="PK_ASYS_RECORD_GROUP_ID"/>
         </column>
-        <column name="USER_ID" type="CHAR(64)"/>
+        <column name="USER_ID" type="CHAR(46)"/>
         <column name="TITLE" type="VARCHAR(256)"/>
         <column name="GROUP_TYPE" type="VARCHAR(64)"/>
     </createTable>
-- 
GitLab


From 9ca9f0d4000ac42e3097833b5a1730d1f7288a46 Mon Sep 17 00:00:00 2001
From: "s.pongratz" <s.pongratz@adito.de>
Date: Mon, 13 Jul 2020 15:44:27 +0200
Subject: [PATCH 045/309] =?UTF-8?q?#1060544-VergabeBerechtigung=20Doku=20h?=
 =?UTF-8?q?inzugef=C3=BCgt?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../documentation.adoc                        | 20 +++++++++++++++++--
 .../permissiondealer_type/valueProcess.js     |  8 +++++---
 2 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/entity/PermissionCalendar_entity/documentation.adoc b/entity/PermissionCalendar_entity/documentation.adoc
index 74fe5d0df0..1c79842cd4 100644
--- a/entity/PermissionCalendar_entity/documentation.adoc
+++ b/entity/PermissionCalendar_entity/documentation.adoc
@@ -1,5 +1,21 @@
 =PermissionCalendar_entity
 
-This Entity is to set Permissions for a Employee of another Employee or Department. Important is that in the `PermissionCalendarEdit_view` the `PERMISSIONPROCURER` gets Rights from the chosen `PERMISSIONDEALER`.
+This Entity is to set Permissions for a Employee or a Department of another Employee or Department. 
+Important is that in the `PermissionCalendarEdit_view` the `PERMISSIONPROCURER` gets Rights from the chosen `PERMISSIONDEALER`.
 
-If you execute a add-Action over the own Filter-View, the current registered User is chosen as `PERMISSIONPROCURER`.
\ No newline at end of file
+If you execute a add-Action over the own of the Filter-Views, you can add a new Permission.
+
+== Consumer of the Provider
+
+if you want to integrate one of the Filter-Views, you have to set the right parameter:
+
+- If you want to show the `PermissionCalendarFilter_view`, you have to set the `PermissionDeler_param`
+- If you want to show the `PermissionCalendarFilterReverse_view`, you have to set the `PermissionProcurer_param`
+
+
+Note: Always set the whole and not the short UID of the Employee. This is need for determining the type.
+
+
+== Relational entities
+
+Employee_entity
\ No newline at end of file
diff --git a/entity/PermissionCalendar_entity/entityfields/permissiondealer_type/valueProcess.js b/entity/PermissionCalendar_entity/entityfields/permissiondealer_type/valueProcess.js
index de18eafdc4..1138eceb87 100644
--- a/entity/PermissionCalendar_entity/entityfields/permissiondealer_type/valueProcess.js
+++ b/entity/PermissionCalendar_entity/entityfields/permissiondealer_type/valueProcess.js
@@ -4,12 +4,14 @@ import("system.result");
 import("system.vars");
 
 
-let permissionProcurerType = vars.get("$param.PermissionDealerType_param");
+let permissionDealerType  = vars.get("$param.PermissionDealerType_param");
 
 if(vars.get("$this.value") == null && vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW) 
 {
-    if (permissionProcurerType)
-        result.string(permissionProcurerType);
+    if (permissionDealerType)
+        // if there would add a new Permission Dealer the Dealer Type will be handed over by the Action
+        result.string(permissionDealerType); 
     else
+        // if there would add a new Permission Procurer the Deler Type has to get
         result.string(PermissionCalendar.getObjectType(vars.get("$param.PermissionDealer_param")));
 }
\ No newline at end of file
-- 
GitLab


From 7185732b04a9c650b8babf3ced0add94621e558e Mon Sep 17 00:00:00 2001
From: "b.ulrich" <b.ulrich@adito.de>
Date: Wed, 15 Jul 2020 09:39:45 +0200
Subject: [PATCH 046/309] [Projekt: Entwicklung - Neon][TicketNr.:
 1061120][DocumentTemplatePlaceOfUse falsche Datentypen bei ids]

---
 .../alter_ComunicationMedium_IdDatatype.xml   |  16 ++-
 ...ter_DocumentTemplatePlaceOfUseDatatype.xml |  13 +-
 .../alter_ExportTemplateDatatype.xml          |  26 +++-
 .../Data_alias/basic/2020.1.2/changelog.xml   |   3 +-
 aliasDefinition/Data_alias/Data_alias.aod     | 114 +++++++++---------
 5 files changed, 103 insertions(+), 69 deletions(-)

diff --git a/.liquibase/Data_alias/basic/2020.1.2/AlterDatatypeOfKeyColumnsToChar/alter_ComunicationMedium_IdDatatype.xml b/.liquibase/Data_alias/basic/2020.1.2/AlterDatatypeOfKeyColumnsToChar/alter_ComunicationMedium_IdDatatype.xml
index 3e4f1fbd5b..7153295dc1 100644
--- a/.liquibase/Data_alias/basic/2020.1.2/AlterDatatypeOfKeyColumnsToChar/alter_ComunicationMedium_IdDatatype.xml
+++ b/.liquibase/Data_alias/basic/2020.1.2/AlterDatatypeOfKeyColumnsToChar/alter_ComunicationMedium_IdDatatype.xml
@@ -1,7 +1,17 @@
 <?xml version="1.1" encoding="UTF-8" standalone="no"?>
 <databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
-                   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
-    <changeSet author="b.ulrich" id="a9f53bcd-b541-4a46-bd40-a21f7fae7aba">
-        <modifyDataType columnName="MEDIUM_ID" newDataType="CHAR(36)" tableName="COMMUNICATION"/> 
+                   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">   
+    <changeSet dbms="derby" author="b.ulrich" id="bd334096-a6ce-4739-b272-753a85ff103e">
+        <sql>
+            ALTER TABLE COMMUNICATION ADD COLUMN MEDIUM_ID_NEW CHAR(36);
+            UPDATE COMMUNICATION SET MEDIUM_ID_NEW=MEDIUM_ID;
+            ALTER TABLE COMMUNICATION DROP COLUMN MEDIUM_ID;
+            RENAME COLUMN COMMUNICATION.MEDIUM_ID_NEW TO MEDIUM_ID;
+        </sql>
     </changeSet>
+    
+    <changeSet dbms="!derby" author="b.ulrich" id="17c1eb73-3131-4a2b-bf9a-913590767c79">
+        <modifyDataType tableName="COMMUNICATION" columnName="MEDIUM_ID" newDataType="CHAR(36)"/>
+    </changeSet>
+
 </databaseChangeLog>
diff --git a/.liquibase/Data_alias/basic/2020.1.2/AlterDatatypeOfKeyColumnsToChar/alter_DocumentTemplatePlaceOfUseDatatype.xml b/.liquibase/Data_alias/basic/2020.1.2/AlterDatatypeOfKeyColumnsToChar/alter_DocumentTemplatePlaceOfUseDatatype.xml
index 14c64bfefe..ec607aa938 100644
--- a/.liquibase/Data_alias/basic/2020.1.2/AlterDatatypeOfKeyColumnsToChar/alter_DocumentTemplatePlaceOfUseDatatype.xml
+++ b/.liquibase/Data_alias/basic/2020.1.2/AlterDatatypeOfKeyColumnsToChar/alter_DocumentTemplatePlaceOfUseDatatype.xml
@@ -1,7 +1,16 @@
 <?xml version="1.1" encoding="UTF-8" standalone="no"?>
 <databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
                    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
-    <changeSet author="b.ulrich" id="5a0d5d3f-e849-4584-8082-481b1411d1fc">
-        <modifyDataType columnName="DOCUMENTTEMPLATE_ID" newDataType="CHAR(36)" tableName="DOCUMENTTEMPLATE"/> 
+    <changeSet dbms="derby" author="b.ulrich" id="83c25119-cf41-42ab-b42f-370195f9de87">
+        <sql>
+            ALTER TABLE DOCUMENTTEMPLATE ADD COLUMN DOCUMENTTEMPLATEID_NEW CHAR(36);
+            UPDATE DOCUMENTTEMPLATE SET DOCUMENTTEMPLATEID_NEW=DOCUMENTTEMPLATEID;
+            ALTER TABLE DOCUMENTTEMPLATE DROP COLUMN DOCUMENTTEMPLATEID;
+            RENAME COLUMN DOCUMENTTEMPLATE.DOCUMENTTEMPLATEID_NEW TO DOCUMENTTEMPLATEID;
+        </sql>
+    </changeSet>
+    
+    <changeSet dbms="!derby" author="b.ulrich" id="85ba6a61-9318-4118-ac4c-e33730f6581d">
+        <modifyDataType tableName="DOCUMENTTEMPLATE" columnName="DOCUMENTTEMPLATEID" newDataType="CHAR(36)"/>
     </changeSet>
 </databaseChangeLog>
diff --git a/.liquibase/Data_alias/basic/2020.1.2/AlterDatatypeOfKeyColumnsToChar/alter_ExportTemplateDatatype.xml b/.liquibase/Data_alias/basic/2020.1.2/AlterDatatypeOfKeyColumnsToChar/alter_ExportTemplateDatatype.xml
index 7de9227718..237c9fd9e4 100644
--- a/.liquibase/Data_alias/basic/2020.1.2/AlterDatatypeOfKeyColumnsToChar/alter_ExportTemplateDatatype.xml
+++ b/.liquibase/Data_alias/basic/2020.1.2/AlterDatatypeOfKeyColumnsToChar/alter_ExportTemplateDatatype.xml
@@ -1,10 +1,26 @@
 <?xml version="1.1" encoding="UTF-8" standalone="no"?>
 <databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
                    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
-    <changeSet author="b.ulrich" id="77ee7dcd-cf5b-47ea-a59a-2b1230fad818">
-        <modifyDataType columnName="EXPORTTEMPLATE_ID" newDataType="CHAR(36)" tableName="EXPORTTEMPLATEPLACEOFUSE"/>
-        <modifyDataType columnName="EXPORTTEMPLATE_ID" newDataType="CHAR(36)" tableName="EXPORTTEMPLATEFIELD"/>
-        <modifyDataType columnName="EXPORTTEMPLATE_ID" newDataType="CHAR(36)" tableName="EXPORTTEMPLATESELECTION"/>
-        
+        <changeSet dbms="derby" author="b.ulrich" id="9c551ee3-f4f0-46e4-a671-943b58c74432">
+        <sql>
+            ALTER TABLE EXPORTTEMPLATEPLACEOFUSE ADD COLUMN EXPORTTEMPLATE_ID_NEW CHAR(36);
+            UPDATE EXPORTTEMPLATEPLACEOFUSE SET EXPORTTEMPLATE_ID_NEW=EXPORTTEMPLATE_ID;
+            ALTER TABLE EXPORTTEMPLATEPLACEOFUSE DROP COLUMN EXPORTTEMPLATE_ID;
+            RENAME COLUMN EXPORTTEMPLATEPLACEOFUSE.EXPORTTEMPLATE_ID_NEW TO EXPORTTEMPLATE_ID;
+             ALTER TABLE EXPORTTEMPLATEFIELD ADD COLUMN EXPORTTEMPLATE_ID_NEW CHAR(36);
+            UPDATE EXPORTTEMPLATEFIELD SET EXPORTTEMPLATE_ID_NEW=EXPORTTEMPLATE_ID;
+            ALTER TABLE EXPORTTEMPLATEFIELD DROP COLUMN EXPORTTEMPLATE_ID;
+            RENAME COLUMN EXPORTTEMPLATEFIELD.EXPORTTEMPLATE_ID_NEW TO EXPORTTEMPLATE_ID;
+             ALTER TABLE EXPORTTEMPLATESELECTION ADD COLUMN EXPORTTEMPLATE_ID_NEW CHAR(36);
+            UPDATE EXPORTTEMPLATESELECTION SET EXPORTTEMPLATE_ID_NEW=EXPORTTEMPLATE_ID;
+            ALTER TABLE EXPORTTEMPLATESELECTION DROP COLUMN EXPORTTEMPLATE_ID;
+            RENAME COLUMN EXPORTTEMPLATESELECTION.EXPORTTEMPLATE_ID_NEW TO EXPORTTEMPLATE_ID;
+        </sql>
+    </changeSet>
+    
+    <changeSet dbms="!derby" author="b.ulrich" id="a53a2f38-3788-44a2-a151-13b3853ccb74">
+        <modifyDataType tableName="EXPORTTEMPLATEPLACEOFUSE" columnName="EXPORTTEMPLATE_ID" newDataType="CHAR(36)"/>
+        <modifyDataType tableName="EXPORTTEMPLATEFIELD" columnName="EXPORTTEMPLATE_ID" newDataType="CHAR(36)"/>
+        <modifyDataType tableName="EXPORTTEMPLATESELECTION" columnName="EXPORTTEMPLATE_ID" newDataType="CHAR(36)"/>
     </changeSet>
 </databaseChangeLog>
diff --git a/.liquibase/Data_alias/basic/2020.1.2/changelog.xml b/.liquibase/Data_alias/basic/2020.1.2/changelog.xml
index 98f643b714..8a20273d61 100644
--- a/.liquibase/Data_alias/basic/2020.1.2/changelog.xml
+++ b/.liquibase/Data_alias/basic/2020.1.2/changelog.xml
@@ -1,7 +1,6 @@
 <?xml version="1.1" encoding="UTF-8" standalone="no"?>
 <databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
                    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
-    <include file="AlterDocumentTemplatePlaceOfUseDatatype/changelog.xml" relativeToChangelogFile="true"/>
+    <include file="AlterDatatypeOfKeyColumnsToChar/changelog.xml" relativeToChangelogFile="true"/>
     <include file="AddNullableToDateNew.xml" relativeToChangelogFile="true" />
-    <include file="insert_workflowCategory_keyword.xml" relativeToChangelogFile="true"/>
 </databaseChangeLog>
diff --git a/aliasDefinition/Data_alias/Data_alias.aod b/aliasDefinition/Data_alias/Data_alias.aod
index 80c4686210..dbe878d7be 100644
--- a/aliasDefinition/Data_alias/Data_alias.aod
+++ b/aliasDefinition/Data_alias/Data_alias.aod
@@ -1180,12 +1180,12 @@
                 <name>MEDIUM_ID</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
+                <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
-                <index v="true" />
+                <index v="false" />
                 <title>Medium</title>
                 <description></description>
                 <customProperties>
@@ -8237,9 +8237,9 @@
                 <name>DATE_EDIT</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
+                <columnType v="91" />
+                <size v="10" />
+                <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -8272,10 +8272,10 @@
                 <name>DATE_NEW</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
-                <notNull v="false" />
+                <columnType v="91" />
+                <size v="10" />
+                <scale v="0" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -8529,9 +8529,9 @@
                 <name>DATE_EDIT</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
+                <columnType v="91" />
+                <size v="10" />
+                <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -8557,10 +8557,10 @@
                 <name>DATE_NEW</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
-                <notNull v="false" />
+                <columnType v="91" />
+                <size v="10" />
+                <scale v="0" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -8647,9 +8647,9 @@
                 <name>DATE_EDIT</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
+                <columnType v="91" />
+                <size v="10" />
+                <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -8696,10 +8696,10 @@
                 <name>DATE_NEW</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
-                <notNull v="false" />
+                <columnType v="91" />
+                <size v="10" />
+                <scale v="0" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -8835,9 +8835,9 @@
                 <name>DATE_EDIT</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
+                <columnType v="91" />
+                <size v="10" />
+                <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -8954,10 +8954,10 @@
                 <name>DATE_NEW</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
-                <notNull v="false" />
+                <columnType v="91" />
+                <size v="10" />
+                <scale v="0" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -9267,9 +9267,9 @@
                 <name>DATE_EDIT</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
+                <columnType v="91" />
+                <size v="10" />
+                <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -9309,10 +9309,10 @@
                 <name>DATE_NEW</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
-                <notNull v="false" />
+                <columnType v="91" />
+                <size v="10" />
+                <scale v="0" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -11573,9 +11573,9 @@
                 <name>DATE_EDIT</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
+                <columnType v="91" />
+                <size v="10" />
+                <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -11601,10 +11601,10 @@
                 <name>DATE_NEW</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
-                <notNull v="false" />
+                <columnType v="91" />
+                <size v="10" />
+                <scale v="0" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -11885,9 +11885,9 @@
                 <name>DATE_EDIT</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
+                <columnType v="91" />
+                <size v="10" />
+                <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -11920,10 +11920,10 @@
                 <name>DATE_NEW</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
-                <notNull v="false" />
+                <columnType v="91" />
+                <size v="10" />
+                <scale v="0" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -14019,12 +14019,12 @@
                 <name>EXPORTTEMPLATE_ID</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
+                <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
-                <index v="true" />
+                <index v="false" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
@@ -14345,12 +14345,12 @@
                 <name>EXPORTTEMPLATE_ID</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
+                <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
-                <index v="true" />
+                <index v="false" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
@@ -14400,12 +14400,12 @@
                 <name>EXPORTTEMPLATE_ID</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
+                <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
-                <index v="true" />
+                <index v="false" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
-- 
GitLab


From 8f497347062c7d3cf7966f1f8c8f267dc60eedc8 Mon Sep 17 00:00:00 2001
From: "a.voegl" <a.voegl@adito.de>
Date: Wed, 15 Jul 2020 10:13:23 +0200
Subject: [PATCH 047/309] move Liquibase-files

---
 .liquibase/Data_alias/basic/2020.1.0/changelog.xml              | 2 --
 .liquibase/Data_alias/basic/2020.1.2/changelog.xml              | 2 ++
 .../basic/{2020.1.0 => 2020.1.2}/drop_salesorder_unpaid.xml     | 0
 .../basic/{2020.1.0 => 2020.1.2}/drop_salesorder_versnr.xml     | 0
 4 files changed, 2 insertions(+), 2 deletions(-)
 rename .liquibase/Data_alias/basic/{2020.1.0 => 2020.1.2}/drop_salesorder_unpaid.xml (100%)
 rename .liquibase/Data_alias/basic/{2020.1.0 => 2020.1.2}/drop_salesorder_versnr.xml (100%)

diff --git a/.liquibase/Data_alias/basic/2020.1.0/changelog.xml b/.liquibase/Data_alias/basic/2020.1.0/changelog.xml
index 9ff22e7eea..1a5cbcf126 100644
--- a/.liquibase/Data_alias/basic/2020.1.0/changelog.xml
+++ b/.liquibase/Data_alias/basic/2020.1.0/changelog.xml
@@ -11,6 +11,4 @@
     <include relativeToChangelogFile="true" file="add_WorkflowSignal_variables.xml"/>
     <include relativeToChangelogFile="true" file="AlterTablesForTranslation/changelog.xml"/>
     <include relativeToChangelogFile="true" file="update_Salutation_headline.xml"/>
-    <include relativeToChangelogFile="true" file="drop_salesorder_unpaid.xml"/>
-    <include relativeToChangelogFile="true" file="drop_salesorder_versnr.xml"/>
 </databaseChangeLog>
diff --git a/.liquibase/Data_alias/basic/2020.1.2/changelog.xml b/.liquibase/Data_alias/basic/2020.1.2/changelog.xml
index 98f643b714..7564d2c105 100644
--- a/.liquibase/Data_alias/basic/2020.1.2/changelog.xml
+++ b/.liquibase/Data_alias/basic/2020.1.2/changelog.xml
@@ -4,4 +4,6 @@
     <include file="AlterDocumentTemplatePlaceOfUseDatatype/changelog.xml" relativeToChangelogFile="true"/>
     <include file="AddNullableToDateNew.xml" relativeToChangelogFile="true" />
     <include file="insert_workflowCategory_keyword.xml" relativeToChangelogFile="true"/>
+    <include relativeToChangelogFile="true" file="drop_salesorder_unpaid.xml"/>
+    <include relativeToChangelogFile="true" file="drop_salesorder_versnr.xml"/>
 </databaseChangeLog>
diff --git a/.liquibase/Data_alias/basic/2020.1.0/drop_salesorder_unpaid.xml b/.liquibase/Data_alias/basic/2020.1.2/drop_salesorder_unpaid.xml
similarity index 100%
rename from .liquibase/Data_alias/basic/2020.1.0/drop_salesorder_unpaid.xml
rename to .liquibase/Data_alias/basic/2020.1.2/drop_salesorder_unpaid.xml
diff --git a/.liquibase/Data_alias/basic/2020.1.0/drop_salesorder_versnr.xml b/.liquibase/Data_alias/basic/2020.1.2/drop_salesorder_versnr.xml
similarity index 100%
rename from .liquibase/Data_alias/basic/2020.1.0/drop_salesorder_versnr.xml
rename to .liquibase/Data_alias/basic/2020.1.2/drop_salesorder_versnr.xml
-- 
GitLab


From e628b9d7f39e9284c2d6edb56812da2b3b948753 Mon Sep 17 00:00:00 2001
From: "a.schindlbeck" <a.schindlbeck@adito.de>
Date: Wed, 15 Jul 2020 13:14:56 +0200
Subject: [PATCH 048/309] #1060647 Favorites: viewtemplate Organisation

---
 entity/Organisation_entity/Organisation_entity.aod    |  4 ++++
 .../entityfields/objecttype/valueProcess.js           |  3 +++
 .../OrganisationPreview_view.aod                      | 11 +++++++++++
 3 files changed, 18 insertions(+)
 create mode 100644 entity/Organisation_entity/entityfields/objecttype/valueProcess.js

diff --git a/entity/Organisation_entity/Organisation_entity.aod b/entity/Organisation_entity/Organisation_entity.aod
index 875ad026d6..4cd0514b5c 100644
--- a/entity/Organisation_entity/Organisation_entity.aod
+++ b/entity/Organisation_entity/Organisation_entity.aod
@@ -1102,6 +1102,10 @@
       <onActionProcess>%aditoprj%/entity/Organisation_entity/entityfields/openlocation/onActionProcess.js</onActionProcess>
       <iconId>NEON:TACKED</iconId>
     </entityActionField>
+    <entityField>
+      <name>OBJECTTYPE</name>
+      <valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/objecttype/valueProcess.js</valueProcess>
+    </entityField>
   </entityFields>
   <recordContainers>
     <dbRecordContainer>
diff --git a/entity/Organisation_entity/entityfields/objecttype/valueProcess.js b/entity/Organisation_entity/entityfields/objecttype/valueProcess.js
new file mode 100644
index 0000000000..9e359dfbd0
--- /dev/null
+++ b/entity/Organisation_entity/entityfields/objecttype/valueProcess.js
@@ -0,0 +1,3 @@
+import("system.result");
+
+result.string("Organisation");
\ No newline at end of file
diff --git a/neonView/OrganisationPreview_view/OrganisationPreview_view.aod b/neonView/OrganisationPreview_view/OrganisationPreview_view.aod
index 77fbb80ddc..3bf5a3f17a 100644
--- a/neonView/OrganisationPreview_view/OrganisationPreview_view.aod
+++ b/neonView/OrganisationPreview_view/OrganisationPreview_view.aod
@@ -19,6 +19,17 @@
       <entityField>#ENTITY</entityField>
       <informationField>COMMRESTRICTIONS_ACTIVE</informationField>
     </cardViewTemplate>
+    <favoriteViewTemplate>
+      <name>Favorite</name>
+      <objectType>OBJECTTYPE</objectType>
+      <rowId>#UID</rowId>
+      <entityField>#ENTITY</entityField>
+      <devices>
+        <element>MOBILE</element>
+        <element>TABLET</element>
+        <element>DESKTOP</element>
+      </devices>
+    </favoriteViewTemplate>
     <neonViewReference>
       <name>2cb11b4e-dd8e-419b-8fff-ef0852ef2641</name>
       <entityField>Communications</entityField>
-- 
GitLab


From 93c74286957eebb8c74c36b01f306c59ce7407f6 Mon Sep 17 00:00:00 2001
From: "s.pongratz" <s.pongratz@adito.de>
Date: Wed, 15 Jul 2020 16:53:23 +0200
Subject: [PATCH 049/309] =?UTF-8?q?#1055236-=C3=9Cbersetzung-LeadimportRes?=
 =?UTF-8?q?et=20=C3=9Cbersetzt?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../_____LANGUAGE_EXTRA.aod                   | 33 +++++++++++++++++++
 .../_____LANGUAGE_de/_____LANGUAGE_de.aod     | 26 +++++++++++++++
 .../_____LANGUAGE_en/_____LANGUAGE_en.aod     | 33 +++++++++++++++++++
 3 files changed, 92 insertions(+)

diff --git a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
index f32d5f97f0..d5ea58da85 100644
--- a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
+++ b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
@@ -6833,6 +6833,39 @@
     <entry>
       <key>send mail</key>
     </entry>
+    <entry>
+      <key>and open modeler</key>
+    </entry>
+    <entry>
+      <key>Create model</key>
+    </entry>
+    <entry>
+      <key>Edit workflow</key>
+    </entry>
+    <entry>
+      <key>Receive new Department Permission</key>
+    </entry>
+    <entry>
+      <key>Receive new User Permission</key>
+    </entry>
+    <entry>
+      <key>workflow notification</key>
+    </entry>
+    <entry>
+      <key>Permission received</key>
+    </entry>
+    <entry>
+      <key>leadimport notification</key>
+    </entry>
+    <entry>
+      <key>granted permission</key>
+    </entry>
+    <entry>
+      <key>bulk mail sent</key>
+    </entry>
+    <entry>
+      <key>download ready</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 7d8ec08a7b..205e05e083 100644
--- a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
+++ b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
@@ -8128,6 +8128,7 @@ Bitte Datumseingabe prüfen</value>
     </entry>
     <entry>
       <key>Leadimport Reset</key>
+      <value>Leadimport zurücksetzen</value>
     </entry>
     <entry>
       <key>Create notification</key>
@@ -8545,6 +8546,7 @@ Bitte Datumseingabe prüfen</value>
     </entry>
     <entry>
       <key>Lead Import Reset</key>
+      <value>Leadimport zurücksetzen</value>
     </entry>
     <entry>
       <key>Type</key>
@@ -8769,6 +8771,30 @@ Bitte Datumseingabe prüfen</value>
       <key>send mail</key>
       <value>E-Mail losschicken</value>
     </entry>
+    <entry>
+      <key>Receive new Department Permission</key>
+    </entry>
+    <entry>
+      <key>Receive new User Permission</key>
+    </entry>
+    <entry>
+      <key>workflow notification</key>
+    </entry>
+    <entry>
+      <key>Permission received</key>
+    </entry>
+    <entry>
+      <key>leadimport notification</key>
+    </entry>
+    <entry>
+      <key>granted permission</key>
+    </entry>
+    <entry>
+      <key>bulk mail sent</key>
+    </entry>
+    <entry>
+      <key>download ready</key>
+    </entry>
   </keyValueMap>
   <font name="Dialog" style="0" size="11" />
 </language>
diff --git a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
index 40c367a50d..831943f96a 100644
--- a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
+++ b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
@@ -6899,6 +6899,39 @@
     <entry>
       <key>send mail</key>
     </entry>
+    <entry>
+      <key>Receive new Department Permission</key>
+    </entry>
+    <entry>
+      <key>Receive new User Permission</key>
+    </entry>
+    <entry>
+      <key>and open modeler</key>
+    </entry>
+    <entry>
+      <key>Create model</key>
+    </entry>
+    <entry>
+      <key>Edit workflow</key>
+    </entry>
+    <entry>
+      <key>workflow notification</key>
+    </entry>
+    <entry>
+      <key>Permission received</key>
+    </entry>
+    <entry>
+      <key>leadimport notification</key>
+    </entry>
+    <entry>
+      <key>granted permission</key>
+    </entry>
+    <entry>
+      <key>bulk mail sent</key>
+    </entry>
+    <entry>
+      <key>download ready</key>
+    </entry>
   </keyValueMap>
   <font name="Dialog" style="0" size="11" />
 </language>
-- 
GitLab


From 281dd52ca5ff1168b28662f3754667a70ce07f03 Mon Sep 17 00:00:00 2001
From: "a.schindlbeck" <a.schindlbeck@adito.de>
Date: Thu, 16 Jul 2020 10:41:51 +0200
Subject: [PATCH 050/309] #1060647 Favorites: Viewtemplate Person

---
 entity/Person_entity/Person_entity.aod               |  4 ++++
 .../entityfields/objecttype/valueProcess.js          |  3 +++
 .../OrganisationPreview_view.aod                     |  1 +
 neonView/PersonPreview_view/PersonPreview_view.aod   | 12 ++++++++++++
 4 files changed, 20 insertions(+)
 create mode 100644 entity/Person_entity/entityfields/objecttype/valueProcess.js

diff --git a/entity/Person_entity/Person_entity.aod b/entity/Person_entity/Person_entity.aod
index 61aa30e669..6fd625f50d 100644
--- a/entity/Person_entity/Person_entity.aod
+++ b/entity/Person_entity/Person_entity.aod
@@ -1266,6 +1266,10 @@
         </entityParameter>
       </children>
     </entityProvider>
+    <entityField>
+      <name>OBJECTTYPE</name>
+      <valueProcess>%aditoprj%/entity/Person_entity/entityfields/objecttype/valueProcess.js</valueProcess>
+    </entityField>
   </entityFields>
   <recordContainers>
     <dbRecordContainer>
diff --git a/entity/Person_entity/entityfields/objecttype/valueProcess.js b/entity/Person_entity/entityfields/objecttype/valueProcess.js
new file mode 100644
index 0000000000..a1a6271987
--- /dev/null
+++ b/entity/Person_entity/entityfields/objecttype/valueProcess.js
@@ -0,0 +1,3 @@
+import("system.result")
+
+result.string("Person");
\ No newline at end of file
diff --git a/neonView/OrganisationPreview_view/OrganisationPreview_view.aod b/neonView/OrganisationPreview_view/OrganisationPreview_view.aod
index 3bf5a3f17a..63fb9474ae 100644
--- a/neonView/OrganisationPreview_view/OrganisationPreview_view.aod
+++ b/neonView/OrganisationPreview_view/OrganisationPreview_view.aod
@@ -24,6 +24,7 @@
       <objectType>OBJECTTYPE</objectType>
       <rowId>#UID</rowId>
       <entityField>#ENTITY</entityField>
+      <title>favorites</title>
       <devices>
         <element>MOBILE</element>
         <element>TABLET</element>
diff --git a/neonView/PersonPreview_view/PersonPreview_view.aod b/neonView/PersonPreview_view/PersonPreview_view.aod
index 4f02cea4c0..17032aac82 100644
--- a/neonView/PersonPreview_view/PersonPreview_view.aod
+++ b/neonView/PersonPreview_view/PersonPreview_view.aod
@@ -19,6 +19,18 @@
       <entityField>#ENTITY</entityField>
       <informationField>COMMRESTRICTIONS_ACTIVE</informationField>
     </cardViewTemplate>
+    <favoriteViewTemplate>
+      <name>Favorites</name>
+      <objectType>OBJECTTYPE</objectType>
+      <rowId>#UID</rowId>
+      <entityField>#ENTITY</entityField>
+      <title>favorites</title>
+      <devices>
+        <element>MOBILE</element>
+        <element>TABLET</element>
+        <element>DESKTOP</element>
+      </devices>
+    </favoriteViewTemplate>
     <neonViewReference>
       <name>5a1b7683-2fec-4763-9b45-e4c7a18d70fd</name>
       <entityField>Communications</entityField>
-- 
GitLab


From 30c0fd403d99174a6cf521ee103714e49fc2e3fc Mon Sep 17 00:00:00 2001
From: "a.schindlbeck" <a.schindlbeck@ASCHINDLBECK.aditosoftware.local>
Date: Thu, 16 Jul 2020 14:34:43 +0200
Subject: [PATCH 051/309] #1060647 Favorites: Viewtemplate for Sales contexts

---
 entity/Contract_entity/Contract_entity.aod    |  4 ++++
 .../contract_objecttype/valueProcess.js       |  3 +++
 entity/Offer_entity/Offer_entity.aod          |  4 ++++
 .../offer_objecttype/valueProcess.js          |  3 +++
 entity/Order_entity/Order_entity.aod          |  4 ++++
 .../order_objecttype/valueProcess.js          |  3 +++
 entity/Product_entity/Product_entity.aod      |  4 ++++
 .../product_objecttype/valueProcess.js        |  3 +++
 .../Productprice_entity.aod                   |  4 ++++
 .../productprice_objecttype/valueProcess.js   |  3 +++
 .../Salesproject_entity.aod                   |  4 ++++
 .../salesproject_objecttype/valueProcess.js   |  3 +++
 .../ContractPreview_view.aod                  |  7 +++++++
 .../OfferPreview_view/OfferPreview_view.aod   |  7 +++++++
 .../OrderPreview_view/OrderPreview_view.aod   |  7 +++++++
 .../ProductPreview_view.aod                   |  7 +++++++
 .../ProductpricePreview_view.aod              | 21 ++++++++++++-------
 .../SalesprojectPreview_view.aod              | 12 +++++++++++
 18 files changed, 96 insertions(+), 7 deletions(-)
 create mode 100644 entity/Contract_entity/entityfields/contract_objecttype/valueProcess.js
 create mode 100644 entity/Offer_entity/entityfields/offer_objecttype/valueProcess.js
 create mode 100644 entity/Order_entity/entityfields/order_objecttype/valueProcess.js
 create mode 100644 entity/Product_entity/entityfields/product_objecttype/valueProcess.js
 create mode 100644 entity/Productprice_entity/entityfields/productprice_objecttype/valueProcess.js
 create mode 100644 entity/Salesproject_entity/entityfields/salesproject_objecttype/valueProcess.js

diff --git a/entity/Contract_entity/Contract_entity.aod b/entity/Contract_entity/Contract_entity.aod
index 51dab19fa4..cccbd3df7c 100644
--- a/entity/Contract_entity/Contract_entity.aod
+++ b/entity/Contract_entity/Contract_entity.aod
@@ -383,6 +383,10 @@
       <iconId>VAADIN:CURLY_BRACKETS</iconId>
       <stateProcess>%aditoprj%/entity/Contract_entity/entityfields/openadminview/stateProcess.js</stateProcess>
     </entityActionField>
+    <entityField>
+      <name>CONTRACT_OBJECTTYPE</name>
+      <valueProcess>%aditoprj%/entity/Contract_entity/entityfields/contract_objecttype/valueProcess.js</valueProcess>
+    </entityField>
   </entityFields>
   <recordContainers>
     <dbRecordContainer>
diff --git a/entity/Contract_entity/entityfields/contract_objecttype/valueProcess.js b/entity/Contract_entity/entityfields/contract_objecttype/valueProcess.js
new file mode 100644
index 0000000000..69af3937a8
--- /dev/null
+++ b/entity/Contract_entity/entityfields/contract_objecttype/valueProcess.js
@@ -0,0 +1,3 @@
+import("system.result");
+
+result.string("Contract");
\ No newline at end of file
diff --git a/entity/Offer_entity/Offer_entity.aod b/entity/Offer_entity/Offer_entity.aod
index 48fe414838..11d49333e1 100644
--- a/entity/Offer_entity/Offer_entity.aod
+++ b/entity/Offer_entity/Offer_entity.aod
@@ -1023,6 +1023,10 @@
       <name>NET_aggregate</name>
       <parentField>NET</parentField>
     </entityAggregateField>
+    <entityField>
+      <name>OFFER_OBJECTTYPE</name>
+      <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/offer_objecttype/valueProcess.js</valueProcess>
+    </entityField>
   </entityFields>
   <recordContainers>
     <dbRecordContainer>
diff --git a/entity/Offer_entity/entityfields/offer_objecttype/valueProcess.js b/entity/Offer_entity/entityfields/offer_objecttype/valueProcess.js
new file mode 100644
index 0000000000..cbe3420c98
--- /dev/null
+++ b/entity/Offer_entity/entityfields/offer_objecttype/valueProcess.js
@@ -0,0 +1,3 @@
+import("system.result");
+
+result.string("Offer");
\ No newline at end of file
diff --git a/entity/Order_entity/Order_entity.aod b/entity/Order_entity/Order_entity.aod
index 2c8082ea9f..bf6651801a 100644
--- a/entity/Order_entity/Order_entity.aod
+++ b/entity/Order_entity/Order_entity.aod
@@ -987,6 +987,10 @@
         <fieldName>Contacts</fieldName>
       </dependency>
     </entityConsumer>
+    <entityField>
+      <name>ORDER_OBJECTTYPE</name>
+      <valueProcess>%aditoprj%/entity/Order_entity/entityfields/order_objecttype/valueProcess.js</valueProcess>
+    </entityField>
   </entityFields>
   <recordContainers>
     <dbRecordContainer>
diff --git a/entity/Order_entity/entityfields/order_objecttype/valueProcess.js b/entity/Order_entity/entityfields/order_objecttype/valueProcess.js
new file mode 100644
index 0000000000..b7ce74bb79
--- /dev/null
+++ b/entity/Order_entity/entityfields/order_objecttype/valueProcess.js
@@ -0,0 +1,3 @@
+import("system.result");
+
+result.string("Order");
\ No newline at end of file
diff --git a/entity/Product_entity/Product_entity.aod b/entity/Product_entity/Product_entity.aod
index 6b97e94cfb..54a47d4ae7 100644
--- a/entity/Product_entity/Product_entity.aod
+++ b/entity/Product_entity/Product_entity.aod
@@ -457,6 +457,10 @@
       <iconId>VAADIN:CURLY_BRACKETS</iconId>
       <stateProcess>%aditoprj%/entity/Product_entity/entityfields/openadminview/stateProcess.js</stateProcess>
     </entityActionField>
+    <entityField>
+      <name>PRODUCT_OBJECTTYPE</name>
+      <valueProcess>%aditoprj%/entity/Product_entity/entityfields/product_objecttype/valueProcess.js</valueProcess>
+    </entityField>
   </entityFields>
   <recordContainers>
     <dbRecordContainer>
diff --git a/entity/Product_entity/entityfields/product_objecttype/valueProcess.js b/entity/Product_entity/entityfields/product_objecttype/valueProcess.js
new file mode 100644
index 0000000000..879615539d
--- /dev/null
+++ b/entity/Product_entity/entityfields/product_objecttype/valueProcess.js
@@ -0,0 +1,3 @@
+import("system.result");
+
+result.string("Product");
\ No newline at end of file
diff --git a/entity/Productprice_entity/Productprice_entity.aod b/entity/Productprice_entity/Productprice_entity.aod
index a6d245878b..4df695970c 100644
--- a/entity/Productprice_entity/Productprice_entity.aod
+++ b/entity/Productprice_entity/Productprice_entity.aod
@@ -229,6 +229,10 @@
         <fieldName>#PROVIDER</fieldName>
       </dependency>
     </entityConsumer>
+    <entityField>
+      <name>PRODUCTPRICE_OBJECTTYPE</name>
+      <valueProcess>%aditoprj%/entity/Productprice_entity/entityfields/productprice_objecttype/valueProcess.js</valueProcess>
+    </entityField>
   </entityFields>
   <recordContainers>
     <dbRecordContainer>
diff --git a/entity/Productprice_entity/entityfields/productprice_objecttype/valueProcess.js b/entity/Productprice_entity/entityfields/productprice_objecttype/valueProcess.js
new file mode 100644
index 0000000000..4296d2e68b
--- /dev/null
+++ b/entity/Productprice_entity/entityfields/productprice_objecttype/valueProcess.js
@@ -0,0 +1,3 @@
+import("system.result");
+
+result.string("Productprice");
\ No newline at end of file
diff --git a/entity/Salesproject_entity/Salesproject_entity.aod b/entity/Salesproject_entity/Salesproject_entity.aod
index 33c8be5fa8..0c1444f2e9 100644
--- a/entity/Salesproject_entity/Salesproject_entity.aod
+++ b/entity/Salesproject_entity/Salesproject_entity.aod
@@ -749,6 +749,10 @@
       <iconId>VAADIN:PLAY</iconId>
       <stateProcess>%aditoprj%/entity/Salesproject_entity/entityfields/startworkflow/stateProcess.js</stateProcess>
     </entityActionField>
+    <entityField>
+      <name>SALESPROJECT_OBJECTTYPE</name>
+      <valueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/salesproject_objecttype/valueProcess.js</valueProcess>
+    </entityField>
   </entityFields>
   <recordContainers>
     <dbRecordContainer>
diff --git a/entity/Salesproject_entity/entityfields/salesproject_objecttype/valueProcess.js b/entity/Salesproject_entity/entityfields/salesproject_objecttype/valueProcess.js
new file mode 100644
index 0000000000..32bdd9f268
--- /dev/null
+++ b/entity/Salesproject_entity/entityfields/salesproject_objecttype/valueProcess.js
@@ -0,0 +1,3 @@
+import("system.result");
+
+result.string("Salesproject");
\ No newline at end of file
diff --git a/neonView/ContractPreview_view/ContractPreview_view.aod b/neonView/ContractPreview_view/ContractPreview_view.aod
index af1ed3be29..d825a03fee 100644
--- a/neonView/ContractPreview_view/ContractPreview_view.aod
+++ b/neonView/ContractPreview_view/ContractPreview_view.aod
@@ -17,6 +17,13 @@
       <favoriteAction1>newActivity</favoriteAction1>
       <entityField>#ENTITY</entityField>
     </cardViewTemplate>
+    <favoriteViewTemplate>
+      <name>Favorites</name>
+      <objectType>CONTRACT_OBJECTTYPE</objectType>
+      <rowId>#UID</rowId>
+      <entityField>#ENTITY</entityField>
+      <title>favorites</title>
+    </favoriteViewTemplate>
     <genericViewTemplate>
       <name>Details</name>
       <showDrawer v="true" />
diff --git a/neonView/OfferPreview_view/OfferPreview_view.aod b/neonView/OfferPreview_view/OfferPreview_view.aod
index 83392a9706..7b78909905 100644
--- a/neonView/OfferPreview_view/OfferPreview_view.aod
+++ b/neonView/OfferPreview_view/OfferPreview_view.aod
@@ -17,6 +17,13 @@
       <favoriteAction1>newActivity</favoriteAction1>
       <entityField>#ENTITY</entityField>
     </cardViewTemplate>
+    <favoriteViewTemplate>
+      <name>Favorites</name>
+      <objectType>OFFER_OBJECTTYPE</objectType>
+      <rowId>#UID</rowId>
+      <entityField>#ENTITY</entityField>
+      <title>favorites</title>
+    </favoriteViewTemplate>
     <genericViewTemplate>
       <name>Details</name>
       <editMode v="false" />
diff --git a/neonView/OrderPreview_view/OrderPreview_view.aod b/neonView/OrderPreview_view/OrderPreview_view.aod
index d75cf66b97..4cfda28a8b 100644
--- a/neonView/OrderPreview_view/OrderPreview_view.aod
+++ b/neonView/OrderPreview_view/OrderPreview_view.aod
@@ -17,6 +17,13 @@
       <favoriteAction1>newActivity</favoriteAction1>
       <entityField>#ENTITY</entityField>
     </cardViewTemplate>
+    <favoriteViewTemplate>
+      <name>Favorites</name>
+      <objectType>ORDER_OBJECTTYPE</objectType>
+      <rowId>#UID</rowId>
+      <entityField>#ENTITY</entityField>
+      <title>favorites</title>
+    </favoriteViewTemplate>
     <genericViewTemplate>
       <name>Details</name>
       <editMode v="false" />
diff --git a/neonView/ProductPreview_view/ProductPreview_view.aod b/neonView/ProductPreview_view/ProductPreview_view.aod
index cb7e8496aa..61b9a8f77c 100644
--- a/neonView/ProductPreview_view/ProductPreview_view.aod
+++ b/neonView/ProductPreview_view/ProductPreview_view.aod
@@ -17,6 +17,13 @@
       <favoriteAction1>newActivity</favoriteAction1>
       <entityField>#ENTITY</entityField>
     </cardViewTemplate>
+    <favoriteViewTemplate>
+      <name>Favorites</name>
+      <objectType>PRODUCT_OBJECTTYPE</objectType>
+      <rowId>#UID</rowId>
+      <entityField>#ENTITY</entityField>
+      <title>favorites</title>
+    </favoriteViewTemplate>
     <genericViewTemplate>
       <name>Info</name>
       <showDrawer v="true" />
diff --git a/neonView/ProductpricePreview_view/ProductpricePreview_view.aod b/neonView/ProductpricePreview_view/ProductpricePreview_view.aod
index c5ea3ef98f..78fe704e10 100644
--- a/neonView/ProductpricePreview_view/ProductpricePreview_view.aod
+++ b/neonView/ProductpricePreview_view/ProductpricePreview_view.aod
@@ -9,6 +9,20 @@
     </headerFooterLayout>
   </layout>
   <children>
+    <cardViewTemplate>
+      <name>Header</name>
+      <iconField>IMAGE</iconField>
+      <titleField>PRICELIST</titleField>
+      <subtitleField>PRODUCT_ID</subtitleField>
+      <entityField>#ENTITY</entityField>
+    </cardViewTemplate>
+    <favoriteViewTemplate>
+      <name>Favorites</name>
+      <objectType>PRODUCTPRICE_OBJECTTYPE</objectType>
+      <rowId>#UID</rowId>
+      <entityField>#ENTITY</entityField>
+      <title>favorites</title>
+    </favoriteViewTemplate>
     <genericViewTemplate>
       <name>PriceInfo</name>
       <showDrawer v="true" />
@@ -45,12 +59,5 @@
         </entityFieldLink>
       </fields>
     </genericViewTemplate>
-    <cardViewTemplate>
-      <name>Header</name>
-      <iconField>IMAGE</iconField>
-      <titleField>PRICELIST</titleField>
-      <subtitleField>PRODUCT_ID</subtitleField>
-      <entityField>#ENTITY</entityField>
-    </cardViewTemplate>
   </children>
 </neonView>
diff --git a/neonView/SalesprojectPreview_view/SalesprojectPreview_view.aod b/neonView/SalesprojectPreview_view/SalesprojectPreview_view.aod
index 393660ef8a..da9674dd3b 100644
--- a/neonView/SalesprojectPreview_view/SalesprojectPreview_view.aod
+++ b/neonView/SalesprojectPreview_view/SalesprojectPreview_view.aod
@@ -19,6 +19,18 @@
       <favoriteAction1>newActivity</favoriteAction1>
       <entityField>#ENTITY</entityField>
     </cardViewTemplate>
+    <favoriteViewTemplate>
+      <name>Favorites</name>
+      <objectType>SALESPROJECT_OBJECTTYPE</objectType>
+      <rowId>#UID</rowId>
+      <entityField>#ENTITY</entityField>
+      <title>favorites</title>
+      <devices>
+        <element>MOBILE</element>
+        <element>TABLET</element>
+        <element>DESKTOP</element>
+      </devices>
+    </favoriteViewTemplate>
     <genericViewTemplate>
       <name>Details</name>
       <showDrawer v="true" />
-- 
GitLab


From 410af9d037abd1ae6ab8d228bfbc3c3f5c0ecd6c Mon Sep 17 00:00:00 2001
From: "a.schindlbeck" <a.schindlbeck@ASCHINDLBECK.aditosoftware.local>
Date: Thu, 16 Jul 2020 14:39:25 +0200
Subject: [PATCH 052/309] #1060647 Favorites: viewtemplate change for Org, Pers

---
 entity/Organisation_entity/Organisation_entity.aod            | 4 ++--
 .../{objecttype => organisation_objecttype}/valueProcess.js   | 0
 entity/Person_entity/Person_entity.aod                        | 4 ++--
 .../{objecttype => person_objecttype}/valueProcess.js         | 0
 .../OrganisationPreview_view/OrganisationPreview_view.aod     | 2 +-
 neonView/PersonPreview_view/PersonPreview_view.aod            | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)
 rename entity/Organisation_entity/entityfields/{objecttype => organisation_objecttype}/valueProcess.js (100%)
 rename entity/Person_entity/entityfields/{objecttype => person_objecttype}/valueProcess.js (100%)

diff --git a/entity/Organisation_entity/Organisation_entity.aod b/entity/Organisation_entity/Organisation_entity.aod
index 4cd0514b5c..414ff2eb81 100644
--- a/entity/Organisation_entity/Organisation_entity.aod
+++ b/entity/Organisation_entity/Organisation_entity.aod
@@ -1103,8 +1103,8 @@
       <iconId>NEON:TACKED</iconId>
     </entityActionField>
     <entityField>
-      <name>OBJECTTYPE</name>
-      <valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/objecttype/valueProcess.js</valueProcess>
+      <name>ORGANISATION_OBJECTTYPE</name>
+      <valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/organisation_objecttype/valueProcess.js</valueProcess>
     </entityField>
   </entityFields>
   <recordContainers>
diff --git a/entity/Organisation_entity/entityfields/objecttype/valueProcess.js b/entity/Organisation_entity/entityfields/organisation_objecttype/valueProcess.js
similarity index 100%
rename from entity/Organisation_entity/entityfields/objecttype/valueProcess.js
rename to entity/Organisation_entity/entityfields/organisation_objecttype/valueProcess.js
diff --git a/entity/Person_entity/Person_entity.aod b/entity/Person_entity/Person_entity.aod
index 6fd625f50d..828766d541 100644
--- a/entity/Person_entity/Person_entity.aod
+++ b/entity/Person_entity/Person_entity.aod
@@ -1267,8 +1267,8 @@
       </children>
     </entityProvider>
     <entityField>
-      <name>OBJECTTYPE</name>
-      <valueProcess>%aditoprj%/entity/Person_entity/entityfields/objecttype/valueProcess.js</valueProcess>
+      <name>PERSON_OBJECTTYPE</name>
+      <valueProcess>%aditoprj%/entity/Person_entity/entityfields/person_objecttype/valueProcess.js</valueProcess>
     </entityField>
   </entityFields>
   <recordContainers>
diff --git a/entity/Person_entity/entityfields/objecttype/valueProcess.js b/entity/Person_entity/entityfields/person_objecttype/valueProcess.js
similarity index 100%
rename from entity/Person_entity/entityfields/objecttype/valueProcess.js
rename to entity/Person_entity/entityfields/person_objecttype/valueProcess.js
diff --git a/neonView/OrganisationPreview_view/OrganisationPreview_view.aod b/neonView/OrganisationPreview_view/OrganisationPreview_view.aod
index 63fb9474ae..eca1cae966 100644
--- a/neonView/OrganisationPreview_view/OrganisationPreview_view.aod
+++ b/neonView/OrganisationPreview_view/OrganisationPreview_view.aod
@@ -21,7 +21,7 @@
     </cardViewTemplate>
     <favoriteViewTemplate>
       <name>Favorite</name>
-      <objectType>OBJECTTYPE</objectType>
+      <objectType>ORGANISATION_OBJECTTYPE</objectType>
       <rowId>#UID</rowId>
       <entityField>#ENTITY</entityField>
       <title>favorites</title>
diff --git a/neonView/PersonPreview_view/PersonPreview_view.aod b/neonView/PersonPreview_view/PersonPreview_view.aod
index 17032aac82..f0f73a44de 100644
--- a/neonView/PersonPreview_view/PersonPreview_view.aod
+++ b/neonView/PersonPreview_view/PersonPreview_view.aod
@@ -21,7 +21,7 @@
     </cardViewTemplate>
     <favoriteViewTemplate>
       <name>Favorites</name>
-      <objectType>OBJECTTYPE</objectType>
+      <objectType>PERSON_OBJECTTYPE</objectType>
       <rowId>#UID</rowId>
       <entityField>#ENTITY</entityField>
       <title>favorites</title>
-- 
GitLab


From ed1d5b43ddddafe77a8c1c96ac13b26e9fabda5c Mon Sep 17 00:00:00 2001
From: "a.schindlbeck" <a.schindlbeck@adito.de>
Date: Thu, 16 Jul 2020 16:07:41 +0200
Subject: [PATCH 053/309] #1060647 Favorites: all Contexts favorable

---
 entity/Campaign_entity/Campaign_entity.aod           |  4 ++++
 .../entityfields/campaign_obejcttype/valueProcess.js |  3 +++
 .../DocumentTemplate_entity.aod                      |  4 ++++
 .../documenttemplate_objecttype/valueProcess.js      |  3 +++
 entity/Employee_entity/Employee_entity.aod           |  4 ++++
 .../entityfields/employee_objecttype/valueProcess.js |  3 +++
 .../ExportTemplate_entity/ExportTemplate_entity.aod  |  4 ++++
 .../exporttemplate_objecttype/valueProcess.js        |  3 +++
 entity/Leadimport_entity/Leadimport_entity.aod       |  4 ++++
 .../leadimport_objecttype/valueProcess.js            |  3 +++
 entity/SupportTicket_entity/SupportTicket_entity.aod |  7 ++++---
 .../supportticket_objecttype/valueProcess.js         |  3 +++
 .../WorkflowDefinition_entity.aod                    |  4 ++++
 .../workflowdefinition_objecttype/valueProcess.js    |  3 +++
 .../CampaignPreview_view/CampaignPreview_view.aod    |  7 +++++++
 .../DocumentTemplatePreview_view.aod                 |  7 +++++++
 .../EmployeePreview_view/EmployeePreview_view.aod    |  7 +++++++
 .../ExportTemplatePreview_view.aod                   |  7 +++++++
 .../LeadimportPreview_view.aod                       | 12 ++++++++++++
 .../SupportTicketPreview_view.aod                    |  7 +++++++
 .../WorkflowDefinitionPreview_view.aod               |  7 +++++++
 21 files changed, 103 insertions(+), 3 deletions(-)
 create mode 100644 entity/Campaign_entity/entityfields/campaign_obejcttype/valueProcess.js
 create mode 100644 entity/DocumentTemplate_entity/entityfields/documenttemplate_objecttype/valueProcess.js
 create mode 100644 entity/Employee_entity/entityfields/employee_objecttype/valueProcess.js
 create mode 100644 entity/ExportTemplate_entity/entityfields/exporttemplate_objecttype/valueProcess.js
 create mode 100644 entity/Leadimport_entity/entityfields/leadimport_objecttype/valueProcess.js
 create mode 100644 entity/SupportTicket_entity/entityfields/supportticket_objecttype/valueProcess.js
 create mode 100644 entity/WorkflowDefinition_entity/entityfields/workflowdefinition_objecttype/valueProcess.js

diff --git a/entity/Campaign_entity/Campaign_entity.aod b/entity/Campaign_entity/Campaign_entity.aod
index d67763b95c..6704823320 100644
--- a/entity/Campaign_entity/Campaign_entity.aod
+++ b/entity/Campaign_entity/Campaign_entity.aod
@@ -517,6 +517,10 @@
         </entityParameter>
       </children>
     </entityConsumer>
+    <entityField>
+      <name>CAMPAIGN_OBEJCTTYPE</name>
+      <valueProcess>%aditoprj%/entity/Campaign_entity/entityfields/campaign_obejcttype/valueProcess.js</valueProcess>
+    </entityField>
   </entityFields>
   <recordContainers>
     <dbRecordContainer>
diff --git a/entity/Campaign_entity/entityfields/campaign_obejcttype/valueProcess.js b/entity/Campaign_entity/entityfields/campaign_obejcttype/valueProcess.js
new file mode 100644
index 0000000000..2377055cd4
--- /dev/null
+++ b/entity/Campaign_entity/entityfields/campaign_obejcttype/valueProcess.js
@@ -0,0 +1,3 @@
+import("system.result");
+
+result.string("Campaign");
\ No newline at end of file
diff --git a/entity/DocumentTemplate_entity/DocumentTemplate_entity.aod b/entity/DocumentTemplate_entity/DocumentTemplate_entity.aod
index 3e4bbba2ab..3e357fa976 100644
--- a/entity/DocumentTemplate_entity/DocumentTemplate_entity.aod
+++ b/entity/DocumentTemplate_entity/DocumentTemplate_entity.aod
@@ -339,6 +339,10 @@
       <name>ComingFrom_param</name>
       <expose v="true" />
     </entityParameter>
+    <entityField>
+      <name>DOCUMENTTEMPLATE_OBJECTTYPE</name>
+      <valueProcess>%aditoprj%/entity/DocumentTemplate_entity/entityfields/documenttemplate_objecttype/valueProcess.js</valueProcess>
+    </entityField>
   </entityFields>
   <recordContainers>
     <dbRecordContainer>
diff --git a/entity/DocumentTemplate_entity/entityfields/documenttemplate_objecttype/valueProcess.js b/entity/DocumentTemplate_entity/entityfields/documenttemplate_objecttype/valueProcess.js
new file mode 100644
index 0000000000..1889e3e2e5
--- /dev/null
+++ b/entity/DocumentTemplate_entity/entityfields/documenttemplate_objecttype/valueProcess.js
@@ -0,0 +1,3 @@
+import("system.result");
+
+result.string("DocumentTemplate");
\ No newline at end of file
diff --git a/entity/Employee_entity/Employee_entity.aod b/entity/Employee_entity/Employee_entity.aod
index 36806cbf40..d3ae09d5ec 100644
--- a/entity/Employee_entity/Employee_entity.aod
+++ b/entity/Employee_entity/Employee_entity.aod
@@ -378,6 +378,10 @@
         <element>MASK</element>
       </onValueChangeTypes>
     </entityField>
+    <entityField>
+      <name>EMPLOYEE_OBJECTTYPE</name>
+      <valueProcess>%aditoprj%/entity/Employee_entity/entityfields/employee_objecttype/valueProcess.js</valueProcess>
+    </entityField>
   </entityFields>
   <recordContainers>
     <jDitoRecordContainer>
diff --git a/entity/Employee_entity/entityfields/employee_objecttype/valueProcess.js b/entity/Employee_entity/entityfields/employee_objecttype/valueProcess.js
new file mode 100644
index 0000000000..a78f6195ba
--- /dev/null
+++ b/entity/Employee_entity/entityfields/employee_objecttype/valueProcess.js
@@ -0,0 +1,3 @@
+import("system.result");
+
+result.string("Employee");
\ No newline at end of file
diff --git a/entity/ExportTemplate_entity/ExportTemplate_entity.aod b/entity/ExportTemplate_entity/ExportTemplate_entity.aod
index becc0bf70e..2ab97cfd7f 100644
--- a/entity/ExportTemplate_entity/ExportTemplate_entity.aod
+++ b/entity/ExportTemplate_entity/ExportTemplate_entity.aod
@@ -140,6 +140,10 @@
       <dropDownProcess>%aditoprj%/entity/ExportTemplate_entity/entityfields/fielddelimiter/dropDownProcess.js</dropDownProcess>
       <textInputAllowed v="true" />
     </entityField>
+    <entityField>
+      <name>EXPORTTEMPLATE_OBJECTTYPE</name>
+      <valueProcess>%aditoprj%/entity/ExportTemplate_entity/entityfields/exporttemplate_objecttype/valueProcess.js</valueProcess>
+    </entityField>
   </entityFields>
   <recordContainers>
     <dbRecordContainer>
diff --git a/entity/ExportTemplate_entity/entityfields/exporttemplate_objecttype/valueProcess.js b/entity/ExportTemplate_entity/entityfields/exporttemplate_objecttype/valueProcess.js
new file mode 100644
index 0000000000..1421e6130d
--- /dev/null
+++ b/entity/ExportTemplate_entity/entityfields/exporttemplate_objecttype/valueProcess.js
@@ -0,0 +1,3 @@
+import("system.result");
+
+result.string("ExportTemplate");
\ No newline at end of file
diff --git a/entity/Leadimport_entity/Leadimport_entity.aod b/entity/Leadimport_entity/Leadimport_entity.aod
index b794f161e4..6f7be5e2f8 100644
--- a/entity/Leadimport_entity/Leadimport_entity.aod
+++ b/entity/Leadimport_entity/Leadimport_entity.aod
@@ -313,6 +313,10 @@
       <state>INVISIBLE</state>
       <stateProcess>%aditoprj%/entity/Leadimport_entity/entityfields/leadimportreset/stateProcess.js</stateProcess>
     </entityActionField>
+    <entityField>
+      <name>LEADIMPORT_OBJECTTYPE</name>
+      <valueProcess>%aditoprj%/entity/Leadimport_entity/entityfields/leadimport_objecttype/valueProcess.js</valueProcess>
+    </entityField>
   </entityFields>
   <recordContainers>
     <dbRecordContainer>
diff --git a/entity/Leadimport_entity/entityfields/leadimport_objecttype/valueProcess.js b/entity/Leadimport_entity/entityfields/leadimport_objecttype/valueProcess.js
new file mode 100644
index 0000000000..a6c90ee2e7
--- /dev/null
+++ b/entity/Leadimport_entity/entityfields/leadimport_objecttype/valueProcess.js
@@ -0,0 +1,3 @@
+import("system.result");
+
+result.string("Leadimport");
\ No newline at end of file
diff --git a/entity/SupportTicket_entity/SupportTicket_entity.aod b/entity/SupportTicket_entity/SupportTicket_entity.aod
index db8daa732b..8438598fe4 100644
--- a/entity/SupportTicket_entity/SupportTicket_entity.aod
+++ b/entity/SupportTicket_entity/SupportTicket_entity.aod
@@ -395,6 +395,10 @@
       <name>RowId_param</name>
       <expose v="true" />
     </entityParameter>
+    <entityField>
+      <name>SUPPORTTICKET_OBJECTTYPE</name>
+      <valueProcess>%aditoprj%/entity/SupportTicket_entity/entityfields/supportticket_objecttype/valueProcess.js</valueProcess>
+    </entityField>
   </entityFields>
   <recordContainers>
     <dbRecordContainer>
@@ -483,9 +487,6 @@
           <name>TASK_REQUESTOR_CONTACT_ID.displayValue</name>
           <expression>%aditoprj%/entity/SupportTicket_entity/recordcontainers/db/recordfieldmappings/task_requestor_contact_id.displayvalue/expression.js</expression>
         </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>TASK_PRIORITY.displayValue</name>
-        </dbRecordFieldMapping>
         <dbRecordFieldMapping>
           <name>TASK_PROGRESS.value</name>
           <recordfield>TASK.PROGRESS</recordfield>
diff --git a/entity/SupportTicket_entity/entityfields/supportticket_objecttype/valueProcess.js b/entity/SupportTicket_entity/entityfields/supportticket_objecttype/valueProcess.js
new file mode 100644
index 0000000000..b111482e01
--- /dev/null
+++ b/entity/SupportTicket_entity/entityfields/supportticket_objecttype/valueProcess.js
@@ -0,0 +1,3 @@
+import("system.result");
+
+result.string("SupportTicket");
\ No newline at end of file
diff --git a/entity/WorkflowDefinition_entity/WorkflowDefinition_entity.aod b/entity/WorkflowDefinition_entity/WorkflowDefinition_entity.aod
index 155a2f033d..8af4e2662c 100644
--- a/entity/WorkflowDefinition_entity/WorkflowDefinition_entity.aod
+++ b/entity/WorkflowDefinition_entity/WorkflowDefinition_entity.aod
@@ -214,6 +214,10 @@
       <iconId>VAADIN:EDIT</iconId>
       <tooltip>Edit workflow</tooltip>
     </entityActionField>
+    <entityField>
+      <name>WORKFLOWDEFINITION_OBJECTTYPE</name>
+      <valueProcess>%aditoprj%/entity/WorkflowDefinition_entity/entityfields/workflowdefinition_objecttype/valueProcess.js</valueProcess>
+    </entityField>
   </entityFields>
   <recordContainers>
     <jDitoRecordContainer>
diff --git a/entity/WorkflowDefinition_entity/entityfields/workflowdefinition_objecttype/valueProcess.js b/entity/WorkflowDefinition_entity/entityfields/workflowdefinition_objecttype/valueProcess.js
new file mode 100644
index 0000000000..10f8662348
--- /dev/null
+++ b/entity/WorkflowDefinition_entity/entityfields/workflowdefinition_objecttype/valueProcess.js
@@ -0,0 +1,3 @@
+import("system.result");
+
+result.string("WorkflowDefinition");
\ No newline at end of file
diff --git a/neonView/CampaignPreview_view/CampaignPreview_view.aod b/neonView/CampaignPreview_view/CampaignPreview_view.aod
index b0af52feaa..a85780112d 100644
--- a/neonView/CampaignPreview_view/CampaignPreview_view.aod
+++ b/neonView/CampaignPreview_view/CampaignPreview_view.aod
@@ -22,6 +22,13 @@
       <entityField>#ENTITY</entityField>
       <title></title>
     </cardViewTemplate>
+    <favoriteViewTemplate>
+      <name>Favorites</name>
+      <objectType>CAMPAIGN_OBEJCTTYPE</objectType>
+      <rowId>#UID</rowId>
+      <entityField>#ENTITY</entityField>
+      <title>favorites</title>
+    </favoriteViewTemplate>
     <genericViewTemplate>
       <name>TimespanGeneric</name>
       <showDrawer v="true" />
diff --git a/neonView/DocumentTemplatePreview_view/DocumentTemplatePreview_view.aod b/neonView/DocumentTemplatePreview_view/DocumentTemplatePreview_view.aod
index 58d8c23792..5c4100bd63 100644
--- a/neonView/DocumentTemplatePreview_view/DocumentTemplatePreview_view.aod
+++ b/neonView/DocumentTemplatePreview_view/DocumentTemplatePreview_view.aod
@@ -18,6 +18,13 @@
       <entityField>#ENTITY</entityField>
       <title>Document Template</title>
     </cardViewTemplate>
+    <favoriteViewTemplate>
+      <name>Favorites</name>
+      <objectType>DOCUMENTTEMPLATE_OBJECTTYPE</objectType>
+      <rowId>#UID</rowId>
+      <entityField>#ENTITY</entityField>
+      <title>favorties</title>
+    </favoriteViewTemplate>
     <neonViewReference>
       <name>0da2cc6b-86c9-4455-b5b2-edc54b30e793</name>
       <entityField>Documents</entityField>
diff --git a/neonView/EmployeePreview_view/EmployeePreview_view.aod b/neonView/EmployeePreview_view/EmployeePreview_view.aod
index 576e510759..ce68cd2619 100644
--- a/neonView/EmployeePreview_view/EmployeePreview_view.aod
+++ b/neonView/EmployeePreview_view/EmployeePreview_view.aod
@@ -16,6 +16,13 @@
       <subtitleField>TITLE</subtitleField>
       <entityField>#ENTITY</entityField>
     </cardViewTemplate>
+    <favoriteViewTemplate>
+      <name>Favorite</name>
+      <objectType>EMPLOYEE_OBJECTTYPE</objectType>
+      <rowId>SHORT_UID</rowId>
+      <entityField>#ENTITY</entityField>
+      <title>favorite</title>
+    </favoriteViewTemplate>
     <genericViewTemplate>
       <name>Info</name>
       <showDrawer v="true" />
diff --git a/neonView/ExportTemplatePreview_view/ExportTemplatePreview_view.aod b/neonView/ExportTemplatePreview_view/ExportTemplatePreview_view.aod
index 8e87cf2946..06bcfe9edf 100644
--- a/neonView/ExportTemplatePreview_view/ExportTemplatePreview_view.aod
+++ b/neonView/ExportTemplatePreview_view/ExportTemplatePreview_view.aod
@@ -15,6 +15,13 @@
       <subtitleField>ISOLANGUAGE</subtitleField>
       <entityField>#ENTITY</entityField>
     </cardViewTemplate>
+    <favoriteViewTemplate>
+      <name>Favorites</name>
+      <objectType>EXPORTTEMPLATE_OBJECTTYPE</objectType>
+      <rowId>#UID</rowId>
+      <entityField>#ENTITY</entityField>
+      <title>favorites</title>
+    </favoriteViewTemplate>
     <genericViewTemplate>
       <name>generic</name>
       <entityField>#ENTITY</entityField>
diff --git a/neonView/LeadimportPreview_view/LeadimportPreview_view.aod b/neonView/LeadimportPreview_view/LeadimportPreview_view.aod
index 7c0a2ef406..1280e17697 100644
--- a/neonView/LeadimportPreview_view/LeadimportPreview_view.aod
+++ b/neonView/LeadimportPreview_view/LeadimportPreview_view.aod
@@ -18,6 +18,18 @@
       <entityField>#ENTITY</entityField>
       <informationField>SENTENCESEPERATOR</informationField>
     </cardViewTemplate>
+    <favoriteViewTemplate>
+      <name>Favorites</name>
+      <objectType>LEADIMPORT_OBJECTTYPE</objectType>
+      <rowId>#UID</rowId>
+      <entityField>#ENTITY</entityField>
+      <title>favorites</title>
+      <devices>
+        <element>MOBILE</element>
+        <element>TABLET</element>
+        <element>DESKTOP</element>
+      </devices>
+    </favoriteViewTemplate>
     <genericViewTemplate>
       <name>info</name>
       <editMode v="false" />
diff --git a/neonView/SupportTicketPreview_view/SupportTicketPreview_view.aod b/neonView/SupportTicketPreview_view/SupportTicketPreview_view.aod
index 502655061d..48b48a2a48 100644
--- a/neonView/SupportTicketPreview_view/SupportTicketPreview_view.aod
+++ b/neonView/SupportTicketPreview_view/SupportTicketPreview_view.aod
@@ -17,6 +17,13 @@
       <favoriteAction1>newActivity</favoriteAction1>
       <entityField>#ENTITY</entityField>
     </cardViewTemplate>
+    <favoriteViewTemplate>
+      <name>Favorites</name>
+      <objectType>SUPPORTTICKET_OBJECTTYPE</objectType>
+      <rowId>#UID</rowId>
+      <entityField>#ENTITY</entityField>
+      <title>favorites</title>
+    </favoriteViewTemplate>
     <genericViewTemplate>
       <name>Info</name>
       <showDrawer v="true" />
diff --git a/neonView/WorkflowDefinitionPreview_view/WorkflowDefinitionPreview_view.aod b/neonView/WorkflowDefinitionPreview_view/WorkflowDefinitionPreview_view.aod
index de087d4217..0d2cd46224 100644
--- a/neonView/WorkflowDefinitionPreview_view/WorkflowDefinitionPreview_view.aod
+++ b/neonView/WorkflowDefinitionPreview_view/WorkflowDefinitionPreview_view.aod
@@ -17,6 +17,13 @@
       <entityField>#ENTITY</entityField>
       <isEditable v="false" />
     </cardViewTemplate>
+    <favoriteViewTemplate>
+      <name>Favorites</name>
+      <objectType>WORKFLOWDEFINITION_OBJECTTYPE</objectType>
+      <rowId>#UID</rowId>
+      <entityField>#ENTITY</entityField>
+      <title>favorites</title>
+    </favoriteViewTemplate>
     <genericViewTemplate>
       <name>Generic</name>
       <showDrawer v="true" />
-- 
GitLab


From ac5f40db1a9356797959d1fcce4ad3ca05c46f66 Mon Sep 17 00:00:00 2001
From: "a.schindlbeck" <a.schindlbeck@adito.de>
Date: Fri, 17 Jul 2020 16:02:27 +0200
Subject: [PATCH 054/309] merged origin/master into favoriten

-- 
GitLab


From f45229b581251ce547ff894e0d2a89ade8353bf1 Mon Sep 17 00:00:00 2001
From: "a.schindlbeck" <a.schindlbeck@ASCHINDLBECK.aditosoftware.local>
Date: Mon, 20 Jul 2020 09:07:18 +0200
Subject: [PATCH 055/309] Favorite-Entity + Views

---
 .../_____SYSTEMALIAS/_____SYSTEMALIAS.aod     | 152 ++++++++++++++++++
 .../_____SYSTEM_APPLICATION_NEON.aod          |   4 +
 entity/Favorite_entity/Favorite_entity.aod    |  92 +++++++++++
 .../#provider/targetConsumerProcess.js        |   0
 .../dbrecordcontainer/conditionProcess.js     |  12 ++
 .../dbrecordcontainer/fromClauseProcess.js    |   3 +
 .../dbrecordcontainer/orderClauseProcess.js   |   7 +
 neonContext/Favorite/Favorite.aod             |  18 +++
 .../FavoriteFilter_view.aod                   |  38 +++++
 .../FavoritePreview_view.aod                  |  10 ++
 10 files changed, 336 insertions(+)
 create mode 100644 entity/Favorite_entity/Favorite_entity.aod
 create mode 100644 entity/Favorite_entity/entityfields/#provider/targetConsumerProcess.js
 create mode 100644 entity/Favorite_entity/recordcontainers/dbrecordcontainer/conditionProcess.js
 create mode 100644 entity/Favorite_entity/recordcontainers/dbrecordcontainer/fromClauseProcess.js
 create mode 100644 entity/Favorite_entity/recordcontainers/dbrecordcontainer/orderClauseProcess.js
 create mode 100644 neonContext/Favorite/Favorite.aod
 create mode 100644 neonView/FavoriteFilter_view/FavoriteFilter_view.aod
 create mode 100644 neonView/FavoritePreview_view/FavoritePreview_view.aod

diff --git a/aliasDefinition/_____SYSTEMALIAS/_____SYSTEMALIAS.aod b/aliasDefinition/_____SYSTEMALIAS/_____SYSTEMALIAS.aod
index 3c5aedffe5..4344381f76 100644
--- a/aliasDefinition/_____SYSTEMALIAS/_____SYSTEMALIAS.aod
+++ b/aliasDefinition/_____SYSTEMALIAS/_____SYSTEMALIAS.aod
@@ -3079,6 +3079,158 @@
               </entityFieldDb>
             </entityFields>
           </entityDb>
+          <entityDb>
+            <name>ASYS_RECORDGROUP</name>
+            <dbName></dbName>
+            <idColumn>ID</idColumn>
+            <idGeneratorType v="0" />
+            <idGeneratorInterval v="0" />
+            <documentation></documentation>
+            <title></title>
+            <description></description>
+            <auditSyncConfig>
+              <name>auditSyncConfig</name>
+              <auditMode v="0" />
+              <syncActive v="false" />
+              <syncComplete v="true" />
+              <syncDirection v="1" />
+              <syncIds></syncIds>
+            </auditSyncConfig>
+            <entityFields>
+              <entityFieldDb>
+                <name>GROUP_TYPE</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="64" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>ID</name>
+                <dbName></dbName>
+                <primaryKey v="true" />
+                <columnType v="1" />
+                <size v="36" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="true" />
+                <index v="true" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>TITLE</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="256" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>USER_ID</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="1" />
+                <size v="46" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+            </entityFields>
+          </entityDb>
+          <entityDb>
+            <name>ASYS_RECORD</name>
+            <dbName></dbName>
+            <idColumn>ID</idColumn>
+            <idGeneratorType v="0" />
+            <idGeneratorInterval v="0" />
+            <documentation></documentation>
+            <title></title>
+            <description></description>
+            <auditSyncConfig>
+              <name>auditSyncConfig</name>
+              <auditMode v="0" />
+              <syncActive v="false" />
+              <syncComplete v="true" />
+              <syncDirection v="1" />
+              <syncIds></syncIds>
+            </auditSyncConfig>
+            <entityFields>
+              <entityFieldDb>
+                <name>ID</name>
+                <dbName></dbName>
+                <primaryKey v="true" />
+                <columnType v="1" />
+                <size v="36" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="true" />
+                <index v="true" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>OBJECT_TYPE</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="64" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>RECORDGROUP_ID</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="1" />
+                <size v="36" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>ROW_ID</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="1" />
+                <size v="36" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+            </entityFields>
+          </entityDb>
         </entities>
       </entityGroup>
     </aliasDefDb>
diff --git a/application/_____SYSTEM_APPLICATION_NEON/_____SYSTEM_APPLICATION_NEON.aod b/application/_____SYSTEM_APPLICATION_NEON/_____SYSTEM_APPLICATION_NEON.aod
index cea18a1f2c..d78037d313 100644
--- a/application/_____SYSTEM_APPLICATION_NEON/_____SYSTEM_APPLICATION_NEON.aod
+++ b/application/_____SYSTEM_APPLICATION_NEON/_____SYSTEM_APPLICATION_NEON.aod
@@ -38,6 +38,10 @@
                 <name>Task</name>
                 <kind v="10077" />
               </entityNode>
+              <entityNode>
+                <name>Favorite</name>
+                <kind v="10077" />
+              </entityNode>
             </childNodes>
           </entityNode>
         </childNodes>
diff --git a/entity/Favorite_entity/Favorite_entity.aod b/entity/Favorite_entity/Favorite_entity.aod
new file mode 100644
index 0000000000..40e467b44b
--- /dev/null
+++ b/entity/Favorite_entity/Favorite_entity.aod
@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
+  <name>Favorite_entity</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <recordContainer>dbRecordContainer</recordContainer>
+  <entityFields>
+    <entityProvider>
+      <name>#PROVIDER</name>
+      <targetContextField>OBJECT_TYPE</targetContextField>
+      <targetIdField>ROW_ID</targetIdField>
+      <targetConsumerProcess>%aditoprj%/entity/Favorite_entity/entityfields/#provider/targetConsumerProcess.js</targetConsumerProcess>
+    </entityProvider>
+    <entityField>
+      <name>UID</name>
+    </entityField>
+    <entityField>
+      <name>GROUP_ID</name>
+    </entityField>
+    <entityField>
+      <name>ROW_ID</name>
+    </entityField>
+    <entityField>
+      <name>OBJECT_TYPE</name>
+    </entityField>
+    <entityField>
+      <name>USER_ID</name>
+    </entityField>
+    <entityField>
+      <name>GROUP_TITLE</name>
+    </entityField>
+    <entityField>
+      <name>GROUP_TYPE</name>
+    </entityField>
+  </entityFields>
+  <recordContainers>
+    <dbRecordContainer>
+      <name>dbRecordContainer</name>
+      <alias>_____SYSTEMALIAS</alias>
+      <isReadOnly v="true" />
+      <hasDependentRecords v="true" />
+      <fromClauseProcess>%aditoprj%/entity/Favorite_entity/recordcontainers/dbrecordcontainer/fromClauseProcess.js</fromClauseProcess>
+      <conditionProcess>%aditoprj%/entity/Favorite_entity/recordcontainers/dbrecordcontainer/conditionProcess.js</conditionProcess>
+      <orderClauseProcess>%aditoprj%/entity/Favorite_entity/recordcontainers/dbrecordcontainer/orderClauseProcess.js</orderClauseProcess>
+      <linkInformation>
+        <linkInformation>
+          <name>ad8d8f1b-d086-433f-80b7-116b99a983af</name>
+          <tableName>ASYS_RECORD</tableName>
+          <primaryKey>ID</primaryKey>
+          <isUIDTable v="true" />
+          <readonly v="true" />
+        </linkInformation>
+        <linkInformation>
+          <name>d4bb5cdf-dc73-4906-b4c4-40c963cbdbc1</name>
+          <tableName>ASYS_RECORDGROUP</tableName>
+          <primaryKey>ID</primaryKey>
+          <isUIDTable v="false" />
+          <readonly v="true" />
+        </linkInformation>
+      </linkInformation>
+      <recordFieldMappings>
+        <dbRecordFieldMapping>
+          <name>UID.value</name>
+          <recordfield>ASYS_RECORD.ID</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>USER_ID.value</name>
+          <recordfield>ASYS_RECORDGROUP.USER_ID</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>ROW_ID.value</name>
+          <recordfield>ASYS_RECORD.ROW_ID</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>OBJECT_TYPE.value</name>
+          <recordfield>ASYS_RECORD.OBJECT_TYPE</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>GROUP_TYPE.value</name>
+          <recordfield>ASYS_RECORDGROUP.GROUP_TYPE</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>GROUP_TITLE.value</name>
+          <recordfield>ASYS_RECORDGROUP.TITLE</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>GROUP_ID.value</name>
+          <recordfield>ASYS_RECORDGROUP.ID</recordfield>
+        </dbRecordFieldMapping>
+      </recordFieldMappings>
+    </dbRecordContainer>
+  </recordContainers>
+</entity>
diff --git a/entity/Favorite_entity/entityfields/#provider/targetConsumerProcess.js b/entity/Favorite_entity/entityfields/#provider/targetConsumerProcess.js
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/entity/Favorite_entity/recordcontainers/dbrecordcontainer/conditionProcess.js b/entity/Favorite_entity/recordcontainers/dbrecordcontainer/conditionProcess.js
new file mode 100644
index 0000000000..94f570ca54
--- /dev/null
+++ b/entity/Favorite_entity/recordcontainers/dbrecordcontainer/conditionProcess.js
@@ -0,0 +1,12 @@
+import("Sql_lib");
+import("system.result");
+import("system.vars");
+import("system.util");
+import("system.tools");
+
+var user = tools.getCurrentUser();
+var userid = user["name"];
+
+var cond = newWhereIfSet("ASYS_RECORDGROUP.USER_ID", userid)
+
+result.string(cond.toString());
\ No newline at end of file
diff --git a/entity/Favorite_entity/recordcontainers/dbrecordcontainer/fromClauseProcess.js b/entity/Favorite_entity/recordcontainers/dbrecordcontainer/fromClauseProcess.js
new file mode 100644
index 0000000000..f89516ba42
--- /dev/null
+++ b/entity/Favorite_entity/recordcontainers/dbrecordcontainer/fromClauseProcess.js
@@ -0,0 +1,3 @@
+import("system.result");
+
+result.string("ASYS_RECORD left join ASYS_RECORDGROUP on ASYS_RECORD.RECORDGROUP_ID = ASYS_RECORDGROUP.ID");
\ No newline at end of file
diff --git a/entity/Favorite_entity/recordcontainers/dbrecordcontainer/orderClauseProcess.js b/entity/Favorite_entity/recordcontainers/dbrecordcontainer/orderClauseProcess.js
new file mode 100644
index 0000000000..638f4d1422
--- /dev/null
+++ b/entity/Favorite_entity/recordcontainers/dbrecordcontainer/orderClauseProcess.js
@@ -0,0 +1,7 @@
+import("system.result");
+import("system.db");
+
+result.object({
+    "ASYS_RECORD.OBJECT_TYPE": db.DESCENDING,
+    "ASYS_RECORDGROUP.TITLE": db.DESCENDING
+    });
\ No newline at end of file
diff --git a/neonContext/Favorite/Favorite.aod b/neonContext/Favorite/Favorite.aod
new file mode 100644
index 0000000000..e884dea2a6
--- /dev/null
+++ b/neonContext/Favorite/Favorite.aod
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<neonContext xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonContext/1.1.1">
+  <name>Favorite</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <filterView>FavoriteFilter_view</filterView>
+  <previewView>FavoritePreview_view</previewView>
+  <entity>Favorite_entity</entity>
+  <references>
+    <neonViewReference>
+      <name>46a9a725-f618-4689-80db-a867d26aff7e</name>
+      <view>FavoriteFilter_view</view>
+    </neonViewReference>
+    <neonViewReference>
+      <name>41857726-5138-4f86-b904-ef2132634e6c</name>
+      <view>FavoritePreview_view</view>
+    </neonViewReference>
+  </references>
+</neonContext>
diff --git a/neonView/FavoriteFilter_view/FavoriteFilter_view.aod b/neonView/FavoriteFilter_view/FavoriteFilter_view.aod
new file mode 100644
index 0000000000..bdc4d59246
--- /dev/null
+++ b/neonView/FavoriteFilter_view/FavoriteFilter_view.aod
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.6">
+  <name>FavoriteFilter_view</name>
+  <title>FavoriteFilter_view</title>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <layout>
+    <groupLayout>
+      <name>layout</name>
+    </groupLayout>
+  </layout>
+  <children>
+    <tableViewTemplate>
+      <name>FavoriteFilter</name>
+      <iconField></iconField>
+      <titleField>ROW_ID</titleField>
+      <subtitleField>GROUP_TITLE</subtitleField>
+      <descriptionField>OBJECT_TYPE</descriptionField>
+      <entityField>#ENTITY</entityField>
+      <linkedColumns />
+      <isCreatable v="false" />
+      <title>favoriteFilter_view</title>
+      <columns>
+        <neonTableColumn>
+          <name>075e4e29-515c-4d9e-b195-f481af367b42</name>
+          <entityField>ROW_ID</entityField>
+        </neonTableColumn>
+        <neonTableColumn>
+          <name>b235f917-4c59-4b8a-be07-ea5371f69f3b</name>
+          <entityField>OBJECT_TYPE</entityField>
+        </neonTableColumn>
+        <neonTableColumn>
+          <name>929170b5-b460-4558-9aa6-f7657f49098c</name>
+          <entityField>GROUP_TITLE</entityField>
+        </neonTableColumn>
+      </columns>
+    </tableViewTemplate>
+  </children>
+</neonView>
diff --git a/neonView/FavoritePreview_view/FavoritePreview_view.aod b/neonView/FavoritePreview_view/FavoritePreview_view.aod
new file mode 100644
index 0000000000..25f98d8ef4
--- /dev/null
+++ b/neonView/FavoritePreview_view/FavoritePreview_view.aod
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.6">
+  <name>FavoritePreview_view</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <layout>
+    <noneLayout>
+      <name>layout</name>
+    </noneLayout>
+  </layout>
+</neonView>
-- 
GitLab


From db714d5c95d82beff1a5a164aedaede738d78eef Mon Sep 17 00:00:00 2001
From: Tom Lutzenberger <t.lutzenberger@adito.de>
Date: Thu, 23 Jul 2020 08:46:10 +0200
Subject: [PATCH 056/309] #1058829: Campaign filter implementation (WiP)

---
 entity/Campaign_entity/Campaign_entity.aod    | 42 ++++++++++++++++++-
 .../recordcontainers/db/conditionProcess.js   | 15 +++++--
 .../filterConditionProcess.js                 | 27 ++++++++++++
 .../filterValuesProcess.js                    | 11 +++++
 .../dateend_filter/filterConditionProcess.js  | 17 ++++++++
 .../filterConditionProcess.js                 | 18 ++++++++
 .../member_filter/filterConditionProcess.js   | 26 ++++++++++++
 .../member_filter/filterValuesProcess.js      | 13 ++++++
 .../filterConditionProcess.js                 | 26 ++++++++++++
 .../participant_filter/filterValuesProcess.js | 16 +++++++
 .../recordcontainers/db/fromClauseProcess.js  | 16 +++++++
 .../date_end.value/expression.js              |  3 +-
 .../date_start.value/expression.js            |  3 +-
 .../CampaignEdit_view/CampaignEdit_view.aod   |  2 +-
 14 files changed, 227 insertions(+), 8 deletions(-)
 create mode 100644 entity/Campaign_entity/recordcontainers/db/filterextensions/campaignstep_filter/filterConditionProcess.js
 create mode 100644 entity/Campaign_entity/recordcontainers/db/filterextensions/campaignstep_filter/filterValuesProcess.js
 create mode 100644 entity/Campaign_entity/recordcontainers/db/filterextensions/dateend_filter/filterConditionProcess.js
 create mode 100644 entity/Campaign_entity/recordcontainers/db/filterextensions/datestart_filter/filterConditionProcess.js
 create mode 100644 entity/Campaign_entity/recordcontainers/db/filterextensions/member_filter/filterConditionProcess.js
 create mode 100644 entity/Campaign_entity/recordcontainers/db/filterextensions/member_filter/filterValuesProcess.js
 create mode 100644 entity/Campaign_entity/recordcontainers/db/filterextensions/participant_filter/filterConditionProcess.js
 create mode 100644 entity/Campaign_entity/recordcontainers/db/filterextensions/participant_filter/filterValuesProcess.js
 create mode 100644 entity/Campaign_entity/recordcontainers/db/fromClauseProcess.js

diff --git a/entity/Campaign_entity/Campaign_entity.aod b/entity/Campaign_entity/Campaign_entity.aod
index 6704823320..6ab1a9900e 100644
--- a/entity/Campaign_entity/Campaign_entity.aod
+++ b/entity/Campaign_entity/Campaign_entity.aod
@@ -51,8 +51,7 @@
       <title>Start</title>
       <contentType>DATE</contentType>
       <resolution>DAY</resolution>
-      <outputFormat></outputFormat>
-      <inputFormat></inputFormat>
+      <outputFormat>dd.MM.yyyy</outputFormat>
       <state>READONLY</state>
       <valueProcess>%aditoprj%/entity/Campaign_entity/entityfields/date_start/valueProcess.js</valueProcess>
     </entityField>
@@ -526,6 +525,7 @@
     <dbRecordContainer>
       <name>db</name>
       <alias>Data_alias</alias>
+      <fromClauseProcess>%aditoprj%/entity/Campaign_entity/recordcontainers/db/fromClauseProcess.js</fromClauseProcess>
       <conditionProcess>%aditoprj%/entity/Campaign_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
       <onDBInsert>%aditoprj%/entity/Campaign_entity/recordcontainers/db/onDBInsert.js</onDBInsert>
       <onDBUpdate>%aditoprj%/entity/Campaign_entity/recordcontainers/db/onDBUpdate.js</onDBUpdate>
@@ -627,6 +627,44 @@
           <filterConditionProcess>%aditoprj%/entity/Campaign_entity/recordcontainers/db/filterextensions/attribute_filter/filterConditionProcess.js</filterConditionProcess>
           <filtertype>BASIC</filtertype>
         </filterExtensionSet>
+        <filterExtension>
+          <name>DateStart_filter</name>
+          <title>Startdatum</title>
+          <contentType>DATE</contentType>
+          <filterConditionProcess>%aditoprj%/entity/Campaign_entity/recordcontainers/db/filterextensions/datestart_filter/filterConditionProcess.js</filterConditionProcess>
+          <filtertype>BASIC</filtertype>
+        </filterExtension>
+        <filterExtension>
+          <name>DateEnd_filter</name>
+          <title>Enddatum</title>
+          <contentType>DATE</contentType>
+          <filterConditionProcess>%aditoprj%/entity/Campaign_entity/recordcontainers/db/filterextensions/dateend_filter/filterConditionProcess.js</filterConditionProcess>
+          <filtertype>BASIC</filtertype>
+        </filterExtension>
+        <filterExtension>
+          <name>Participant_filter</name>
+          <title>Participants</title>
+          <contentType>TEXT</contentType>
+          <filterValuesProcess>%aditoprj%/entity/Campaign_entity/recordcontainers/db/filterextensions/participant_filter/filterValuesProcess.js</filterValuesProcess>
+          <filterConditionProcess>%aditoprj%/entity/Campaign_entity/recordcontainers/db/filterextensions/participant_filter/filterConditionProcess.js</filterConditionProcess>
+          <filtertype>BASIC</filtertype>
+        </filterExtension>
+        <filterExtension>
+          <name>CampaignStep_filter</name>
+          <title>Steps</title>
+          <contentType>TEXT</contentType>
+          <filterValuesProcess>%aditoprj%/entity/Campaign_entity/recordcontainers/db/filterextensions/campaignstep_filter/filterValuesProcess.js</filterValuesProcess>
+          <filterConditionProcess>%aditoprj%/entity/Campaign_entity/recordcontainers/db/filterextensions/campaignstep_filter/filterConditionProcess.js</filterConditionProcess>
+          <filtertype>BASIC</filtertype>
+        </filterExtension>
+        <filterExtension>
+          <name>Member_filter</name>
+          <title>Members</title>
+          <contentType>TEXT</contentType>
+          <filterValuesProcess>%aditoprj%/entity/Campaign_entity/recordcontainers/db/filterextensions/member_filter/filterValuesProcess.js</filterValuesProcess>
+          <filterConditionProcess>%aditoprj%/entity/Campaign_entity/recordcontainers/db/filterextensions/member_filter/filterConditionProcess.js</filterConditionProcess>
+          <filtertype>BASIC</filtertype>
+        </filterExtension>
       </filterExtensions>
     </dbRecordContainer>
   </recordContainers>
diff --git a/entity/Campaign_entity/recordcontainers/db/conditionProcess.js b/entity/Campaign_entity/recordcontainers/db/conditionProcess.js
index 5f3455bc5b..de6ee1b893 100644
--- a/entity/Campaign_entity/recordcontainers/db/conditionProcess.js
+++ b/entity/Campaign_entity/recordcontainers/db/conditionProcess.js
@@ -1,11 +1,20 @@
-import("Employee_lib");
 import("system.db");
 import("system.result");
-import("Sql_lib");
 import("system.vars");
+import("Employee_lib");
+import("Sql_lib");
+
 
 if(vars.get("$param.ShowOnlyCurrentUsersCampaigns_param") == 'true')
 {
     //TODO: use a preparedCondition (.build instead of .translate) when available #1030812 #1034026
     result.string(newWhere("CAMPAIGN.EMPLOYEE_CONTACT_ID", EmployeeUtils.getCurrentContactId()).toString());
-}
\ No newline at end of file
+}
+
+
+var condition = new SqlBuilder()
+    .whereIfSet("STEPDATESTART_TABLEALIAS.CAMPAIGN_ID = CAMPAIGN.CAMPAIGNID")
+    .andIfSet("STEPDATEEND_TABLEALIAS.CAMPAIGN_ID = CAMPAIGN.CAMPAIGNID")
+    ;
+
+result.string(condition.toString());
diff --git a/entity/Campaign_entity/recordcontainers/db/filterextensions/campaignstep_filter/filterConditionProcess.js b/entity/Campaign_entity/recordcontainers/db/filterextensions/campaignstep_filter/filterConditionProcess.js
new file mode 100644
index 0000000000..d0dddcc8b3
--- /dev/null
+++ b/entity/Campaign_entity/recordcontainers/db/filterextensions/campaignstep_filter/filterConditionProcess.js
@@ -0,0 +1,27 @@
+import("system.result");
+import("system.vars");
+import("Sql_lib");
+import("Util_lib");
+import("Campaign_lib");
+
+
+var valueSubSelect = "(select CAMPAIGNSTEPID from CAMPAIGNSTEP where CAMPAIGN.CAMPAIGNID = CAMPAIGNSTEP.CAMPAIGN_ID)";
+var countSubSelect = "(select count(*) from CAMPAIGNSTEP where CAMPAIGNSTEP.CAMPAIGN_ID = CAMPAIGN.CAMPAIGNID)";
+var condition = "";
+
+switch(vars.get("$local.comparison")) {
+    case "ISNOTNULL":
+        condition = countSubSelect + " > 0";
+        break;
+    case "ISNULL":
+        condition = countSubSelect + " = 0";
+        break;
+    case "NOT_EQUAL":
+        condition = vars.get("$local.value") + " not in " + valueSubSelect;
+        break;
+    case "EQUAL":
+        condition = vars.get("$local.value") + " in " + valueSubSelect;
+    break;
+}
+
+result.object(condition);
diff --git a/entity/Campaign_entity/recordcontainers/db/filterextensions/campaignstep_filter/filterValuesProcess.js b/entity/Campaign_entity/recordcontainers/db/filterextensions/campaignstep_filter/filterValuesProcess.js
new file mode 100644
index 0000000000..13b3ff34c3
--- /dev/null
+++ b/entity/Campaign_entity/recordcontainers/db/filterextensions/campaignstep_filter/filterValuesProcess.js
@@ -0,0 +1,11 @@
+import("system.result");
+import("Sql_lib");
+
+
+var campaignStepValues = new SqlBuilder()
+    .select("CAMPAIGNSTEPID, NAME")
+    .from("CAMPAIGNSTEP")
+    .orderBy("NAME")
+    .table();
+    
+result.object(campaignStepValues);
\ No newline at end of file
diff --git a/entity/Campaign_entity/recordcontainers/db/filterextensions/dateend_filter/filterConditionProcess.js b/entity/Campaign_entity/recordcontainers/db/filterextensions/dateend_filter/filterConditionProcess.js
new file mode 100644
index 0000000000..c589585989
--- /dev/null
+++ b/entity/Campaign_entity/recordcontainers/db/filterextensions/dateend_filter/filterConditionProcess.js
@@ -0,0 +1,17 @@
+import("system.result");
+import("system.vars");
+import("Sql_lib");
+import("Util_lib");
+
+
+var subSelect = new SqlBuilder()
+    .select("max(CAMPAIGNSTEP.DATE_END)")
+    .from("CAMPAIGNSTEP")
+    .where("CAMPAIGNSTEP.CAMPAIGN_ID = CAMPAIGN.CAMPAIGNID")
+    .toString();
+
+subSelect = "(" + subSelect + ")";
+
+var condition = StringUtils.replaceAll(vars.get("$local.condition"), vars.get("$local.columnPlaceholder"), subSelect);
+
+result.object(condition);
diff --git a/entity/Campaign_entity/recordcontainers/db/filterextensions/datestart_filter/filterConditionProcess.js b/entity/Campaign_entity/recordcontainers/db/filterextensions/datestart_filter/filterConditionProcess.js
new file mode 100644
index 0000000000..4424653e1e
--- /dev/null
+++ b/entity/Campaign_entity/recordcontainers/db/filterextensions/datestart_filter/filterConditionProcess.js
@@ -0,0 +1,18 @@
+import("system.result");
+import("system.vars");
+import("system.logging");
+import("Sql_lib");
+import("Util_lib");
+
+
+var subSelect = new SqlBuilder()
+    .select("min(CAMPAIGNSTEP.DATE_START)")
+    .from("CAMPAIGNSTEP")
+    .where("CAMPAIGNSTEP.CAMPAIGN_ID = CAMPAIGN.CAMPAIGNID")
+    .toString();
+
+subSelect = "(" + subSelect + ")";
+
+var condition = StringUtils.replaceAll(vars.get("$local.condition"), vars.get("$local.columnPlaceholder"), subSelect);
+
+result.object(condition);
diff --git a/entity/Campaign_entity/recordcontainers/db/filterextensions/member_filter/filterConditionProcess.js b/entity/Campaign_entity/recordcontainers/db/filterextensions/member_filter/filterConditionProcess.js
new file mode 100644
index 0000000000..48c84a8dcb
--- /dev/null
+++ b/entity/Campaign_entity/recordcontainers/db/filterextensions/member_filter/filterConditionProcess.js
@@ -0,0 +1,26 @@
+import("system.result");
+import("system.vars");
+import("Sql_lib");
+import("Util_lib");
+
+
+var valueSubSelect = "(select CONTACT_ID from OBJECTMEMBER where OBJECTMEMBER.OBJECT_ROWID = CAMPAIGN.CAMPAIGNID)";
+var countSubSelect = "(select count(*) from OBJECTMEMBER where OBJECTMEMBER.OBJECT_ROWID = CAMPAIGN.CAMPAIGNID)";
+var condition = "";
+
+switch(vars.get("$local.comparison")) {
+    case "ISNOTNULL":
+        condition = countSubSelect + " > 0";
+        break;
+    case "ISNULL":
+        condition = countSubSelect + " = 0";
+        break;
+    case "NOT_EQUAL":
+        condition = vars.get("$local.value") + " not in " + valueSubSelect;
+        break;
+    case "EQUAL":
+        condition = vars.get("$local.value") + " in " + valueSubSelect;
+    break;
+}
+
+result.object(condition);
diff --git a/entity/Campaign_entity/recordcontainers/db/filterextensions/member_filter/filterValuesProcess.js b/entity/Campaign_entity/recordcontainers/db/filterextensions/member_filter/filterValuesProcess.js
new file mode 100644
index 0000000000..f0a61566a9
--- /dev/null
+++ b/entity/Campaign_entity/recordcontainers/db/filterextensions/member_filter/filterValuesProcess.js
@@ -0,0 +1,13 @@
+import("system.result");
+import("Sql_lib");
+import("Person_lib");
+
+
+var query = new SqlBuilder()
+    .select("OBJECTMEMBER.CONTACT_ID, (" + PersUtils.getResolvingDisplaySubSql("OBJECTMEMBER.CONTACT_ID") + ") as C")
+    .from("OBJECTMEMBER")
+    .join("CAMPAIGN on OBJECTMEMBER.OBJECT_ROWID = CAMPAIGN.CAMPAIGNID", "", "", "inner")
+    .join("CONTACT on OBJECTMEMBER.CONTACT_ID = CONTACT.CONTACTID", "", "", "inner")
+    ;
+    
+result.object(query.table());
\ No newline at end of file
diff --git a/entity/Campaign_entity/recordcontainers/db/filterextensions/participant_filter/filterConditionProcess.js b/entity/Campaign_entity/recordcontainers/db/filterextensions/participant_filter/filterConditionProcess.js
new file mode 100644
index 0000000000..be23e1087b
--- /dev/null
+++ b/entity/Campaign_entity/recordcontainers/db/filterextensions/participant_filter/filterConditionProcess.js
@@ -0,0 +1,26 @@
+import("system.result");
+import("system.vars");
+import("Sql_lib");
+import("Util_lib");
+
+
+var valueSubSelect = "(select CONTACT_ID from CAMPAIGNPARTICIPANT where CAMPAIGNPARTICIPANT.CAMPAIGN_ID = CAMPAIGN.CAMPAIGNID)";
+var countSubSelect = "(select count(*) from CAMPAIGNPARTICIPANT where CAMPAIGNPARTICIPANT.CAMPAIGN_ID = CAMPAIGN.CAMPAIGNID)";
+var condition = "";
+
+switch(vars.get("$local.comparison")) {
+    case "ISNOTNULL":
+        condition = countSubSelect + " > 0";
+        break;
+    case "ISNULL":
+        condition = countSubSelect + " = 0";
+        break;
+    case "NOT_EQUAL":
+        condition = vars.get("$local.value") + " not in " + valueSubSelect;
+        break;
+    case "EQUAL":
+        condition = vars.get("$local.value") + " in " + valueSubSelect;
+    break;
+}
+
+result.object(condition);
diff --git a/entity/Campaign_entity/recordcontainers/db/filterextensions/participant_filter/filterValuesProcess.js b/entity/Campaign_entity/recordcontainers/db/filterextensions/participant_filter/filterValuesProcess.js
new file mode 100644
index 0000000000..0ff2d9c975
--- /dev/null
+++ b/entity/Campaign_entity/recordcontainers/db/filterextensions/participant_filter/filterValuesProcess.js
@@ -0,0 +1,16 @@
+import("system.result");
+import("Sql_lib");
+import("Person_lib");
+
+
+var contactDisplaySelect = "case when CONTACT.PERSON_ID is null"
+                            + " then (select ORGANISATION.NAME FROM ORGANISATION join CONTACT on CONTACT.ORGANISATION_ID = ORGANISATION.ORGANISATIONID where CONTACT.CONTACTID = CAMPAIGNPARTICIPANT.CONTACT_ID)"
+                            + " else (" + PersUtils.getResolvingDisplaySubSql("CAMPAIGNPARTICIPANT.CONTACT_ID") + ")"
+                            + " end";
+var query = new SqlBuilder()
+    .select("distinct CAMPAIGNPARTICIPANT.CONTACT_ID, (" + contactDisplaySelect + ") as C")
+    .from("CAMPAIGNPARTICIPANT")
+    .join("CONTACT on CAMPAIGNPARTICIPANT.CONTACT_ID = CONTACT.CONTACTID", "", "", "inner")
+    ;
+    
+result.object(query.table());
\ No newline at end of file
diff --git a/entity/Campaign_entity/recordcontainers/db/fromClauseProcess.js b/entity/Campaign_entity/recordcontainers/db/fromClauseProcess.js
new file mode 100644
index 0000000000..ebb38fc05f
--- /dev/null
+++ b/entity/Campaign_entity/recordcontainers/db/fromClauseProcess.js
@@ -0,0 +1,16 @@
+import("system.result");
+import("system.neon");
+import("system.vars");
+
+
+var recordState = vars.get("$sys.recordstate");
+
+if (recordState != neon.OPERATINGSTATE_NEW && recordState != neon.OPERATINGSTATE_EDIT) {
+    var subSelectDateStart = "(select min(DATE_START) as STEPDATESTART_ALIAS, CAMPAIGN_ID from CAMPAIGNSTEP group by CAMPAIGN_ID) as STEPDATESTART_TABLEALIAS";
+    var subSelectDateEnd = "(select max(DATE_END) as STEPDATEEND_ALIAS, CAMPAIGN_ID from CAMPAIGNSTEP group by CAMPAIGN_ID) as STEPDATEEND_TABLEALIAS";
+         
+    result.string("CAMPAIGN, " + subSelectDateStart + ", " + subSelectDateEnd);
+} else {
+    result.string("CAMPAIGN");
+}
+
diff --git a/entity/Campaign_entity/recordcontainers/db/recordfieldmappings/date_end.value/expression.js b/entity/Campaign_entity/recordcontainers/db/recordfieldmappings/date_end.value/expression.js
index ace40927ff..11c7772942 100644
--- a/entity/Campaign_entity/recordcontainers/db/recordfieldmappings/date_end.value/expression.js
+++ b/entity/Campaign_entity/recordcontainers/db/recordfieldmappings/date_end.value/expression.js
@@ -1,3 +1,4 @@
 import("system.result");
 
-result.string("(select max(DATE_END) from campaignstep where campaign_id = campaignid)");
\ No newline at end of file
+
+result.string("STEPDATEEND_ALIAS");
\ No newline at end of file
diff --git a/entity/Campaign_entity/recordcontainers/db/recordfieldmappings/date_start.value/expression.js b/entity/Campaign_entity/recordcontainers/db/recordfieldmappings/date_start.value/expression.js
index bf0fecca3c..ab23a74c47 100644
--- a/entity/Campaign_entity/recordcontainers/db/recordfieldmappings/date_start.value/expression.js
+++ b/entity/Campaign_entity/recordcontainers/db/recordfieldmappings/date_start.value/expression.js
@@ -1,3 +1,4 @@
 import("system.result");
 
-result.string("(select min(DATE_START) from campaignstep where campaign_id = campaignid)");
\ No newline at end of file
+
+result.string("STEPDATESTART_ALIAS");
\ No newline at end of file
diff --git a/neonView/CampaignEdit_view/CampaignEdit_view.aod b/neonView/CampaignEdit_view/CampaignEdit_view.aod
index e16693943d..09b4854722 100644
--- a/neonView/CampaignEdit_view/CampaignEdit_view.aod
+++ b/neonView/CampaignEdit_view/CampaignEdit_view.aod
@@ -4,7 +4,7 @@
   <title>Campaign</title>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <icon>VAADIN:GROUP</icon>
-  <size>SMALL</size>
+  <size>NORMAL</size>
   <overlayOrientation>PORTRAIT</overlayOrientation>
   <layout>
     <noneLayout>
-- 
GitLab


From 53f5d223551880f41af518508e9d2048ea00cce5 Mon Sep 17 00:00:00 2001
From: "S.Listl" <S.Listl@SLISTL.aditosoftware.local>
Date: Thu, 23 Jul 2020 16:53:01 +0200
Subject: [PATCH 057/309] #1058714 Workflow forms with conditional fields

---
 .../WorkflowTask_entity.aod                   |  5 ++--
 .../formdefinition/valueProcess.js            |  9 +++++++
 .../entityfields/formresult/onValueChange.js  | 25 +++++++++++++++++++
 .../recordcontainers/jdito/contentProcess.js  |  1 -
 4 files changed, 36 insertions(+), 4 deletions(-)
 create mode 100644 entity/WorkflowTask_entity/entityfields/formdefinition/valueProcess.js
 create mode 100644 entity/WorkflowTask_entity/entityfields/formresult/onValueChange.js

diff --git a/entity/WorkflowTask_entity/WorkflowTask_entity.aod b/entity/WorkflowTask_entity/WorkflowTask_entity.aod
index f5bcf99498..938fbcdc99 100644
--- a/entity/WorkflowTask_entity/WorkflowTask_entity.aod
+++ b/entity/WorkflowTask_entity/WorkflowTask_entity.aod
@@ -27,9 +27,11 @@
     </entityField>
     <entityField>
       <name>FORMDEFINITION</name>
+      <valueProcess>%aditoprj%/entity/WorkflowTask_entity/entityfields/formdefinition/valueProcess.js</valueProcess>
     </entityField>
     <entityField>
       <name>FORMRESULT</name>
+      <onValueChange>%aditoprj%/entity/WorkflowTask_entity/entityfields/formresult/onValueChange.js</onValueChange>
     </entityField>
     <entityField>
       <name>NAME</name>
@@ -257,9 +259,6 @@
           <isFilterable v="true" />
           <isLookupFilter v="true" />
         </jDitoRecordFieldMapping>
-        <jDitoRecordFieldMapping>
-          <name>FORMDEFINITION.value</name>
-        </jDitoRecordFieldMapping>
         <jDitoRecordFieldMapping>
           <name>FORMRESULT.value</name>
         </jDitoRecordFieldMapping>
diff --git a/entity/WorkflowTask_entity/entityfields/formdefinition/valueProcess.js b/entity/WorkflowTask_entity/entityfields/formdefinition/valueProcess.js
new file mode 100644
index 0000000000..8fc3f05f70
--- /dev/null
+++ b/entity/WorkflowTask_entity/entityfields/formdefinition/valueProcess.js
@@ -0,0 +1,9 @@
+import("system.result");
+import("system.vars");
+import("system.workflow");
+import("system.neon");
+
+//the value of this field can be set by the onValueChange process of FORMRESULT
+
+if (vars.get("$this.value") == null)
+    result.string(workflow.getFormProperties(vars.get("$field.UID")));
\ No newline at end of file
diff --git a/entity/WorkflowTask_entity/entityfields/formresult/onValueChange.js b/entity/WorkflowTask_entity/entityfields/formresult/onValueChange.js
new file mode 100644
index 0000000000..9e42cd8ca7
--- /dev/null
+++ b/entity/WorkflowTask_entity/entityfields/formresult/onValueChange.js
@@ -0,0 +1,25 @@
+import("system.result");
+import("system.vars");
+import("system.workflow");
+import("system.neon");
+
+var taskId = vars.get("$field.UID");
+var newResult = vars.get("$local.value");
+var oldResult = vars.get("$field.FORMRESULT");
+
+if (newResult && newResult !== oldResult)
+{
+    /*
+     * fieldListeners = all fields that are used inside a visibility expression
+     * -> if one of these fields is changed, set the new FORMDEFINITION
+     */
+    var fieldListeners = JSON.parse(workflow.getFormFieldListeners(taskId));
+    newResult = newResult ? JSON.parse(newResult) : {};
+    oldResult = oldResult ? JSON.parse(oldResult) : {};
+    var isRefreshRequired = fieldListeners.some(function (fieldId)
+    {
+        return newResult[fieldId] !== oldResult[fieldId];
+    });
+    if (isRefreshRequired)
+        neon.setFieldValue("$field.FORMDEFINITION", workflow.getFormProperties(taskId, newResult));
+}
\ No newline at end of file
diff --git a/entity/WorkflowTask_entity/recordcontainers/jdito/contentProcess.js b/entity/WorkflowTask_entity/recordcontainers/jdito/contentProcess.js
index de6e83f10c..ed15981f64 100644
--- a/entity/WorkflowTask_entity/recordcontainers/jdito/contentProcess.js
+++ b/entity/WorkflowTask_entity/recordcontainers/jdito/contentProcess.js
@@ -96,7 +96,6 @@ result.object((function ()
             task.processDefinitionId,
             task.processInstanceId,
             Date.parse(task.createTime).toString(),
-            workflow.getFormProperties(task.id) || "",
             "",
             variables.USER_ID || "",
             task.description || "",
-- 
GitLab


From 7a406720e041e845a00ea2b1c9b4f3b77da27233 Mon Sep 17 00:00:00 2001
From: "S.Listl" <S.Listl@SLISTL.aditosoftware.local>
Date: Fri, 24 Jul 2020 10:21:09 +0200
Subject: [PATCH 058/309] Some Scan Service problems fixed

---
 .../entityfields/date_new/valueProcess.js          |  6 ------
 .../entityfields/user_new/valueProcess.js          |  6 ------
 .../entityfields/date_new/valueProcess.js          |  6 ------
 .../children/containername_param/valueProcess.js   |  5 -----
 .../entityfields/user_new/valueProcess.js          |  6 ------
 .../children/contactid_param/valueProcess.js       |  4 ----
 .../entityfields/selectedcampaign/onValueChange.js |  4 ----
 .../state.displayvalue/expression.js               |  6 ------
 entity/Campaign_entity/Campaign_entity.aod         |  4 ----
 process/Context_lib/process.js                     | 14 --------------
 process/Email_lib/process.js                       |  2 ++
 process/JditoFilter_lib/process.js                 |  2 +-
 12 files changed, 3 insertions(+), 62 deletions(-)
 delete mode 100644 entity/AttributeUsage_entity/entityfields/date_new/valueProcess.js
 delete mode 100644 entity/AttributeUsage_entity/entityfields/user_new/valueProcess.js
 delete mode 100644 entity/Attribute_entity/entityfields/date_new/valueProcess.js
 delete mode 100644 entity/Attribute_entity/entityfields/keywordattributetype/children/containername_param/valueProcess.js
 delete mode 100644 entity/Attribute_entity/entityfields/user_new/valueProcess.js
 delete mode 100644 entity/CampaignParticipant_entity/entityfields/participantscommrestiction/children/contactid_param/valueProcess.js
 delete mode 100644 entity/CampaignParticipant_entity/entityfields/selectedcampaign/onValueChange.js
 delete mode 100644 entity/CampaignStep_entity/recordcontainers/db/recordfieldmappings/state.displayvalue/expression.js

diff --git a/entity/AttributeUsage_entity/entityfields/date_new/valueProcess.js b/entity/AttributeUsage_entity/entityfields/date_new/valueProcess.js
deleted file mode 100644
index 7acb3c8084..0000000000
--- a/entity/AttributeUsage_entity/entityfields/date_new/valueProcess.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import("system.vars");
-import("system.result");
-import("system.neon");
-
-if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
-    result.string(vars.getString("$sys.date"));
\ No newline at end of file
diff --git a/entity/AttributeUsage_entity/entityfields/user_new/valueProcess.js b/entity/AttributeUsage_entity/entityfields/user_new/valueProcess.js
deleted file mode 100644
index a8a5e28793..0000000000
--- a/entity/AttributeUsage_entity/entityfields/user_new/valueProcess.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import("system.vars");
-import("system.result");
-import("system.neon");
-
-if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
-    result.string(vars.getString("$sys.user"));
\ No newline at end of file
diff --git a/entity/Attribute_entity/entityfields/date_new/valueProcess.js b/entity/Attribute_entity/entityfields/date_new/valueProcess.js
deleted file mode 100644
index 7acb3c8084..0000000000
--- a/entity/Attribute_entity/entityfields/date_new/valueProcess.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import("system.vars");
-import("system.result");
-import("system.neon");
-
-if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
-    result.string(vars.getString("$sys.date"));
\ No newline at end of file
diff --git a/entity/Attribute_entity/entityfields/keywordattributetype/children/containername_param/valueProcess.js b/entity/Attribute_entity/entityfields/keywordattributetype/children/containername_param/valueProcess.js
deleted file mode 100644
index dc6dfca332..0000000000
--- a/entity/Attribute_entity/entityfields/keywordattributetype/children/containername_param/valueProcess.js
+++ /dev/null
@@ -1,5 +0,0 @@
-import("system.result");
-import("Keyword_lib");
-import("KeywordRegistry_basic");
-
-result.string($KeywordRegistry.attributeType());
\ No newline at end of file
diff --git a/entity/Attribute_entity/entityfields/user_new/valueProcess.js b/entity/Attribute_entity/entityfields/user_new/valueProcess.js
deleted file mode 100644
index a8a5e28793..0000000000
--- a/entity/Attribute_entity/entityfields/user_new/valueProcess.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import("system.vars");
-import("system.result");
-import("system.neon");
-
-if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
-    result.string(vars.getString("$sys.user"));
\ No newline at end of file
diff --git a/entity/CampaignParticipant_entity/entityfields/participantscommrestiction/children/contactid_param/valueProcess.js b/entity/CampaignParticipant_entity/entityfields/participantscommrestiction/children/contactid_param/valueProcess.js
deleted file mode 100644
index f5825a6c09..0000000000
--- a/entity/CampaignParticipant_entity/entityfields/participantscommrestiction/children/contactid_param/valueProcess.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import("system.result");
-import("system.vars");
-
-result.string(vars.getString("$field.CONTACT_ID"));
\ No newline at end of file
diff --git a/entity/CampaignParticipant_entity/entityfields/selectedcampaign/onValueChange.js b/entity/CampaignParticipant_entity/entityfields/selectedcampaign/onValueChange.js
deleted file mode 100644
index 2bf64744b6..0000000000
--- a/entity/CampaignParticipant_entity/entityfields/selectedcampaign/onValueChange.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import("system.neon");
-
-
-neon.setFieldValue("$field.SYSTEMTEMPLATE", templateId);
\ No newline at end of file
diff --git a/entity/CampaignStep_entity/recordcontainers/db/recordfieldmappings/state.displayvalue/expression.js b/entity/CampaignStep_entity/recordcontainers/db/recordfieldmappings/state.displayvalue/expression.js
deleted file mode 100644
index f0e8a44ade..0000000000
--- a/entity/CampaignStep_entity/recordcontainers/db/recordfieldmappings/state.displayvalue/expression.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import("system.result");
-import("Keyword_lib");
-import("KeywordRegistry_basic");
-
-var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.campaignStepState(), "CAMPAIGNSTEP.STATUS");
-result.string(sql);
\ No newline at end of file
diff --git a/entity/Campaign_entity/Campaign_entity.aod b/entity/Campaign_entity/Campaign_entity.aod
index a9420fd4fb..6f35c476eb 100644
--- a/entity/Campaign_entity/Campaign_entity.aod
+++ b/entity/Campaign_entity/Campaign_entity.aod
@@ -624,10 +624,6 @@
           <name>CURRENCY.displayValue</name>
           <expression>%aditoprj%/entity/Campaign_entity/recordcontainers/db/recordfieldmappings/currency.displayvalue/expression.js</expression>
         </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>COUNT.value</name>
-          <expression>%aditoprj%/entity/Campaign_entity/recordcontainers/db/recordfieldmappings/count.value/expression.js</expression>
-        </dbRecordFieldMapping>
         <aggregateFieldDbMapping>
           <name>COUNT_aggregate.value</name>
           <recordfield>CAMPAIGN.CAMPAIGNID</recordfield>
diff --git a/process/Context_lib/process.js b/process/Context_lib/process.js
index 83ad817a1b..59bed65186 100644
--- a/process/Context_lib/process.js
+++ b/process/Context_lib/process.js
@@ -593,20 +593,6 @@ ContextUtils.getSelectMap  = function()
                             $KeywordRegistry.taskStatus$customerChecks(),
                         ])
                         .setCreationDateField("TASK.START_DATE")
-            ,"SupportTicket": ContextSelector.create("TICKET", "TICKETID", "TASK.SUBJECT")
-                        .setJoinExpression("left join TASK on TASK.TASKID = TICKET.TASK_ID left join TASKLINK on TASKLINK.TASK_ID = TASK.TASKID")
-                        .setCondition(newWhere("TICKET.TICKETTYPE", $KeywordRegistry.ticketType$supportTicket()))
-                        .setContactIdField("TASKLINK.OBJECT_ROWID")
-                        .setStateField("TASK.STATUS")
-                        .setActiveStates([
-                            $KeywordRegistry.taskStatus$new(),
-                            $KeywordRegistry.taskStatus$unassigned(),
-                            $KeywordRegistry.taskStatus$assigned(),
-                            $KeywordRegistry.taskStatus$inProgress(),
-                            $KeywordRegistry.taskStatus$waiting(),
-                            $KeywordRegistry.taskStatus$customerChecks(),
-                        ])
-                        .setCreationDateField("TASK.START_DATE")
             ,"BulkMail" : ContextSelector.create("BULKMAIL", "BULKMAILID", "NAME")
             ,"SerialLetter" : ContextSelector.create("SERIALLETTER", "SERIALLETTERID", "TITLE")
             ,"Leadimport": ContextSelector.create("LEADIMPORT", "LEADIMPORTID")
diff --git a/process/Email_lib/process.js b/process/Email_lib/process.js
index a8645c40d5..94a4ab8ba9 100644
--- a/process/Email_lib/process.js
+++ b/process/Email_lib/process.js
@@ -28,6 +28,7 @@ function EmailWritingUtils () {}
  * @param {Array} [pAttachments] attachments in a array (base64 encoded).
  * @param {String} pSubject an optional subject.
  * @param {String} [pEmailFilename] filename of the email.
+ * @param {Placeholder[]} [pAdditionalPlaceholders] additional placeholders
  * @return {Array} the eml document as array with [filename, base64]
  */
 EmailWritingUtils.openMailTemplate = function (pToRecipients, pSenderContactId, pTemplateId, pRecipientContactId, pBindata, pAttachments, pSubject, pEmailFilename, pAdditionalPlaceholders)
@@ -169,6 +170,7 @@ Email.fromRFC = function (pBase64RFC)
  * @param {String} [pTemplateId] UUID of the explicit template which shall used. (optional)
  * @param {String} [pContactId] (required)
  * @param {String} [pBindata] (required)
+ * @param {Placeholder[]} [pAdditionalPlaceholders] additional placeholders
  * @return {Email} a new Email object
  */
 Email.fromTemplate = function (pTemplateId, pContactId, pBindata, pAdditionalPlaceholders)
diff --git a/process/JditoFilter_lib/process.js b/process/JditoFilter_lib/process.js
index b318e28763..d24d07552a 100644
--- a/process/JditoFilter_lib/process.js
+++ b/process/JditoFilter_lib/process.js
@@ -306,7 +306,7 @@ FilterSqlTranslator.prototype.table = function (pTable, pTableAlias)
  * Adds a special database field mapping for the given field that will be used for the sql condition
  * 
  * @param {String} pFieldName the field name
- * @param {String|String[]} the database field ("TABLE.COLUMN" or ["TABLE", "COLUMN", "alias"])
+ * @param {String|String[]} pDBField the database field ("TABLE.COLUMN" or ["TABLE", "COLUMN", "alias"])
  * @return {FilterSqlTranslator} current object
  */
 FilterSqlTranslator.prototype.addSqlFieldMapping = function (pFieldName, pDBField)
-- 
GitLab


From 6a6d6922e5cad05b180a6778e6a0b1cf35b4b0e2 Mon Sep 17 00:00:00 2001
From: "S.Listl" <S.Listl@SLISTL.aditosoftware.local>
Date: Mon, 27 Jul 2020 10:59:01 +0200
Subject: [PATCH 059/309] WorkflowTask conditional forms disabled

---
 .../WorkflowTask_entity.aod                   |  1 -
 .../entityfields/formresult/onValueChange.js  | 25 -------------------
 2 files changed, 26 deletions(-)
 delete mode 100644 entity/WorkflowTask_entity/entityfields/formresult/onValueChange.js

diff --git a/entity/WorkflowTask_entity/WorkflowTask_entity.aod b/entity/WorkflowTask_entity/WorkflowTask_entity.aod
index 938fbcdc99..3ffbe846c7 100644
--- a/entity/WorkflowTask_entity/WorkflowTask_entity.aod
+++ b/entity/WorkflowTask_entity/WorkflowTask_entity.aod
@@ -31,7 +31,6 @@
     </entityField>
     <entityField>
       <name>FORMRESULT</name>
-      <onValueChange>%aditoprj%/entity/WorkflowTask_entity/entityfields/formresult/onValueChange.js</onValueChange>
     </entityField>
     <entityField>
       <name>NAME</name>
diff --git a/entity/WorkflowTask_entity/entityfields/formresult/onValueChange.js b/entity/WorkflowTask_entity/entityfields/formresult/onValueChange.js
deleted file mode 100644
index 9e42cd8ca7..0000000000
--- a/entity/WorkflowTask_entity/entityfields/formresult/onValueChange.js
+++ /dev/null
@@ -1,25 +0,0 @@
-import("system.result");
-import("system.vars");
-import("system.workflow");
-import("system.neon");
-
-var taskId = vars.get("$field.UID");
-var newResult = vars.get("$local.value");
-var oldResult = vars.get("$field.FORMRESULT");
-
-if (newResult && newResult !== oldResult)
-{
-    /*
-     * fieldListeners = all fields that are used inside a visibility expression
-     * -> if one of these fields is changed, set the new FORMDEFINITION
-     */
-    var fieldListeners = JSON.parse(workflow.getFormFieldListeners(taskId));
-    newResult = newResult ? JSON.parse(newResult) : {};
-    oldResult = oldResult ? JSON.parse(oldResult) : {};
-    var isRefreshRequired = fieldListeners.some(function (fieldId)
-    {
-        return newResult[fieldId] !== oldResult[fieldId];
-    });
-    if (isRefreshRequired)
-        neon.setFieldValue("$field.FORMDEFINITION", workflow.getFormProperties(taskId, newResult));
-}
\ No newline at end of file
-- 
GitLab


From 3a3f8dd81b35a338b597248d4b4b0521b08a2470 Mon Sep 17 00:00:00 2001
From: "S.Listl" <S.Listl@SLISTL.aditosoftware.local>
Date: Mon, 27 Jul 2020 12:16:15 +0200
Subject: [PATCH 060/309] WorkflowDefinition preview fix

---
 .../WorkflowDefinitionPreview_view.aod                          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/neonView/WorkflowDefinitionPreview_view/WorkflowDefinitionPreview_view.aod b/neonView/WorkflowDefinitionPreview_view/WorkflowDefinitionPreview_view.aod
index a9c11e5e24..7f955c5616 100644
--- a/neonView/WorkflowDefinitionPreview_view/WorkflowDefinitionPreview_view.aod
+++ b/neonView/WorkflowDefinitionPreview_view/WorkflowDefinitionPreview_view.aod
@@ -20,7 +20,7 @@
     <favoriteViewTemplate>
       <name>Favorites</name>
       <objectType>WORKFLOWDEFINITION_OBJECTTYPE</objectType>
-      <rowId>#UID</rowId>
+      <rowId>UID</rowId>
       <entityField>#ENTITY</entityField>
       <title>favorites</title>
     </favoriteViewTemplate>
-- 
GitLab


From 4118912983ae849af2e4b648f3ce7d559035c100 Mon Sep 17 00:00:00 2001
From: "a.schindlbeck" <a.schindlbeck@adito.de>
Date: Mon, 27 Jul 2020 16:01:55 +0200
Subject: [PATCH 061/309] #1060648 Favorites: set useFavorite true for default
 enabled contexts

---
 entity/Campaign_entity/Campaign_entity.aod                     | 1 +
 entity/Contract_entity/Contract_entity.aod                     | 1 +
 entity/DocumentTemplate_entity/DocumentTemplate_entity.aod     | 1 +
 entity/Employee_entity/Employee_entity.aod                     | 1 +
 entity/ExportTemplate_entity/ExportTemplate_entity.aod         | 1 +
 entity/Leadimport_entity/Leadimport_entity.aod                 | 1 +
 entity/Offer_entity/Offer_entity.aod                           | 1 +
 entity/Order_entity/Order_entity.aod                           | 1 +
 entity/Organisation_entity/Organisation_entity.aod             | 1 +
 entity/Person_entity/Person_entity.aod                         | 1 +
 entity/Product_entity/Product_entity.aod                       | 1 +
 entity/Productprice_entity/Productprice_entity.aod             | 1 +
 entity/Salesproject_entity/Salesproject_entity.aod             | 1 +
 entity/SupportTicket_entity/SupportTicket_entity.aod           | 1 +
 entity/WorkflowDefinition_entity/WorkflowDefinition_entity.aod | 1 +
 15 files changed, 15 insertions(+)

diff --git a/entity/Campaign_entity/Campaign_entity.aod b/entity/Campaign_entity/Campaign_entity.aod
index de16292a1e..d51ee6244b 100644
--- a/entity/Campaign_entity/Campaign_entity.aod
+++ b/entity/Campaign_entity/Campaign_entity.aod
@@ -14,6 +14,7 @@
   <grantDeleteProcess>%aditoprj%/entity/Campaign_entity/grantDeleteProcess.js</grantDeleteProcess>
   <contentTitleProcess>%aditoprj%/entity/Campaign_entity/contentTitleProcess.js</contentTitleProcess>
   <afterUiInit>%aditoprj%/entity/Campaign_entity/afterUiInit.js</afterUiInit>
+  <useFavorites v="true" />
   <iconId>VAADIN:GROUP</iconId>
   <imageProcess>%aditoprj%/entity/Campaign_entity/imageProcess.js</imageProcess>
   <titlePlural>Campaigns</titlePlural>
diff --git a/entity/Contract_entity/Contract_entity.aod b/entity/Contract_entity/Contract_entity.aod
index fb236573b8..8a6ccfd90c 100644
--- a/entity/Contract_entity/Contract_entity.aod
+++ b/entity/Contract_entity/Contract_entity.aod
@@ -8,6 +8,7 @@
   <contentTitleProcess>%aditoprj%/entity/Contract_entity/contentTitleProcess.js</contentTitleProcess>
   <afterUiInit>%aditoprj%/entity/Contract_entity/afterUiInit.js</afterUiInit>
   <onValidation>%aditoprj%/entity/Contract_entity/onValidation.js</onValidation>
+  <useFavorites v="true" />
   <iconId>VAADIN:FILE_TEXT</iconId>
   <titlePlural>Contracts</titlePlural>
   <recordContainer>db</recordContainer>
diff --git a/entity/DocumentTemplate_entity/DocumentTemplate_entity.aod b/entity/DocumentTemplate_entity/DocumentTemplate_entity.aod
index 3e357fa976..2536bd7173 100644
--- a/entity/DocumentTemplate_entity/DocumentTemplate_entity.aod
+++ b/entity/DocumentTemplate_entity/DocumentTemplate_entity.aod
@@ -8,6 +8,7 @@
   <contentTitleProcess>%aditoprj%/entity/DocumentTemplate_entity/contentTitleProcess.js</contentTitleProcess>
   <afterUiInit>%aditoprj%/entity/DocumentTemplate_entity/afterUiInit.js</afterUiInit>
   <onValidation>%aditoprj%/entity/DocumentTemplate_entity/onValidation.js</onValidation>
+  <useFavorites v="true" />
   <iconId>VAADIN:FILE_FONT</iconId>
   <titlePlural>Document templates</titlePlural>
   <recordContainer>db</recordContainer>
diff --git a/entity/Employee_entity/Employee_entity.aod b/entity/Employee_entity/Employee_entity.aod
index d3ae09d5ec..7017e5bde0 100644
--- a/entity/Employee_entity/Employee_entity.aod
+++ b/entity/Employee_entity/Employee_entity.aod
@@ -8,6 +8,7 @@
   <contentTitleProcess>%aditoprj%/entity/Employee_entity/contentTitleProcess.js</contentTitleProcess>
   <afterUiInit>%aditoprj%/entity/Employee_entity/afterUiInit.js</afterUiInit>
   <onValidation>%aditoprj%/entity/Employee_entity/onValidation.js</onValidation>
+  <useFavorites v="true" />
   <iconId>VAADIN:USER</iconId>
   <titlePlural>Employees</titlePlural>
   <recordContainer>jdito</recordContainer>
diff --git a/entity/ExportTemplate_entity/ExportTemplate_entity.aod b/entity/ExportTemplate_entity/ExportTemplate_entity.aod
index 2ab97cfd7f..b6614896d8 100644
--- a/entity/ExportTemplate_entity/ExportTemplate_entity.aod
+++ b/entity/ExportTemplate_entity/ExportTemplate_entity.aod
@@ -7,6 +7,7 @@
   <grantCreate v="true" />
   <grantUpdate v="true" />
   <grantDelete v="true" />
+  <useFavorites v="true" />
   <iconId>NEON:EXPORT</iconId>
   <titlePlural>Export Templates</titlePlural>
   <recordContainer>db</recordContainer>
diff --git a/entity/Leadimport_entity/Leadimport_entity.aod b/entity/Leadimport_entity/Leadimport_entity.aod
index 6f7be5e2f8..7c0f6c87f1 100644
--- a/entity/Leadimport_entity/Leadimport_entity.aod
+++ b/entity/Leadimport_entity/Leadimport_entity.aod
@@ -10,6 +10,7 @@
   <grantDelete v="true" />
   <grantDeleteProcess>%aditoprj%/entity/Leadimport_entity/grantDeleteProcess.js</grantDeleteProcess>
   <contentTitleProcess>%aditoprj%/entity/Leadimport_entity/contentTitleProcess.js</contentTitleProcess>
+  <useFavorites v="true" />
   <iconId>NEON:IMPORT</iconId>
   <imageProcess>%aditoprj%/entity/Leadimport_entity/imageProcess.js</imageProcess>
   <titlePlural>Lead Imports</titlePlural>
diff --git a/entity/Offer_entity/Offer_entity.aod b/entity/Offer_entity/Offer_entity.aod
index 7459007391..ef4dc76656 100644
--- a/entity/Offer_entity/Offer_entity.aod
+++ b/entity/Offer_entity/Offer_entity.aod
@@ -12,6 +12,7 @@
   <contentTitleProcess>%aditoprj%/entity/Offer_entity/contentTitleProcess.js</contentTitleProcess>
   <afterUiInit>%aditoprj%/entity/Offer_entity/afterUiInit.js</afterUiInit>
   <afterOperatingState>%aditoprj%/entity/Offer_entity/afterOperatingState.js</afterOperatingState>
+  <useFavorites v="true" />
   <iconId>VAADIN:CART</iconId>
   <titlePlural>Offers</titlePlural>
   <recordContainer>db</recordContainer>
diff --git a/entity/Order_entity/Order_entity.aod b/entity/Order_entity/Order_entity.aod
index 7d0429a7cd..e040ec1ef9 100644
--- a/entity/Order_entity/Order_entity.aod
+++ b/entity/Order_entity/Order_entity.aod
@@ -7,6 +7,7 @@
   <grantDeleteProcess>%aditoprj%/entity/Order_entity/grantDeleteProcess.js</grantDeleteProcess>
   <contentTitleProcess>%aditoprj%/entity/Order_entity/contentTitleProcess.js</contentTitleProcess>
   <afterUiInit>%aditoprj%/entity/Order_entity/afterUiInit.js</afterUiInit>
+  <useFavorites v="true" />
   <iconId>VAADIN:DOLLAR</iconId>
   <titlePlural>Receipts</titlePlural>
   <recordContainer>db</recordContainer>
diff --git a/entity/Organisation_entity/Organisation_entity.aod b/entity/Organisation_entity/Organisation_entity.aod
index 192b93ca86..496715ec02 100644
--- a/entity/Organisation_entity/Organisation_entity.aod
+++ b/entity/Organisation_entity/Organisation_entity.aod
@@ -9,6 +9,7 @@
   <contentTitleProcess>%aditoprj%/entity/Organisation_entity/contentTitleProcess.js</contentTitleProcess>
   <onInit>%aditoprj%/entity/Organisation_entity/onInit.js</onInit>
   <afterOperatingState>%aditoprj%/entity/Organisation_entity/afterOperatingState.js</afterOperatingState>
+  <useFavorites v="true" />
   <iconId>VAADIN:BUILDING</iconId>
   <imageProcess>%aditoprj%/entity/Organisation_entity/imageProcess.js</imageProcess>
   <titlePlural>Companies</titlePlural>
diff --git a/entity/Person_entity/Person_entity.aod b/entity/Person_entity/Person_entity.aod
index 0fd8e2ba84..5a29945dbd 100644
--- a/entity/Person_entity/Person_entity.aod
+++ b/entity/Person_entity/Person_entity.aod
@@ -13,6 +13,7 @@
   <onInit>%aditoprj%/entity/Person_entity/onInit.js</onInit>
   <onValidation>%aditoprj%/entity/Person_entity/onValidation.js</onValidation>
   <afterOperatingState>%aditoprj%/entity/Person_entity/afterOperatingState.js</afterOperatingState>
+  <useFavorites v="true" />
   <iconId>VAADIN:USERS</iconId>
   <imageProcess>%aditoprj%/entity/Person_entity/imageProcess.js</imageProcess>
   <usePermissions v="false" />
diff --git a/entity/Product_entity/Product_entity.aod b/entity/Product_entity/Product_entity.aod
index 5249b9cf12..6c336478ef 100644
--- a/entity/Product_entity/Product_entity.aod
+++ b/entity/Product_entity/Product_entity.aod
@@ -10,6 +10,7 @@
   <grantDeleteProcess>%aditoprj%/entity/Product_entity/grantDeleteProcess.js</grantDeleteProcess>
   <contentTitleProcess>%aditoprj%/entity/Product_entity/contentTitleProcess.js</contentTitleProcess>
   <afterUiInit>%aditoprj%/entity/Product_entity/afterUiInit.js</afterUiInit>
+  <useFavorites v="true" />
   <iconId>VAADIN:HAMMER</iconId>
   <imageProcess>%aditoprj%/entity/Product_entity/imageProcess.js</imageProcess>
   <titlePlural>Products</titlePlural>
diff --git a/entity/Productprice_entity/Productprice_entity.aod b/entity/Productprice_entity/Productprice_entity.aod
index 4df695970c..ea43f8afdd 100644
--- a/entity/Productprice_entity/Productprice_entity.aod
+++ b/entity/Productprice_entity/Productprice_entity.aod
@@ -9,6 +9,7 @@
     <element>Product_entity</element>
   </siblings>
   <onValidation>%aditoprj%/entity/Productprice_entity/onValidation.js</onValidation>
+  <useFavorites v="true" />
   <titlePlural>Prices</titlePlural>
   <recordContainer>db</recordContainer>
   <entityFields>
diff --git a/entity/Salesproject_entity/Salesproject_entity.aod b/entity/Salesproject_entity/Salesproject_entity.aod
index 2c940e34ba..2c5b4e88d5 100644
--- a/entity/Salesproject_entity/Salesproject_entity.aod
+++ b/entity/Salesproject_entity/Salesproject_entity.aod
@@ -12,6 +12,7 @@
   <afterUiInit>%aditoprj%/entity/Salesproject_entity/afterUiInit.js</afterUiInit>
   <onValidation>%aditoprj%/entity/Salesproject_entity/onValidation.js</onValidation>
   <afterOperatingState>%aditoprj%/entity/Salesproject_entity/afterOperatingState.js</afterOperatingState>
+  <useFavorites v="true" />
   <iconId>VAADIN:BOOK_DOLLAR</iconId>
   <titlePlural>Sales Projects</titlePlural>
   <recordContainer>db</recordContainer>
diff --git a/entity/SupportTicket_entity/SupportTicket_entity.aod b/entity/SupportTicket_entity/SupportTicket_entity.aod
index ddaf1a5c7a..095a43105b 100644
--- a/entity/SupportTicket_entity/SupportTicket_entity.aod
+++ b/entity/SupportTicket_entity/SupportTicket_entity.aod
@@ -7,6 +7,7 @@
   <contentTitleProcess>%aditoprj%/entity/SupportTicket_entity/contentTitleProcess.js</contentTitleProcess>
   <afterUiInit>%aditoprj%/entity/SupportTicket_entity/afterUiInit.js</afterUiInit>
   <onValidation>%aditoprj%/entity/SupportTicket_entity/onValidation.js</onValidation>
+  <useFavorites v="true" />
   <iconId>VAADIN:CHAT</iconId>
   <titlePlural>Support Tickets</titlePlural>
   <recordContainer>db</recordContainer>
diff --git a/entity/WorkflowDefinition_entity/WorkflowDefinition_entity.aod b/entity/WorkflowDefinition_entity/WorkflowDefinition_entity.aod
index a7541f1ef8..e6b791a155 100644
--- a/entity/WorkflowDefinition_entity/WorkflowDefinition_entity.aod
+++ b/entity/WorkflowDefinition_entity/WorkflowDefinition_entity.aod
@@ -8,6 +8,7 @@
   <grantDelete v="false" />
   <contentTitleProcess>%aditoprj%/entity/WorkflowDefinition_entity/contentTitleProcess.js</contentTitleProcess>
   <onInit>%aditoprj%/entity/WorkflowDefinition_entity/onInit.js</onInit>
+  <useFavorites v="true" />
   <iconId>VAADIN:DROP</iconId>
   <titlePlural>Workflow definitions</titlePlural>
   <recordContainer>jdito</recordContainer>
-- 
GitLab


From ea0f58cff02620276f090c00caf7527eb30f4e49 Mon Sep 17 00:00:00 2001
From: "S.Listl" <S.Listl@SLISTL.aditosoftware.local>
Date: Mon, 27 Jul 2020 16:27:50 +0200
Subject: [PATCH 062/309] #1061660 inactive attributes not selectable

---
 process/AttributeFilter_lib/process.js | 2 +-
 process/Attribute_lib/process.js       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/process/AttributeFilter_lib/process.js b/process/AttributeFilter_lib/process.js
index f64477390f..81a5208ba9 100644
--- a/process/AttributeFilter_lib/process.js
+++ b/process/AttributeFilter_lib/process.js
@@ -155,7 +155,7 @@ AttributeFilterExtensionMaker.getFilterValues = function(pFilter)
     var attrType = name.type;
     if (attrType == $AttributeTypes.VOID.toString())
         attrType = $AttributeTypes.BOOLEAN.toString();
-    var res = AttributeUtil.getPossibleListValues(attributeId, attrType);
+    var res = AttributeUtil.getPossibleListValues(attributeId, attrType, true);
     if (res == null)
         res = [];
     return res;
diff --git a/process/Attribute_lib/process.js b/process/Attribute_lib/process.js
index 40eed67b87..9fd2230221 100644
--- a/process/Attribute_lib/process.js
+++ b/process/Attribute_lib/process.js
@@ -148,7 +148,7 @@ AttributeUtil.getPossibleListValues = function (pAttributeId, pAttributeType, pI
 {
     var attributeId = pAttributeId;
     var attrType = pAttributeType.trim();
-    var onlyActives = (pIncludeInactives == undefined ? false : pIncludeInactives);
+    var onlyActives = !pIncludeInactives;
     if (attrType == $AttributeTypes.COMBO.toString())
     {
         var valuesSelect = newSelect("AB_ATTRIBUTEID, ATTRIBUTE_NAME")
-- 
GitLab


From 240ba1f85c851122cd7934a3b1de32bdb105648c Mon Sep 17 00:00:00 2001
From: "S.Listl" <S.Listl@SLISTL.aditosoftware.local>
Date: Tue, 28 Jul 2020 15:05:34 +0200
Subject: [PATCH 063/309] Filter presets moved to initFilterProcess

---
 .../AnyContact_entity/AnyContact_entity.aod   |  2 +-
 entity/AnyContact_entity/initFilterProcess.js | 19 ++++++++++++
 entity/AnyContact_entity/onInit.js            | 23 --------------
 entity/Contact_entity/Contact_entity.aod      |  2 +-
 entity/Contact_entity/initFilterProcess.js    | 19 ++++++++++++
 entity/Contact_entity/onInit.js               | 23 --------------
 .../Organisation_entity.aod                   |  3 +-
 entity/Organisation_entity/afterUiInit.js     |  7 +++++
 .../Organisation_entity/initFilterProcess.js  | 19 ++++++++++++
 entity/Organisation_entity/onInit.js          | 30 ------------------
 entity/Person_entity/Person_entity.aod        |  3 +-
 entity/Person_entity/afterUiInit.js           |  7 +++++
 entity/Person_entity/initFilterProcess.js     | 19 ++++++++++++
 entity/Person_entity/onInit.js                | 30 ------------------
 entity/Task_entity/Task_entity.aod            |  3 +-
 entity/Task_entity/afterUiInit.js             |  6 ++++
 entity/Task_entity/initFilterProcess.js       | 19 ++++++++++++
 entity/Task_entity/onInit.js                  | 31 -------------------
 .../WorkflowDefinition_entity.aod             |  1 -
 entity/WorkflowDefinition_entity/onInit.js    | 20 ------------
 .../WorkflowInstance_entity.aod               |  1 +
 .../initFilterProcess.js                      | 17 ++++++++++
 22 files changed, 141 insertions(+), 163 deletions(-)
 create mode 100644 entity/AnyContact_entity/initFilterProcess.js
 delete mode 100644 entity/AnyContact_entity/onInit.js
 create mode 100644 entity/Contact_entity/initFilterProcess.js
 delete mode 100644 entity/Contact_entity/onInit.js
 create mode 100644 entity/Organisation_entity/afterUiInit.js
 create mode 100644 entity/Organisation_entity/initFilterProcess.js
 delete mode 100644 entity/Organisation_entity/onInit.js
 create mode 100644 entity/Person_entity/afterUiInit.js
 create mode 100644 entity/Person_entity/initFilterProcess.js
 delete mode 100644 entity/Person_entity/onInit.js
 create mode 100644 entity/Task_entity/afterUiInit.js
 create mode 100644 entity/Task_entity/initFilterProcess.js
 delete mode 100644 entity/Task_entity/onInit.js
 delete mode 100644 entity/WorkflowDefinition_entity/onInit.js
 create mode 100644 entity/WorkflowInstance_entity/initFilterProcess.js

diff --git a/entity/AnyContact_entity/AnyContact_entity.aod b/entity/AnyContact_entity/AnyContact_entity.aod
index b9e852b3b2..c9855622f5 100644
--- a/entity/AnyContact_entity/AnyContact_entity.aod
+++ b/entity/AnyContact_entity/AnyContact_entity.aod
@@ -4,7 +4,7 @@
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/AnyContact_entity/documentation.adoc</documentation>
   <contentTitleProcess>%aditoprj%/entity/AnyContact_entity/contentTitleProcess.js</contentTitleProcess>
-  <onInit>%aditoprj%/entity/AnyContact_entity/onInit.js</onInit>
+  <initFilterProcess>%aditoprj%/entity/AnyContact_entity/initFilterProcess.js</initFilterProcess>
   <imageProcess>%aditoprj%/entity/AnyContact_entity/imageProcess.js</imageProcess>
   <recordContainer>db</recordContainer>
   <entityFields>
diff --git a/entity/AnyContact_entity/initFilterProcess.js b/entity/AnyContact_entity/initFilterProcess.js
new file mode 100644
index 0000000000..695577262b
--- /dev/null
+++ b/entity/AnyContact_entity/initFilterProcess.js
@@ -0,0 +1,19 @@
+import("system.result");
+import("Keyword_lib");
+import("KeywordRegistry_basic");
+
+var statusInactive = $KeywordRegistry.contactStatus$inactive();
+var filter = {
+    type: "group",
+    operator: "AND",
+    childs: [{
+        type: "row",
+        name: "STATUS",
+        operator: "NOT_EQUAL",
+        contenttype: "TEXT",
+        key: statusInactive,
+        value: KeywordUtils.getViewValue($KeywordRegistry.contactStatus(), statusInactive)
+    }]
+};
+
+result.string(JSON.stringify(filter));
\ No newline at end of file
diff --git a/entity/AnyContact_entity/onInit.js b/entity/AnyContact_entity/onInit.js
deleted file mode 100644
index a75a8d405e..0000000000
--- a/entity/AnyContact_entity/onInit.js
+++ /dev/null
@@ -1,23 +0,0 @@
-import("system.neon");
-import("Keyword_lib");
-import("system.vars");
-import("KeywordRegistry_basic");
-
-var statusFilterElement = {
-        "type":"row",
-        "name":"STATUS",
-        "operator":"NOT_EQUAL",
-        "key":$KeywordRegistry.contactStatus$inactive(),
-        "contenttype": "TEXT"
-};
-    
-statusFilterElement.value = KeywordUtils.getViewValue($KeywordRegistry.contactStatus(), statusFilterElement.key);
-    
-var filter = {
-        "type":"group",
-        "operator":"AND",
-        "childs": [statusFilterElement]
-};
-    
-filter = JSON.stringify(filter);
-neon.setFilter("#ENTITY", filter);
\ No newline at end of file
diff --git a/entity/Contact_entity/Contact_entity.aod b/entity/Contact_entity/Contact_entity.aod
index 82c35b3c61..ad05310a9d 100644
--- a/entity/Contact_entity/Contact_entity.aod
+++ b/entity/Contact_entity/Contact_entity.aod
@@ -8,8 +8,8 @@
   <grantUpdateProcess>%aditoprj%/entity/Contact_entity/grantUpdateProcess.js</grantUpdateProcess>
   <grantDeleteProcess>%aditoprj%/entity/Contact_entity/grantDeleteProcess.js</grantDeleteProcess>
   <contentTitleProcess>%aditoprj%/entity/Contact_entity/contentTitleProcess.js</contentTitleProcess>
-  <onInit>%aditoprj%/entity/Contact_entity/onInit.js</onInit>
   <onValidation>%aditoprj%/entity/Contact_entity/onValidation.js</onValidation>
+  <initFilterProcess>%aditoprj%/entity/Contact_entity/initFilterProcess.js</initFilterProcess>
   <iconId>VAADIN:USERS</iconId>
   <titlePlural>Contacts</titlePlural>
   <recordContainer>db</recordContainer>
diff --git a/entity/Contact_entity/initFilterProcess.js b/entity/Contact_entity/initFilterProcess.js
new file mode 100644
index 0000000000..695577262b
--- /dev/null
+++ b/entity/Contact_entity/initFilterProcess.js
@@ -0,0 +1,19 @@
+import("system.result");
+import("Keyword_lib");
+import("KeywordRegistry_basic");
+
+var statusInactive = $KeywordRegistry.contactStatus$inactive();
+var filter = {
+    type: "group",
+    operator: "AND",
+    childs: [{
+        type: "row",
+        name: "STATUS",
+        operator: "NOT_EQUAL",
+        contenttype: "TEXT",
+        key: statusInactive,
+        value: KeywordUtils.getViewValue($KeywordRegistry.contactStatus(), statusInactive)
+    }]
+};
+
+result.string(JSON.stringify(filter));
\ No newline at end of file
diff --git a/entity/Contact_entity/onInit.js b/entity/Contact_entity/onInit.js
deleted file mode 100644
index ad4324c768..0000000000
--- a/entity/Contact_entity/onInit.js
+++ /dev/null
@@ -1,23 +0,0 @@
-import("system.neon");
-import("Keyword_lib");
-import("system.vars");
-import("KeywordRegistry_basic");
-
-var statusFilterElement = {
-        "type":"row",
-        "name":"STATUS",
-        "operator":"NOT_EQUAL",
-        "key":$KeywordRegistry.contactStatus$inactive(),
-        "contenttype": vars.get("$property.STATUS.contentType")
-};
-    
-statusFilterElement.value = KeywordUtils.getViewValue($KeywordRegistry.contactStatus(), statusFilterElement.key);
-    
-var filter = {
-        "type":"group",
-        "operator":"AND",
-        "childs": [statusFilterElement]
-};
-    
-filter = JSON.stringify(filter);
-neon.setFilter("#ENTITY", filter);
\ No newline at end of file
diff --git a/entity/Organisation_entity/Organisation_entity.aod b/entity/Organisation_entity/Organisation_entity.aod
index 26fe1fdb3d..cbd7cb44ef 100644
--- a/entity/Organisation_entity/Organisation_entity.aod
+++ b/entity/Organisation_entity/Organisation_entity.aod
@@ -7,8 +7,9 @@
   <title>Company</title>
   <grantDeleteProcess>%aditoprj%/entity/Organisation_entity/grantDeleteProcess.js</grantDeleteProcess>
   <contentTitleProcess>%aditoprj%/entity/Organisation_entity/contentTitleProcess.js</contentTitleProcess>
-  <onInit>%aditoprj%/entity/Organisation_entity/onInit.js</onInit>
+  <afterUiInit>%aditoprj%/entity/Organisation_entity/afterUiInit.js</afterUiInit>
   <afterOperatingState>%aditoprj%/entity/Organisation_entity/afterOperatingState.js</afterOperatingState>
+  <initFilterProcess>%aditoprj%/entity/Organisation_entity/initFilterProcess.js</initFilterProcess>
   <iconId>VAADIN:BUILDING</iconId>
   <imageProcess>%aditoprj%/entity/Organisation_entity/imageProcess.js</imageProcess>
   <titlePlural>Companies</titlePlural>
diff --git a/entity/Organisation_entity/afterUiInit.js b/entity/Organisation_entity/afterUiInit.js
new file mode 100644
index 0000000000..d529418d07
--- /dev/null
+++ b/entity/Organisation_entity/afterUiInit.js
@@ -0,0 +1,7 @@
+import("system.neon");
+import("system.vars");
+import("Context_lib");
+import("Attribute_lib");
+
+if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
+    AttributeRelationUtils.presetMandatoryAttributes(ContextUtils.getCurrentContextId(), "Attributes");
\ No newline at end of file
diff --git a/entity/Organisation_entity/initFilterProcess.js b/entity/Organisation_entity/initFilterProcess.js
new file mode 100644
index 0000000000..26ce7fa02b
--- /dev/null
+++ b/entity/Organisation_entity/initFilterProcess.js
@@ -0,0 +1,19 @@
+import("Keyword_lib");
+import("KeywordRegistry_basic");
+import("system.result");
+
+var statusInactive = $KeywordRegistry.contactStatus$inactive();
+var filter = {
+    type: "group",
+    operator: "AND",
+    childs: [{
+        type: "row",
+        name: "STATUS",
+        operator: "NOT_EQUAL",
+        contenttype: "TEXT",
+        key: statusInactive,
+        value: KeywordUtils.getViewValue($KeywordRegistry.contactStatus(), statusInactive)
+    }]
+};
+    
+result.string(JSON.stringify(filter));
\ No newline at end of file
diff --git a/entity/Organisation_entity/onInit.js b/entity/Organisation_entity/onInit.js
deleted file mode 100644
index b971758355..0000000000
--- a/entity/Organisation_entity/onInit.js
+++ /dev/null
@@ -1,30 +0,0 @@
-import("Keyword_lib");
-import("KeywordRegistry_basic");
-import("system.neon");
-import("system.vars");
-import("Context_lib");
-import("Attribute_lib");
-
-var statusFilterElement = {
-        "type":"row",
-        "name":"STATUS",
-        "operator":"NOT_EQUAL",
-        "key":$KeywordRegistry.contactStatus$inactive(),
-        "contenttype": "TEXT"
-};
-    
-statusFilterElement.value = KeywordUtils.getViewValue($KeywordRegistry.contactStatus(), statusFilterElement.key);
-    
-var filter = {
-        "type":"group",
-        "operator":"AND",
-        "childs": [statusFilterElement]
-};
-    
-filter = JSON.stringify(filter);
-neon.setFilter("#ENTITY", filter);
-
-if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
-{
-    AttributeRelationUtils.presetMandatoryAttributes(ContextUtils.getCurrentContextId(), "Attributes");
-}
diff --git a/entity/Person_entity/Person_entity.aod b/entity/Person_entity/Person_entity.aod
index cbabea3276..907d1408a4 100644
--- a/entity/Person_entity/Person_entity.aod
+++ b/entity/Person_entity/Person_entity.aod
@@ -10,9 +10,10 @@
   </siblings>
   <grantDeleteProcess>%aditoprj%/entity/Person_entity/grantDeleteProcess.js</grantDeleteProcess>
   <contentTitleProcess>%aditoprj%/entity/Person_entity/contentTitleProcess.js</contentTitleProcess>
-  <onInit>%aditoprj%/entity/Person_entity/onInit.js</onInit>
+  <afterUiInit>%aditoprj%/entity/Person_entity/afterUiInit.js</afterUiInit>
   <onValidation>%aditoprj%/entity/Person_entity/onValidation.js</onValidation>
   <afterOperatingState>%aditoprj%/entity/Person_entity/afterOperatingState.js</afterOperatingState>
+  <initFilterProcess>%aditoprj%/entity/Person_entity/initFilterProcess.js</initFilterProcess>
   <iconId>VAADIN:USERS</iconId>
   <imageProcess>%aditoprj%/entity/Person_entity/imageProcess.js</imageProcess>
   <usePermissions v="false" />
diff --git a/entity/Person_entity/afterUiInit.js b/entity/Person_entity/afterUiInit.js
new file mode 100644
index 0000000000..d529418d07
--- /dev/null
+++ b/entity/Person_entity/afterUiInit.js
@@ -0,0 +1,7 @@
+import("system.neon");
+import("system.vars");
+import("Context_lib");
+import("Attribute_lib");
+
+if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
+    AttributeRelationUtils.presetMandatoryAttributes(ContextUtils.getCurrentContextId(), "Attributes");
\ No newline at end of file
diff --git a/entity/Person_entity/initFilterProcess.js b/entity/Person_entity/initFilterProcess.js
new file mode 100644
index 0000000000..26ce7fa02b
--- /dev/null
+++ b/entity/Person_entity/initFilterProcess.js
@@ -0,0 +1,19 @@
+import("Keyword_lib");
+import("KeywordRegistry_basic");
+import("system.result");
+
+var statusInactive = $KeywordRegistry.contactStatus$inactive();
+var filter = {
+    type: "group",
+    operator: "AND",
+    childs: [{
+        type: "row",
+        name: "STATUS",
+        operator: "NOT_EQUAL",
+        contenttype: "TEXT",
+        key: statusInactive,
+        value: KeywordUtils.getViewValue($KeywordRegistry.contactStatus(), statusInactive)
+    }]
+};
+    
+result.string(JSON.stringify(filter));
\ No newline at end of file
diff --git a/entity/Person_entity/onInit.js b/entity/Person_entity/onInit.js
deleted file mode 100644
index 1958e327f2..0000000000
--- a/entity/Person_entity/onInit.js
+++ /dev/null
@@ -1,30 +0,0 @@
-import("Keyword_lib");
-import("KeywordRegistry_basic");
-import("system.neon");
-import("system.vars");
-import("Context_lib");
-import("Attribute_lib");
-
-var statusFilterElement = {
-        "type":"row",
-        "name":"STATUS",
-        "operator":"NOT_EQUAL",
-        "key":$KeywordRegistry.contactStatus$inactive(),
-        "contenttype": "TEXT"
-};
-    
-statusFilterElement.value = KeywordUtils.getViewValue($KeywordRegistry.contactStatus(), statusFilterElement.key);
-    
-var filter = {
-        "type":"group",
-        "operator":"AND",
-        "childs": [statusFilterElement]
-};
-    
-filter = JSON.stringify(filter);
-neon.setFilter("#ENTITY", filter);   
-
-if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
-{
-    AttributeRelationUtils.presetMandatoryAttributes(ContextUtils.getCurrentContextId(), "Attributes");
-}
diff --git a/entity/Task_entity/Task_entity.aod b/entity/Task_entity/Task_entity.aod
index 14cdb18785..64f381e93f 100644
--- a/entity/Task_entity/Task_entity.aod
+++ b/entity/Task_entity/Task_entity.aod
@@ -6,8 +6,9 @@
   <title>Task</title>
   <grantDeleteProcess>%aditoprj%/entity/Task_entity/grantDeleteProcess.js</grantDeleteProcess>
   <contentTitleProcess>%aditoprj%/entity/Task_entity/contentTitleProcess.js</contentTitleProcess>
-  <onInit>%aditoprj%/entity/Task_entity/onInit.js</onInit>
+  <afterUiInit>%aditoprj%/entity/Task_entity/afterUiInit.js</afterUiInit>
   <onValidation>%aditoprj%/entity/Task_entity/onValidation.js</onValidation>
+  <initFilterProcess>%aditoprj%/entity/Task_entity/initFilterProcess.js</initFilterProcess>
   <iconId>VAADIN:TASKS</iconId>
   <iconIdProcess>%aditoprj%/entity/Task_entity/iconIdProcess.js</iconIdProcess>
   <titlePlural>Tasks</titlePlural>
diff --git a/entity/Task_entity/afterUiInit.js b/entity/Task_entity/afterUiInit.js
new file mode 100644
index 0000000000..2f108ba446
--- /dev/null
+++ b/entity/Task_entity/afterUiInit.js
@@ -0,0 +1,6 @@
+import("system.neon");
+import("system.vars");
+import("ActivityTask_lib");
+
+if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
+    TaskUtils.addLinkRecords("$param.ObjectId_param", "$param.RowId_param", "$param.PresetLinks_param", "$field.PARENT_CONTEXT", "$field.PARENT_ID");
\ No newline at end of file
diff --git a/entity/Task_entity/initFilterProcess.js b/entity/Task_entity/initFilterProcess.js
new file mode 100644
index 0000000000..39b6e0b2e2
--- /dev/null
+++ b/entity/Task_entity/initFilterProcess.js
@@ -0,0 +1,19 @@
+import("system.result");
+import("Keyword_lib");
+import("KeywordRegistry_basic");
+
+var statusEnded = $KeywordRegistry.taskStatus$ended();
+var filter = {
+    type: "group",
+    operator: "AND",
+    childs: [{
+        type: "row",
+        name: "STATUS",
+        operator: "NOT_EQUAL",
+        contenttype: "TEXT",
+        key: statusEnded,
+        value: KeywordUtils.getViewValue($KeywordRegistry.taskStatus(), statusEnded)
+    }]
+};
+
+result.string(JSON.stringify(filter));
\ No newline at end of file
diff --git a/entity/Task_entity/onInit.js b/entity/Task_entity/onInit.js
deleted file mode 100644
index 0a610862cb..0000000000
--- a/entity/Task_entity/onInit.js
+++ /dev/null
@@ -1,31 +0,0 @@
-import("system.neon");
-import("system.vars");
-import("system.neon");
-import("ActivityTask_lib");
-import("Keyword_lib");
-import("KeywordRegistry_basic");
-
-var recordState = vars.get("$sys.recordstate");
-if(recordState == neon.OPERATINGSTATE_NEW)
-{
-    TaskUtils.addLinkRecords("$param.ObjectId_param", "$param.RowId_param", "$param.PresetLinks_param", "$field.PARENT_CONTEXT", "$field.PARENT_ID");
-}
-else if (recordState != neon.OPERATINGSTATE_SEARCH)
-{
-    var statusFilterElement = {
-        "type":"row",
-        "name":"STATUS",
-        "operator":"NOT_EQUAL",
-        "key":$KeywordRegistry.taskStatus$ended(),
-        "contenttype": "TEXT"
-    };
-    statusFilterElement.value = KeywordUtils.getViewValue($KeywordRegistry.taskStatus(), statusFilterElement.key);
-    
-    var filter = {
-        "type":"group",
-        "operator":"AND",
-        "childs": [statusFilterElement]
-    };
-    filter = JSON.stringify(filter);
-    neon.setFilter("#ENTITY", filter);
-}
\ No newline at end of file
diff --git a/entity/WorkflowDefinition_entity/WorkflowDefinition_entity.aod b/entity/WorkflowDefinition_entity/WorkflowDefinition_entity.aod
index 1cd52f7035..db719f1fd0 100644
--- a/entity/WorkflowDefinition_entity/WorkflowDefinition_entity.aod
+++ b/entity/WorkflowDefinition_entity/WorkflowDefinition_entity.aod
@@ -7,7 +7,6 @@
   <grantCreateProcess>%aditoprj%/entity/WorkflowDefinition_entity/grantCreateProcess.js</grantCreateProcess>
   <grantDelete v="false" />
   <contentTitleProcess>%aditoprj%/entity/WorkflowDefinition_entity/contentTitleProcess.js</contentTitleProcess>
-  <onInit>%aditoprj%/entity/WorkflowDefinition_entity/onInit.js</onInit>
   <iconId>VAADIN:DROP</iconId>
   <titlePlural>Workflow definitions</titlePlural>
   <recordContainer>jdito</recordContainer>
diff --git a/entity/WorkflowDefinition_entity/onInit.js b/entity/WorkflowDefinition_entity/onInit.js
deleted file mode 100644
index 7199fd35b0..0000000000
--- a/entity/WorkflowDefinition_entity/onInit.js
+++ /dev/null
@@ -1,20 +0,0 @@
-import("system.neon");
-import("system.vars");
-import("system.translate");
-
-if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_VIEW && vars.get("$sys.viewmode") == neon.FRAME_VIEWMODE_DATASET)
-{
-    var filterOnlyUnfinished = {
-        type : "group",
-        operator : "AND",
-        childs : [{
-            type : "row",
-            name : "ISFINISHED",
-            operator : "EQUAL",
-            value : translate.text("No"),
-            key : "false",
-            contenttype : "BOOLEAN"
-        }]
-    };
-    neon.setFilter("Instances", JSON.stringify(filterOnlyUnfinished));
-}
\ No newline at end of file
diff --git a/entity/WorkflowInstance_entity/WorkflowInstance_entity.aod b/entity/WorkflowInstance_entity/WorkflowInstance_entity.aod
index 37c5a337ba..765793b9f3 100644
--- a/entity/WorkflowInstance_entity/WorkflowInstance_entity.aod
+++ b/entity/WorkflowInstance_entity/WorkflowInstance_entity.aod
@@ -5,6 +5,7 @@
   <documentation>%aditoprj%/entity/WorkflowInstance_entity/documentation.adoc</documentation>
   <title>Workflow instance</title>
   <contentTitleProcess>%aditoprj%/entity/WorkflowInstance_entity/contentTitleProcess.js</contentTitleProcess>
+  <initFilterProcess>%aditoprj%/entity/WorkflowInstance_entity/initFilterProcess.js</initFilterProcess>
   <titlePlural>Workflow instances</titlePlural>
   <recordContainer>jdito</recordContainer>
   <entityFields>
diff --git a/entity/WorkflowInstance_entity/initFilterProcess.js b/entity/WorkflowInstance_entity/initFilterProcess.js
new file mode 100644
index 0000000000..80a38560e2
--- /dev/null
+++ b/entity/WorkflowInstance_entity/initFilterProcess.js
@@ -0,0 +1,17 @@
+import("system.result");
+import("system.translate");
+
+var filterOnlyUnfinished = {
+    type : "group",
+    operator : "AND",
+    childs : [{
+        type : "row",
+        name : "ISFINISHED",
+        operator : "EQUAL",
+        value : translate.text("No"),
+        key : "false",
+        contenttype : "BOOLEAN"
+    }]
+};
+
+result.string(JSON.stringify(filterOnlyUnfinished));
\ No newline at end of file
-- 
GitLab


From fafa324891ab358bcac7fae1d2b1b29b6e2e1c9d Mon Sep 17 00:00:00 2001
From: "b.ulrich" <b.ulrich@adito.de>
Date: Thu, 30 Jul 2020 15:01:59 +0200
Subject: [PATCH 064/309] =?UTF-8?q?[Projekt:=20Entwicklung=20-=20Neon][Tic?=
 =?UTF-8?q?ketNr.:=201059557]["Untergeordnete=20Eigenschaft=20anlegen"-But?=
 =?UTF-8?q?ton=20f=C3=BCr=20den=20Typ=20"Auswahl"=20nicht=20aktiv]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../attributeactions/children/newchildattribute/stateProcess.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/entity/Attribute_entity/entityfields/attributeactions/children/newchildattribute/stateProcess.js b/entity/Attribute_entity/entityfields/attributeactions/children/newchildattribute/stateProcess.js
index 1d16d29705..89793c57e8 100644
--- a/entity/Attribute_entity/entityfields/attributeactions/children/newchildattribute/stateProcess.js
+++ b/entity/Attribute_entity/entityfields/attributeactions/children/newchildattribute/stateProcess.js
@@ -3,7 +3,7 @@ import("system.result");
 import("system.vars");
 import("system.neon");
 
-if(vars.get("$sys.selection").length == 1 && (vars.get("$field.ATTRIBUTE_TYPE") == $AttributeTypes.GROUP.toString() || vars.get("$field.ATTRIBUTE_TYPE") == $AttributeTypes.OBJECTSELECTION.toString()))
+if(vars.get("$sys.selection").length == 1 && vars.get("$field.ATTRIBUTE_TYPE") != $AttributeTypes.OBJECTSELECTION.toString())
     result.string(neon.COMPONENTSTATE_EDITABLE);
 else
     result.string(neon.COMPONENTSTATE_DISABLED);
\ No newline at end of file
-- 
GitLab


From 1a8444906ebd8830907a5c4df3ed9e954bc1c4eb Mon Sep 17 00:00:00 2001
From: "a.schindlbeck" <a.schindlbeck@adito.de>
Date: Thu, 30 Jul 2020 15:55:46 +0200
Subject: [PATCH 065/309] #1062785 Calendar: Bugfixes recurring appointments

---
 .../Appointment_entity/Appointment_entity.aod |  1 +
 .../entityfields/begin/valueProcess.js        | 10 ++---
 .../entityfields/end/valueProcess.js          | 10 ++---
 .../recordcontainers/jdito/contentProcess.js  | 37 ++++++++++---------
 .../AppointmentPreview_view.aod               |  1 +
 5 files changed, 31 insertions(+), 28 deletions(-)

diff --git a/entity/Appointment_entity/Appointment_entity.aod b/entity/Appointment_entity/Appointment_entity.aod
index 28c70af661..c68158fb33 100644
--- a/entity/Appointment_entity/Appointment_entity.aod
+++ b/entity/Appointment_entity/Appointment_entity.aod
@@ -183,6 +183,7 @@
         <entityParameter>
           <name>AppointmentState_param</name>
           <valueProcess>%aditoprj%/entity/Appointment_entity/entityfields/appointmentlinks/children/appointmentstate_param/valueProcess.js</valueProcess>
+          <expose v="false" />
         </entityParameter>
       </children>
     </entityConsumer>
diff --git a/entity/Appointment_entity/entityfields/begin/valueProcess.js b/entity/Appointment_entity/entityfields/begin/valueProcess.js
index eca54b6382..87e3ad4739 100644
--- a/entity/Appointment_entity/entityfields/begin/valueProcess.js
+++ b/entity/Appointment_entity/entityfields/begin/valueProcess.js
@@ -19,8 +19,8 @@ if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.exists("$para
 /**
  * Sets explicitly the start date when a preset is sent from the core, due to a move or resize event from the user. Do not remove.
  */
-if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT && vars.exists("$param.Entry_param"))
-{
-    var event = JSON.parse(vars.getString("$param.Entry_param"));
-    result.string(event[calendars.DTSTART]);
-}
\ No newline at end of file
+//if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT && vars.exists("$param.Entry_param"))
+//{
+//    var event = JSON.parse(vars.getString("$param.Entry_param"));
+//    result.string(event[calendars.DTSTART]);
+//}
\ No newline at end of file
diff --git a/entity/Appointment_entity/entityfields/end/valueProcess.js b/entity/Appointment_entity/entityfields/end/valueProcess.js
index b953112d2c..818bd4a4c9 100644
--- a/entity/Appointment_entity/entityfields/end/valueProcess.js
+++ b/entity/Appointment_entity/entityfields/end/valueProcess.js
@@ -19,8 +19,8 @@ if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.exists("$para
 /**
  * Sets explicitly the end date when a preset is sent from the core, due to a move or resize event from the user. Do not remove.
  */
-if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT && vars.exists("$param.Entry_param"))
-{
-    var event = JSON.parse(vars.getString("$param.Entry_param"));
-    result.string(event[calendars.DTEND]);
-}
\ No newline at end of file
+//if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT && vars.exists("$param.Entry_param"))
+//{
+//    var event = JSON.parse(vars.getString("$param.Entry_param"));
+//    result.string(event[calendars.DTEND]);
+//}
\ No newline at end of file
diff --git a/entity/Appointment_entity/recordcontainers/jdito/contentProcess.js b/entity/Appointment_entity/recordcontainers/jdito/contentProcess.js
index 7e8972a145..e56415a0fa 100644
--- a/entity/Appointment_entity/recordcontainers/jdito/contentProcess.js
+++ b/entity/Appointment_entity/recordcontainers/jdito/contentProcess.js
@@ -13,7 +13,25 @@ import("system.neon");
 var appointmentSelect = newSelect("APPOINTMENT_ID").from("AB_APPOINTMENTLINK");
 var appointmentUids;
 
-if(vars.get("$sys.recordstate") != neon.OPERATINGSTATE_NEW && vars.get("$local.idvalues") != null && vars.get("$local.idvalues") != "")
+/**
+ * Will be used, if the user is operating the calendar.
+ */
+if(vars.exists("$param.Entry_param") && vars.get("$param.Entry_param"))
+{
+    var entry = JSON.parse(vars.getString("$param.Entry_param"));
+
+    var masterEntry = null;
+    if (vars.exists("$param.MasterEntry_param") && vars.get("$param.MasterEntry_param") != "") {
+        masterEntry = JSON.parse(vars.getString("$param.MasterEntry_param"));
+    }
+
+    //@TODO Icon 
+    result.object([
+        buildEntry(entry, masterEntry)
+    ]);
+}
+
+else if(vars.get("$sys.recordstate") != neon.OPERATINGSTATE_NEW && vars.get("$local.idvalues") != null && vars.get("$local.idvalues") != "")
 {
     var selectedids = vars.get("$local.idvalues");
     result.object([buildEntry(calendars.getEntry(selectedids, null, null), null)]);
@@ -35,23 +53,6 @@ else if(vars.getString("$param.LinkedObjectId_param") != undefined)
     appointmentSelect.whereIfSet("AB_APPOINTMENTLINK.OBJECT_ROWID", "$param.LinkedObjectId_param")
     result.object(buildEntriesFromUids(appointmentSelect.table()));
 }
-/**
- * Will be used, if the user is operating the calendar.
- */
-else if(vars.exists("$param.Entry_param") && vars.get("$param.Entry_param"))
-{
-    var entry = JSON.parse(vars.getString("$param.Entry_param"));
-
-    var masterEntry = null;
-    if (vars.exists("$param.MasterEntry_param") && vars.get("$param.MasterEntry_param") != "") {
-        masterEntry = JSON.parse(vars.getString("$param.MasterEntry_param"));
-    }
-
-    //@TODO Icon 
-    result.object([
-        buildEntry(entry, masterEntry)
-    ]);
-}
 
 function buildEntriesFromUids(appointmentUids)
 {
diff --git a/neonView/AppointmentPreview_view/AppointmentPreview_view.aod b/neonView/AppointmentPreview_view/AppointmentPreview_view.aod
index 23c9de063b..727a644d89 100644
--- a/neonView/AppointmentPreview_view/AppointmentPreview_view.aod
+++ b/neonView/AppointmentPreview_view/AppointmentPreview_view.aod
@@ -27,6 +27,7 @@
       <organizerField>ORGANIZER</organizerField>
       <ownerField>OWNER</ownerField>
       <categoriesField>CATEGORIES</categoriesField>
+      <recurrenceIdField>RECURRENCEID</recurrenceIdField>
       <favoriteActionGroup1>PartStatActionGroup</favoriteActionGroup1>
       <favoriteActionGroup2>seriesActionGroup</favoriteActionGroup2>
       <entityField>#ENTITY</entityField>
-- 
GitLab


From 7de6016e9aa9a26b48579238f34ed9518f3a3dfb Mon Sep 17 00:00:00 2001
From: "b.ulrich" <b.ulrich@adito.de>
Date: Fri, 31 Jul 2020 09:23:35 +0200
Subject: [PATCH 066/309] [Projekt: Entwicklung - Neon][TicketNr.:
 1061849][Anlage von Angebotsposition zieht falschen Preis von Produkt]

---
 process/Product_lib/process.js | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/process/Product_lib/process.js b/process/Product_lib/process.js
index d49860b7ac..c6e9a85c7e 100644
--- a/process/Product_lib/process.js
+++ b/process/Product_lib/process.js
@@ -283,8 +283,21 @@ ProductUtils.getProductDetails = function(pid, priceListFilter, additionalProduc
                 return priceLists[list];
             }
             //customer deposited price list (defined by Attribute)
-            if (priceListFilter.priceList != "" && priceListFilter.priceList == priceLists[list].priceList) {
-                return priceLists[list];
+            if (priceListFilter.priceList != "") {
+                var res;
+                var escape;
+                 // runs trough the possible pricelists to find the one with the correct pricelist ("-type"). 
+                 // e.g: PRICELISTSERVICE, PRICELISTSPECIAL, PRICELISTKEY, PRICELISTDEFAULT
+                for(var index in priceLists)
+                {
+                    
+                    if (!escape && priceLists[index]["priceList"] == priceListFilter.priceList) 
+                    {
+                        res = priceLists[index]; //The first time the condition is true the correct pricelist is found.
+                        escape = true;          // The object is ordered by fromQuantity descending so we have to stop after the condition is true
+                    }
+                }
+                return res;
             }
             //default price list
             if (priceLists[list].priceList == $KeywordRegistry.productPricelist$standardList()) {
-- 
GitLab


From 3aeac02ddf37dbed1d1a7d2c75e3b83db39faf35 Mon Sep 17 00:00:00 2001
From: "b.ulrich" <b.ulrich@adito.de>
Date: Fri, 31 Jul 2020 10:00:08 +0200
Subject: [PATCH 067/309] [Projekt: Entwicklung - Neon][TicketNr.:
 1061075][Beleg - Belegposten bearbeiten]

---
 neonView/OrderitemFilter_view/OrderitemFilter_view.aod | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/neonView/OrderitemFilter_view/OrderitemFilter_view.aod b/neonView/OrderitemFilter_view/OrderitemFilter_view.aod
index e6eaeeb9f9..5879614ec3 100644
--- a/neonView/OrderitemFilter_view/OrderitemFilter_view.aod
+++ b/neonView/OrderitemFilter_view/OrderitemFilter_view.aod
@@ -11,7 +11,7 @@
   <children>
     <tableViewTemplate>
       <name>Orderitems</name>
-      <inlineEdit v="true" />
+      <inlineEdit v="false" />
       <entityField>#ENTITY</entityField>
       <autoNewRow v="true" />
       <columns>
-- 
GitLab


From 2ff9769cac3e4d433acd8abf1d1a540588fe0fd5 Mon Sep 17 00:00:00 2001
From: "b.ulrich" <b.ulrich@adito.de>
Date: Fri, 31 Jul 2020 10:38:04 +0200
Subject: [PATCH 068/309] [Projekt: Entwicklung - Neon][TicketNr.:
 1060915][Schnelleingabe - nur kontaktperson in Schnelleingabe erfasst -
 Erfassung Vertriebsprojekt ist aktiv]

---
 entity/Salesproject_entity/onValidation.js     |  5 ++++-
 .../_____LANGUAGE_EXTRA.aod                    |  9 ++++++---
 language/_____LANGUAGE_de/_____LANGUAGE_de.aod | 18 ++++++------------
 language/_____LANGUAGE_en/_____LANGUAGE_en.aod |  9 +++++++++
 4 files changed, 25 insertions(+), 16 deletions(-)

diff --git a/entity/Salesproject_entity/onValidation.js b/entity/Salesproject_entity/onValidation.js
index e0b1e589a7..c961879681 100644
--- a/entity/Salesproject_entity/onValidation.js
+++ b/entity/Salesproject_entity/onValidation.js
@@ -1,3 +1,4 @@
+import("system.translate");
 import("system.result");
 import("Date_lib");
 import("system.vars");
@@ -6,4 +7,6 @@ var startDate = vars.get("$field.STARTDATE");
 var endDate = vars.get("$field.ENDDATE");
 
 if (!DateUtils.validateBeginnBeforeEnd(startDate, endDate))
-    result.string(DateUtils.getValidationFailString());
\ No newline at end of file
+    result.string(DateUtils.getValidationFailString());
+else if(!vars.get("$field.PROJECTTITLE") && vars.get("$field.PROJECTTYPE") && vars.exists("$param.PresetTitle_param"))
+    result.string(translate.text("The Sales Project can only be filled when a company has been specified"));
\ No newline at end of file
diff --git a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
index 42409fc7a7..d339195f21 100644
--- a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
+++ b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
@@ -6867,10 +6867,13 @@
       <key>download ready</key>
     </entry>
     <entry>
-      <key>Add new Department Permission</key>
+      <key>Total in euros</key>
     </entry>
-     <entry>
-      <key>Add new User Permission</key>
+    <entry>
+      <key>Workflow Model</key>
+    </entry>
+    <entry>
+      <key>The Sales Project can only be filled when a company has been specified</key>
     </entry>
   </keyValueMap>
   <font name="Dialog" style="0" size="11" />
diff --git a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
index 04af5e1dd1..f62aa2329c 100644
--- a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
+++ b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
@@ -8265,6 +8265,10 @@ Bitte Datumseingabe prüfen</value>
       <key>Contactreport</key>
       <value>Kontaktbericht</value>
     </entry>
+    <entry>
+      <key>The Sales Project can only be filled when a company has been specified</key>
+      <value>Das Vertriebsprojekt kann nur ausgefüllt werden, wenn eine Firma angegeben ist</value>
+    </entry>
     <entry>
       <key>Appointment planned</key>
       <value>Termin vereinbart</value>
@@ -8795,20 +8799,10 @@ Bitte Datumseingabe prüfen</value>
       <key>download ready</key>
     </entry>
     <entry>
-      <key>Download letter and create Activity</key>
-      <value>Brief herunterladen und Aktivität erstellen</value>
-    </entry>
-    <entry>
-      <key>Add Participants</key>
-      <value>Teilnehmer hinzufügen</value>
-    </entry>
-    <entry>
-      <key>and open Report</key>
-      <value>und Report öffnen</value>
+      <key>Total in euros</key>
     </entry>
     <entry>
-      <key>Add Recipients</key>
-      <value>Empfänger hinzufügen</value>
+      <key>Workflow Model</key>
     </entry>
   </keyValueMap>
   <font name="Dialog" style="0" size="11" />
diff --git a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
index 831943f96a..dd32b2a7b3 100644
--- a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
+++ b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
@@ -6932,6 +6932,15 @@
     <entry>
       <key>download ready</key>
     </entry>
+    <entry>
+      <key>Total in euros</key>
+    </entry>
+    <entry>
+      <key>Workflow Model</key>
+    </entry>
+    <entry>
+      <key>The Sales Project can only be filled when a company has been specified</key>
+    </entry>
   </keyValueMap>
   <font name="Dialog" style="0" size="11" />
 </language>
-- 
GitLab


From 8b98319a953b28a69db181743802fb52f7950884 Mon Sep 17 00:00:00 2001
From: "b.ulrich" <b.ulrich@adito.de>
Date: Fri, 31 Jul 2020 13:36:38 +0200
Subject: [PATCH 069/309] [Projekt: Entwicklung - Neon][TicketNr.:
 1062048][Kachelansicht in Lookupview]

---
 neonContext/Product/Product.aod               |  6 ++-
 .../ProductLookup_view/ProductLookup_view.aod | 52 +++++++++++++++++++
 .../ProductLookup_view/documentation.adoc     |  3 ++
 3 files changed, 60 insertions(+), 1 deletion(-)
 create mode 100644 neonView/ProductLookup_view/ProductLookup_view.aod
 create mode 100644 neonView/ProductLookup_view/documentation.adoc

diff --git a/neonContext/Product/Product.aod b/neonContext/Product/Product.aod
index 455bfd3421..7d36aaa10f 100644
--- a/neonContext/Product/Product.aod
+++ b/neonContext/Product/Product.aod
@@ -8,7 +8,7 @@
   <filterView>ProductFilter_view</filterView>
   <editView>ProductEdit_view</editView>
   <previewView>ProductPreview_view</previewView>
-  <lookupView>ProductFilter_view</lookupView>
+  <lookupView>ProductLookup_view</lookupView>
   <entity>Product_entity</entity>
   <references>
     <neonViewReference>
@@ -27,5 +27,9 @@
       <name>5580ead4-2257-4cdb-a3ac-5e7067c4c1ab</name>
       <view>ProductPreview_view</view>
     </neonViewReference>
+    <neonViewReference>
+      <name>ec872778-87d1-4070-a3da-3808da326119</name>
+      <view>ProductLookup_view</view>
+    </neonViewReference>
   </references>
 </neonContext>
diff --git a/neonView/ProductLookup_view/ProductLookup_view.aod b/neonView/ProductLookup_view/ProductLookup_view.aod
new file mode 100644
index 0000000000..e038ed3765
--- /dev/null
+++ b/neonView/ProductLookup_view/ProductLookup_view.aod
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.6">
+  <name>ProductLookup_view</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <documentation>%aditoprj%/neonView/ProductLookup_view/documentation.adoc</documentation>
+  <layout>
+    <noneLayout>
+      <name>layout</name>
+    </noneLayout>
+  </layout>
+  <children>
+    <tableViewTemplate>
+      <name>table</name>
+      <titleField>PRODUCTNAME</titleField>
+      <subtitleField>PRODUCTCODE</subtitleField>
+      <entityField>#ENTITY</entityField>
+      <linkedColumns>
+        <element>PRODUCTNAME</element>
+      </linkedColumns>
+      <columns>
+        <neonTableColumn>
+          <name>6d4cafea-bc73-4df1-949e-1aba224780ed</name>
+          <entityField>#IMAGE</entityField>
+        </neonTableColumn>
+        <neonTableColumn>
+          <name>ef5fa8f0-7a72-4201-ad2e-44496490d2b2</name>
+          <entityField>PRODUCTCODE</entityField>
+        </neonTableColumn>
+        <neonTableColumn>
+          <name>35834ce8-cd8b-452f-b558-484d2a3a8f02</name>
+          <entityField>PRODUCTNAME</entityField>
+        </neonTableColumn>
+        <neonTableColumn>
+          <name>f125dbe5-3f46-46dc-b037-4765b115997f</name>
+          <entityField>GROUPCODEID</entityField>
+        </neonTableColumn>
+        <neonTableColumn>
+          <name>40b14795-afcb-4ae5-b5df-cd667a5b8219</name>
+          <entityField>STATUS</entityField>
+        </neonTableColumn>
+        <neonTableColumn>
+          <name>86fce471-6d2e-4066-9bdb-2ed04f940f7d</name>
+          <entityField>CONTACT_ID</entityField>
+        </neonTableColumn>
+        <neonTableColumn>
+          <name>2a2e74e4-dc45-4133-92d6-f2797fc3dcd7</name>
+          <entityField>UNIT</entityField>
+        </neonTableColumn>
+      </columns>
+    </tableViewTemplate>
+  </children>
+</neonView>
diff --git a/neonView/ProductLookup_view/documentation.adoc b/neonView/ProductLookup_view/documentation.adoc
new file mode 100644
index 0000000000..38d4dc8ee1
--- /dev/null
+++ b/neonView/ProductLookup_view/documentation.adoc
@@ -0,0 +1,3 @@
+== ProductLookup_view
+
+Needed, because using the normal filterview as the lookup would result in the tileTemplate being used as the lookup.
\ No newline at end of file
-- 
GitLab


From 7f8f7f066356c550572156181d422e051d5e948c Mon Sep 17 00:00:00 2001
From: "b.ulrich" <b.ulrich@adito.de>
Date: Fri, 31 Jul 2020 14:04:46 +0200
Subject: [PATCH 070/309] [Projekt: Entwicklung - Neon][TicketNr.:
 1053788][Notifications: Buttonlabel inkonsistent zu Statusnamen]

---
 .../AlterButtonLabelTitles.xml                 | 18 ++++++++++++++++++
 .../Data_alias/basic/2020.1.2/changelog.xml    |  2 ++
 language/_____LANGUAGE_de/_____LANGUAGE_de.aod |  4 ++--
 3 files changed, 22 insertions(+), 2 deletions(-)
 create mode 100644 .liquibase/Data_alias/basic/2020.1.2/AlterButtonlabelTitles/AlterButtonLabelTitles.xml

diff --git a/.liquibase/Data_alias/basic/2020.1.2/AlterButtonlabelTitles/AlterButtonLabelTitles.xml b/.liquibase/Data_alias/basic/2020.1.2/AlterButtonlabelTitles/AlterButtonLabelTitles.xml
new file mode 100644
index 0000000000..5bc4d387a4
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2020.1.2/AlterButtonlabelTitles/AlterButtonLabelTitles.xml
@@ -0,0 +1,18 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+                   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+    <changeSet author="b.ulrich" id="853aca63-8234-4dfd-9fc6-2e8b71af82aa">
+        <update tableName="AB_KEYWORD_ENTRY">
+            <column name="TITLE" value="Read"/>
+            <where>AB_KEYWORD_ENTRYID='b5f402a0-29a0-43e9-8db3-454fdbcfc9d1'</where>
+        </update>
+        <update tableName="AB_KEYWORD_ENTRY">
+            <column name="TITLE" value="New"/>
+            <where>AB_KEYWORD_ENTRYID='678f61e5-ef27-4e1c-b52b-0e19188b038d'</where>
+        </update>
+        <update tableName="AB_KEYWORD_ENTRY">
+            <column name="TITLE" value="Archived"/>
+            <where>AB_KEYWORD_ENTRYID='1c40a2de-e6c1-469b-b324-d7089893ca5c'</where>
+        </update>
+    </changeSet>
+</databaseChangeLog>
diff --git a/.liquibase/Data_alias/basic/2020.1.2/changelog.xml b/.liquibase/Data_alias/basic/2020.1.2/changelog.xml
index 8a20273d61..9ca6f43076 100644
--- a/.liquibase/Data_alias/basic/2020.1.2/changelog.xml
+++ b/.liquibase/Data_alias/basic/2020.1.2/changelog.xml
@@ -3,4 +3,6 @@
                    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
     <include file="AlterDatatypeOfKeyColumnsToChar/changelog.xml" relativeToChangelogFile="true"/>
     <include file="AddNullableToDateNew.xml" relativeToChangelogFile="true" />
+    <include file="AddNullableToDateNew.xml" relativeToChangelogFile="true" />
+    <include file="AlterButtonLabelTitles/AlterButtonLabelTitles.xml" relativeToChangelogFile="true" />
 </databaseChangeLog>
diff --git a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
index 04af5e1dd1..b9753f9e56 100644
--- a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
+++ b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
@@ -5062,7 +5062,7 @@
     </entry>
     <entry>
       <key>Read</key>
-      <value>gelesen</value>
+      <value>Gelesen</value>
     </entry>
     <entry>
       <key>Permission Set ID</key>
@@ -6737,7 +6737,7 @@
     </entry>
     <entry>
       <key>archive</key>
-      <value>archivieren</value>
+      <value>Archivieren</value>
     </entry>
     <entry>
       <key>Bangladesh</key>
-- 
GitLab


From bbedb7d13a8f23aaa552c93c88e5056267430461 Mon Sep 17 00:00:00 2001
From: "a.schindlbeck" <a.schindlbeck@adito.de>
Date: Fri, 31 Jul 2020 16:57:50 +0200
Subject: [PATCH 071/309] #1062785 Calendar: Bugfixes recurring appointments

---
 .../Appointment_entity/Appointment_entity.aod |  1 +
 .../entityfields/begin/valueProcess.js        | 10 ++---
 .../entityfields/end/valueProcess.js          | 10 ++---
 .../recordcontainers/jdito/contentProcess.js  | 37 ++++++++++---------
 .../AppointmentPreview_view.aod               |  1 +
 5 files changed, 31 insertions(+), 28 deletions(-)

diff --git a/entity/Appointment_entity/Appointment_entity.aod b/entity/Appointment_entity/Appointment_entity.aod
index 28c70af661..c68158fb33 100644
--- a/entity/Appointment_entity/Appointment_entity.aod
+++ b/entity/Appointment_entity/Appointment_entity.aod
@@ -183,6 +183,7 @@
         <entityParameter>
           <name>AppointmentState_param</name>
           <valueProcess>%aditoprj%/entity/Appointment_entity/entityfields/appointmentlinks/children/appointmentstate_param/valueProcess.js</valueProcess>
+          <expose v="false" />
         </entityParameter>
       </children>
     </entityConsumer>
diff --git a/entity/Appointment_entity/entityfields/begin/valueProcess.js b/entity/Appointment_entity/entityfields/begin/valueProcess.js
index 494b5d528f..87e3ad4739 100644
--- a/entity/Appointment_entity/entityfields/begin/valueProcess.js
+++ b/entity/Appointment_entity/entityfields/begin/valueProcess.js
@@ -19,8 +19,8 @@ if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.exists("$para
 /**
  * Sets explicitly the start date when a preset is sent from the core, due to a move or resize event from the user. Do not remove.
  */
-if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT && vars.exists("$param.Entry_param"))
-{
-    let event = JSON.parse(vars.getString("$param.Entry_param"));
-    result.string(event[calendars.DTSTART]);
-}
\ No newline at end of file
+//if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT && vars.exists("$param.Entry_param"))
+//{
+//    var event = JSON.parse(vars.getString("$param.Entry_param"));
+//    result.string(event[calendars.DTSTART]);
+//}
\ No newline at end of file
diff --git a/entity/Appointment_entity/entityfields/end/valueProcess.js b/entity/Appointment_entity/entityfields/end/valueProcess.js
index 23262e1a86..4f9cd21b8a 100644
--- a/entity/Appointment_entity/entityfields/end/valueProcess.js
+++ b/entity/Appointment_entity/entityfields/end/valueProcess.js
@@ -19,8 +19,8 @@ if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.exists("$para
 /**
  * Sets explicitly the end date when a preset is sent from the core, due to a move or resize event from the user. Do not remove.
  */
-if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT && vars.exists("$param.Entry_param"))
-{
-    let event = JSON.parse(vars.getString("$param.Entry_param"));
-    result.string(event[calendars.DTEND]);
-}
\ No newline at end of file
+//if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT && vars.exists("$param.Entry_param"))
+//{
+//    let event = JSON.parse(vars.getString("$param.Entry_param"));
+//    result.string(event[calendars.DTEND]);
+//}
\ No newline at end of file
diff --git a/entity/Appointment_entity/recordcontainers/jdito/contentProcess.js b/entity/Appointment_entity/recordcontainers/jdito/contentProcess.js
index 7e8972a145..e56415a0fa 100644
--- a/entity/Appointment_entity/recordcontainers/jdito/contentProcess.js
+++ b/entity/Appointment_entity/recordcontainers/jdito/contentProcess.js
@@ -13,7 +13,25 @@ import("system.neon");
 var appointmentSelect = newSelect("APPOINTMENT_ID").from("AB_APPOINTMENTLINK");
 var appointmentUids;
 
-if(vars.get("$sys.recordstate") != neon.OPERATINGSTATE_NEW && vars.get("$local.idvalues") != null && vars.get("$local.idvalues") != "")
+/**
+ * Will be used, if the user is operating the calendar.
+ */
+if(vars.exists("$param.Entry_param") && vars.get("$param.Entry_param"))
+{
+    var entry = JSON.parse(vars.getString("$param.Entry_param"));
+
+    var masterEntry = null;
+    if (vars.exists("$param.MasterEntry_param") && vars.get("$param.MasterEntry_param") != "") {
+        masterEntry = JSON.parse(vars.getString("$param.MasterEntry_param"));
+    }
+
+    //@TODO Icon 
+    result.object([
+        buildEntry(entry, masterEntry)
+    ]);
+}
+
+else if(vars.get("$sys.recordstate") != neon.OPERATINGSTATE_NEW && vars.get("$local.idvalues") != null && vars.get("$local.idvalues") != "")
 {
     var selectedids = vars.get("$local.idvalues");
     result.object([buildEntry(calendars.getEntry(selectedids, null, null), null)]);
@@ -35,23 +53,6 @@ else if(vars.getString("$param.LinkedObjectId_param") != undefined)
     appointmentSelect.whereIfSet("AB_APPOINTMENTLINK.OBJECT_ROWID", "$param.LinkedObjectId_param")
     result.object(buildEntriesFromUids(appointmentSelect.table()));
 }
-/**
- * Will be used, if the user is operating the calendar.
- */
-else if(vars.exists("$param.Entry_param") && vars.get("$param.Entry_param"))
-{
-    var entry = JSON.parse(vars.getString("$param.Entry_param"));
-
-    var masterEntry = null;
-    if (vars.exists("$param.MasterEntry_param") && vars.get("$param.MasterEntry_param") != "") {
-        masterEntry = JSON.parse(vars.getString("$param.MasterEntry_param"));
-    }
-
-    //@TODO Icon 
-    result.object([
-        buildEntry(entry, masterEntry)
-    ]);
-}
 
 function buildEntriesFromUids(appointmentUids)
 {
diff --git a/neonView/AppointmentPreview_view/AppointmentPreview_view.aod b/neonView/AppointmentPreview_view/AppointmentPreview_view.aod
index 23c9de063b..727a644d89 100644
--- a/neonView/AppointmentPreview_view/AppointmentPreview_view.aod
+++ b/neonView/AppointmentPreview_view/AppointmentPreview_view.aod
@@ -27,6 +27,7 @@
       <organizerField>ORGANIZER</organizerField>
       <ownerField>OWNER</ownerField>
       <categoriesField>CATEGORIES</categoriesField>
+      <recurrenceIdField>RECURRENCEID</recurrenceIdField>
       <favoriteActionGroup1>PartStatActionGroup</favoriteActionGroup1>
       <favoriteActionGroup2>seriesActionGroup</favoriteActionGroup2>
       <entityField>#ENTITY</entityField>
-- 
GitLab


From 6aadaf417ae2bd8e62233ef09868441d4b0a58a6 Mon Sep 17 00:00:00 2001
From: "a.schindlbeck" <a.schindlbeck@adito.de>
Date: Fri, 31 Jul 2020 16:57:50 +0200
Subject: [PATCH 072/309] #1062785 Calendar: Bugfixes recurring appointments

---
 .../Appointment_entity/Appointment_entity.aod |  1 +
 .../entityfields/begin/valueProcess.js        | 10 ++---
 .../entityfields/end/valueProcess.js          | 10 ++---
 .../recordcontainers/jdito/contentProcess.js  | 37 ++++++++++---------
 .../AppointmentPreview_view.aod               |  1 +
 5 files changed, 31 insertions(+), 28 deletions(-)

diff --git a/entity/Appointment_entity/Appointment_entity.aod b/entity/Appointment_entity/Appointment_entity.aod
index 28c70af661..c68158fb33 100644
--- a/entity/Appointment_entity/Appointment_entity.aod
+++ b/entity/Appointment_entity/Appointment_entity.aod
@@ -183,6 +183,7 @@
         <entityParameter>
           <name>AppointmentState_param</name>
           <valueProcess>%aditoprj%/entity/Appointment_entity/entityfields/appointmentlinks/children/appointmentstate_param/valueProcess.js</valueProcess>
+          <expose v="false" />
         </entityParameter>
       </children>
     </entityConsumer>
diff --git a/entity/Appointment_entity/entityfields/begin/valueProcess.js b/entity/Appointment_entity/entityfields/begin/valueProcess.js
index 494b5d528f..87e3ad4739 100644
--- a/entity/Appointment_entity/entityfields/begin/valueProcess.js
+++ b/entity/Appointment_entity/entityfields/begin/valueProcess.js
@@ -19,8 +19,8 @@ if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.exists("$para
 /**
  * Sets explicitly the start date when a preset is sent from the core, due to a move or resize event from the user. Do not remove.
  */
-if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT && vars.exists("$param.Entry_param"))
-{
-    let event = JSON.parse(vars.getString("$param.Entry_param"));
-    result.string(event[calendars.DTSTART]);
-}
\ No newline at end of file
+//if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT && vars.exists("$param.Entry_param"))
+//{
+//    var event = JSON.parse(vars.getString("$param.Entry_param"));
+//    result.string(event[calendars.DTSTART]);
+//}
\ No newline at end of file
diff --git a/entity/Appointment_entity/entityfields/end/valueProcess.js b/entity/Appointment_entity/entityfields/end/valueProcess.js
index 23262e1a86..4f9cd21b8a 100644
--- a/entity/Appointment_entity/entityfields/end/valueProcess.js
+++ b/entity/Appointment_entity/entityfields/end/valueProcess.js
@@ -19,8 +19,8 @@ if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.exists("$para
 /**
  * Sets explicitly the end date when a preset is sent from the core, due to a move or resize event from the user. Do not remove.
  */
-if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT && vars.exists("$param.Entry_param"))
-{
-    let event = JSON.parse(vars.getString("$param.Entry_param"));
-    result.string(event[calendars.DTEND]);
-}
\ No newline at end of file
+//if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT && vars.exists("$param.Entry_param"))
+//{
+//    let event = JSON.parse(vars.getString("$param.Entry_param"));
+//    result.string(event[calendars.DTEND]);
+//}
\ No newline at end of file
diff --git a/entity/Appointment_entity/recordcontainers/jdito/contentProcess.js b/entity/Appointment_entity/recordcontainers/jdito/contentProcess.js
index 7e8972a145..e56415a0fa 100644
--- a/entity/Appointment_entity/recordcontainers/jdito/contentProcess.js
+++ b/entity/Appointment_entity/recordcontainers/jdito/contentProcess.js
@@ -13,7 +13,25 @@ import("system.neon");
 var appointmentSelect = newSelect("APPOINTMENT_ID").from("AB_APPOINTMENTLINK");
 var appointmentUids;
 
-if(vars.get("$sys.recordstate") != neon.OPERATINGSTATE_NEW && vars.get("$local.idvalues") != null && vars.get("$local.idvalues") != "")
+/**
+ * Will be used, if the user is operating the calendar.
+ */
+if(vars.exists("$param.Entry_param") && vars.get("$param.Entry_param"))
+{
+    var entry = JSON.parse(vars.getString("$param.Entry_param"));
+
+    var masterEntry = null;
+    if (vars.exists("$param.MasterEntry_param") && vars.get("$param.MasterEntry_param") != "") {
+        masterEntry = JSON.parse(vars.getString("$param.MasterEntry_param"));
+    }
+
+    //@TODO Icon 
+    result.object([
+        buildEntry(entry, masterEntry)
+    ]);
+}
+
+else if(vars.get("$sys.recordstate") != neon.OPERATINGSTATE_NEW && vars.get("$local.idvalues") != null && vars.get("$local.idvalues") != "")
 {
     var selectedids = vars.get("$local.idvalues");
     result.object([buildEntry(calendars.getEntry(selectedids, null, null), null)]);
@@ -35,23 +53,6 @@ else if(vars.getString("$param.LinkedObjectId_param") != undefined)
     appointmentSelect.whereIfSet("AB_APPOINTMENTLINK.OBJECT_ROWID", "$param.LinkedObjectId_param")
     result.object(buildEntriesFromUids(appointmentSelect.table()));
 }
-/**
- * Will be used, if the user is operating the calendar.
- */
-else if(vars.exists("$param.Entry_param") && vars.get("$param.Entry_param"))
-{
-    var entry = JSON.parse(vars.getString("$param.Entry_param"));
-
-    var masterEntry = null;
-    if (vars.exists("$param.MasterEntry_param") && vars.get("$param.MasterEntry_param") != "") {
-        masterEntry = JSON.parse(vars.getString("$param.MasterEntry_param"));
-    }
-
-    //@TODO Icon 
-    result.object([
-        buildEntry(entry, masterEntry)
-    ]);
-}
 
 function buildEntriesFromUids(appointmentUids)
 {
diff --git a/neonView/AppointmentPreview_view/AppointmentPreview_view.aod b/neonView/AppointmentPreview_view/AppointmentPreview_view.aod
index 23c9de063b..727a644d89 100644
--- a/neonView/AppointmentPreview_view/AppointmentPreview_view.aod
+++ b/neonView/AppointmentPreview_view/AppointmentPreview_view.aod
@@ -27,6 +27,7 @@
       <organizerField>ORGANIZER</organizerField>
       <ownerField>OWNER</ownerField>
       <categoriesField>CATEGORIES</categoriesField>
+      <recurrenceIdField>RECURRENCEID</recurrenceIdField>
       <favoriteActionGroup1>PartStatActionGroup</favoriteActionGroup1>
       <favoriteActionGroup2>seriesActionGroup</favoriteActionGroup2>
       <entityField>#ENTITY</entityField>
-- 
GitLab


From c72ea3c692e7872d0b39a950e4ad24c9758328c8 Mon Sep 17 00:00:00 2001
From: "s.pongratz" <s.pongratz@adito.de>
Date: Mon, 3 Aug 2020 11:43:43 +0200
Subject: [PATCH 073/309] #1062047-FehlerBearbeitungMitarbeiter Anzeige der
 E-Mail und Behebung des Fehlers beim Setzen

---
 entity/Employee_entity/entityfields/contact_id/onValueChange.js | 2 +-
 .../entityfields/email_address/dropDownProcess.js               | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/entity/Employee_entity/entityfields/contact_id/onValueChange.js b/entity/Employee_entity/entityfields/contact_id/onValueChange.js
index d469435d5c..4a1dbe67e5 100644
--- a/entity/Employee_entity/entityfields/contact_id/onValueChange.js
+++ b/entity/Employee_entity/entityfields/contact_id/onValueChange.js
@@ -22,7 +22,7 @@ if ((vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW || vars.get("$sys.r
     neon.setFieldValues({
         "$field.FIRSTNAME" : name[0] || "",
         "$field.LASTNAME" : name[1] || "",
-        "$field.EMAIL_ADDRESS" : name[2] || "",
+        "$field.EMAIL_ADDRESS" : name[2] || vars.get("$field.EMAIL_ADDRESS") || "",
         "$field.TITLE" : username
     });
 }
\ No newline at end of file
diff --git a/entity/Employee_entity/entityfields/email_address/dropDownProcess.js b/entity/Employee_entity/entityfields/email_address/dropDownProcess.js
index 99e97c2ddd..559a598b48 100644
--- a/entity/Employee_entity/entityfields/email_address/dropDownProcess.js
+++ b/entity/Employee_entity/entityfields/email_address/dropDownProcess.js
@@ -6,7 +6,7 @@ import("system.result");
 import("Sql_lib");
 
 var contactId = vars.get("$field.CONTACT_ID");
-if (contactId && (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT || vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW))
+if (contactId)
 {
     var addresses = newSelect("ADDR, ADDR")
                 .from("COMMUNICATION")
-- 
GitLab


From 937e2267a49076b0f85cf4fb455e6237f0e40dab Mon Sep 17 00:00:00 2001
From: "b.ulrich" <b.ulrich@adito.de>
Date: Mon, 3 Aug 2020 13:32:46 +0200
Subject: [PATCH 074/309] [Projekt: Entwicklung - Neon][TicketNr.:
 1062818][gleiche Organisation_Id und Contact_Id bei Demo-Firmen]

---
 .../generatedData/ab_attributerelation.xml    | 150 +++++++++---------
 .../_demoData/generatedData/ab_loghistory.xml |  72 ++++-----
 .../generatedData/ab_objectrelation.xml       |  42 ++---
 .../_demoData/generatedData/activitylink.xml  | 118 +++++++-------
 .../generatedData/campaignparticipantlog.xml  |   2 +-
 .../basic/_demoData/generatedData/contact.xml |  88 +++++-----
 .../_demoData/generatedData/dsgvoinfo.xml     |   2 +-
 .../_demoData/generatedData/organisation.xml  |  40 ++---
 .../_demoData/generatedData/tasklink.xml      |   8 +-
 .../_demoData/generatedData/visitplan.xml     |  14 +-
 .liquibase/Data_alias/changelog.xml           |   2 +-
 aliasDefinition/Data_alias/Data_alias.aod     |  92 +++++------
 12 files changed, 315 insertions(+), 315 deletions(-)

diff --git a/.liquibase/Data_alias/basic/_demoData/generatedData/ab_attributerelation.xml b/.liquibase/Data_alias/basic/_demoData/generatedData/ab_attributerelation.xml
index 517d9ed466..1a2d9eafc5 100644
--- a/.liquibase/Data_alias/basic/_demoData/generatedData/ab_attributerelation.xml
+++ b/.liquibase/Data_alias/basic/_demoData/generatedData/ab_attributerelation.xml
@@ -7,7 +7,7 @@
       <column name="AB_ATTRIBUTE_ID" value="3a6e11fc-b00a-4cf3-975a-a5e8b60fc5cb"/>
       <column name="DATE_NEW" valueDate="2019-05-23T08:45:34"/>
       <column name="ID_VALUE" value="DELIVERCIF"/>
-      <column name="OBJECT_ROWID" value="8707accf-b1fd-4bde-97b1-ab44b75f66f9"/>
+      <column name="OBJECT_ROWID" value="13e60843-5d6d-45ee-88c7-46db41874138"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -25,7 +25,7 @@
       <column name="AB_ATTRIBUTE_ID" value="97b449a5-d9b4-42ff-b9b0-4f8b27b8a9ec"/>
       <column name="DATE_NEW" valueDate="2019-05-23T08:45:09"/>
       <column name="ID_VALUE" value="PRICELISTSPECIAL"/>
-      <column name="OBJECT_ROWID" value="019651a4-503e-4e06-aefd-e7e631bf3144"/>
+      <column name="OBJECT_ROWID" value="97b66b3c-a9f5-4dc4-902e-850d69973d1d"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -34,7 +34,7 @@
       <column name="AB_ATTRIBUTE_ID" value="7e9927a4-41e4-426f-bddd-c3e9ee3b093e"/>
       <column name="DATE_NEW" valueDate="2019-05-23T10:54:10"/>
       <column name="ID_VALUE" value="acafca42-8ef4-4c21-abe8-1c2ca358a5aa"/>
-      <column name="OBJECT_ROWID" value="fb07cb0e-c391-4503-9c47-a39ec7388f4f"/>
+      <column name="OBJECT_ROWID" value="692e1f81-9f05-4e22-b74d-56d34c671067"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -43,7 +43,7 @@
       <column name="AB_ATTRIBUTE_ID" value="f11f65d0-4352-4f81-85d0-bfd034275e34"/>
       <column name="DATE_NEW" valueDate="2019-05-23T08:47:54"/>
       <column name="ID_VALUE" value="292825e8-fa96-4b7b-8dab-71955ae14571"/>
-      <column name="OBJECT_ROWID" value="cabf6192-f9c3-4bd4-9366-ad2b073bdfa3"/>
+      <column name="OBJECT_ROWID" value="22f1ca45-e633-4080-9d5c-9a8c2e06d3f9"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -61,7 +61,7 @@
       <column name="AB_ATTRIBUTE_ID" value="71226196-2812-4d70-b90f-c3e2c14fd4d1"/>
       <column name="DATE_NEW" valueDate="2019-05-23T08:51:07"/>
       <column name="ID_VALUE" value="SALPROJWEAKLIQUIDITY"/>
-      <column name="OBJECT_ROWID" value="8eecb5e5-40d9-4bf0-a152-1ca456795563"/>
+      <column name="OBJECT_ROWID" value="a5d107ac-f796-430e-a686-5a132f96650b"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -79,7 +79,7 @@
       <column name="AB_ATTRIBUTE_ID" value="71226196-2812-4d70-b90f-c3e2c14fd4d1"/>
       <column name="DATE_NEW" valueDate="2019-05-23T08:44:08"/>
       <column name="ID_VALUE" value="SALPROJWEAKMARKET"/>
-      <column name="OBJECT_ROWID" value="449080f6-b714-4189-a261-37439d0d4010"/>
+      <column name="OBJECT_ROWID" value="756662b5-f5e4-479c-8d97-abd6a395bd79"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -96,7 +96,7 @@
       <column name="AB_ATTRIBUTE_ID" value="97b449a5-d9b4-42ff-b9b0-4f8b27b8a9ec"/>
       <column name="DATE_NEW" valueDate="2019-05-23T08:49:39"/>
       <column name="ID_VALUE" value="PRICELISTSPECIAL"/>
-      <column name="OBJECT_ROWID" value="fd082db5-be43-4219-a705-588f9c06e59b"/>
+      <column name="OBJECT_ROWID" value="82c7b72d-da4e-4fab-a6cc-31e1be07dd08"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -105,7 +105,7 @@
       <column name="AB_ATTRIBUTE_ID" value="97b449a5-d9b4-42ff-b9b0-4f8b27b8a9ec"/>
       <column name="DATE_NEW" valueDate="2019-05-23T08:52:25"/>
       <column name="ID_VALUE" value="PRICELISTSPECIAL"/>
-      <column name="OBJECT_ROWID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
+      <column name="OBJECT_ROWID" value="06006801-c6a1-4321-9fde-95f9d3f9b786"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -114,7 +114,7 @@
       <column name="AB_ATTRIBUTE_ID" value="292fae38-6557-466d-8843-3b1b4a1f6599"/>
       <column name="DATE_NEW" valueDate="2019-05-23T08:47:46"/>
       <column name="ID_VALUE" value="PAYTERM7"/>
-      <column name="OBJECT_ROWID" value="cabf6192-f9c3-4bd4-9366-ad2b073bdfa3"/>
+      <column name="OBJECT_ROWID" value="22f1ca45-e633-4080-9d5c-9a8c2e06d3f9"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -123,7 +123,7 @@
       <column name="AB_ATTRIBUTE_ID" value="71226196-2812-4d70-b90f-c3e2c14fd4d1"/>
       <column name="DATE_NEW" valueDate="2019-05-23T08:47:37"/>
       <column name="ID_VALUE" value="SALPROJWEAKMARKET"/>
-      <column name="OBJECT_ROWID" value="cabf6192-f9c3-4bd4-9366-ad2b073bdfa3"/>
+      <column name="OBJECT_ROWID" value="22f1ca45-e633-4080-9d5c-9a8c2e06d3f9"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -132,7 +132,7 @@
       <column name="AB_ATTRIBUTE_ID" value="7e9927a4-41e4-426f-bddd-c3e9ee3b093e"/>
       <column name="DATE_NEW" valueDate="2019-11-26T06:21:26"/>
       <column name="ID_VALUE" value="617da3f5-d8bc-45ff-85a1-258621ea2a0b"/>
-      <column name="OBJECT_ROWID" value="a3fd3c23-12e1-4820-b76e-2cd70103d94d"/>
+      <column name="OBJECT_ROWID" value="62175b31-b432-4ec6-932f-8e69033884c6"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -141,7 +141,7 @@
       <column name="AB_ATTRIBUTE_ID" value="7e9927a4-41e4-426f-bddd-c3e9ee3b093e"/>
       <column name="DATE_NEW" valueDate="2019-11-26T06:24:42"/>
       <column name="ID_VALUE" value="9882c4bc-a3d9-43a9-8238-81ef39387869"/>
-      <column name="OBJECT_ROWID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
+      <column name="OBJECT_ROWID" value="06006801-c6a1-4321-9fde-95f9d3f9b786"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -159,7 +159,7 @@
       <column name="AB_ATTRIBUTE_ID" value="7e9927a4-41e4-426f-bddd-c3e9ee3b093e"/>
       <column name="DATE_NEW" valueDate="2019-05-23T08:46:58"/>
       <column name="ID_VALUE" value="26385e16-6b2f-428c-9c28-1bfa9c2ccf6f"/>
-      <column name="OBJECT_ROWID" value="eda61ea6-35ed-4a92-a93c-6118fc67d533"/>
+      <column name="OBJECT_ROWID" value="ea07af40-4918-4ea2-94ad-031d01aeaab4"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -168,7 +168,7 @@
       <column name="AB_ATTRIBUTE_ID" value="e73ed929-8631-46de-b28f-eb1423abb808"/>
       <column name="DATE_NEW" valueDate="2019-05-15T03:21:35"/>
       <column name="ID_VALUE" value="0a6cbbc0-bd0e-4794-96ef-3d458d5fdb70"/>
-      <column name="OBJECT_ROWID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
+      <column name="OBJECT_ROWID" value="2c63e0de-f21c-474f-89d7-bff8ba1dbf43"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -186,7 +186,7 @@
       <column name="AB_ATTRIBUTE_ID" value="7e9927a4-41e4-426f-bddd-c3e9ee3b093e"/>
       <column name="DATE_NEW" valueDate="2019-11-26T06:18:11"/>
       <column name="ID_VALUE" value="acafca42-8ef4-4c21-abe8-1c2ca358a5aa"/>
-      <column name="OBJECT_ROWID" value="019651a4-503e-4e06-aefd-e7e631bf3144"/>
+      <column name="OBJECT_ROWID" value="97b66b3c-a9f5-4dc4-902e-850d69973d1d"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -195,7 +195,7 @@
       <column name="AB_ATTRIBUTE_ID" value="e73ed929-8631-46de-b28f-eb1423abb808"/>
       <column name="DATE_NEW" valueDate="2019-11-26T06:27:34"/>
       <column name="ID_VALUE" value="0a6cbbc0-bd0e-4794-96ef-3d458d5fdb70"/>
-      <column name="OBJECT_ROWID" value="8eecb5e5-40d9-4bf0-a152-1ca456795563"/>
+      <column name="OBJECT_ROWID" value="a5d107ac-f796-430e-a686-5a132f96650b"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -222,7 +222,7 @@
       <column name="AB_ATTRIBUTE_ID" value="e73ed929-8631-46de-b28f-eb1423abb808"/>
       <column name="DATE_NEW" valueDate="2019-11-26T06:27:08"/>
       <column name="ID_VALUE" value="c85a5ebe-80fe-4176-a92a-35d2200baa07"/>
-      <column name="OBJECT_ROWID" value="fc465f2f-803b-4a1f-b79d-7b466d7ecff4"/>
+      <column name="OBJECT_ROWID" value="f7b8f0c3-7702-4466-b502-d21fa4fa0010"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -231,7 +231,7 @@
       <column name="AB_ATTRIBUTE_ID" value="292fae38-6557-466d-8843-3b1b4a1f6599"/>
       <column name="DATE_NEW" valueDate="2019-05-23T08:43:59"/>
       <column name="ID_VALUE" value="PAYTERM30"/>
-      <column name="OBJECT_ROWID" value="449080f6-b714-4189-a261-37439d0d4010"/>
+      <column name="OBJECT_ROWID" value="756662b5-f5e4-479c-8d97-abd6a395bd79"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -240,7 +240,7 @@
       <column name="AB_ATTRIBUTE_ID" value="7e9927a4-41e4-426f-bddd-c3e9ee3b093e"/>
       <column name="DATE_NEW" valueDate="2019-05-15T03:28:49"/>
       <column name="ID_VALUE" value="617da3f5-d8bc-45ff-85a1-258621ea2a0b"/>
-      <column name="OBJECT_ROWID" value="6efb4fab-64f9-4d8e-aa6f-a158d13fc273"/>
+      <column name="OBJECT_ROWID" value="6a92df58-2b98-40da-ba6a-d0ddb1fde234"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -249,7 +249,7 @@
       <column name="AB_ATTRIBUTE_ID" value="7e9927a4-41e4-426f-bddd-c3e9ee3b093e"/>
       <column name="DATE_NEW" valueDate="2019-11-26T06:19:47"/>
       <column name="ID_VALUE" value="79378933-9f74-4391-b876-4528b582661f"/>
-      <column name="OBJECT_ROWID" value="e450d126-eab8-4517-ba7c-8b6804f8c859"/>
+      <column name="OBJECT_ROWID" value="09281be8-8cb5-4201-9758-8c86b3d2bb85"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -258,7 +258,7 @@
       <column name="AB_ATTRIBUTE_ID" value="7e9927a4-41e4-426f-bddd-c3e9ee3b093e"/>
       <column name="DATE_NEW" valueDate="2019-11-26T06:22:05"/>
       <column name="ID_VALUE" value="9882c4bc-a3d9-43a9-8238-81ef39387869"/>
-      <column name="OBJECT_ROWID" value="e83c45e0-c30b-436e-b445-00a8b58383b0"/>
+      <column name="OBJECT_ROWID" value="03e09527-21cc-489a-b37f-0dd7df553c20"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -267,7 +267,7 @@
       <column name="AB_ATTRIBUTE_ID" value="e73ed929-8631-46de-b28f-eb1423abb808"/>
       <column name="DATE_NEW" valueDate="2019-11-26T06:26:46"/>
       <column name="ID_VALUE" value="c85a5ebe-80fe-4176-a92a-35d2200baa07"/>
-      <column name="OBJECT_ROWID" value="2c14fb05-d48e-4eeb-8a7f-85d423746848"/>
+      <column name="OBJECT_ROWID" value="8f4f43e0-669b-4e1f-b050-42193f8d2998"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -276,7 +276,7 @@
       <column name="AB_ATTRIBUTE_ID" value="e73ed929-8631-46de-b28f-eb1423abb808"/>
       <column name="DATE_NEW" valueDate="2019-11-26T06:17:34"/>
       <column name="ID_VALUE" value="0a6cbbc0-bd0e-4794-96ef-3d458d5fdb70"/>
-      <column name="OBJECT_ROWID" value="449080f6-b714-4189-a261-37439d0d4010"/>
+      <column name="OBJECT_ROWID" value="756662b5-f5e4-479c-8d97-abd6a395bd79"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -303,7 +303,7 @@
       <column name="AB_ATTRIBUTE_ID" value="e73ed929-8631-46de-b28f-eb1423abb808"/>
       <column name="DATE_NEW" valueDate="2019-05-23T08:51:53"/>
       <column name="ID_VALUE" value="0a6cbbc0-bd0e-4794-96ef-3d458d5fdb70"/>
-      <column name="OBJECT_ROWID" value="5a52304e-65e8-40ed-9aca-a76af6c8c3a0"/>
+      <column name="OBJECT_ROWID" value="b043cd42-058c-48bd-8326-4c92e0e74c48"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -330,7 +330,7 @@
       <column name="AB_ATTRIBUTE_ID" value="c7d28377-8cb1-4f92-a9ac-ed08041a782b"/>
       <column name="DATE_NEW" valueDate="2019-05-23T08:51:44"/>
       <column name="ID_VALUE" value="1d30d0ab-6103-4972-84c0-fd23eef15ca1"/>
-      <column name="OBJECT_ROWID" value="5a52304e-65e8-40ed-9aca-a76af6c8c3a0"/>
+      <column name="OBJECT_ROWID" value="b043cd42-058c-48bd-8326-4c92e0e74c48"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -348,7 +348,7 @@
       <column name="AB_ATTRIBUTE_ID" value="558419b2-6113-4060-b88d-cc6324754765"/>
       <column name="DATE_NEW" valueDate="2019-05-23T08:47:08"/>
       <column name="ID_VALUE" value="SALPROJSTPRICEPOL"/>
-      <column name="OBJECT_ROWID" value="eda61ea6-35ed-4a92-a93c-6118fc67d533"/>
+      <column name="OBJECT_ROWID" value="ea07af40-4918-4ea2-94ad-031d01aeaab4"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -357,7 +357,7 @@
       <column name="AB_ATTRIBUTE_ID" value="7e9927a4-41e4-426f-bddd-c3e9ee3b093e"/>
       <column name="DATE_NEW" valueDate="2019-11-26T06:27:34"/>
       <column name="ID_VALUE" value="79378933-9f74-4391-b876-4528b582661f"/>
-      <column name="OBJECT_ROWID" value="8eecb5e5-40d9-4bf0-a152-1ca456795563"/>
+      <column name="OBJECT_ROWID" value="a5d107ac-f796-430e-a686-5a132f96650b"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -366,7 +366,7 @@
       <column name="AB_ATTRIBUTE_ID" value="97b449a5-d9b4-42ff-b9b0-4f8b27b8a9ec"/>
       <column name="DATE_NEW" valueDate="2019-05-23T08:48:46"/>
       <column name="ID_VALUE" value="PRICELISTDEFAULT"/>
-      <column name="OBJECT_ROWID" value="e83c45e0-c30b-436e-b445-00a8b58383b0"/>
+      <column name="OBJECT_ROWID" value="03e09527-21cc-489a-b37f-0dd7df553c20"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -375,7 +375,7 @@
       <column name="AB_ATTRIBUTE_ID" value="e73ed929-8631-46de-b28f-eb1423abb808"/>
       <column name="DATE_NEW" valueDate="2019-11-26T06:19:47"/>
       <column name="ID_VALUE" value="0a6cbbc0-bd0e-4794-96ef-3d458d5fdb70"/>
-      <column name="OBJECT_ROWID" value="e450d126-eab8-4517-ba7c-8b6804f8c859"/>
+      <column name="OBJECT_ROWID" value="09281be8-8cb5-4201-9758-8c86b3d2bb85"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -393,7 +393,7 @@
       <column name="AB_ATTRIBUTE_ID" value="e73ed929-8631-46de-b28f-eb1423abb808"/>
       <column name="DATE_NEW" valueDate="2019-11-26T06:25:55"/>
       <column name="ID_VALUE" value="0a6cbbc0-bd0e-4794-96ef-3d458d5fdb70"/>
-      <column name="OBJECT_ROWID" value="fd082db5-be43-4219-a705-588f9c06e59b"/>
+      <column name="OBJECT_ROWID" value="82c7b72d-da4e-4fab-a6cc-31e1be07dd08"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -402,7 +402,7 @@
       <column name="AB_ATTRIBUTE_ID" value="292fae38-6557-466d-8843-3b1b4a1f6599"/>
       <column name="DATE_NEW" valueDate="2019-05-23T08:49:10"/>
       <column name="ID_VALUE" value="PAYTERMDISCOUNT"/>
-      <column name="OBJECT_ROWID" value="e6da1393-f46b-41a4-826b-2c7d22de2246"/>
+      <column name="OBJECT_ROWID" value="d3707591-5620-49a8-a63f-19e88ca7a21c"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -411,7 +411,7 @@
       <column name="AB_ATTRIBUTE_ID" value="7e9927a4-41e4-426f-bddd-c3e9ee3b093e"/>
       <column name="DATE_NEW" valueDate="2019-11-26T06:25:55"/>
       <column name="ID_VALUE" value="617da3f5-d8bc-45ff-85a1-258621ea2a0b"/>
-      <column name="OBJECT_ROWID" value="fd082db5-be43-4219-a705-588f9c06e59b"/>
+      <column name="OBJECT_ROWID" value="82c7b72d-da4e-4fab-a6cc-31e1be07dd08"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -420,7 +420,7 @@
       <column name="AB_ATTRIBUTE_ID" value="8af37871-d407-4414-98ad-e64dbaa5794a"/>
       <column name="DATE_NEW" valueDate="2019-05-15T03:41:53"/>
       <column name="ID_VALUE" value="SALPROJPOLLOW"/>
-      <column name="OBJECT_ROWID" value="fc465f2f-803b-4a1f-b79d-7b466d7ecff4"/>
+      <column name="OBJECT_ROWID" value="f7b8f0c3-7702-4466-b502-d21fa4fa0010"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -429,7 +429,7 @@
       <column name="AB_ATTRIBUTE_ID" value="292fae38-6557-466d-8843-3b1b4a1f6599"/>
       <column name="DATE_NEW" valueDate="2019-05-15T03:41:53"/>
       <column name="ID_VALUE" value="PAYTERM30"/>
-      <column name="OBJECT_ROWID" value="fc465f2f-803b-4a1f-b79d-7b466d7ecff4"/>
+      <column name="OBJECT_ROWID" value="f7b8f0c3-7702-4466-b502-d21fa4fa0010"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -438,7 +438,7 @@
       <column name="AB_ATTRIBUTE_ID" value="8af37871-d407-4414-98ad-e64dbaa5794a"/>
       <column name="DATE_NEW" valueDate="2019-05-15T03:28:49"/>
       <column name="ID_VALUE" value="SALPROJPOLLOW"/>
-      <column name="OBJECT_ROWID" value="6efb4fab-64f9-4d8e-aa6f-a158d13fc273"/>
+      <column name="OBJECT_ROWID" value="6a92df58-2b98-40da-ba6a-d0ddb1fde234"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -447,7 +447,7 @@
       <column name="AB_ATTRIBUTE_ID" value="e73ed929-8631-46de-b28f-eb1423abb808"/>
       <column name="DATE_NEW" valueDate="2019-05-15T03:28:49"/>
       <column name="ID_VALUE" value="0a6cbbc0-bd0e-4794-96ef-3d458d5fdb70"/>
-      <column name="OBJECT_ROWID" value="6efb4fab-64f9-4d8e-aa6f-a158d13fc273"/>
+      <column name="OBJECT_ROWID" value="6a92df58-2b98-40da-ba6a-d0ddb1fde234"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -456,7 +456,7 @@
       <column name="AB_ATTRIBUTE_ID" value="8af37871-d407-4414-98ad-e64dbaa5794a"/>
       <column name="DATE_NEW" valueDate="2019-05-23T08:44:47"/>
       <column name="ID_VALUE" value="SALPROJPOLABO"/>
-      <column name="OBJECT_ROWID" value="019651a4-503e-4e06-aefd-e7e631bf3144"/>
+      <column name="OBJECT_ROWID" value="97b66b3c-a9f5-4dc4-902e-850d69973d1d"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -474,7 +474,7 @@
       <column name="AB_ATTRIBUTE_ID" value="8af37871-d407-4414-98ad-e64dbaa5794a"/>
       <column name="DATE_NEW" valueDate="2019-05-23T08:52:18"/>
       <column name="ID_VALUE" value="SALPROJPOLABO"/>
-      <column name="OBJECT_ROWID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
+      <column name="OBJECT_ROWID" value="06006801-c6a1-4321-9fde-95f9d3f9b786"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -483,7 +483,7 @@
       <column name="AB_ATTRIBUTE_ID" value="e73ed929-8631-46de-b28f-eb1423abb808"/>
       <column name="DATE_NEW" valueDate="2019-11-26T06:20:55"/>
       <column name="ID_VALUE" value="0a6cbbc0-bd0e-4794-96ef-3d458d5fdb70"/>
-      <column name="OBJECT_ROWID" value="cabf6192-f9c3-4bd4-9366-ad2b073bdfa3"/>
+      <column name="OBJECT_ROWID" value="22f1ca45-e633-4080-9d5c-9a8c2e06d3f9"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -501,7 +501,7 @@
       <column name="AB_ATTRIBUTE_ID" value="e73ed929-8631-46de-b28f-eb1423abb808"/>
       <column name="DATE_NEW" valueDate="2019-05-23T10:56:16"/>
       <column name="ID_VALUE" value="c85a5ebe-80fe-4176-a92a-35d2200baa07"/>
-      <column name="OBJECT_ROWID" value="777246d5-7a73-4c52-af14-84df66128e5d"/>
+      <column name="OBJECT_ROWID" value="aed65442-06aa-4cdc-b924-1d9728b444d3"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -510,7 +510,7 @@
       <column name="AB_ATTRIBUTE_ID" value="c7d28377-8cb1-4f92-a9ac-ed08041a782b"/>
       <column name="DATE_NEW" valueDate="2019-05-15T03:21:35"/>
       <column name="ID_VALUE" value="17746b46-2702-447a-b749-a92bfdf4bb38"/>
-      <column name="OBJECT_ROWID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
+      <column name="OBJECT_ROWID" value="2c63e0de-f21c-474f-89d7-bff8ba1dbf43"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -546,7 +546,7 @@
       <column name="AB_ATTRIBUTE_ID" value="c7d28377-8cb1-4f92-a9ac-ed08041a782b"/>
       <column name="DATE_NEW" valueDate="2019-05-17T10:36:47"/>
       <column name="ID_VALUE" value="1d30d0ab-6103-4972-84c0-fd23eef15ca1"/>
-      <column name="OBJECT_ROWID" value="449080f6-b714-4189-a261-37439d0d4010"/>
+      <column name="OBJECT_ROWID" value="756662b5-f5e4-479c-8d97-abd6a395bd79"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -555,7 +555,7 @@
       <column name="AB_ATTRIBUTE_ID" value="558419b2-6113-4060-b88d-cc6324754765"/>
       <column name="DATE_NEW" valueDate="2019-05-23T08:46:41"/>
       <column name="ID_VALUE" value="SALPROJSTPERSAPP"/>
-      <column name="OBJECT_ROWID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
+      <column name="OBJECT_ROWID" value="2c63e0de-f21c-474f-89d7-bff8ba1dbf43"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -573,7 +573,7 @@
       <column name="AB_ATTRIBUTE_ID" value="c7d28377-8cb1-4f92-a9ac-ed08041a782b"/>
       <column name="DATE_NEW" valueDate="2019-05-23T08:50:03"/>
       <column name="ID_VALUE" value="e4a60941-513f-4e75-a787-f00070ecb00a"/>
-      <column name="OBJECT_ROWID" value="2c14fb05-d48e-4eeb-8a7f-85d423746848"/>
+      <column name="OBJECT_ROWID" value="8f4f43e0-669b-4e1f-b050-42193f8d2998"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -582,7 +582,7 @@
       <column name="AB_ATTRIBUTE_ID" value="7e9927a4-41e4-426f-bddd-c3e9ee3b093e"/>
       <column name="DATE_NEW" valueDate="2019-11-26T06:26:46"/>
       <column name="ID_VALUE" value="79378933-9f74-4391-b876-4528b582661f"/>
-      <column name="OBJECT_ROWID" value="2c14fb05-d48e-4eeb-8a7f-85d423746848"/>
+      <column name="OBJECT_ROWID" value="8f4f43e0-669b-4e1f-b050-42193f8d2998"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -591,7 +591,7 @@
       <column name="AB_ATTRIBUTE_ID" value="71226196-2812-4d70-b90f-c3e2c14fd4d1"/>
       <column name="DATE_NEW" valueDate="2019-05-23T08:48:40"/>
       <column name="ID_VALUE" value="SALPROJWEAKMARKET"/>
-      <column name="OBJECT_ROWID" value="e83c45e0-c30b-436e-b445-00a8b58383b0"/>
+      <column name="OBJECT_ROWID" value="03e09527-21cc-489a-b37f-0dd7df553c20"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -609,7 +609,7 @@
       <column name="AB_ATTRIBUTE_ID" value="7e9927a4-41e4-426f-bddd-c3e9ee3b093e"/>
       <column name="DATE_NEW" valueDate="2019-11-26T06:20:55"/>
       <column name="ID_VALUE" value="bb0c6356-33be-4e7c-a409-9ef5145f7aae"/>
-      <column name="OBJECT_ROWID" value="cabf6192-f9c3-4bd4-9366-ad2b073bdfa3"/>
+      <column name="OBJECT_ROWID" value="22f1ca45-e633-4080-9d5c-9a8c2e06d3f9"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -618,7 +618,7 @@
       <column name="AB_ATTRIBUTE_ID" value="3a6e11fc-b00a-4cf3-975a-a5e8b60fc5cb"/>
       <column name="DATE_NEW" valueDate="2019-05-23T08:51:25"/>
       <column name="ID_VALUE" value="DELIVEREX"/>
-      <column name="OBJECT_ROWID" value="6efb4fab-64f9-4d8e-aa6f-a158d13fc273"/>
+      <column name="OBJECT_ROWID" value="6a92df58-2b98-40da-ba6a-d0ddb1fde234"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -627,7 +627,7 @@
       <column name="AB_ATTRIBUTE_ID" value="7e9927a4-41e4-426f-bddd-c3e9ee3b093e"/>
       <column name="DATE_NEW" valueDate="2019-05-17T10:01:27"/>
       <column name="ID_VALUE" value="79378933-9f74-4391-b876-4528b582661f"/>
-      <column name="OBJECT_ROWID" value="8707accf-b1fd-4bde-97b1-ab44b75f66f9"/>
+      <column name="OBJECT_ROWID" value="13e60843-5d6d-45ee-88c7-46db41874138"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -645,7 +645,7 @@
       <column name="AB_ATTRIBUTE_ID" value="558419b2-6113-4060-b88d-cc6324754765"/>
       <column name="DATE_NEW" valueDate="2019-05-23T08:49:54"/>
       <column name="ID_VALUE" value="SALPROJSTPERSAPP"/>
-      <column name="OBJECT_ROWID" value="2c14fb05-d48e-4eeb-8a7f-85d423746848"/>
+      <column name="OBJECT_ROWID" value="8f4f43e0-669b-4e1f-b050-42193f8d2998"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -663,7 +663,7 @@
       <column name="AB_ATTRIBUTE_ID" value="e73ed929-8631-46de-b28f-eb1423abb808"/>
       <column name="DATE_NEW" valueDate="2019-05-23T08:40:12"/>
       <column name="ID_VALUE" value="0a6cbbc0-bd0e-4794-96ef-3d458d5fdb70"/>
-      <column name="OBJECT_ROWID" value="33ae2997-7bff-4c3c-8038-2fa6781dbe9d"/>
+      <column name="OBJECT_ROWID" value="bd92680c-fb4b-4f9b-b434-da4fcee5b079"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -672,7 +672,7 @@
       <column name="AB_ATTRIBUTE_ID" value="7e9927a4-41e4-426f-bddd-c3e9ee3b093e"/>
       <column name="DATE_NEW" valueDate="2019-11-26T06:17:34"/>
       <column name="ID_VALUE" value="9882c4bc-a3d9-43a9-8238-81ef39387869"/>
-      <column name="OBJECT_ROWID" value="449080f6-b714-4189-a261-37439d0d4010"/>
+      <column name="OBJECT_ROWID" value="756662b5-f5e4-479c-8d97-abd6a395bd79"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -681,7 +681,7 @@
       <column name="AB_ATTRIBUTE_ID" value="7e9927a4-41e4-426f-bddd-c3e9ee3b093e"/>
       <column name="DATE_NEW" valueDate="2019-05-23T08:40:12"/>
       <column name="ID_VALUE" value="9882c4bc-a3d9-43a9-8238-81ef39387869"/>
-      <column name="OBJECT_ROWID" value="33ae2997-7bff-4c3c-8038-2fa6781dbe9d"/>
+      <column name="OBJECT_ROWID" value="bd92680c-fb4b-4f9b-b434-da4fcee5b079"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -690,7 +690,7 @@
       <column name="AB_ATTRIBUTE_ID" value="f11f65d0-4352-4f81-85d0-bfd034275e34"/>
       <column name="DATE_NEW" valueDate="2019-05-23T08:45:25"/>
       <column name="ID_VALUE" value="e7e05c6e-6108-44bd-824a-c076dfa5ae93"/>
-      <column name="OBJECT_ROWID" value="8707accf-b1fd-4bde-97b1-ab44b75f66f9"/>
+      <column name="OBJECT_ROWID" value="13e60843-5d6d-45ee-88c7-46db41874138"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -699,7 +699,7 @@
       <column name="AB_ATTRIBUTE_ID" value="c7d28377-8cb1-4f92-a9ac-ed08041a782b"/>
       <column name="DATE_NEW" valueDate="2019-05-23T08:46:05"/>
       <column name="ID_VALUE" value="e4a60941-513f-4e75-a787-f00070ecb00a"/>
-      <column name="OBJECT_ROWID" value="e450d126-eab8-4517-ba7c-8b6804f8c859"/>
+      <column name="OBJECT_ROWID" value="09281be8-8cb5-4201-9758-8c86b3d2bb85"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -708,7 +708,7 @@
       <column name="AB_ATTRIBUTE_ID" value="c7d28377-8cb1-4f92-a9ac-ed08041a782b"/>
       <column name="DATE_NEW" valueDate="2019-05-23T08:50:59"/>
       <column name="ID_VALUE" value="1d30d0ab-6103-4972-84c0-fd23eef15ca1"/>
-      <column name="OBJECT_ROWID" value="8eecb5e5-40d9-4bf0-a152-1ca456795563"/>
+      <column name="OBJECT_ROWID" value="a5d107ac-f796-430e-a686-5a132f96650b"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -717,7 +717,7 @@
       <column name="AB_ATTRIBUTE_ID" value="e73ed929-8631-46de-b28f-eb1423abb808"/>
       <column name="DATE_NEW" valueDate="2019-11-26T06:18:12"/>
       <column name="ID_VALUE" value="c85a5ebe-80fe-4176-a92a-35d2200baa07"/>
-      <column name="OBJECT_ROWID" value="019651a4-503e-4e06-aefd-e7e631bf3144"/>
+      <column name="OBJECT_ROWID" value="97b66b3c-a9f5-4dc4-902e-850d69973d1d"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -726,7 +726,7 @@
       <column name="AB_ATTRIBUTE_ID" value="292fae38-6557-466d-8843-3b1b4a1f6599"/>
       <column name="DATE_NEW" valueDate="2019-05-23T08:46:30"/>
       <column name="ID_VALUE" value="PAYTERM30"/>
-      <column name="OBJECT_ROWID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
+      <column name="OBJECT_ROWID" value="2c63e0de-f21c-474f-89d7-bff8ba1dbf43"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -735,7 +735,7 @@
       <column name="AB_ATTRIBUTE_ID" value="e73ed929-8631-46de-b28f-eb1423abb808"/>
       <column name="DATE_NEW" valueDate="2019-05-17T10:01:27"/>
       <column name="ID_VALUE" value="0a6cbbc0-bd0e-4794-96ef-3d458d5fdb70"/>
-      <column name="OBJECT_ROWID" value="8707accf-b1fd-4bde-97b1-ab44b75f66f9"/>
+      <column name="OBJECT_ROWID" value="13e60843-5d6d-45ee-88c7-46db41874138"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -744,7 +744,7 @@
       <column name="AB_ATTRIBUTE_ID" value="7e9927a4-41e4-426f-bddd-c3e9ee3b093e"/>
       <column name="DATE_NEW" valueDate="2019-05-15T03:21:35"/>
       <column name="ID_VALUE" value="9882c4bc-a3d9-43a9-8238-81ef39387869"/>
-      <column name="OBJECT_ROWID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
+      <column name="OBJECT_ROWID" value="2c63e0de-f21c-474f-89d7-bff8ba1dbf43"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -762,7 +762,7 @@
       <column name="AB_ATTRIBUTE_ID" value="e73ed929-8631-46de-b28f-eb1423abb808"/>
       <column name="DATE_NEW" valueDate="2019-05-23T10:54:10"/>
       <column name="ID_VALUE" value="0a6cbbc0-bd0e-4794-96ef-3d458d5fdb70"/>
-      <column name="OBJECT_ROWID" value="fb07cb0e-c391-4503-9c47-a39ec7388f4f"/>
+      <column name="OBJECT_ROWID" value="692e1f81-9f05-4e22-b74d-56d34c671067"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -771,7 +771,7 @@
       <column name="AB_ATTRIBUTE_ID" value="7e9927a4-41e4-426f-bddd-c3e9ee3b093e"/>
       <column name="DATE_NEW" valueDate="2019-11-26T06:28:14"/>
       <column name="ID_VALUE" value="79378933-9f74-4391-b876-4528b582661f"/>
-      <column name="OBJECT_ROWID" value="5a52304e-65e8-40ed-9aca-a76af6c8c3a0"/>
+      <column name="OBJECT_ROWID" value="b043cd42-058c-48bd-8326-4c92e0e74c48"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -780,7 +780,7 @@
       <column name="AB_ATTRIBUTE_ID" value="e73ed929-8631-46de-b28f-eb1423abb808"/>
       <column name="DATE_NEW" valueDate="2019-11-26T06:25:12"/>
       <column name="ID_VALUE" value="0a6cbbc0-bd0e-4794-96ef-3d458d5fdb70"/>
-      <column name="OBJECT_ROWID" value="e6da1393-f46b-41a4-826b-2c7d22de2246"/>
+      <column name="OBJECT_ROWID" value="d3707591-5620-49a8-a63f-19e88ca7a21c"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -789,7 +789,7 @@
       <column name="AB_ATTRIBUTE_ID" value="e73ed929-8631-46de-b28f-eb1423abb808"/>
       <column name="DATE_NEW" valueDate="2019-11-26T06:24:42"/>
       <column name="ID_VALUE" value="0a6cbbc0-bd0e-4794-96ef-3d458d5fdb70"/>
-      <column name="OBJECT_ROWID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
+      <column name="OBJECT_ROWID" value="06006801-c6a1-4321-9fde-95f9d3f9b786"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -798,7 +798,7 @@
       <column name="AB_ATTRIBUTE_ID" value="71226196-2812-4d70-b90f-c3e2c14fd4d1"/>
       <column name="DATE_NEW" valueDate="2019-05-23T08:44:55"/>
       <column name="ID_VALUE" value="SALPROJWEAKMARKET"/>
-      <column name="OBJECT_ROWID" value="019651a4-503e-4e06-aefd-e7e631bf3144"/>
+      <column name="OBJECT_ROWID" value="97b66b3c-a9f5-4dc4-902e-850d69973d1d"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -807,7 +807,7 @@
       <column name="AB_ATTRIBUTE_ID" value="7e9927a4-41e4-426f-bddd-c3e9ee3b093e"/>
       <column name="DATE_NEW" valueDate="2019-11-26T06:25:12"/>
       <column name="ID_VALUE" value="9882c4bc-a3d9-43a9-8238-81ef39387869"/>
-      <column name="OBJECT_ROWID" value="e6da1393-f46b-41a4-826b-2c7d22de2246"/>
+      <column name="OBJECT_ROWID" value="d3707591-5620-49a8-a63f-19e88ca7a21c"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -816,7 +816,7 @@
       <column name="AB_ATTRIBUTE_ID" value="e73ed929-8631-46de-b28f-eb1423abb808"/>
       <column name="DATE_NEW" valueDate="2019-11-26T06:22:05"/>
       <column name="ID_VALUE" value="0a6cbbc0-bd0e-4794-96ef-3d458d5fdb70"/>
-      <column name="OBJECT_ROWID" value="e83c45e0-c30b-436e-b445-00a8b58383b0"/>
+      <column name="OBJECT_ROWID" value="03e09527-21cc-489a-b37f-0dd7df553c20"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -825,7 +825,7 @@
       <column name="AB_ATTRIBUTE_ID" value="8af37871-d407-4414-98ad-e64dbaa5794a"/>
       <column name="DATE_NEW" valueDate="2019-05-23T08:49:31"/>
       <column name="ID_VALUE" value="SALPROJPOLLOW"/>
-      <column name="OBJECT_ROWID" value="fd082db5-be43-4219-a705-588f9c06e59b"/>
+      <column name="OBJECT_ROWID" value="82c7b72d-da4e-4fab-a6cc-31e1be07dd08"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -843,7 +843,7 @@
       <column name="AB_ATTRIBUTE_ID" value="e73ed929-8631-46de-b28f-eb1423abb808"/>
       <column name="DATE_NEW" valueDate="2019-11-26T06:20:19"/>
       <column name="ID_VALUE" value="0a6cbbc0-bd0e-4794-96ef-3d458d5fdb70"/>
-      <column name="OBJECT_ROWID" value="eda61ea6-35ed-4a92-a93c-6118fc67d533"/>
+      <column name="OBJECT_ROWID" value="ea07af40-4918-4ea2-94ad-031d01aeaab4"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -852,7 +852,7 @@
       <column name="AB_ATTRIBUTE_ID" value="7e9927a4-41e4-426f-bddd-c3e9ee3b093e"/>
       <column name="DATE_NEW" valueDate="2019-05-23T10:56:16"/>
       <column name="ID_VALUE" value="79378933-9f74-4391-b876-4528b582661f"/>
-      <column name="OBJECT_ROWID" value="777246d5-7a73-4c52-af14-84df66128e5d"/>
+      <column name="OBJECT_ROWID" value="aed65442-06aa-4cdc-b924-1d9728b444d3"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -861,7 +861,7 @@
       <column name="AB_ATTRIBUTE_ID" value="558419b2-6113-4060-b88d-cc6324754765"/>
       <column name="DATE_NEW" valueDate="2019-05-23T08:40:12"/>
       <column name="ID_VALUE" value="SALPROJSTPRICEPOL"/>
-      <column name="OBJECT_ROWID" value="33ae2997-7bff-4c3c-8038-2fa6781dbe9d"/>
+      <column name="OBJECT_ROWID" value="bd92680c-fb4b-4f9b-b434-da4fcee5b079"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -870,7 +870,7 @@
       <column name="AB_ATTRIBUTE_ID" value="8af37871-d407-4414-98ad-e64dbaa5794a"/>
       <column name="DATE_NEW" valueDate="2019-05-23T08:49:02"/>
       <column name="ID_VALUE" value="SALPROJPOLLOW"/>
-      <column name="OBJECT_ROWID" value="e6da1393-f46b-41a4-826b-2c7d22de2246"/>
+      <column name="OBJECT_ROWID" value="d3707591-5620-49a8-a63f-19e88ca7a21c"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -879,7 +879,7 @@
       <column name="AB_ATTRIBUTE_ID" value="f11f65d0-4352-4f81-85d0-bfd034275e34"/>
       <column name="DATE_NEW" valueDate="2019-05-23T08:52:10"/>
       <column name="ID_VALUE" value="292825e8-fa96-4b7b-8dab-71955ae14571"/>
-      <column name="OBJECT_ROWID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
+      <column name="OBJECT_ROWID" value="06006801-c6a1-4321-9fde-95f9d3f9b786"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -888,7 +888,7 @@
       <column name="AB_ATTRIBUTE_ID" value="292fae38-6557-466d-8843-3b1b4a1f6599"/>
       <column name="DATE_NEW" valueDate="2019-05-23T08:45:57"/>
       <column name="ID_VALUE" value="PAYTERM30"/>
-      <column name="OBJECT_ROWID" value="e450d126-eab8-4517-ba7c-8b6804f8c859"/>
+      <column name="OBJECT_ROWID" value="09281be8-8cb5-4201-9758-8c86b3d2bb85"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -897,7 +897,7 @@
       <column name="AB_ATTRIBUTE_ID" value="7e9927a4-41e4-426f-bddd-c3e9ee3b093e"/>
       <column name="DATE_NEW" valueDate="2019-05-15T03:41:53"/>
       <column name="ID_VALUE" value="79378933-9f74-4391-b876-4528b582661f"/>
-      <column name="OBJECT_ROWID" value="fc465f2f-803b-4a1f-b79d-7b466d7ecff4"/>
+      <column name="OBJECT_ROWID" value="f7b8f0c3-7702-4466-b502-d21fa4fa0010"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
diff --git a/.liquibase/Data_alias/basic/_demoData/generatedData/ab_loghistory.xml b/.liquibase/Data_alias/basic/_demoData/generatedData/ab_loghistory.xml
index b9e7fed8e3..65cea7ecab 100644
--- a/.liquibase/Data_alias/basic/_demoData/generatedData/ab_loghistory.xml
+++ b/.liquibase/Data_alias/basic/_demoData/generatedData/ab_loghistory.xml
@@ -220,7 +220,7 @@
     </insert>
     <insert tableName="ab_loghistory">
       <column name="DATE_NEW" valueDate="2019-11-13T11:06:51"/>
-      <column name="DESCRIPTION" value="Activity Id: &quot;e265a424-b343-4bc1-b1cd-d40b9405ca12&quot;,&#10;Objekt: &quot;dec94545-2487-46d5-978d-26ee0fcf0f5f&quot;,&#10;Art: &quot;Organisation&quot; eingefügt."/>
+      <column name="DESCRIPTION" value="Activity Id: &quot;e265a424-b343-4bc1-b1cd-d40b9405ca12&quot;,&#10;Objekt: &quot;2c63e0de-f21c-474f-89d7-bff8ba1dbf43&quot;,&#10;Art: &quot;Organisation&quot; eingefügt."/>
       <column name="LOGTYPE" value="I"/>
       <column name="TABLENAME" value="ACTIVITYLINK"/>
       <column name="TABLENAMEID" value="f1b02cad-2a68-45fb-9313-1983b83bb310"/>
@@ -660,7 +660,7 @@
     </insert>
     <insert tableName="ab_loghistory">
       <column name="DATE_NEW" valueDate="2019-11-15T08:46:21"/>
-      <column name="DESCRIPTION" value="Activity Id: &quot;d3e2acf7-ee1c-4b17-9cb6-e8e720d0cc0b&quot;,&#10;Objekt: &quot;fc465f2f-803b-4a1f-b79d-7b466d7ecff4&quot;,&#10;Art: &quot;Organisation&quot; eingefügt."/>
+      <column name="DESCRIPTION" value="Activity Id: &quot;d3e2acf7-ee1c-4b17-9cb6-e8e720d0cc0b&quot;,&#10;Objekt: &quot;f7b8f0c3-7702-4466-b502-d21fa4fa0010&quot;,&#10;Art: &quot;Organisation&quot; eingefügt."/>
       <column name="LOGTYPE" value="I"/>
       <column name="TABLENAME" value="ACTIVITYLINK"/>
       <column name="TABLENAMEID" value="26f94d20-7f3a-4b3e-9655-fcf3e971ce1d"/>
@@ -804,7 +804,7 @@
     </insert>
     <insert tableName="ab_loghistory">
       <column name="DATE_NEW" valueDate="2019-11-15T08:57:12"/>
-      <column name="DESCRIPTION" value="Activity Id: &quot;9c22ba51-8a09-40f1-b6b8-9787fe43b141&quot;,&#10;Objekt: &quot;6efb4fab-64f9-4d8e-aa6f-a158d13fc273&quot;,&#10;Art: &quot;Organisation&quot; eingefügt."/>
+      <column name="DESCRIPTION" value="Activity Id: &quot;9c22ba51-8a09-40f1-b6b8-9787fe43b141&quot;,&#10;Objekt: &quot;6a92df58-2b98-40da-ba6a-d0ddb1fde234&quot;,&#10;Art: &quot;Organisation&quot; eingefügt."/>
       <column name="LOGTYPE" value="I"/>
       <column name="TABLENAME" value="ACTIVITYLINK"/>
       <column name="TABLENAMEID" value="fedb7c1b-0a41-4dba-8abb-2e4af7b4ee2d"/>
@@ -836,7 +836,7 @@
     </insert>
     <insert tableName="ab_loghistory">
       <column name="DATE_NEW" valueDate="2019-11-15T11:01:59"/>
-      <column name="DESCRIPTION" value="Objekt: &quot;dec94545-2487-46d5-978d-26ee0fcf0f5f&quot;,&#10;Task Id: &quot;46164eac-62d1-4dbb-a252-93ac49429855&quot;,&#10;Art: &quot;Organisation&quot; eingefügt."/>
+      <column name="DESCRIPTION" value="Objekt: &quot;2c63e0de-f21c-474f-89d7-bff8ba1dbf43&quot;,&#10;Task Id: &quot;46164eac-62d1-4dbb-a252-93ac49429855&quot;,&#10;Art: &quot;Organisation&quot; eingefügt."/>
       <column name="LOGTYPE" value="I"/>
       <column name="TABLENAME" value="TASKLINK"/>
       <column name="TABLENAMEID" value="eca5c8cb-bd10-4425-b4bc-a2e50f2518b9"/>
@@ -876,7 +876,7 @@
     </insert>
     <insert tableName="ab_loghistory">
       <column name="DATE_NEW" valueDate="2019-11-15T11:05:25"/>
-      <column name="DESCRIPTION" value="Activity Id: &quot;b8067a42-d059-4d86-88b0-485a194faa36&quot;,&#10;Objekt: &quot;dec94545-2487-46d5-978d-26ee0fcf0f5f&quot;,&#10;Art: &quot;Organisation&quot; eingefügt."/>
+      <column name="DESCRIPTION" value="Activity Id: &quot;b8067a42-d059-4d86-88b0-485a194faa36&quot;,&#10;Objekt: &quot;2c63e0de-f21c-474f-89d7-bff8ba1dbf43&quot;,&#10;Art: &quot;Organisation&quot; eingefügt."/>
       <column name="LOGTYPE" value="I"/>
       <column name="TABLENAME" value="ACTIVITYLINK"/>
       <column name="TABLENAMEID" value="60c58962-9b76-4d22-855d-b0cf9ef388dc"/>
@@ -934,7 +934,7 @@
     </insert>
     <insert tableName="ab_loghistory">
       <column name="DATE_NEW" valueDate="2019-11-15T01:03:35"/>
-      <column name="DESCRIPTION" value="Activity Id: &quot;c7c29526-3138-4264-8eb4-c6876797f8fe&quot;,&#10;Objekt: &quot;dec94545-2487-46d5-978d-26ee0fcf0f5f&quot;,&#10;Art: &quot;Organisation&quot; eingefügt."/>
+      <column name="DESCRIPTION" value="Activity Id: &quot;c7c29526-3138-4264-8eb4-c6876797f8fe&quot;,&#10;Objekt: &quot;2c63e0de-f21c-474f-89d7-bff8ba1dbf43&quot;,&#10;Art: &quot;Organisation&quot; eingefügt."/>
       <column name="LOGTYPE" value="I"/>
       <column name="TABLENAME" value="ACTIVITYLINK"/>
       <column name="TABLENAMEID" value="9770d2f3-409c-4fab-a3df-4fd3dcd14693"/>
@@ -1059,7 +1059,7 @@
       <column name="DESCRIPTION" value="Eigenschaft Assessment / Loyalty: &quot;mittel&quot; eingefügt."/>
       <column name="LOGTYPE" value="I"/>
       <column name="TABLENAME" value="AB_ATTRIBUTERELATION"/>
-      <column name="TABLENAMEID" value="449080f6-b714-4189-a261-37439d0d4010"/>
+      <column name="TABLENAMEID" value="756662b5-f5e4-479c-8d97-abd6a395bd79"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="ab_loghistory">
@@ -1067,7 +1067,7 @@
       <column name="DESCRIPTION" value="Eigenschaft Assessment / Industry: &quot;Maschinenbau&quot; eingefügt."/>
       <column name="LOGTYPE" value="I"/>
       <column name="TABLENAME" value="AB_ATTRIBUTERELATION"/>
-      <column name="TABLENAMEID" value="449080f6-b714-4189-a261-37439d0d4010"/>
+      <column name="TABLENAMEID" value="756662b5-f5e4-479c-8d97-abd6a395bd79"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="ab_loghistory">
@@ -1075,7 +1075,7 @@
       <column name="DESCRIPTION" value="Eigenschaft Assessment / Industry: &quot;Handel&quot; eingefügt."/>
       <column name="LOGTYPE" value="I"/>
       <column name="TABLENAME" value="AB_ATTRIBUTERELATION"/>
-      <column name="TABLENAMEID" value="019651a4-503e-4e06-aefd-e7e631bf3144"/>
+      <column name="TABLENAMEID" value="97b66b3c-a9f5-4dc4-902e-850d69973d1d"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="ab_loghistory">
@@ -1083,7 +1083,7 @@
       <column name="DESCRIPTION" value="Eigenschaft Assessment / Loyalty: &quot;gross&quot; eingefügt."/>
       <column name="LOGTYPE" value="I"/>
       <column name="TABLENAME" value="AB_ATTRIBUTERELATION"/>
-      <column name="TABLENAMEID" value="019651a4-503e-4e06-aefd-e7e631bf3144"/>
+      <column name="TABLENAMEID" value="97b66b3c-a9f5-4dc4-902e-850d69973d1d"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="ab_loghistory">
@@ -1091,7 +1091,7 @@
       <column name="DESCRIPTION" value="Eigenschaft Assessment / Loyalty: &quot;mittel&quot; eingefügt."/>
       <column name="LOGTYPE" value="I"/>
       <column name="TABLENAME" value="AB_ATTRIBUTERELATION"/>
-      <column name="TABLENAMEID" value="e450d126-eab8-4517-ba7c-8b6804f8c859"/>
+      <column name="TABLENAMEID" value="09281be8-8cb5-4201-9758-8c86b3d2bb85"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="ab_loghistory">
@@ -1099,7 +1099,7 @@
       <column name="DESCRIPTION" value="Eigenschaft Assessment / Industry: &quot;Bauwesen&quot; eingefügt."/>
       <column name="LOGTYPE" value="I"/>
       <column name="TABLENAME" value="AB_ATTRIBUTERELATION"/>
-      <column name="TABLENAMEID" value="e450d126-eab8-4517-ba7c-8b6804f8c859"/>
+      <column name="TABLENAMEID" value="09281be8-8cb5-4201-9758-8c86b3d2bb85"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="ab_loghistory">
@@ -1107,7 +1107,7 @@
       <column name="DESCRIPTION" value="Eigenschaft Assessment / Loyalty: &quot;mittel&quot; eingefügt."/>
       <column name="LOGTYPE" value="I"/>
       <column name="TABLENAME" value="AB_ATTRIBUTERELATION"/>
-      <column name="TABLENAMEID" value="eda61ea6-35ed-4a92-a93c-6118fc67d533"/>
+      <column name="TABLENAMEID" value="ea07af40-4918-4ea2-94ad-031d01aeaab4"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="ab_loghistory">
@@ -1115,7 +1115,7 @@
       <column name="DESCRIPTION" value="Eigenschaft Assessment / Industry: &quot;Service&quot; eingefügt."/>
       <column name="LOGTYPE" value="I"/>
       <column name="TABLENAME" value="AB_ATTRIBUTERELATION"/>
-      <column name="TABLENAMEID" value="cabf6192-f9c3-4bd4-9366-ad2b073bdfa3"/>
+      <column name="TABLENAMEID" value="22f1ca45-e633-4080-9d5c-9a8c2e06d3f9"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="ab_loghistory">
@@ -1123,7 +1123,7 @@
       <column name="DESCRIPTION" value="Eigenschaft Assessment / Loyalty: &quot;mittel&quot; eingefügt."/>
       <column name="LOGTYPE" value="I"/>
       <column name="TABLENAME" value="AB_ATTRIBUTERELATION"/>
-      <column name="TABLENAMEID" value="cabf6192-f9c3-4bd4-9366-ad2b073bdfa3"/>
+      <column name="TABLENAMEID" value="22f1ca45-e633-4080-9d5c-9a8c2e06d3f9"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="ab_loghistory">
@@ -1131,7 +1131,7 @@
       <column name="DESCRIPTION" value="Eigenschaft Assessment / Industry: &quot;Logistik&quot; eingefügt."/>
       <column name="LOGTYPE" value="I"/>
       <column name="TABLENAME" value="AB_ATTRIBUTERELATION"/>
-      <column name="TABLENAMEID" value="a3fd3c23-12e1-4820-b76e-2cd70103d94d"/>
+      <column name="TABLENAMEID" value="62175b31-b432-4ec6-932f-8e69033884c6"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="ab_loghistory">
@@ -1139,7 +1139,7 @@
       <column name="DESCRIPTION" value="Eigenschaft Assessment / Loyalty: &quot;mittel&quot; eingefügt."/>
       <column name="LOGTYPE" value="I"/>
       <column name="TABLENAME" value="AB_ATTRIBUTERELATION"/>
-      <column name="TABLENAMEID" value="a3fd3c23-12e1-4820-b76e-2cd70103d94d"/>
+      <column name="TABLENAMEID" value="62175b31-b432-4ec6-932f-8e69033884c6"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="ab_loghistory">
@@ -1147,7 +1147,7 @@
       <column name="DESCRIPTION" value="Eigenschaft Assessment / Loyalty: &quot;mittel&quot; eingefügt."/>
       <column name="LOGTYPE" value="I"/>
       <column name="TABLENAME" value="AB_ATTRIBUTERELATION"/>
-      <column name="TABLENAMEID" value="e83c45e0-c30b-436e-b445-00a8b58383b0"/>
+      <column name="TABLENAMEID" value="03e09527-21cc-489a-b37f-0dd7df553c20"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="ab_loghistory">
@@ -1155,7 +1155,7 @@
       <column name="DESCRIPTION" value="Eigenschaft Assessment / Industry: &quot;Maschinenbau&quot; eingefügt."/>
       <column name="LOGTYPE" value="I"/>
       <column name="TABLENAME" value="AB_ATTRIBUTERELATION"/>
-      <column name="TABLENAMEID" value="e83c45e0-c30b-436e-b445-00a8b58383b0"/>
+      <column name="TABLENAMEID" value="03e09527-21cc-489a-b37f-0dd7df553c20"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="ab_loghistory">
@@ -1163,7 +1163,7 @@
       <column name="DESCRIPTION" value="Eigenschaft Assessment / Industry: &quot;Maschinenbau&quot; eingefügt."/>
       <column name="LOGTYPE" value="I"/>
       <column name="TABLENAME" value="AB_ATTRIBUTERELATION"/>
-      <column name="TABLENAMEID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
+      <column name="TABLENAMEID" value="06006801-c6a1-4321-9fde-95f9d3f9b786"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="ab_loghistory">
@@ -1171,7 +1171,7 @@
       <column name="DESCRIPTION" value="Eigenschaft Assessment / Loyalty: &quot;mittel&quot; eingefügt."/>
       <column name="LOGTYPE" value="I"/>
       <column name="TABLENAME" value="AB_ATTRIBUTERELATION"/>
-      <column name="TABLENAMEID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
+      <column name="TABLENAMEID" value="06006801-c6a1-4321-9fde-95f9d3f9b786"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="ab_loghistory">
@@ -1179,7 +1179,7 @@
       <column name="DESCRIPTION" value="Eigenschaft Assessment / Industry: &quot;Maschinenbau&quot; eingefügt."/>
       <column name="LOGTYPE" value="I"/>
       <column name="TABLENAME" value="AB_ATTRIBUTERELATION"/>
-      <column name="TABLENAMEID" value="e6da1393-f46b-41a4-826b-2c7d22de2246"/>
+      <column name="TABLENAMEID" value="d3707591-5620-49a8-a63f-19e88ca7a21c"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="ab_loghistory">
@@ -1187,7 +1187,7 @@
       <column name="DESCRIPTION" value="Eigenschaft Assessment / Loyalty: &quot;mittel&quot; eingefügt."/>
       <column name="LOGTYPE" value="I"/>
       <column name="TABLENAME" value="AB_ATTRIBUTERELATION"/>
-      <column name="TABLENAMEID" value="e6da1393-f46b-41a4-826b-2c7d22de2246"/>
+      <column name="TABLENAMEID" value="d3707591-5620-49a8-a63f-19e88ca7a21c"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="ab_loghistory">
@@ -1195,7 +1195,7 @@
       <column name="DESCRIPTION" value="Eigenschaft Assessment / Loyalty: &quot;mittel&quot; eingefügt."/>
       <column name="LOGTYPE" value="I"/>
       <column name="TABLENAME" value="AB_ATTRIBUTERELATION"/>
-      <column name="TABLENAMEID" value="fd082db5-be43-4219-a705-588f9c06e59b"/>
+      <column name="TABLENAMEID" value="82c7b72d-da4e-4fab-a6cc-31e1be07dd08"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="ab_loghistory">
@@ -1203,7 +1203,7 @@
       <column name="DESCRIPTION" value="Eigenschaft Assessment / Industry: &quot;Logistik&quot; eingefügt."/>
       <column name="LOGTYPE" value="I"/>
       <column name="TABLENAME" value="AB_ATTRIBUTERELATION"/>
-      <column name="TABLENAMEID" value="fd082db5-be43-4219-a705-588f9c06e59b"/>
+      <column name="TABLENAMEID" value="82c7b72d-da4e-4fab-a6cc-31e1be07dd08"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="ab_loghistory">
@@ -1211,7 +1211,7 @@
       <column name="DESCRIPTION" value="Eigenschaft Assessment / Industry: &quot;Bauwesen&quot; eingefügt."/>
       <column name="LOGTYPE" value="I"/>
       <column name="TABLENAME" value="AB_ATTRIBUTERELATION"/>
-      <column name="TABLENAMEID" value="2c14fb05-d48e-4eeb-8a7f-85d423746848"/>
+      <column name="TABLENAMEID" value="8f4f43e0-669b-4e1f-b050-42193f8d2998"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="ab_loghistory">
@@ -1227,7 +1227,7 @@
       <column name="DESCRIPTION" value="Eigenschaft Assessment / Loyalty: &quot;gross&quot; eingefügt."/>
       <column name="LOGTYPE" value="I"/>
       <column name="TABLENAME" value="AB_ATTRIBUTERELATION"/>
-      <column name="TABLENAMEID" value="fc465f2f-803b-4a1f-b79d-7b466d7ecff4"/>
+      <column name="TABLENAMEID" value="f7b8f0c3-7702-4466-b502-d21fa4fa0010"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="ab_loghistory">
@@ -1235,7 +1235,7 @@
       <column name="DESCRIPTION" value="Eigenschaft Assessment / Industry: &quot;Bauwesen&quot; eingefügt."/>
       <column name="LOGTYPE" value="I"/>
       <column name="TABLENAME" value="AB_ATTRIBUTERELATION"/>
-      <column name="TABLENAMEID" value="8eecb5e5-40d9-4bf0-a152-1ca456795563"/>
+      <column name="TABLENAMEID" value="a5d107ac-f796-430e-a686-5a132f96650b"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="ab_loghistory">
@@ -1243,7 +1243,7 @@
       <column name="DESCRIPTION" value="Eigenschaft Assessment / Loyalty: &quot;mittel&quot; eingefügt."/>
       <column name="LOGTYPE" value="I"/>
       <column name="TABLENAME" value="AB_ATTRIBUTERELATION"/>
-      <column name="TABLENAMEID" value="8eecb5e5-40d9-4bf0-a152-1ca456795563"/>
+      <column name="TABLENAMEID" value="a5d107ac-f796-430e-a686-5a132f96650b"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="ab_loghistory">
@@ -1251,7 +1251,7 @@
       <column name="DESCRIPTION" value="Eigenschaft Assessment / Industry: &quot;Bauwesen&quot; eingefügt."/>
       <column name="LOGTYPE" value="I"/>
       <column name="TABLENAME" value="AB_ATTRIBUTERELATION"/>
-      <column name="TABLENAMEID" value="5a52304e-65e8-40ed-9aca-a76af6c8c3a0"/>
+      <column name="TABLENAMEID" value="b043cd42-058c-48bd-8326-4c92e0e74c48"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="ab_loghistory">
@@ -1312,7 +1312,7 @@
     </insert>
     <insert tableName="ab_loghistory">
       <column name="DATE_NEW" valueDate="2019-11-26T08:17:08"/>
-      <column name="DESCRIPTION" value="Object 1 row Id: &quot;8707accf-b1fd-4bde-97b1-ab44b75f66f9&quot;,&#10;Object 2 row Id: &quot;dec94545-2487-46d5-978d-26ee0fcf0f5f&quot;,&#10;Object relation type 1: &quot;3cee0474-504f-43cc-844a-715f1a0db271&quot;,&#10;Object relation type 2: &quot;fa879afd-b2c5-4eee-9799-d63c6764b348&quot; eingefügt."/>
+      <column name="DESCRIPTION" value="Object 1 row Id: &quot;13e60843-5d6d-45ee-88c7-46db41874138&quot;,&#10;Object 2 row Id: &quot;2c63e0de-f21c-474f-89d7-bff8ba1dbf43&quot;,&#10;Object relation type 1: &quot;3cee0474-504f-43cc-844a-715f1a0db271&quot;,&#10;Object relation type 2: &quot;fa879afd-b2c5-4eee-9799-d63c6764b348&quot; eingefügt."/>
       <column name="LOGTYPE" value="I"/>
       <column name="TABLENAME" value="AB_OBJECTRELATION"/>
       <column name="TABLENAMEID" value="e94240b7-4492-43f8-8913-cd7ff6ea2892"/>
@@ -1320,7 +1320,7 @@
     </insert>
     <insert tableName="ab_loghistory">
       <column name="DATE_NEW" valueDate="2019-11-26T08:17:20"/>
-      <column name="DESCRIPTION" value="Object 1 row Id: &quot;6efb4fab-64f9-4d8e-aa6f-a158d13fc273&quot;,&#10;Object 2 row Id: &quot;dec94545-2487-46d5-978d-26ee0fcf0f5f&quot;,&#10;Object relation type 1: &quot;0795a3cd-295b-421b-aed1-decc09b05362&quot;,&#10;Object relation type 2: &quot;0795a3cd-295b-421b-aed1-decc09b05362&quot; eingefügt."/>
+      <column name="DESCRIPTION" value="Object 1 row Id: &quot;b043cd42-058c-48bd-8326-4c92e0e74c48&quot;,&#10;Object 2 row Id: &quot;2c63e0de-f21c-474f-89d7-bff8ba1dbf43&quot;,&#10;Object relation type 1: &quot;0795a3cd-295b-421b-aed1-decc09b05362&quot;,&#10;Object relation type 2: &quot;0795a3cd-295b-421b-aed1-decc09b05362&quot; eingefügt."/>
       <column name="LOGTYPE" value="I"/>
       <column name="TABLENAME" value="AB_OBJECTRELATION"/>
       <column name="TABLENAMEID" value="8c09b724-5ff0-4869-add8-803097cd94aa"/>
@@ -1328,7 +1328,7 @@
     </insert>
     <insert tableName="ab_loghistory">
       <column name="DATE_NEW" valueDate="2019-11-26T08:17:47"/>
-      <column name="DESCRIPTION" value="Object relation type 1: &quot;0795a3cd-295b-421b-aed1-decc09b05362&quot;,&#10;Object relation type 2: &quot;0795a3cd-295b-421b-aed1-decc09b05362&quot;,&#10;Object 1 row Id: &quot;6efb4fab-64f9-4d8e-aa6f-a158d13fc273&quot;,&#10;Object 2 row Id: &quot;dec94545-2487-46d5-978d-26ee0fcf0f5f&quot; gelöscht."/>
+      <column name="DESCRIPTION" value="Object relation type 1: &quot;0795a3cd-295b-421b-aed1-decc09b05362&quot;,&#10;Object relation type 2: &quot;0795a3cd-295b-421b-aed1-decc09b05362&quot;,&#10;Object 1 row Id: &quot;b043cd42-058c-48bd-8326-4c92e0e74c48&quot;,&#10;Object 2 row Id: &quot;2c63e0de-f21c-474f-89d7-bff8ba1dbf43&quot; gelöscht."/>
       <column name="LOGTYPE" value="D"/>
       <column name="TABLENAME" value="AB_OBJECTRELATION"/>
       <column name="TABLENAMEID" value="8c09b724-5ff0-4869-add8-803097cd94aa"/>
@@ -1336,7 +1336,7 @@
     </insert>
     <insert tableName="ab_loghistory">
       <column name="DATE_NEW" valueDate="2019-11-26T08:18:26"/>
-      <column name="DESCRIPTION" value="Object 1 row Id: &quot;a3fd3c23-12e1-4820-b76e-2cd70103d94d&quot;,&#10;Object 2 row Id: &quot;dec94545-2487-46d5-978d-26ee0fcf0f5f&quot;,&#10;Object relation type 1: &quot;0795a3cd-295b-421b-aed1-decc09b05362&quot;,&#10;Object relation type 2: &quot;0795a3cd-295b-421b-aed1-decc09b05362&quot; eingefügt."/>
+      <column name="DESCRIPTION" value="Object 1 row Id: &quot;62175b31-b432-4ec6-932f-8e69033884c6&quot;,&#10;Object 2 row Id: &quot;2c63e0de-f21c-474f-89d7-bff8ba1dbf43&quot;,&#10;Object relation type 1: &quot;0795a3cd-295b-421b-aed1-decc09b05362&quot;,&#10;Object relation type 2: &quot;0795a3cd-295b-421b-aed1-decc09b05362&quot; eingefügt."/>
       <column name="LOGTYPE" value="I"/>
       <column name="TABLENAME" value="AB_OBJECTRELATION"/>
       <column name="TABLENAMEID" value="47802bb5-7785-43ba-a860-6b494e8ef593"/>
@@ -1344,7 +1344,7 @@
     </insert>
     <insert tableName="ab_loghistory">
       <column name="DATE_NEW" valueDate="2019-11-26T08:19:02"/>
-      <column name="DESCRIPTION" value="Object 1 row Id: &quot;019651a4-503e-4e06-aefd-e7e631bf3144&quot;,&#10;Object 2 row Id: &quot;dec94545-2487-46d5-978d-26ee0fcf0f5f&quot;,&#10;Object relation type 1: &quot;c9b7ce6b-1100-46f6-8498-2da6ac24189e&quot;,&#10;Object relation type 2: &quot;259babbd-7827-44d4-b9ec-8245d27b5f70&quot; eingefügt."/>
+      <column name="DESCRIPTION" value="Object 1 row Id: &quot;97b66b3c-a9f5-4dc4-902e-850d69973d1d&quot;,&#10;Object 2 row Id: &quot;2c63e0de-f21c-474f-89d7-bff8ba1dbf43&quot;,&#10;Object relation type 1: &quot;c9b7ce6b-1100-46f6-8498-2da6ac24189e&quot;,&#10;Object relation type 2: &quot;259babbd-7827-44d4-b9ec-8245d27b5f70&quot; eingefügt."/>
       <column name="LOGTYPE" value="I"/>
       <column name="TABLENAME" value="AB_OBJECTRELATION"/>
       <column name="TABLENAMEID" value="2bd8678c-e621-4e22-b203-2d5d967422c0"/>
@@ -1386,7 +1386,7 @@
     </insert>
     <insert tableName="ab_loghistory">
       <column name="DATE_NEW" valueDate="2019-11-26T12:34:38"/>
-      <column name="DESCRIPTION" value="Activity Id: &quot;c7c29526-3138-4264-8eb4-c6876797f8fe&quot;,&#10;Objekt: &quot;dec94545-2487-46d5-978d-26ee0fcf0f5f&quot;,&#10;Art: &quot;Organisation&quot; gelöscht."/>
+      <column name="DESCRIPTION" value="Activity Id: &quot;c7c29526-3138-4264-8eb4-c6876797f8fe&quot;,&#10;Objekt: &quot;2c63e0de-f21c-474f-89d7-bff8ba1dbf43&quot;,&#10;Art: &quot;Organisation&quot; gelöscht."/>
       <column name="LOGTYPE" value="D"/>
       <column name="TABLENAME" value="ACTIVITYLINK"/>
       <column name="TABLENAMEID" value="9770d2f3-409c-4fab-a3df-4fd3dcd14693"/>
diff --git a/.liquibase/Data_alias/basic/_demoData/generatedData/ab_objectrelation.xml b/.liquibase/Data_alias/basic/_demoData/generatedData/ab_objectrelation.xml
index 2bb4e96366..2daffba38d 100644
--- a/.liquibase/Data_alias/basic/_demoData/generatedData/ab_objectrelation.xml
+++ b/.liquibase/Data_alias/basic/_demoData/generatedData/ab_objectrelation.xml
@@ -6,8 +6,8 @@
       <column name="AB_OBJECTRELATIONID" value="03c855e5-f236-4e39-b886-91832b3a53fb"/>
       <column name="AB_OBJECTRELATIONTYPE1" value="c9b7ce6b-1100-46f6-8498-2da6ac24189e"/>
       <column name="AB_OBJECTRELATIONTYPE2" value="259babbd-7827-44d4-b9ec-8245d27b5f70"/>
-      <column name="OBJECT1_ROWID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
-      <column name="OBJECT2_ROWID" value="6efb4fab-64f9-4d8e-aa6f-a158d13fc273"/>
+      <column name="OBJECT1_ROWID" value="06006801-c6a1-4321-9fde-95f9d3f9b786"/>
+      <column name="OBJECT2_ROWID" value="6a92df58-2b98-40da-ba6a-d0ddb1fde234"/>
     </insert>
     <insert tableName="ab_objectrelation">
       <column name="AB_OBJECTRELATIONID" value="1a67eaa7-21da-4a18-97ab-755ac5cb74f7"/>
@@ -20,43 +20,43 @@
       <column name="AB_OBJECTRELATIONID" value="2bd8678c-e621-4e22-b203-2d5d967422c0"/>
       <column name="AB_OBJECTRELATIONTYPE1" value="c9b7ce6b-1100-46f6-8498-2da6ac24189e"/>
       <column name="AB_OBJECTRELATIONTYPE2" value="259babbd-7827-44d4-b9ec-8245d27b5f70"/>
-      <column name="OBJECT1_ROWID" value="019651a4-503e-4e06-aefd-e7e631bf3144"/>
-      <column name="OBJECT2_ROWID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
+      <column name="OBJECT1_ROWID" value="97b66b3c-a9f5-4dc4-902e-850d69973d1d"/>
+      <column name="OBJECT2_ROWID" value="2c63e0de-f21c-474f-89d7-bff8ba1dbf43"/>
     </insert>
     <insert tableName="ab_objectrelation">
       <column name="AB_OBJECTRELATIONID" value="390cd4d2-8231-4dbc-ac9d-0ea7aecc6ef6"/>
       <column name="AB_OBJECTRELATIONTYPE1" value="47a9e611-79b6-46b6-b767-3a0dfed9d010"/>
       <column name="AB_OBJECTRELATIONTYPE2" value="47a9e611-79b6-46b6-b767-3a0dfed9d010"/>
-      <column name="OBJECT1_ROWID" value="6efb4fab-64f9-4d8e-aa6f-a158d13fc273"/>
-      <column name="OBJECT2_ROWID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
+      <column name="OBJECT1_ROWID" value="6a92df58-2b98-40da-ba6a-d0ddb1fde234"/>
+      <column name="OBJECT2_ROWID" value="2c63e0de-f21c-474f-89d7-bff8ba1dbf43"/>
     </insert>
     <insert tableName="ab_objectrelation">
       <column name="AB_OBJECTRELATIONID" value="47802bb5-7785-43ba-a860-6b494e8ef593"/>
       <column name="AB_OBJECTRELATIONTYPE1" value="0795a3cd-295b-421b-aed1-decc09b05362"/>
       <column name="AB_OBJECTRELATIONTYPE2" value="0795a3cd-295b-421b-aed1-decc09b05362"/>
-      <column name="OBJECT1_ROWID" value="a3fd3c23-12e1-4820-b76e-2cd70103d94d"/>
-      <column name="OBJECT2_ROWID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
+      <column name="OBJECT1_ROWID" value="62175b31-b432-4ec6-932f-8e69033884c6"/>
+      <column name="OBJECT2_ROWID" value="2c63e0de-f21c-474f-89d7-bff8ba1dbf43"/>
     </insert>
     <insert tableName="ab_objectrelation">
       <column name="AB_OBJECTRELATIONID" value="4c9bc7f3-c13b-4e55-9c23-012ba40196c9"/>
       <column name="AB_OBJECTRELATIONTYPE1" value="3cee0474-504f-43cc-844a-715f1a0db271"/>
       <column name="AB_OBJECTRELATIONTYPE2" value="fa879afd-b2c5-4eee-9799-d63c6764b348"/>
-      <column name="OBJECT1_ROWID" value="e6da1393-f46b-41a4-826b-2c7d22de2246"/>
-      <column name="OBJECT2_ROWID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
+      <column name="OBJECT1_ROWID" value="d3707591-5620-49a8-a63f-19e88ca7a21c"/>
+      <column name="OBJECT2_ROWID" value="06006801-c6a1-4321-9fde-95f9d3f9b786"/>
     </insert>
     <insert tableName="ab_objectrelation">
       <column name="AB_OBJECTRELATIONID" value="5c545235-231f-4082-9e74-4ec4512eb98d"/>
       <column name="AB_OBJECTRELATIONTYPE1" value="9d4739ba-33b0-4e87-b281-561e2cbdd277"/>
       <column name="AB_OBJECTRELATIONTYPE2" value="e397b595-38ae-4365-908e-75ee388838eb"/>
       <column name="OBJECT1_ROWID" value="ef345d11-a40d-59e0-a24c-afcb6095d2cb"/>
-      <column name="OBJECT2_ROWID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
+      <column name="OBJECT2_ROWID" value="06006801-c6a1-4321-9fde-95f9d3f9b786"/>
     </insert>
     <insert tableName="ab_objectrelation">
       <column name="AB_OBJECTRELATIONID" value="63ecd05d-f2e5-4957-a496-96a87451a78f"/>
       <column name="AB_OBJECTRELATIONTYPE1" value="47a9e611-79b6-46b6-b767-3a0dfed9d010"/>
       <column name="AB_OBJECTRELATIONTYPE2" value="47a9e611-79b6-46b6-b767-3a0dfed9d010"/>
-      <column name="OBJECT1_ROWID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
-      <column name="OBJECT2_ROWID" value="fc465f2f-803b-4a1f-b79d-7b466d7ecff4"/>
+      <column name="OBJECT1_ROWID" value="2c63e0de-f21c-474f-89d7-bff8ba1dbf43"/>
+      <column name="OBJECT2_ROWID" value="f7b8f0c3-7702-4466-b502-d21fa4fa0010"/>
     </insert>
     <insert tableName="ab_objectrelation">
       <column name="AB_OBJECTRELATIONID" value="85ad4578-dce2-49df-a844-d162f1bd9f2f"/>
@@ -69,29 +69,29 @@
       <column name="AB_OBJECTRELATIONID" value="c8aa4abb-a274-43d6-a067-ee935c443bfb"/>
       <column name="AB_OBJECTRELATIONTYPE1" value="3cee0474-504f-43cc-844a-715f1a0db271"/>
       <column name="AB_OBJECTRELATIONTYPE2" value="fa879afd-b2c5-4eee-9799-d63c6764b348"/>
-      <column name="OBJECT1_ROWID" value="fc465f2f-803b-4a1f-b79d-7b466d7ecff4"/>
-      <column name="OBJECT2_ROWID" value="6efb4fab-64f9-4d8e-aa6f-a158d13fc273"/>
+      <column name="OBJECT1_ROWID" value="f7b8f0c3-7702-4466-b502-d21fa4fa0010"/>
+      <column name="OBJECT2_ROWID" value="6a92df58-2b98-40da-ba6a-d0ddb1fde234"/>
     </insert>
     <insert tableName="ab_objectrelation">
       <column name="AB_OBJECTRELATIONID" value="cfbbce3e-1c0d-4d05-9ccf-8232f7eaaf02"/>
       <column name="AB_OBJECTRELATIONTYPE1" value="47a9e611-79b6-46b6-b767-3a0dfed9d010"/>
       <column name="AB_OBJECTRELATIONTYPE2" value="47a9e611-79b6-46b6-b767-3a0dfed9d010"/>
-      <column name="OBJECT1_ROWID" value="019651a4-503e-4e06-aefd-e7e631bf3144"/>
-      <column name="OBJECT2_ROWID" value="a3fd3c23-12e1-4820-b76e-2cd70103d94d"/>
+      <column name="OBJECT1_ROWID" value="97b66b3c-a9f5-4dc4-902e-850d69973d1d"/>
+      <column name="OBJECT2_ROWID" value="62175b31-b432-4ec6-932f-8e69033884c6"/>
     </insert>
     <insert tableName="ab_objectrelation">
       <column name="AB_OBJECTRELATIONID" value="d4454686-8d4e-42d9-9df8-61f19c69ce93"/>
       <column name="AB_OBJECTRELATIONTYPE1" value="c9b7ce6b-1100-46f6-8498-2da6ac24189e"/>
       <column name="AB_OBJECTRELATIONTYPE2" value="259babbd-7827-44d4-b9ec-8245d27b5f70"/>
-      <column name="OBJECT1_ROWID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
-      <column name="OBJECT2_ROWID" value="a3fd3c23-12e1-4820-b76e-2cd70103d94d"/>
+      <column name="OBJECT1_ROWID" value="2c63e0de-f21c-474f-89d7-bff8ba1dbf43"/>
+      <column name="OBJECT2_ROWID" value="62175b31-b432-4ec6-932f-8e69033884c6"/>
     </insert>
     <insert tableName="ab_objectrelation">
       <column name="AB_OBJECTRELATIONID" value="e94240b7-4492-43f8-8913-cd7ff6ea2892"/>
       <column name="AB_OBJECTRELATIONTYPE1" value="3cee0474-504f-43cc-844a-715f1a0db271"/>
       <column name="AB_OBJECTRELATIONTYPE2" value="fa879afd-b2c5-4eee-9799-d63c6764b348"/>
-      <column name="OBJECT1_ROWID" value="8707accf-b1fd-4bde-97b1-ab44b75f66f9"/>
-      <column name="OBJECT2_ROWID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
+      <column name="OBJECT1_ROWID" value="13e60843-5d6d-45ee-88c7-46db41874138"/>
+      <column name="OBJECT2_ROWID" value="2c63e0de-f21c-474f-89d7-bff8ba1dbf43"/>
     </insert>
   </changeSet>
 </databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/_demoData/generatedData/activitylink.xml b/.liquibase/Data_alias/basic/_demoData/generatedData/activitylink.xml
index affcc88eb5..4baba39a61 100644
--- a/.liquibase/Data_alias/basic/_demoData/generatedData/activitylink.xml
+++ b/.liquibase/Data_alias/basic/_demoData/generatedData/activitylink.xml
@@ -14,7 +14,7 @@
       <column name="ACTIVITYLINKID" value="01ff4193-d5b4-41eb-b2db-ea31e5ed7df4"/>
       <column name="ACTIVITY_ID" value="94365b81-cddd-4f56-8379-7ba0a98840a4"/>
       <column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
-      <column name="OBJECT_ROWID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
+      <column name="OBJECT_ROWID" value="06006801-c6a1-4321-9fde-95f9d3f9b786"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -30,7 +30,7 @@
       <column name="ACTIVITYLINKID" value="05ccef04-86cd-4b29-96b7-e106c015a82f"/>
       <column name="ACTIVITY_ID" value="ccbb8eef-5caa-4f6b-ad1e-dbb8ba171650"/>
       <column name="DATE_NEW" valueDate="2019-05-22T05:57:11"/>
-      <column name="OBJECT_ROWID" value="6efb4fab-64f9-4d8e-aa6f-a158d13fc273"/>
+      <column name="OBJECT_ROWID" value="6a92df58-2b98-40da-ba6a-d0ddb1fde234"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -38,7 +38,7 @@
       <column name="ACTIVITYLINKID" value="0aaad19f-daa1-44d3-b7df-cba2a88b2745"/>
       <column name="ACTIVITY_ID" value="8c88dd83-20cb-4601-b1e0-098f1aef8963"/>
       <column name="DATE_NEW" valueDate="2019-05-17T08:56:54"/>
-      <column name="OBJECT_ROWID" value="6efb4fab-64f9-4d8e-aa6f-a158d13fc273"/>
+      <column name="OBJECT_ROWID" value="6a92df58-2b98-40da-ba6a-d0ddb1fde234"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -78,7 +78,7 @@
       <column name="ACTIVITYLINKID" value="10aa8b38-509c-4385-bfe0-775ab92571a8"/>
       <column name="ACTIVITY_ID" value="dc0d01bc-6a8e-48cc-8ce0-58fc9d83af01"/>
       <column name="DATE_NEW" valueDate="2019-05-22T05:45:07"/>
-      <column name="OBJECT_ROWID" value="6efb4fab-64f9-4d8e-aa6f-a158d13fc273"/>
+      <column name="OBJECT_ROWID" value="6a92df58-2b98-40da-ba6a-d0ddb1fde234"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -86,7 +86,7 @@
       <column name="ACTIVITYLINKID" value="10b9499b-2f14-4251-8001-ac9e838c59a8"/>
       <column name="ACTIVITY_ID" value="a42f7cff-53e5-4515-aca2-49c5b4c46f69"/>
       <column name="DATE_NEW" valueDate="2019-05-17T07:55:56"/>
-      <column name="OBJECT_ROWID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
+      <column name="OBJECT_ROWID" value="2c63e0de-f21c-474f-89d7-bff8ba1dbf43"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -134,7 +134,7 @@
       <column name="ACTIVITYLINKID" value="20a50d5d-fe87-4ed2-8f94-b2571b6b34e7"/>
       <column name="ACTIVITY_ID" value="9f498736-c523-4c63-8c53-28e49324b52b"/>
       <column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
-      <column name="OBJECT_ROWID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
+      <column name="OBJECT_ROWID" value="06006801-c6a1-4321-9fde-95f9d3f9b786"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -150,7 +150,7 @@
       <column name="ACTIVITYLINKID" value="26b0f97e-30fc-4808-85a1-5d95cd5f6b34"/>
       <column name="ACTIVITY_ID" value="d6ee3c57-1a49-45d2-8d09-d1480ad3e159"/>
       <column name="DATE_NEW" valueDate="2019-05-23T08:56:37"/>
-      <column name="OBJECT_ROWID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
+      <column name="OBJECT_ROWID" value="2c63e0de-f21c-474f-89d7-bff8ba1dbf43"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -158,7 +158,7 @@
       <column name="ACTIVITYLINKID" value="26f94d20-7f3a-4b3e-9655-fcf3e971ce1d"/>
       <column name="ACTIVITY_ID" value="d3e2acf7-ee1c-4b17-9cb6-e8e720d0cc0b"/>
       <column name="DATE_NEW" valueDate="2019-11-15T08:46:21"/>
-      <column name="OBJECT_ROWID" value="fc465f2f-803b-4a1f-b79d-7b466d7ecff4"/>
+      <column name="OBJECT_ROWID" value="f7b8f0c3-7702-4466-b502-d21fa4fa0010"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -174,7 +174,7 @@
       <column name="ACTIVITYLINKID" value="2de91976-7c5e-4676-87e6-1869381235b0"/>
       <column name="ACTIVITY_ID" value="aaf320cd-b849-4062-a3b4-e6636230c114"/>
       <column name="DATE_NEW" valueDate="2019-05-23T10:51:56"/>
-      <column name="OBJECT_ROWID" value="6efb4fab-64f9-4d8e-aa6f-a158d13fc273"/>
+      <column name="OBJECT_ROWID" value="6a92df58-2b98-40da-ba6a-d0ddb1fde234"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -182,7 +182,7 @@
       <column name="ACTIVITYLINKID" value="2e4494d3-0160-4e9a-a78a-54884dd465f7"/>
       <column name="ACTIVITY_ID" value="502167d7-8946-41bb-9353-8bafde8c7b09"/>
       <column name="DATE_NEW" valueDate="2019-06-11T02:41:00"/>
-      <column name="OBJECT_ROWID" value="fc465f2f-803b-4a1f-b79d-7b466d7ecff4"/>
+      <column name="OBJECT_ROWID" value="f7b8f0c3-7702-4466-b502-d21fa4fa0010"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -208,7 +208,7 @@
       <column name="ACTIVITYLINKID" value="3385ac40-6f0e-45eb-bb71-ca3027325133"/>
       <column name="ACTIVITY_ID" value="84136771-b2ea-4ad6-a6f7-a08ed228581e"/>
       <column name="DATE_NEW" valueDate="2019-05-17T07:56:49"/>
-      <column name="OBJECT_ROWID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
+      <column name="OBJECT_ROWID" value="2c63e0de-f21c-474f-89d7-bff8ba1dbf43"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -256,7 +256,7 @@
       <column name="ACTIVITYLINKID" value="4247ff5e-db95-4114-a1e6-21bbea86098e"/>
       <column name="ACTIVITY_ID" value="8034de5b-48e7-4ca6-bfbf-db86395a4c59"/>
       <column name="DATE_NEW" valueDate="2019-05-17T08:14:49"/>
-      <column name="OBJECT_ROWID" value="fc465f2f-803b-4a1f-b79d-7b466d7ecff4"/>
+      <column name="OBJECT_ROWID" value="f7b8f0c3-7702-4466-b502-d21fa4fa0010"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -264,7 +264,7 @@
       <column name="ACTIVITYLINKID" value="44ae4bcc-ccec-493c-a0db-32b136c450bc"/>
       <column name="ACTIVITY_ID" value="810346d8-ab0e-4f1a-ae78-9f55efcadbe6"/>
       <column name="DATE_NEW" valueDate="2019-05-15T05:07:31"/>
-      <column name="OBJECT_ROWID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
+      <column name="OBJECT_ROWID" value="2c63e0de-f21c-474f-89d7-bff8ba1dbf43"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -280,7 +280,7 @@
       <column name="ACTIVITYLINKID" value="46d9d317-1b7d-4046-8278-9a4957cc1dfe"/>
       <column name="ACTIVITY_ID" value="1c711078-8324-4fcf-93ec-2c8aa29c0cc6"/>
       <column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
-      <column name="OBJECT_ROWID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
+      <column name="OBJECT_ROWID" value="06006801-c6a1-4321-9fde-95f9d3f9b786"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -312,7 +312,7 @@
       <column name="ACTIVITYLINKID" value="4c526e91-a6b1-4d53-8ecc-a79418c81941"/>
       <column name="ACTIVITY_ID" value="86bd08ed-38ca-42bb-af5b-2bcfb9d3ee1b"/>
       <column name="DATE_NEW" valueDate="2019-05-15T05:03:18"/>
-      <column name="OBJECT_ROWID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
+      <column name="OBJECT_ROWID" value="2c63e0de-f21c-474f-89d7-bff8ba1dbf43"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -392,7 +392,7 @@
       <column name="ACTIVITYLINKID" value="565f3c19-3a81-4af6-b2ae-5b4fdccb87eb"/>
       <column name="ACTIVITY_ID" value="a586aba1-0880-4705-9d2a-46b19cbdb954"/>
       <column name="DATE_NEW" valueDate="2019-05-23T09:30:34"/>
-      <column name="OBJECT_ROWID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
+      <column name="OBJECT_ROWID" value="2c63e0de-f21c-474f-89d7-bff8ba1dbf43"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -416,7 +416,7 @@
       <column name="ACTIVITYLINKID" value="5a4672ac-99ff-4a2e-a4ca-aad217bef144"/>
       <column name="ACTIVITY_ID" value="21852330-9c66-42a3-9d25-d053833f146d"/>
       <column name="DATE_NEW" valueDate="2019-05-15T05:22:44"/>
-      <column name="OBJECT_ROWID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
+      <column name="OBJECT_ROWID" value="2c63e0de-f21c-474f-89d7-bff8ba1dbf43"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -424,7 +424,7 @@
       <column name="ACTIVITYLINKID" value="5a4d249a-e3e4-48e5-80a5-2fd1567a82b8"/>
       <column name="ACTIVITY_ID" value="661a7b87-68ae-4d52-bc22-6bf96184e6fe"/>
       <column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
-      <column name="OBJECT_ROWID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
+      <column name="OBJECT_ROWID" value="06006801-c6a1-4321-9fde-95f9d3f9b786"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -432,7 +432,7 @@
       <column name="ACTIVITYLINKID" value="5ad45b3e-72a0-419e-a183-17aaead38158"/>
       <column name="ACTIVITY_ID" value="b378876d-dba5-4e41-865f-9ac056bffa60"/>
       <column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
-      <column name="OBJECT_ROWID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
+      <column name="OBJECT_ROWID" value="06006801-c6a1-4321-9fde-95f9d3f9b786"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -448,7 +448,7 @@
       <column name="ACTIVITYLINKID" value="60c58962-9b76-4d22-855d-b0cf9ef388dc"/>
       <column name="ACTIVITY_ID" value="b8067a42-d059-4d86-88b0-485a194faa36"/>
       <column name="DATE_NEW" valueDate="2019-11-15T11:05:25"/>
-      <column name="OBJECT_ROWID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
+      <column name="OBJECT_ROWID" value="2c63e0de-f21c-474f-89d7-bff8ba1dbf43"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -496,7 +496,7 @@
       <column name="ACTIVITYLINKID" value="6c212e64-a9db-4395-a118-5279dbc6761d"/>
       <column name="ACTIVITY_ID" value="beda92e0-bbd6-423a-8b49-78da30064e84"/>
       <column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
-      <column name="OBJECT_ROWID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
+      <column name="OBJECT_ROWID" value="06006801-c6a1-4321-9fde-95f9d3f9b786"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -536,7 +536,7 @@
       <column name="ACTIVITYLINKID" value="75b42e7c-4748-41ca-9a23-3436b55cadf6"/>
       <column name="ACTIVITY_ID" value="325d38fe-e0e8-44b7-b67c-279fcba6a7bd"/>
       <column name="DATE_NEW" valueDate="2019-05-17T09:00:40"/>
-      <column name="OBJECT_ROWID" value="6efb4fab-64f9-4d8e-aa6f-a158d13fc273"/>
+      <column name="OBJECT_ROWID" value="6a92df58-2b98-40da-ba6a-d0ddb1fde234"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -544,7 +544,7 @@
       <column name="ACTIVITYLINKID" value="769721cc-a526-4e61-989f-71296085e7df"/>
       <column name="ACTIVITY_ID" value="e2d3cde4-e214-4cef-ae5a-d52da5633094"/>
       <column name="DATE_NEW" valueDate="2019-05-15T05:14:26"/>
-      <column name="OBJECT_ROWID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
+      <column name="OBJECT_ROWID" value="2c63e0de-f21c-474f-89d7-bff8ba1dbf43"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -552,7 +552,7 @@
       <column name="ACTIVITYLINKID" value="777ed544-bcb2-43b2-914f-31bfa684e5c3"/>
       <column name="ACTIVITY_ID" value="5fcb8c51-22da-49ec-83c4-d47c296c77a7"/>
       <column name="DATE_NEW" valueDate="2019-05-17T08:11:53"/>
-      <column name="OBJECT_ROWID" value="fc465f2f-803b-4a1f-b79d-7b466d7ecff4"/>
+      <column name="OBJECT_ROWID" value="f7b8f0c3-7702-4466-b502-d21fa4fa0010"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -568,7 +568,7 @@
       <column name="ACTIVITYLINKID" value="7a4b1e70-1773-4529-8506-3243c9349ebc"/>
       <column name="ACTIVITY_ID" value="7a058394-b360-41e0-aaea-6a3ca625f0d3"/>
       <column name="DATE_NEW" valueDate="2019-05-19T08:54:52"/>
-      <column name="OBJECT_ROWID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
+      <column name="OBJECT_ROWID" value="2c63e0de-f21c-474f-89d7-bff8ba1dbf43"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -576,7 +576,7 @@
       <column name="ACTIVITYLINKID" value="7f9cbd45-7ff0-4d7d-9412-58db6245f400"/>
       <column name="ACTIVITY_ID" value="91f7f3c5-8f36-44a7-ba0b-503a05c81d3b"/>
       <column name="DATE_NEW" valueDate="2019-05-15T03:48:02"/>
-      <column name="OBJECT_ROWID" value="fc465f2f-803b-4a1f-b79d-7b466d7ecff4"/>
+      <column name="OBJECT_ROWID" value="f7b8f0c3-7702-4466-b502-d21fa4fa0010"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -584,7 +584,7 @@
       <column name="ACTIVITYLINKID" value="80d3de8f-fd86-401b-aeae-63b389b9310c"/>
       <column name="ACTIVITY_ID" value="6397161c-afed-40cf-a1bd-12e657054ce4"/>
       <column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
-      <column name="OBJECT_ROWID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
+      <column name="OBJECT_ROWID" value="06006801-c6a1-4321-9fde-95f9d3f9b786"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -616,7 +616,7 @@
       <column name="ACTIVITYLINKID" value="869c8987-7239-4f61-a0dc-b2f9e83ab2db"/>
       <column name="ACTIVITY_ID" value="a416d1f7-553a-43b6-a084-021ad1f92dd9"/>
       <column name="DATE_NEW" valueDate="2019-05-17T10:47:38"/>
-      <column name="OBJECT_ROWID" value="a3fd3c23-12e1-4820-b76e-2cd70103d94d"/>
+      <column name="OBJECT_ROWID" value="62175b31-b432-4ec6-932f-8e69033884c6"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -640,7 +640,7 @@
       <column name="ACTIVITYLINKID" value="8d136835-b822-49a2-a516-87d4af34e8e1"/>
       <column name="ACTIVITY_ID" value="2e2e733b-0d88-41aa-80c3-04dab338011a"/>
       <column name="DATE_NEW" valueDate="2019-05-17T07:58:03"/>
-      <column name="OBJECT_ROWID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
+      <column name="OBJECT_ROWID" value="2c63e0de-f21c-474f-89d7-bff8ba1dbf43"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -648,7 +648,7 @@
       <column name="ACTIVITYLINKID" value="8d2ff9ea-5416-47ac-839f-3f7c7b517129"/>
       <column name="ACTIVITY_ID" value="5e95209e-0c7d-4c45-a5de-0d3ccdbc5f08"/>
       <column name="DATE_NEW" valueDate="2019-05-22T05:42:09"/>
-      <column name="OBJECT_ROWID" value="6efb4fab-64f9-4d8e-aa6f-a158d13fc273"/>
+      <column name="OBJECT_ROWID" value="6a92df58-2b98-40da-ba6a-d0ddb1fde234"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -656,7 +656,7 @@
       <column name="ACTIVITYLINKID" value="8d384436-9989-4571-a193-cc3061249f97"/>
       <column name="ACTIVITY_ID" value="56c78f3d-e126-4e36-8031-d5eef9877243"/>
       <column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
-      <column name="OBJECT_ROWID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
+      <column name="OBJECT_ROWID" value="06006801-c6a1-4321-9fde-95f9d3f9b786"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -672,7 +672,7 @@
       <column name="ACTIVITYLINKID" value="918ec650-9e5a-430b-b6a7-d0f5e9780935"/>
       <column name="ACTIVITY_ID" value="107a18dd-94f1-4df4-8775-6016262951ef"/>
       <column name="DATE_NEW" valueDate="2019-05-17T08:19:41"/>
-      <column name="OBJECT_ROWID" value="fc465f2f-803b-4a1f-b79d-7b466d7ecff4"/>
+      <column name="OBJECT_ROWID" value="f7b8f0c3-7702-4466-b502-d21fa4fa0010"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -680,7 +680,7 @@
       <column name="ACTIVITYLINKID" value="93c76b23-fc2c-4544-9e18-2422b2721860"/>
       <column name="ACTIVITY_ID" value="7c89c987-2751-4d87-8d42-1ebbd7bdba7f"/>
       <column name="DATE_NEW" valueDate="2019-05-17T08:16:16"/>
-      <column name="OBJECT_ROWID" value="fc465f2f-803b-4a1f-b79d-7b466d7ecff4"/>
+      <column name="OBJECT_ROWID" value="f7b8f0c3-7702-4466-b502-d21fa4fa0010"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -696,7 +696,7 @@
       <column name="ACTIVITYLINKID" value="94ed9437-9050-4358-975b-c07988c36117"/>
       <column name="ACTIVITY_ID" value="7fa61c35-0b88-4e01-aadf-73101245a2e8"/>
       <column name="DATE_NEW" valueDate="2019-05-23T10:50:27"/>
-      <column name="OBJECT_ROWID" value="6efb4fab-64f9-4d8e-aa6f-a158d13fc273"/>
+      <column name="OBJECT_ROWID" value="6a92df58-2b98-40da-ba6a-d0ddb1fde234"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -704,7 +704,7 @@
       <column name="ACTIVITYLINKID" value="9715d82b-5239-46c3-a651-fdc7ca4c1d0e"/>
       <column name="ACTIVITY_ID" value="a01f1cc6-e588-451d-b22a-6dfe314fda51"/>
       <column name="DATE_NEW" valueDate="2019-05-17T10:51:50"/>
-      <column name="OBJECT_ROWID" value="a3fd3c23-12e1-4820-b76e-2cd70103d94d"/>
+      <column name="OBJECT_ROWID" value="62175b31-b432-4ec6-932f-8e69033884c6"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -736,7 +736,7 @@
       <column name="ACTIVITYLINKID" value="9f20ee40-22b8-440a-93e3-749bc6d6e273"/>
       <column name="ACTIVITY_ID" value="62486e9e-52c6-476f-b1e3-5d62e3f6384e"/>
       <column name="DATE_NEW" valueDate="2019-05-22T05:54:23"/>
-      <column name="OBJECT_ROWID" value="6efb4fab-64f9-4d8e-aa6f-a158d13fc273"/>
+      <column name="OBJECT_ROWID" value="6a92df58-2b98-40da-ba6a-d0ddb1fde234"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -744,7 +744,7 @@
       <column name="ACTIVITYLINKID" value="9f2616fb-7d78-44f6-9f5e-94ef5268dad4"/>
       <column name="ACTIVITY_ID" value="ed70c795-2a72-40e4-bce7-13aca09da578"/>
       <column name="DATE_NEW" valueDate="2019-05-23T08:57:56"/>
-      <column name="OBJECT_ROWID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
+      <column name="OBJECT_ROWID" value="2c63e0de-f21c-474f-89d7-bff8ba1dbf43"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -776,7 +776,7 @@
       <column name="ACTIVITYLINKID" value="a631ea8d-c09a-4bff-83ab-4573df6dbe4f"/>
       <column name="ACTIVITY_ID" value="52462c82-d05f-4a73-9bac-4d9929d07436"/>
       <column name="DATE_NEW" valueDate="2019-05-17T07:52:12"/>
-      <column name="OBJECT_ROWID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
+      <column name="OBJECT_ROWID" value="2c63e0de-f21c-474f-89d7-bff8ba1dbf43"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -792,7 +792,7 @@
       <column name="ACTIVITYLINKID" value="aa944406-61f4-4044-9f69-51a42b270113"/>
       <column name="ACTIVITY_ID" value="d6038dc6-a28f-42ad-b17b-094adc98fd8a"/>
       <column name="DATE_NEW" valueDate="2019-05-22T05:46:52"/>
-      <column name="OBJECT_ROWID" value="6efb4fab-64f9-4d8e-aa6f-a158d13fc273"/>
+      <column name="OBJECT_ROWID" value="6a92df58-2b98-40da-ba6a-d0ddb1fde234"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -816,7 +816,7 @@
       <column name="ACTIVITYLINKID" value="b0fae79b-0b1e-4650-8d94-853d17cca7bd"/>
       <column name="ACTIVITY_ID" value="9dda39bf-966c-4560-be03-5ddbbc1da84a"/>
       <column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
-      <column name="OBJECT_ROWID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
+      <column name="OBJECT_ROWID" value="06006801-c6a1-4321-9fde-95f9d3f9b786"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -856,7 +856,7 @@
       <column name="ACTIVITYLINKID" value="baa5a1da-39f2-48ae-93a5-bad704e5ae48"/>
       <column name="ACTIVITY_ID" value="de110a33-bcab-407e-9d60-7a65f028159b"/>
       <column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
-      <column name="OBJECT_ROWID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
+      <column name="OBJECT_ROWID" value="06006801-c6a1-4321-9fde-95f9d3f9b786"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -872,7 +872,7 @@
       <column name="ACTIVITYLINKID" value="bc86224f-8266-4c8a-950b-b8cb9e1a5569"/>
       <column name="ACTIVITY_ID" value="f38f8b69-7c10-4991-af8c-40dda43376f9"/>
       <column name="DATE_NEW" valueDate="2019-05-22T05:58:08"/>
-      <column name="OBJECT_ROWID" value="6efb4fab-64f9-4d8e-aa6f-a158d13fc273"/>
+      <column name="OBJECT_ROWID" value="6a92df58-2b98-40da-ba6a-d0ddb1fde234"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -912,7 +912,7 @@
       <column name="ACTIVITYLINKID" value="c3751fb7-ae77-402b-8716-3e3a477dc813"/>
       <column name="ACTIVITY_ID" value="e3be48af-e679-4b3a-972f-ad17239e3bb4"/>
       <column name="DATE_NEW" valueDate="2019-05-15T04:58:50"/>
-      <column name="OBJECT_ROWID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
+      <column name="OBJECT_ROWID" value="2c63e0de-f21c-474f-89d7-bff8ba1dbf43"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -928,7 +928,7 @@
       <column name="ACTIVITYLINKID" value="c419929e-2b07-4cc4-9c7d-b0cf8b47b252"/>
       <column name="ACTIVITY_ID" value="e303e7e9-6d16-40cd-a7a9-7196d219d1de"/>
       <column name="DATE_NEW" valueDate="2019-05-22T05:52:55"/>
-      <column name="OBJECT_ROWID" value="6efb4fab-64f9-4d8e-aa6f-a158d13fc273"/>
+      <column name="OBJECT_ROWID" value="6a92df58-2b98-40da-ba6a-d0ddb1fde234"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -944,7 +944,7 @@
       <column name="ACTIVITYLINKID" value="caa5a1da-39f2-48ae-93a5-bad704e5ae48"/>
       <column name="ACTIVITY_ID" value="de110a35-aaab-407e-9d60-7a65f028159b"/>
       <column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
-      <column name="OBJECT_ROWID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
+      <column name="OBJECT_ROWID" value="06006801-c6a1-4321-9fde-95f9d3f9b786"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -960,7 +960,7 @@
       <column name="ACTIVITYLINKID" value="cfb3f5f6-c148-42c9-b86c-14900e8d30c9"/>
       <column name="ACTIVITY_ID" value="6fe97d41-b44a-42b8-b19d-3ed9ce1cc393"/>
       <column name="DATE_NEW" valueDate="2019-05-17T08:54:10"/>
-      <column name="OBJECT_ROWID" value="6efb4fab-64f9-4d8e-aa6f-a158d13fc273"/>
+      <column name="OBJECT_ROWID" value="6a92df58-2b98-40da-ba6a-d0ddb1fde234"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -976,7 +976,7 @@
       <column name="ACTIVITYLINKID" value="d1cfe415-bf05-4ee0-98b6-56ba560a39b6"/>
       <column name="ACTIVITY_ID" value="a867b04c-b2be-48ec-8108-1144a978f54a"/>
       <column name="DATE_NEW" valueDate="2019-05-15T05:00:39"/>
-      <column name="OBJECT_ROWID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
+      <column name="OBJECT_ROWID" value="2c63e0de-f21c-474f-89d7-bff8ba1dbf43"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -1040,7 +1040,7 @@
       <column name="ACTIVITYLINKID" value="da68ccb2-09c8-4a63-9dc3-16bec0777ad6"/>
       <column name="ACTIVITY_ID" value="d608cae4-7b54-4a12-95f3-5b9eac3d04ef"/>
       <column name="DATE_NEW" valueDate="2019-05-15T03:53:44"/>
-      <column name="OBJECT_ROWID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
+      <column name="OBJECT_ROWID" value="2c63e0de-f21c-474f-89d7-bff8ba1dbf43"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -1088,7 +1088,7 @@
       <column name="ACTIVITYLINKID" value="e090084f-d2e4-42e5-b524-7e79dafcb78e"/>
       <column name="ACTIVITY_ID" value="36ec539c-a451-4166-b64d-fb98f1b73481"/>
       <column name="DATE_NEW" valueDate="2019-05-17T10:49:00"/>
-      <column name="OBJECT_ROWID" value="a3fd3c23-12e1-4820-b76e-2cd70103d94d"/>
+      <column name="OBJECT_ROWID" value="62175b31-b432-4ec6-932f-8e69033884c6"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -1128,7 +1128,7 @@
       <column name="ACTIVITYLINKID" value="e80cdefe-ff46-49f9-84ce-393882730337"/>
       <column name="ACTIVITY_ID" value="81b4d02f-be0b-4437-b51d-d5c833adede4"/>
       <column name="DATE_NEW" valueDate="2019-06-11T02:30:33"/>
-      <column name="OBJECT_ROWID" value="6efb4fab-64f9-4d8e-aa6f-a158d13fc273"/>
+      <column name="OBJECT_ROWID" value="6a92df58-2b98-40da-ba6a-d0ddb1fde234"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -1136,7 +1136,7 @@
       <column name="ACTIVITYLINKID" value="ef66f553-93f4-4df5-a97c-d7a93b57ae6a"/>
       <column name="ACTIVITY_ID" value="dcf266be-505d-4344-b091-6d9b01007a72"/>
       <column name="DATE_NEW" valueDate="2019-05-17T08:00:17"/>
-      <column name="OBJECT_ROWID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
+      <column name="OBJECT_ROWID" value="2c63e0de-f21c-474f-89d7-bff8ba1dbf43"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -1144,7 +1144,7 @@
       <column name="ACTIVITYLINKID" value="f1b02cad-2a68-45fb-9313-1983b83bb310"/>
       <column name="ACTIVITY_ID" value="e265a424-b343-4bc1-b1cd-d40b9405ca12"/>
       <column name="DATE_NEW" valueDate="2019-11-13T11:06:51"/>
-      <column name="OBJECT_ROWID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
+      <column name="OBJECT_ROWID" value="2c63e0de-f21c-474f-89d7-bff8ba1dbf43"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -1152,7 +1152,7 @@
       <column name="ACTIVITYLINKID" value="f20857e3-3191-4fdf-b803-9ffd1a0668d7"/>
       <column name="ACTIVITY_ID" value="0cf02b72-a46a-4cd2-975f-15556618ea90"/>
       <column name="DATE_NEW" valueDate="2019-05-22T05:43:15"/>
-      <column name="OBJECT_ROWID" value="6efb4fab-64f9-4d8e-aa6f-a158d13fc273"/>
+      <column name="OBJECT_ROWID" value="6a92df58-2b98-40da-ba6a-d0ddb1fde234"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -1168,7 +1168,7 @@
       <column name="ACTIVITYLINKID" value="f37c2f14-27ce-4782-a7d4-c9f6d6fbcecd"/>
       <column name="ACTIVITY_ID" value="26c4ccf9-a59d-483d-83a8-264b5fac219a"/>
       <column name="DATE_NEW" valueDate="2019-05-23T09:28:27"/>
-      <column name="OBJECT_ROWID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
+      <column name="OBJECT_ROWID" value="2c63e0de-f21c-474f-89d7-bff8ba1dbf43"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -1176,7 +1176,7 @@
       <column name="ACTIVITYLINKID" value="f43ce26b-e728-41cd-9a93-745718b98972"/>
       <column name="ACTIVITY_ID" value="e2068edd-75cf-4b8a-8ff2-96a3c63956c2"/>
       <column name="DATE_NEW" valueDate="2019-05-23T10:49:12"/>
-      <column name="OBJECT_ROWID" value="6efb4fab-64f9-4d8e-aa6f-a158d13fc273"/>
+      <column name="OBJECT_ROWID" value="6a92df58-2b98-40da-ba6a-d0ddb1fde234"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -1200,7 +1200,7 @@
       <column name="ACTIVITYLINKID" value="f91f6e28-01f1-4b45-98f5-b0fb42ac3c38"/>
       <column name="ACTIVITY_ID" value="dd74c12b-44c5-4c58-a363-48333edd5538"/>
       <column name="DATE_NEW" valueDate="2019-05-17T08:17:16"/>
-      <column name="OBJECT_ROWID" value="fc465f2f-803b-4a1f-b79d-7b466d7ecff4"/>
+      <column name="OBJECT_ROWID" value="f7b8f0c3-7702-4466-b502-d21fa4fa0010"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -1224,7 +1224,7 @@
       <column name="ACTIVITYLINKID" value="fb08245a-d14b-4a41-bfb3-973aa560d079"/>
       <column name="ACTIVITY_ID" value="0e62c5cf-7562-4c03-ae11-e6163acada9f"/>
       <column name="DATE_NEW" valueDate="2019-05-19T08:57:37"/>
-      <column name="OBJECT_ROWID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
+      <column name="OBJECT_ROWID" value="2c63e0de-f21c-474f-89d7-bff8ba1dbf43"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -1232,7 +1232,7 @@
       <column name="ACTIVITYLINKID" value="fbd5ad75-92ac-48e2-ae11-d2f6e135123e"/>
       <column name="ACTIVITY_ID" value="b660824c-4336-4119-b5d3-5d0459764d86"/>
       <column name="DATE_NEW" valueDate="2019-05-23T09:07:02"/>
-      <column name="OBJECT_ROWID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
+      <column name="OBJECT_ROWID" value="2c63e0de-f21c-474f-89d7-bff8ba1dbf43"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -1240,7 +1240,7 @@
       <column name="ACTIVITYLINKID" value="fedb7c1b-0a41-4dba-8abb-2e4af7b4ee2d"/>
       <column name="ACTIVITY_ID" value="9c22ba51-8a09-40f1-b6b8-9787fe43b141"/>
       <column name="DATE_NEW" valueDate="2019-11-15T08:57:12"/>
-      <column name="OBJECT_ROWID" value="6efb4fab-64f9-4d8e-aa6f-a158d13fc273"/>
+      <column name="OBJECT_ROWID" value="6a92df58-2b98-40da-ba6a-d0ddb1fde234"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
diff --git a/.liquibase/Data_alias/basic/_demoData/generatedData/campaignparticipantlog.xml b/.liquibase/Data_alias/basic/_demoData/generatedData/campaignparticipantlog.xml
index 3df6fdd767..55d609e113 100644
--- a/.liquibase/Data_alias/basic/_demoData/generatedData/campaignparticipantlog.xml
+++ b/.liquibase/Data_alias/basic/_demoData/generatedData/campaignparticipantlog.xml
@@ -14,7 +14,7 @@
     <insert tableName="campaignparticipantlog">
       <column name="CAMPAIGNPARTICIPANTLOGID" value="732cb81a-5971-488c-82ea-cf0f3c7c9587"/>
       <column name="CAMPAIGNPARTICIPANT_ID" value="996b8af6-13f4-4606-a303-69f941cf6f13"/>
-      <column name="CAMPAIGNSTEP_ID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
+      <column name="CAMPAIGNSTEP_ID" value="0168b2eb-048e-4308-9c3c-f7ad9dcc9647"/>
       <column name="CAMPAIGN_ID" value="161e57aa-3ea6-46bc-a3eb-5a577b858c20"/>
       <column name="DATE_NEW" valueDate="2019-11-15T10:45:26"/>
       <column name="USER_NEW" value="Admin"/>
diff --git a/.liquibase/Data_alias/basic/_demoData/generatedData/contact.xml b/.liquibase/Data_alias/basic/_demoData/generatedData/contact.xml
index 0965fb8004..0646343dd3 100644
--- a/.liquibase/Data_alias/basic/_demoData/generatedData/contact.xml
+++ b/.liquibase/Data_alias/basic/_demoData/generatedData/contact.xml
@@ -16,7 +16,7 @@
       <column name="CONTACTID" value="019651a4-503e-4e06-aefd-e7e631bf3144"/>
       <column name="DATE_NEW" valueDate="2019-05-17T09:49:58"/>
       <column name="ISOLANGUAGE" value="deu"/>
-      <column name="ORGANISATION_ID" value="019651a4-503e-4e06-aefd-e7e631bf3144"/>
+      <column name="ORGANISATION_ID" value="97b66b3c-a9f5-4dc4-902e-850d69973d1d"/>
       <column name="STATUS" value="CONTACTSTATACTIVE"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -25,7 +25,7 @@
       <column name="CONTACTID" value="1868bd3a-05af-4b7f-a633-e3aec50ac45c"/>
       <column name="DATE_NEW" valueDate="2019-05-17T08:43:42"/>
       <column name="ISOLANGUAGE" value="deu"/>
-      <column name="ORGANISATION_ID" value="6efb4fab-64f9-4d8e-aa6f-a158d13fc273"/>
+      <column name="ORGANISATION_ID" value="6a92df58-2b98-40da-ba6a-d0ddb1fde234"/>
       <column name="PERSON_ID" value="09514fe1-a0d6-465e-883b-6cc93cc758a2"/>
       <column name="STATUS" value="CONTACTSTATACTIVE"/>
       <column name="USER_NEW" value="Admin"/>
@@ -37,7 +37,7 @@
       <column name="DATE_NEW" valueDate="2019-05-17T08:39:57"/>
       <column name="DEPARTMENT" value="Vertrieb"/>
       <column name="ISOLANGUAGE" value="deu"/>
-      <column name="ORGANISATION_ID" value="6efb4fab-64f9-4d8e-aa6f-a158d13fc273"/>
+      <column name="ORGANISATION_ID" value="6a92df58-2b98-40da-ba6a-d0ddb1fde234"/>
       <column name="PERSON_ID" value="9f4528ce-3d83-4292-ae23-d9b314271f69"/>
       <column name="STATUS" value="CONTACTSTATACTIVE"/>
       <column name="USER_NEW" value="Admin"/>
@@ -47,7 +47,7 @@
       <column name="CONTACTID" value="1a67eaa7-21da-4a18-97ab-755ac5cb74f7"/>
       <column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
       <column name="ISOLANGUAGE" value="deu"/>
-      <column name="ORGANISATION_ID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
+      <column name="ORGANISATION_ID" value="06006801-c6a1-4321-9fde-95f9d3f9b786"/>
       <column name="PERSON_ID" value="1a67eaa7-21da-4a18-97ab-755ac5cb74f7"/>
       <column name="STATUS" value="CONTACTSTATACTIVE"/>
       <column name="USER_NEW" value="Admin"/>
@@ -57,7 +57,7 @@
       <column name="CONTACTID" value="29271db0-4253-46c9-b7c2-5e25376b9d19"/>
       <column name="DATE_NEW" valueDate="2019-05-17T08:42:37"/>
       <column name="ISOLANGUAGE" value="deu"/>
-      <column name="ORGANISATION_ID" value="6efb4fab-64f9-4d8e-aa6f-a158d13fc273"/>
+      <column name="ORGANISATION_ID" value="6a92df58-2b98-40da-ba6a-d0ddb1fde234"/>
       <column name="PERSON_ID" value="22a497cb-39c3-4e72-9f88-423d7630c7e1"/>
       <column name="STATUS" value="CONTACTSTATACTIVE"/>
       <column name="USER_NEW" value="Admin"/>
@@ -67,7 +67,7 @@
       <column name="CONTACTID" value="2c14fb05-d48e-4eeb-8a7f-85d423746848"/>
       <column name="DATE_NEW" valueDate="2019-05-17T09:42:16"/>
       <column name="ISOLANGUAGE" value="eng"/>
-      <column name="ORGANISATION_ID" value="2c14fb05-d48e-4eeb-8a7f-85d423746848"/>
+      <column name="ORGANISATION_ID" value="8f4f43e0-669b-4e1f-b050-42193f8d2998"/>
       <column name="STATUS" value="CONTACTSTATACTIVE"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -78,7 +78,7 @@
       <column name="DATE_NEW" valueDate="2019-05-16T01:25:07"/>
       <column name="DEPARTMENT" value="Marketing"/>
       <column name="ISOLANGUAGE" value="deu"/>
-      <column name="ORGANISATION_ID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
+      <column name="ORGANISATION_ID" value="2c63e0de-f21c-474f-89d7-bff8ba1dbf43"/>
       <column name="PERSON_ID" value="e35de858-6eca-4328-9efb-dc705ca6792c"/>
       <column name="STATUS" value="CONTACTSTATACTIVE"/>
       <column name="USER_NEW" value="Admin"/>
@@ -88,7 +88,7 @@
       <column name="CONTACTID" value="33ae2997-7bff-4c3c-8038-2fa6781dbe9d"/>
       <column name="DATE_NEW" valueDate="2019-05-23T08:38:50"/>
       <column name="ISOLANGUAGE" value="deu"/>
-      <column name="ORGANISATION_ID" value="33ae2997-7bff-4c3c-8038-2fa6781dbe9d"/>
+      <column name="ORGANISATION_ID" value="bd92680c-fb4b-4f9b-b434-da4fcee5b079"/>
       <column name="STATUS" value="CONTACTSTATACTIVE"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -99,7 +99,7 @@
       <column name="DATE_NEW" valueDate="2019-05-17T08:03:16"/>
       <column name="DEPARTMENT" value="Marketing"/>
       <column name="ISOLANGUAGE" value="deu"/>
-      <column name="ORGANISATION_ID" value="fc465f2f-803b-4a1f-b79d-7b466d7ecff4"/>
+      <column name="ORGANISATION_ID" value="f7b8f0c3-7702-4466-b502-d21fa4fa0010"/>
       <column name="PERSON_ID" value="9874de9b-d517-42f2-81b9-b5f3f0b0dae3"/>
       <column name="STATUS" value="CONTACTSTATACTIVE"/>
       <column name="USER_NEW" value="Admin"/>
@@ -109,7 +109,7 @@
       <column name="CONTACTID" value="449080f6-b714-4189-a261-37439d0d4010"/>
       <column name="DATE_NEW" valueDate="2019-05-17T10:03:12"/>
       <column name="ISOLANGUAGE" value="eng"/>
-      <column name="ORGANISATION_ID" value="449080f6-b714-4189-a261-37439d0d4010"/>
+      <column name="ORGANISATION_ID" value="756662b5-f5e4-479c-8d97-abd6a395bd79"/>
       <column name="STATUS" value="CONTACTSTATACTIVE"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -120,7 +120,7 @@
       <column name="DATE_NEW" valueDate="2019-05-15T05:08:54"/>
       <column name="DEPARTMENT" value="Marketing"/>
       <column name="ISOLANGUAGE" value="deu"/>
-      <column name="ORGANISATION_ID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
+      <column name="ORGANISATION_ID" value="2c63e0de-f21c-474f-89d7-bff8ba1dbf43"/>
       <column name="PERSON_ID" value="b4c37f47-b4b8-4fe4-812a-9043530cce84"/>
       <column name="STATUS" value="CONTACTSTATACTIVE"/>
       <column name="USER_NEW" value="Admin"/>
@@ -132,7 +132,7 @@
       <column name="DATE_NEW" valueDate="2019-05-17T08:41:40"/>
       <column name="DEPARTMENT" value="Marketing"/>
       <column name="ISOLANGUAGE" value="deu"/>
-      <column name="ORGANISATION_ID" value="6efb4fab-64f9-4d8e-aa6f-a158d13fc273"/>
+      <column name="ORGANISATION_ID" value="6a92df58-2b98-40da-ba6a-d0ddb1fde234"/>
       <column name="PERSON_ID" value="c41afea2-c4b5-45dd-a4a7-05826b9dd38c"/>
       <column name="STATUS" value="CONTACTSTATACTIVE"/>
       <column name="USER_NEW" value="Admin"/>
@@ -142,7 +142,7 @@
       <column name="CONTACTID" value="57d524f6-ad66-4550-be83-fee6e31b7a52"/>
       <column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
       <column name="ISOLANGUAGE" value="deu"/>
-      <column name="ORGANISATION_ID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
+      <column name="ORGANISATION_ID" value="06006801-c6a1-4321-9fde-95f9d3f9b786"/>
       <column name="PERSON_ID" value="57d524f6-ad66-4550-be83-fee6e31b7a52"/>
       <column name="STATUS" value="CONTACTSTATACTIVE"/>
       <column name="USER_NEW" value="Admin"/>
@@ -152,7 +152,7 @@
       <column name="CONTACTID" value="5a52304e-65e8-40ed-9aca-a76af6c8c3a0"/>
       <column name="DATE_NEW" valueDate="2019-05-17T09:44:27"/>
       <column name="ISOLANGUAGE" value="deu"/>
-      <column name="ORGANISATION_ID" value="5a52304e-65e8-40ed-9aca-a76af6c8c3a0"/>
+      <column name="ORGANISATION_ID" value="b043cd42-058c-48bd-8326-4c92e0e74c48"/>
       <column name="STATUS" value="CONTACTSTATACTIVE"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -162,7 +162,7 @@
       <column name="DATE_NEW" valueDate="2019-05-17T08:02:26"/>
       <column name="DEPARTMENT" value="Management"/>
       <column name="ISOLANGUAGE" value="deu"/>
-      <column name="ORGANISATION_ID" value="fc465f2f-803b-4a1f-b79d-7b466d7ecff4"/>
+      <column name="ORGANISATION_ID" value="f7b8f0c3-7702-4466-b502-d21fa4fa0010"/>
       <column name="PERSON_ID" value="528d7307-295c-4829-a2e4-9b59e43cf3bb"/>
       <column name="STATUS" value="CONTACTSTATACTIVE"/>
       <column name="USER_NEW" value="Admin"/>
@@ -174,7 +174,7 @@
       <column name="DATE_NEW" valueDate="2019-05-15T03:54:25"/>
       <column name="DEPARTMENT" value="Vertrieb"/>
       <column name="ISOLANGUAGE" value="deu"/>
-      <column name="ORGANISATION_ID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
+      <column name="ORGANISATION_ID" value="2c63e0de-f21c-474f-89d7-bff8ba1dbf43"/>
       <column name="PERSON_ID" value="08c36adc-cd2b-4ce9-a51b-944667084f7f"/>
       <column name="STATUS" value="CONTACTSTATACTIVE"/>
       <column name="USER_NEW" value="Admin"/>
@@ -184,7 +184,7 @@
       <column name="CONTACTID" value="6efb4fab-64f9-4d8e-aa6f-a158d13fc273"/>
       <column name="DATE_NEW" valueDate="2019-05-15T03:23:13"/>
       <column name="ISOLANGUAGE" value="deu"/>
-      <column name="ORGANISATION_ID" value="6efb4fab-64f9-4d8e-aa6f-a158d13fc273"/>
+      <column name="ORGANISATION_ID" value="6a92df58-2b98-40da-ba6a-d0ddb1fde234"/>
       <column name="STATUS" value="CONTACTSTATACTIVE"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -213,7 +213,7 @@
       <column name="CONTACTID" value="777246d5-7a73-4c52-af14-84df66128e5d"/>
       <column name="DATE_NEW" valueDate="2019-05-23T10:54:17"/>
       <column name="ISOLANGUAGE" value="deu"/>
-      <column name="ORGANISATION_ID" value="777246d5-7a73-4c52-af14-84df66128e5d"/>
+      <column name="ORGANISATION_ID" value="aed65442-06aa-4cdc-b924-1d9728b444d3"/>
       <column name="STATUS" value="CONTACTSTATACTIVE"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -224,7 +224,7 @@
       <column name="DATE_NEW" valueDate="2019-11-25T01:52:05"/>
       <column name="DEPARTMENT" value="Vertrieb"/>
       <column name="ISOLANGUAGE" value="deu"/>
-      <column name="ORGANISATION_ID" value="8707accf-b1fd-4bde-97b1-ab44b75f66f9"/>
+      <column name="ORGANISATION_ID" value="13e60843-5d6d-45ee-88c7-46db41874138"/>
       <column name="PERSON_ID" value="0a611832-9476-481e-bde5-af3c3a98f1b4"/>
       <column name="STATUS" value="CONTACTSTATACTIVE"/>
       <column name="USER_NEW" value="Admin"/>
@@ -236,7 +236,7 @@
       <column name="DATE_NEW" valueDate="2019-05-17T08:04:06"/>
       <column name="DEPARTMENT" value="IT"/>
       <column name="ISOLANGUAGE" value="deu"/>
-      <column name="ORGANISATION_ID" value="fc465f2f-803b-4a1f-b79d-7b466d7ecff4"/>
+      <column name="ORGANISATION_ID" value="f7b8f0c3-7702-4466-b502-d21fa4fa0010"/>
       <column name="PERSON_ID" value="3660abd7-73de-4825-83a1-e1992469cf56"/>
       <column name="STATUS" value="CONTACTSTATACTIVE"/>
       <column name="USER_NEW" value="Admin"/>
@@ -246,7 +246,7 @@
       <column name="CONTACTID" value="8707accf-b1fd-4bde-97b1-ab44b75f66f9"/>
       <column name="DATE_NEW" valueDate="2019-05-17T10:00:09"/>
       <column name="ISOLANGUAGE" value="deu"/>
-      <column name="ORGANISATION_ID" value="8707accf-b1fd-4bde-97b1-ab44b75f66f9"/>
+      <column name="ORGANISATION_ID" value="13e60843-5d6d-45ee-88c7-46db41874138"/>
       <column name="STATUS" value="CONTACTSTATACTIVE"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -255,7 +255,7 @@
       <column name="CONTACTID" value="8eecb5e5-40d9-4bf0-a152-1ca456795563"/>
       <column name="DATE_NEW" valueDate="2019-05-17T09:46:35"/>
       <column name="ISOLANGUAGE" value="deu"/>
-      <column name="ORGANISATION_ID" value="8eecb5e5-40d9-4bf0-a152-1ca456795563"/>
+      <column name="ORGANISATION_ID" value="a5d107ac-f796-430e-a686-5a132f96650b"/>
       <column name="STATUS" value="CONTACTSTATACTIVE"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -264,7 +264,7 @@
       <column name="CONTACTID" value="a2e084e2-d68a-4f1e-a1bb-f8d46ad6293d"/>
       <column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
       <column name="ISOLANGUAGE" value="deu"/>
-      <column name="ORGANISATION_ID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
+      <column name="ORGANISATION_ID" value="06006801-c6a1-4321-9fde-95f9d3f9b786"/>
       <column name="PERSON_ID" value="a2e084e2-d68a-4f1e-a1bb-f8d46ad6293d"/>
       <column name="STATUS" value="CONTACTSTATACTIVE"/>
       <column name="USER_NEW" value="Admin"/>
@@ -274,7 +274,7 @@
       <column name="CONTACTID" value="a3fd3c23-12e1-4820-b76e-2cd70103d94d"/>
       <column name="DATE_NEW" valueDate="2019-05-17T09:39:15"/>
       <column name="ISOLANGUAGE" value="deu"/>
-      <column name="ORGANISATION_ID" value="a3fd3c23-12e1-4820-b76e-2cd70103d94d"/>
+      <column name="ORGANISATION_ID" value="62175b31-b432-4ec6-932f-8e69033884c6"/>
       <column name="STATUS" value="CONTACTSTATACTIVE"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -285,7 +285,7 @@
       <column name="DATE_NEW" valueDate="2019-05-16T01:23:15"/>
       <column name="DEPARTMENT" value="Produktion"/>
       <column name="ISOLANGUAGE" value="deu"/>
-      <column name="ORGANISATION_ID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
+      <column name="ORGANISATION_ID" value="2c63e0de-f21c-474f-89d7-bff8ba1dbf43"/>
       <column name="PERSON_ID" value="0a611832-9476-481e-bde5-af3c3a98f1b4"/>
       <column name="STATUS" value="CONTACTSTATACTIVE"/>
       <column name="USER_NEW" value="Admin"/>
@@ -295,7 +295,7 @@
       <column name="CONTACTID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
       <column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
       <column name="ISOLANGUAGE" value="deu"/>
-      <column name="ORGANISATION_ID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
+      <column name="ORGANISATION_ID" value="06006801-c6a1-4321-9fde-95f9d3f9b786"/>
       <column name="STATUS" value="CONTACTSTATACTIVE"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -304,7 +304,7 @@
       <column name="CONTACTID" value="c7ddf982-0e58-4152-b82b-8f5673b0b729"/>
       <column name="DATE_NEW" valueDate="2019-05-13T01:16:38"/>
       <column name="ISOLANGUAGE" value="deu"/>
-      <column name="ORGANISATION_ID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
+      <column name="ORGANISATION_ID" value="06006801-c6a1-4321-9fde-95f9d3f9b786"/>
       <column name="PERSON_ID" value="b16282bd-254e-4569-a56e-675449821467"/>
       <column name="STATUS" value="CONTACTSTATACTIVE"/>
       <column name="USER_NEW" value="Admin"/>
@@ -314,7 +314,7 @@
       <column name="CONTACTID" value="cabf6192-f9c3-4bd4-9366-ad2b073bdfa3"/>
       <column name="DATE_NEW" valueDate="2019-05-17T09:40:51"/>
       <column name="ISOLANGUAGE" value="deu"/>
-      <column name="ORGANISATION_ID" value="cabf6192-f9c3-4bd4-9366-ad2b073bdfa3"/>
+      <column name="ORGANISATION_ID" value="22f1ca45-e633-4080-9d5c-9a8c2e06d3f9"/>
       <column name="STATUS" value="CONTACTSTATACTIVE"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -323,7 +323,7 @@
       <column name="CONTACTID" value="d105f7f4-afd1-4a98-adc2-13fd6934b7e9"/>
       <column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
       <column name="ISOLANGUAGE" value="deu"/>
-      <column name="ORGANISATION_ID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
+      <column name="ORGANISATION_ID" value="06006801-c6a1-4321-9fde-95f9d3f9b786"/>
       <column name="PERSON_ID" value="d105f7f4-afd1-4a98-adc2-13fd6934b7e9"/>
       <column name="STATUS" value="CONTACTSTATACTIVE"/>
       <column name="USER_NEW" value="Admin"/>
@@ -335,7 +335,7 @@
       <column name="DATE_NEW" valueDate="2019-05-15T05:11:10"/>
       <column name="DEPARTMENT" value="IT"/>
       <column name="ISOLANGUAGE" value="deu"/>
-      <column name="ORGANISATION_ID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
+      <column name="ORGANISATION_ID" value="2c63e0de-f21c-474f-89d7-bff8ba1dbf43"/>
       <column name="PERSON_ID" value="c4e24800-e9f3-4226-afd7-cfd5dd670d93"/>
       <column name="STATUS" value="CONTACTSTATACTIVE"/>
       <column name="USER_NEW" value="Admin"/>
@@ -346,7 +346,7 @@
       <column name="DATE_NEW" valueDate="2019-05-17T08:06:15"/>
       <column name="DEPARTMENT" value="Vertrieb"/>
       <column name="ISOLANGUAGE" value="deu"/>
-      <column name="ORGANISATION_ID" value="fc465f2f-803b-4a1f-b79d-7b466d7ecff4"/>
+      <column name="ORGANISATION_ID" value="f7b8f0c3-7702-4466-b502-d21fa4fa0010"/>
       <column name="PERSON_ID" value="44c5d7db-b96e-4f67-a00f-c206cd3f7e1b"/>
       <column name="STATUS" value="CONTACTSTATACTIVE"/>
       <column name="USER_NEW" value="Admin"/>
@@ -356,7 +356,7 @@
       <column name="CONTACTID" value="d5a2dc64-e503-4aed-a0c6-d54f49b8db87"/>
       <column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
       <column name="ISOLANGUAGE" value="deu"/>
-      <column name="ORGANISATION_ID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
+      <column name="ORGANISATION_ID" value="06006801-c6a1-4321-9fde-95f9d3f9b786"/>
       <column name="PERSON_ID" value="d5a2dc64-e503-4aed-a0c6-d54f49b8db87"/>
       <column name="STATUS" value="CONTACTSTATACTIVE"/>
       <column name="USER_NEW" value="Admin"/>
@@ -368,7 +368,7 @@
       <column name="DATE_NEW" valueDate="2019-05-17T08:04:51"/>
       <column name="DEPARTMENT" value="Vertrieb"/>
       <column name="ISOLANGUAGE" value="deu"/>
-      <column name="ORGANISATION_ID" value="fc465f2f-803b-4a1f-b79d-7b466d7ecff4"/>
+      <column name="ORGANISATION_ID" value="f7b8f0c3-7702-4466-b502-d21fa4fa0010"/>
       <column name="PERSON_ID" value="57ec6707-e4a4-4702-9356-ee43dd4c5b00"/>
       <column name="STATUS" value="CONTACTSTATACTIVE"/>
       <column name="USER_NEW" value="Admin"/>
@@ -378,7 +378,7 @@
       <column name="CONTACTID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
       <column name="DATE_NEW" valueDate="2019-05-15T03:16:58"/>
       <column name="ISOLANGUAGE" value="deu"/>
-      <column name="ORGANISATION_ID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
+      <column name="ORGANISATION_ID" value="2c63e0de-f21c-474f-89d7-bff8ba1dbf43"/>
       <column name="STATUS" value="CONTACTSTATACTIVE"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -387,7 +387,7 @@
       <column name="CONTACTID" value="e450d126-eab8-4517-ba7c-8b6804f8c859"/>
       <column name="DATE_NEW" valueDate="2019-05-17T09:47:59"/>
       <column name="ISOLANGUAGE" value="deu"/>
-      <column name="ORGANISATION_ID" value="e450d126-eab8-4517-ba7c-8b6804f8c859"/>
+      <column name="ORGANISATION_ID" value="09281be8-8cb5-4201-9758-8c86b3d2bb85"/>
       <column name="STATUS" value="CONTACTSTATACTIVE"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -396,7 +396,7 @@
       <column name="CONTACTID" value="e6da1393-f46b-41a4-826b-2c7d22de2246"/>
       <column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
       <column name="ISOLANGUAGE" value="deu"/>
-      <column name="ORGANISATION_ID" value="e6da1393-f46b-41a4-826b-2c7d22de2246"/>
+      <column name="ORGANISATION_ID" value="d3707591-5620-49a8-a63f-19e88ca7a21c"/>
       <column name="STATUS" value="CONTACTSTATACTIVE"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -405,7 +405,7 @@
       <column name="CONTACTID" value="e83c45e0-c30b-436e-b445-00a8b58383b0"/>
       <column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
       <column name="ISOLANGUAGE" value="deu"/>
-      <column name="ORGANISATION_ID" value="e83c45e0-c30b-436e-b445-00a8b58383b0"/>
+      <column name="ORGANISATION_ID" value="03e09527-21cc-489a-b37f-0dd7df553c20"/>
       <column name="STATUS" value="CONTACTSTATACTIVE"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -414,7 +414,7 @@
       <column name="CONTACTID" value="eda61ea6-35ed-4a92-a93c-6118fc67d533"/>
       <column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
       <column name="ISOLANGUAGE" value="deu"/>
-      <column name="ORGANISATION_ID" value="eda61ea6-35ed-4a92-a93c-6118fc67d533"/>
+      <column name="ORGANISATION_ID" value="ea07af40-4918-4ea2-94ad-031d01aeaab4"/>
       <column name="STATUS" value="CONTACTSTATACTIVE"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -423,7 +423,7 @@
       <column name="CONTACTID" value="ef345d11-a40d-59e0-a24c-afcb6095d2cb"/>
       <column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
       <column name="ISOLANGUAGE" value="deu"/>
-      <column name="ORGANISATION_ID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
+      <column name="ORGANISATION_ID" value="06006801-c6a1-4321-9fde-95f9d3f9b786"/>
       <column name="PERSON_ID" value="ef345d11-a40d-59e0-a24c-afcb6095d2cb"/>
       <column name="STATUS" value="CONTACTSTATACTIVE"/>
       <column name="USER_NEW" value="Admin"/>
@@ -433,7 +433,7 @@
       <column name="CONTACTID" value="f0fb7676-8183-4bc7-beca-ca32c1e11c10"/>
       <column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
       <column name="ISOLANGUAGE" value="deu"/>
-      <column name="ORGANISATION_ID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
+      <column name="ORGANISATION_ID" value="06006801-c6a1-4321-9fde-95f9d3f9b786"/>
       <column name="PERSON_ID" value="f0fb7676-8183-4bc7-beca-ca32c1e11c10"/>
       <column name="STATUS" value="CONTACTSTATACTIVE"/>
       <column name="USER_NEW" value="Admin"/>
@@ -445,7 +445,7 @@
       <column name="DATE_NEW" valueDate="2019-11-26T08:27:11"/>
       <column name="DEPARTMENT" value="Produktion"/>
       <column name="ISOLANGUAGE" value="deu"/>
-      <column name="ORGANISATION_ID" value="fc465f2f-803b-4a1f-b79d-7b466d7ecff4"/>
+      <column name="ORGANISATION_ID" value="f7b8f0c3-7702-4466-b502-d21fa4fa0010"/>
       <column name="PERSON_ID" value="0a611832-9476-481e-bde5-af3c3a98f1b4"/>
       <column name="STATUS" value="CONTACTSTATACTIVE"/>
       <column name="USER_NEW" value="Admin"/>
@@ -455,7 +455,7 @@
       <column name="CONTACTID" value="fb07cb0e-c391-4503-9c47-a39ec7388f4f"/>
       <column name="DATE_NEW" valueDate="2019-05-23T10:53:07"/>
       <column name="ISOLANGUAGE" value="eng"/>
-      <column name="ORGANISATION_ID" value="fb07cb0e-c391-4503-9c47-a39ec7388f4f"/>
+      <column name="ORGANISATION_ID" value="692e1f81-9f05-4e22-b74d-56d34c671067"/>
       <column name="STATUS" value="CONTACTSTATACTIVE"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -464,7 +464,7 @@
       <column name="CONTACTID" value="fc465f2f-803b-4a1f-b79d-7b466d7ecff4"/>
       <column name="DATE_NEW" valueDate="2019-05-15T03:33:57"/>
       <column name="ISOLANGUAGE" value="deu"/>
-      <column name="ORGANISATION_ID" value="fc465f2f-803b-4a1f-b79d-7b466d7ecff4"/>
+      <column name="ORGANISATION_ID" value="f7b8f0c3-7702-4466-b502-d21fa4fa0010"/>
       <column name="STATUS" value="CONTACTSTATACTIVE"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -473,7 +473,7 @@
       <column name="CONTACTID" value="fd082db5-be43-4219-a705-588f9c06e59b"/>
       <column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
       <column name="ISOLANGUAGE" value="deu"/>
-      <column name="ORGANISATION_ID" value="fd082db5-be43-4219-a705-588f9c06e59b"/>
+      <column name="ORGANISATION_ID" value="82c7b72d-da4e-4fab-a6cc-31e1be07dd08"/>
       <column name="STATUS" value="CONTACTSTATACTIVE"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
diff --git a/.liquibase/Data_alias/basic/_demoData/generatedData/dsgvoinfo.xml b/.liquibase/Data_alias/basic/_demoData/generatedData/dsgvoinfo.xml
index a025550ab5..3833595792 100644
--- a/.liquibase/Data_alias/basic/_demoData/generatedData/dsgvoinfo.xml
+++ b/.liquibase/Data_alias/basic/_demoData/generatedData/dsgvoinfo.xml
@@ -4,7 +4,7 @@
     <delete tableName="dsgvoinfo"/>
     <insert tableName="dsgvoinfo">
       <column name="CONTACT_ID" value="b3906c2d-7b2e-4f64-8c97-ae92e39f96b6"/>
-      <column name="DATASOURCE" value="449080f6-b714-4189-a261-37439d0d4010"/>
+      <column name="DATASOURCE" value="756662b5-f5e4-479c-8d97-abd6a395bd79"/>
       <column name="DSGVOINFOID" value="6b117aad-02f4-4746-985a-de931059b72e"/>
       <column name="TRANSMISSION" value="DSGVONONE"/>
     </insert>
diff --git a/.liquibase/Data_alias/basic/_demoData/generatedData/organisation.xml b/.liquibase/Data_alias/basic/_demoData/generatedData/organisation.xml
index ef15452df7..74f323cb7b 100644
--- a/.liquibase/Data_alias/basic/_demoData/generatedData/organisation.xml
+++ b/.liquibase/Data_alias/basic/_demoData/generatedData/organisation.xml
@@ -14,7 +14,7 @@
       <column name="DATE_EDIT" valueDate="2019-11-26T06:17:51"/>
       <column name="DATE_NEW" valueDate="2019-05-17T09:49:58"/>
       <column name="NAME" value="Bucher Unternehmensgruppe"/>
-      <column name="ORGANISATIONID" value="019651a4-503e-4e06-aefd-e7e631bf3144"/>
+      <column name="ORGANISATIONID" value="97b66b3c-a9f5-4dc4-902e-850d69973d1d"/>
       <column name="USER_EDIT" value="Admin"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -25,7 +25,7 @@
       <column name="INFO" value="Automobilvermietung"/>
       <column name="KIND" value="ORGCUTOMER"/>
       <column name="NAME" value="Sevent SE"/>
-      <column name="ORGANISATIONID" value="2c14fb05-d48e-4eeb-8a7f-85d423746848"/>
+      <column name="ORGANISATIONID" value="8f4f43e0-669b-4e1f-b050-42193f8d2998"/>
       <column name="USER_EDIT" value="Admin"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -35,7 +35,7 @@
       <column name="DATE_NEW" valueDate="2019-05-23T08:38:50"/>
       <column name="KIND" value="ORGMANUF"/>
       <column name="NAME" value="Netro AG"/>
-      <column name="ORGANISATIONID" value="33ae2997-7bff-4c3c-8038-2fa6781dbe9d"/>
+      <column name="ORGANISATIONID" value="bd92680c-fb4b-4f9b-b434-da4fcee5b079"/>
       <column name="USER_EDIT" value="Admin"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -45,7 +45,7 @@
       <column name="DATE_NEW" valueDate="2019-05-17T10:03:12"/>
       <column name="KIND" value="ORGMANUF"/>
       <column name="NAME" value="Aquire GmbH"/>
-      <column name="ORGANISATIONID" value="449080f6-b714-4189-a261-37439d0d4010"/>
+      <column name="ORGANISATIONID" value="756662b5-f5e4-479c-8d97-abd6a395bd79"/>
       <column name="USER_EDIT" value="Admin"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -54,7 +54,7 @@
       <column name="DATE_EDIT" valueDate="2019-11-26T06:28:03"/>
       <column name="DATE_NEW" valueDate="2019-05-17T09:44:27"/>
       <column name="NAME" value="Waken Neuser SE"/>
-      <column name="ORGANISATIONID" value="5a52304e-65e8-40ed-9aca-a76af6c8c3a0"/>
+      <column name="ORGANISATIONID" value="b043cd42-058c-48bd-8326-4c92e0e74c48"/>
       <column name="USER_EDIT" value="Admin"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -65,7 +65,7 @@
       <column name="INFO" value="Die Transatlantik Logistic Gruppe ist ein Zusammenschluss aus mehreren Logistik Unternehmen.  Über 3.000 Mitarbeiter sind bei dem europäischen Logistikriesen beschäftigt. "/>
       <column name="KIND" value="ORGCUTOMER"/>
       <column name="NAME" value="Transatlantik Logistics GmbH"/>
-      <column name="ORGANISATIONID" value="6efb4fab-64f9-4d8e-aa6f-a158d13fc273"/>
+      <column name="ORGANISATIONID" value="6a92df58-2b98-40da-ba6a-d0ddb1fde234"/>
       <column name="USER_EDIT" value="Admin"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -75,7 +75,7 @@
       <column name="DATE_NEW" valueDate="2019-05-23T10:54:17"/>
       <column name="KIND" value="ORGPARTNER"/>
       <column name="NAME" value="Schild AG"/>
-      <column name="ORGANISATIONID" value="777246d5-7a73-4c52-af14-84df66128e5d"/>
+      <column name="ORGANISATIONID" value="aed65442-06aa-4cdc-b924-1d9728b444d3"/>
       <column name="USER_EDIT" value="Admin"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -85,7 +85,7 @@
       <column name="DATE_NEW" valueDate="2019-05-17T10:00:09"/>
       <column name="KIND" value="ORGCUTOMER"/>
       <column name="NAME" value="Firmengruppe Matthias Bogen"/>
-      <column name="ORGANISATIONID" value="8707accf-b1fd-4bde-97b1-ab44b75f66f9"/>
+      <column name="ORGANISATIONID" value="13e60843-5d6d-45ee-88c7-46db41874138"/>
       <column name="USER_EDIT" value="Admin"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -95,7 +95,7 @@
       <column name="DATE_NEW" valueDate="2019-05-17T09:46:35"/>
       <column name="KIND" value="ORGCUTOMER"/>
       <column name="NAME" value="SuperBauer AG"/>
-      <column name="ORGANISATIONID" value="8eecb5e5-40d9-4bf0-a152-1ca456795563"/>
+      <column name="ORGANISATIONID" value="a5d107ac-f796-430e-a686-5a132f96650b"/>
       <column name="USER_EDIT" value="Admin"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -104,7 +104,7 @@
       <column name="DATE_EDIT" valueDate="2019-11-26T06:21:07"/>
       <column name="DATE_NEW" valueDate="2019-05-17T09:39:15"/>
       <column name="NAME" value="Kronen AG"/>
-      <column name="ORGANISATIONID" value="a3fd3c23-12e1-4820-b76e-2cd70103d94d"/>
+      <column name="ORGANISATIONID" value="62175b31-b432-4ec6-932f-8e69033884c6"/>
       <column name="USER_EDIT" value="Admin"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -114,7 +114,7 @@
       <column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
       <column name="KIND" value="ORGCUTOMER"/>
       <column name="NAME" value="meine Firma"/>
-      <column name="ORGANISATIONID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
+      <column name="ORGANISATIONID" value="06006801-c6a1-4321-9fde-95f9d3f9b786"/>
       <column name="USER_EDIT" value="Admin"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -124,7 +124,7 @@
       <column name="DATE_NEW" valueDate="2019-05-17T09:40:51"/>
       <column name="KIND" value="ORGCUTOMER"/>
       <column name="NAME" value="JPM Touristik GmbH"/>
-      <column name="ORGANISATIONID" value="cabf6192-f9c3-4bd4-9366-ad2b073bdfa3"/>
+      <column name="ORGANISATIONID" value="22f1ca45-e633-4080-9d5c-9a8c2e06d3f9"/>
       <column name="USER_EDIT" value="Admin"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -135,7 +135,7 @@
       <column name="INFO" value="Die Industrial Steal AG ist einer der führenden Stahlhersteller weltweit. Das Unternehmen agiert mit über 5.000 Mitarbeitern in über 30 Ländern. "/>
       <column name="KIND" value="ORGCUTOMER"/>
       <column name="NAME" value="Industrial Steel AG"/>
-      <column name="ORGANISATIONID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
+      <column name="ORGANISATIONID" value="0a65625b-147a-4709-94e2-b164a450d587"/>
       <column name="USER_EDIT" value="Admin"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -145,7 +145,7 @@
       <column name="DATE_NEW" valueDate="2019-05-17T09:47:59"/>
       <column name="KIND" value="ORGCUTOMER"/>
       <column name="NAME" value="Grobbe-Werk GmbH"/>
-      <column name="ORGANISATIONID" value="e450d126-eab8-4517-ba7c-8b6804f8c859"/>
+      <column name="ORGANISATIONID" value="09281be8-8cb5-4201-9758-8c86b3d2bb85"/>
       <column name="USER_EDIT" value="Admin"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -154,7 +154,7 @@
       <column name="DATE_EDIT" valueDate="2019-11-26T06:24:53"/>
       <column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
       <column name="NAME" value="MNF Versicherung"/>
-      <column name="ORGANISATIONID" value="e6da1393-f46b-41a4-826b-2c7d22de2246"/>
+      <column name="ORGANISATIONID" value="d3707591-5620-49a8-a63f-19e88ca7a21c"/>
       <column name="USER_EDIT" value="Admin"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -163,7 +163,7 @@
       <column name="DATE_EDIT" valueDate="2019-11-26T06:21:44"/>
       <column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
       <column name="NAME" value="Lichtenstein Document Solutions GmbH&#10;"/>
-      <column name="ORGANISATIONID" value="e83c45e0-c30b-436e-b445-00a8b58383b0"/>
+      <column name="ORGANISATIONID" value="03e09527-21cc-489a-b37f-0dd7df553c20"/>
       <column name="USER_EDIT" value="Admin"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -172,7 +172,7 @@
       <column name="DATE_EDIT" valueDate="2019-11-26T06:20:08"/>
       <column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
       <column name="NAME" value="International Kältetechnik AG&#10;"/>
-      <column name="ORGANISATIONID" value="eda61ea6-35ed-4a92-a93c-6118fc67d533"/>
+      <column name="ORGANISATIONID" value="ea07af40-4918-4ea2-94ad-031d01aeaab4"/>
       <column name="USER_EDIT" value="Admin"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -182,7 +182,7 @@
       <column name="DATE_NEW" valueDate="2019-05-23T10:53:07"/>
       <column name="KIND" value="ORGCUTOMER"/>
       <column name="NAME" value="Glob Group"/>
-      <column name="ORGANISATIONID" value="fb07cb0e-c391-4503-9c47-a39ec7388f4f"/>
+      <column name="ORGANISATIONID" value="692e1f81-9f05-4e22-b74d-56d34c671067"/>
       <column name="USER_EDIT" value="Admin"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -193,7 +193,7 @@
       <column name="INFO" value="Die Skyscraper Bau GmbH zählt zu den führenden Unternehmen in der Baubranche. Mit ihrem breiten Portfolio überzeugen sie regelmäßig und diversifizieren sich von ihren Mitbewerbern. "/>
       <column name="KIND" value="ORGCUTOMER"/>
       <column name="NAME" value="Skyscraper Bau GmbH"/>
-      <column name="ORGANISATIONID" value="fc465f2f-803b-4a1f-b79d-7b466d7ecff4"/>
+      <column name="ORGANISATIONID" value="f7b8f0c3-7702-4466-b502-d21fa4fa0010"/>
       <column name="USER_EDIT" value="Admin"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -202,7 +202,7 @@
       <column name="DATE_EDIT" valueDate="2019-11-26T06:25:36"/>
       <column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
       <column name="NAME" value="Pichelmaier Financial  AG&#13;&#10;"/>
-      <column name="ORGANISATIONID" value="fd082db5-be43-4219-a705-588f9c06e59b"/>
+      <column name="ORGANISATIONID" value="82c7b72d-da4e-4fab-a6cc-31e1be07dd08"/>
       <column name="USER_EDIT" value="Admin"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
diff --git a/.liquibase/Data_alias/basic/_demoData/generatedData/tasklink.xml b/.liquibase/Data_alias/basic/_demoData/generatedData/tasklink.xml
index 9b2fdd69c1..a87c527c26 100644
--- a/.liquibase/Data_alias/basic/_demoData/generatedData/tasklink.xml
+++ b/.liquibase/Data_alias/basic/_demoData/generatedData/tasklink.xml
@@ -9,7 +9,7 @@
       <column name="TASK_ID" value="67afcc4b-f71b-4da6-a8b3-e7947c411a2a"/>
     </insert>
     <insert tableName="tasklink">
-      <column name="OBJECT_ROWID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
+      <column name="OBJECT_ROWID" value="0a65625b-147a-4709-94e2-b164a450d587"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="TASKLINKID" value="44c1f582-7681-4f6f-b592-6221ebbdee52"/>
       <column name="TASK_ID" value="81a4c8e7-4429-41e1-a534-f1be21e56b5e"/>
@@ -21,7 +21,7 @@
       <column name="TASK_ID" value="f8fcdce1-da60-46d6-9ce3-3866e093730d"/>
     </insert>
     <insert tableName="tasklink">
-      <column name="OBJECT_ROWID" value="6efb4fab-64f9-4d8e-aa6f-a158d13fc273"/>
+      <column name="OBJECT_ROWID" value="6a92df58-2b98-40da-ba6a-d0ddb1fde234"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="TASKLINKID" value="6c2f84af-ff2e-4b70-b4d0-607a2bd0d941"/>
       <column name="TASK_ID" value="2e50d2cd-9429-433c-8f6e-2e31a9e7908e"/>
@@ -33,13 +33,13 @@
       <column name="TASK_ID" value="81a4c8e7-4429-41e1-a534-f1be21e56b5e"/>
     </insert>
     <insert tableName="tasklink">
-      <column name="OBJECT_ROWID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
+      <column name="OBJECT_ROWID" value="0a65625b-147a-4709-94e2-b164a450d587"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="TASKLINKID" value="b618fb87-d39d-41d8-be41-2b03bce29538"/>
       <column name="TASK_ID" value="96ec8b48-9fac-4216-bc98-a8323f0592f9"/>
     </insert>
     <insert tableName="tasklink">
-      <column name="OBJECT_ROWID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
+      <column name="OBJECT_ROWID" value="0a65625b-147a-4709-94e2-b164a450d587"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="TASKLINKID" value="eca5c8cb-bd10-4425-b4bc-a2e50f2518b9"/>
       <column name="TASK_ID" value="46164eac-62d1-4dbb-a252-93ac49429855"/>
diff --git a/.liquibase/Data_alias/basic/_demoData/generatedData/visitplan.xml b/.liquibase/Data_alias/basic/_demoData/generatedData/visitplan.xml
index af7e5d06f6..b9cdf7f05d 100644
--- a/.liquibase/Data_alias/basic/_demoData/generatedData/visitplan.xml
+++ b/.liquibase/Data_alias/basic/_demoData/generatedData/visitplan.xml
@@ -15,7 +15,7 @@
           <column name="ENTRYDATE" valueDate="2020-05-18"/>
           <column name="BEGIN_TIME" value="10:00"/>
           <column name="END_TIME" value="11:00"/>
-          <column name="ORGANISATION_ID" value="fc465f2f-803b-4a1f-b79d-7b466d7ecff4"/>
+          <column name="ORGANISATION_ID" value="f7b8f0c3-7702-4466-b502-d21fa4fa0010"/>
           <column name ="CONTACT_ID" value="6c612f91-0160-4f09-9103-dccee7f7a6b7"/>
           <column name="VISITPLANEMPLOYEEWEEK_ID" value="821b3424-b6d2-41f8-b0b2-6a7c2c050214"/>
           <column name="STATUS" value="VISITSTATUSPLANNED                  "/>
@@ -25,7 +25,7 @@
           <column name="ENTRYDATE" valueDate="2020-05-19"/>
           <column name="BEGIN_TIME" value="14:00"/>
           <column name="END_TIME" value="17:00"/>
-          <column name="ORGANISATION_ID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
+          <column name="ORGANISATION_ID" value="0a65625b-147a-4709-94e2-b164a450d587"/>
           <column name ="CONTACT_ID" value="45635aca-7971-43df-a683-c80c86cb58cc"/>
           <column name="VISITPLANEMPLOYEEWEEK_ID" value="821b3424-b6d2-41f8-b0b2-6a7c2c050214"/>
           <column name="STATUS" value="VISITSTATUSPLANNED                  "/>
@@ -35,7 +35,7 @@
           <column name="ENTRYDATE" valueDate="2020-05-19"/>
           <column name="BEGIN_TIME" value="10:00"/>
           <column name="END_TIME" value="11:00"/>
-          <column name="ORGANISATION_ID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
+          <column name="ORGANISATION_ID" value="06006801-c6a1-4321-9fde-95f9d3f9b786"/>
           <column name ="CONTACT_ID" value="ef345d11-a40d-59e0-a24c-afcb6095d2cb"/>
           <column name="VISITPLANEMPLOYEEWEEK_ID" value="821b3424-b6d2-41f8-b0b2-6a7c2c050214"/>
           <column name="STATUS" value="VISITSTATUSPLANNED                  "/>
@@ -45,7 +45,7 @@
           <column name="ENTRYDATE" valueDate="2020-05-20"/>
           <column name="BEGIN_TIME" value="10:00"/>
           <column name="END_TIME" value="11:00"/>
-          <column name="ORGANISATION_ID" value="8707accf-b1fd-4bde-97b1-ab44b75f66f9"/>
+          <column name="ORGANISATION_ID" value="13e60843-5d6d-45ee-88c7-46db41874138"/>
           <column name ="CONTACT_ID" value="79ce56fc-0022-4d5c-91b1-080c0f1e2191"/>
           <column name="VISITPLANEMPLOYEEWEEK_ID" value="821b3424-b6d2-41f8-b0b2-6a7c2c050214"/>
           <column name="STATUS" value="VISITSTATUSPLANNED                  "/>
@@ -64,7 +64,7 @@
           <column name="ENTRYDATE" valueDate="2020-05-25"/>
           <column name="BEGIN_TIME" value="10:00"/>
           <column name="END_TIME" value="11:00"/>
-          <column name="ORGANISATION_ID" value="fc465f2f-803b-4a1f-b79d-7b466d7ecff4"/>
+          <column name="ORGANISATION_ID" value="f7b8f0c3-7702-4466-b502-d21fa4fa0010"/>
           <column name="VISITPLANEMPLOYEEWEEK_ID" value="73fbf25a-5668-411f-9ef5-42603d163a77"/>
           <column name="STATUS" value="VISITSTATUSPLANNED                  "/>
         </insert>
@@ -73,7 +73,7 @@
           <column name="ENTRYDATE" valueDate="2020-05-26"/>
           <column name="BEGIN_TIME" value="10:00"/>
           <column name="END_TIME" value="11:00"/>
-          <column name="ORGANISATION_ID" value="fd082db5-be43-4219-a705-588f9c06e59b"/>
+          <column name="ORGANISATION_ID" value="82c7b72d-da4e-4fab-a6cc-31e1be07dd08"/>
           <column name="VISITPLANEMPLOYEEWEEK_ID" value="73fbf25a-5668-411f-9ef5-42603d163a77"/>
           <column name="STATUS" value="VISITSTATUSPLANNED                  "/>
         </insert>
@@ -82,7 +82,7 @@
           <column name="ENTRYDATE" valueDate="2020-05-27"/>
           <column name="BEGIN_TIME" value="10:00"/>
           <column name="END_TIME" value="11:00"/>
-          <column name="ORGANISATION_ID" value="a3fd3c23-12e1-4820-b76e-2cd70103d94d"/>
+          <column name="ORGANISATION_ID" value="62175b31-b432-4ec6-932f-8e69033884c6"/>
           <column name="VISITPLANEMPLOYEEWEEK_ID" value="73fbf25a-5668-411f-9ef5-42603d163a77"/>
           <column name="STATUS" value="VISITSTATUSPLANNED                  "/>
         </insert>
diff --git a/.liquibase/Data_alias/changelog.xml b/.liquibase/Data_alias/changelog.xml
index a8cc53b406..925dfaab9b 100644
--- a/.liquibase/Data_alias/changelog.xml
+++ b/.liquibase/Data_alias/changelog.xml
@@ -16,5 +16,5 @@
     <include relativeToChangelogFile="true" file="basic/2020.1.2/changelog.xml"/>
     
     <!--enable this only when you definetly want to overwrite the existing data with demo records:--> 
-    <!--<include relativeToChangelogFile="true" file="basic/_demoData/changelog.xml" context="example"/>-->
+    <include relativeToChangelogFile="true" file="basic/_demoData/changelog.xml" context="example"/>
 </databaseChangeLog>
\ No newline at end of file
diff --git a/aliasDefinition/Data_alias/Data_alias.aod b/aliasDefinition/Data_alias/Data_alias.aod
index dbe878d7be..6e685b98b7 100644
--- a/aliasDefinition/Data_alias/Data_alias.aod
+++ b/aliasDefinition/Data_alias/Data_alias.aod
@@ -8237,9 +8237,9 @@
                 <name>DATE_EDIT</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="91" />
-                <size v="10" />
-                <scale v="0" />
+                <columnType v="93" />
+                <size v="29" />
+                <scale v="9" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -8272,9 +8272,9 @@
                 <name>DATE_NEW</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="91" />
-                <size v="10" />
-                <scale v="0" />
+                <columnType v="93" />
+                <size v="29" />
+                <scale v="9" />
                 <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -8382,13 +8382,13 @@
               <entityFieldDb>
                 <name>DOCUMENTTEMPLATEID</name>
                 <dbName></dbName>
-                <primaryKey v="true" />
+                <primaryKey v="false" />
                 <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
-                <notNull v="true" />
-                <isUnique v="true" />
-                <index v="true" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
@@ -8529,9 +8529,9 @@
                 <name>DATE_EDIT</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="91" />
-                <size v="10" />
-                <scale v="0" />
+                <columnType v="93" />
+                <size v="29" />
+                <scale v="9" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -8557,9 +8557,9 @@
                 <name>DATE_NEW</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="91" />
-                <size v="10" />
-                <scale v="0" />
+                <columnType v="93" />
+                <size v="29" />
+                <scale v="9" />
                 <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -8647,9 +8647,9 @@
                 <name>DATE_EDIT</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="91" />
-                <size v="10" />
-                <scale v="0" />
+                <columnType v="93" />
+                <size v="29" />
+                <scale v="9" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -8696,9 +8696,9 @@
                 <name>DATE_NEW</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="91" />
-                <size v="10" />
-                <scale v="0" />
+                <columnType v="93" />
+                <size v="29" />
+                <scale v="9" />
                 <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -8835,9 +8835,9 @@
                 <name>DATE_EDIT</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="91" />
-                <size v="10" />
-                <scale v="0" />
+                <columnType v="93" />
+                <size v="29" />
+                <scale v="9" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -8954,9 +8954,9 @@
                 <name>DATE_NEW</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="91" />
-                <size v="10" />
-                <scale v="0" />
+                <columnType v="93" />
+                <size v="29" />
+                <scale v="9" />
                 <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -9267,9 +9267,9 @@
                 <name>DATE_EDIT</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="91" />
-                <size v="10" />
-                <scale v="0" />
+                <columnType v="93" />
+                <size v="29" />
+                <scale v="9" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -9309,9 +9309,9 @@
                 <name>DATE_NEW</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="91" />
-                <size v="10" />
-                <scale v="0" />
+                <columnType v="93" />
+                <size v="29" />
+                <scale v="9" />
                 <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -11573,9 +11573,9 @@
                 <name>DATE_EDIT</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="91" />
-                <size v="10" />
-                <scale v="0" />
+                <columnType v="93" />
+                <size v="29" />
+                <scale v="9" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -11601,9 +11601,9 @@
                 <name>DATE_NEW</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="91" />
-                <size v="10" />
-                <scale v="0" />
+                <columnType v="93" />
+                <size v="29" />
+                <scale v="9" />
                 <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -11885,9 +11885,9 @@
                 <name>DATE_EDIT</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="91" />
-                <size v="10" />
-                <scale v="0" />
+                <columnType v="93" />
+                <size v="29" />
+                <scale v="9" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -11920,9 +11920,9 @@
                 <name>DATE_NEW</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="91" />
-                <size v="10" />
-                <scale v="0" />
+                <columnType v="93" />
+                <size v="29" />
+                <scale v="9" />
                 <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
-- 
GitLab


From a1e4918b7221e8489e9325ca39f9b9f3002e5b3e Mon Sep 17 00:00:00 2001
From: "b.ulrich" <b.ulrich@adito.de>
Date: Mon, 3 Aug 2020 14:00:10 +0200
Subject: [PATCH 075/309] [Projekt: Entwicklung - Neon][TicketNr.:
 1062818][gleiche Organisation_Id und Contact_Id bei Demo-Firmen]

---
 .../basic/_demoData/generatedData/organisation.xml          | 2 +-
 .../Data_alias/basic/_demoData/generatedData/tasklink.xml   | 6 +++---
 .../Data_alias/basic/_demoData/generatedData/visitplan.xml  | 2 +-
 .liquibase/Data_alias/changelog.xml                         | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.liquibase/Data_alias/basic/_demoData/generatedData/organisation.xml b/.liquibase/Data_alias/basic/_demoData/generatedData/organisation.xml
index 74f323cb7b..631d6e9831 100644
--- a/.liquibase/Data_alias/basic/_demoData/generatedData/organisation.xml
+++ b/.liquibase/Data_alias/basic/_demoData/generatedData/organisation.xml
@@ -135,7 +135,7 @@
       <column name="INFO" value="Die Industrial Steal AG ist einer der führenden Stahlhersteller weltweit. Das Unternehmen agiert mit über 5.000 Mitarbeitern in über 30 Ländern. "/>
       <column name="KIND" value="ORGCUTOMER"/>
       <column name="NAME" value="Industrial Steel AG"/>
-      <column name="ORGANISATIONID" value="0a65625b-147a-4709-94e2-b164a450d587"/>
+      <column name="ORGANISATIONID" value="2c63e0de-f21c-474f-89d7-bff8ba1dbf43"/>
       <column name="USER_EDIT" value="Admin"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
diff --git a/.liquibase/Data_alias/basic/_demoData/generatedData/tasklink.xml b/.liquibase/Data_alias/basic/_demoData/generatedData/tasklink.xml
index a87c527c26..d63eb70db4 100644
--- a/.liquibase/Data_alias/basic/_demoData/generatedData/tasklink.xml
+++ b/.liquibase/Data_alias/basic/_demoData/generatedData/tasklink.xml
@@ -9,7 +9,7 @@
       <column name="TASK_ID" value="67afcc4b-f71b-4da6-a8b3-e7947c411a2a"/>
     </insert>
     <insert tableName="tasklink">
-      <column name="OBJECT_ROWID" value="0a65625b-147a-4709-94e2-b164a450d587"/>
+      <column name="OBJECT_ROWID" value="2c63e0de-f21c-474f-89d7-bff8ba1dbf43"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="TASKLINKID" value="44c1f582-7681-4f6f-b592-6221ebbdee52"/>
       <column name="TASK_ID" value="81a4c8e7-4429-41e1-a534-f1be21e56b5e"/>
@@ -33,13 +33,13 @@
       <column name="TASK_ID" value="81a4c8e7-4429-41e1-a534-f1be21e56b5e"/>
     </insert>
     <insert tableName="tasklink">
-      <column name="OBJECT_ROWID" value="0a65625b-147a-4709-94e2-b164a450d587"/>
+      <column name="OBJECT_ROWID" value="2c63e0de-f21c-474f-89d7-bff8ba1dbf43"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="TASKLINKID" value="b618fb87-d39d-41d8-be41-2b03bce29538"/>
       <column name="TASK_ID" value="96ec8b48-9fac-4216-bc98-a8323f0592f9"/>
     </insert>
     <insert tableName="tasklink">
-      <column name="OBJECT_ROWID" value="0a65625b-147a-4709-94e2-b164a450d587"/>
+      <column name="OBJECT_ROWID" value="2c63e0de-f21c-474f-89d7-bff8ba1dbf43"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="TASKLINKID" value="eca5c8cb-bd10-4425-b4bc-a2e50f2518b9"/>
       <column name="TASK_ID" value="46164eac-62d1-4dbb-a252-93ac49429855"/>
diff --git a/.liquibase/Data_alias/basic/_demoData/generatedData/visitplan.xml b/.liquibase/Data_alias/basic/_demoData/generatedData/visitplan.xml
index b9cdf7f05d..855c9976ab 100644
--- a/.liquibase/Data_alias/basic/_demoData/generatedData/visitplan.xml
+++ b/.liquibase/Data_alias/basic/_demoData/generatedData/visitplan.xml
@@ -25,7 +25,7 @@
           <column name="ENTRYDATE" valueDate="2020-05-19"/>
           <column name="BEGIN_TIME" value="14:00"/>
           <column name="END_TIME" value="17:00"/>
-          <column name="ORGANISATION_ID" value="0a65625b-147a-4709-94e2-b164a450d587"/>
+          <column name="ORGANISATION_ID" value="2c63e0de-f21c-474f-89d7-bff8ba1dbf43"/>
           <column name ="CONTACT_ID" value="45635aca-7971-43df-a683-c80c86cb58cc"/>
           <column name="VISITPLANEMPLOYEEWEEK_ID" value="821b3424-b6d2-41f8-b0b2-6a7c2c050214"/>
           <column name="STATUS" value="VISITSTATUSPLANNED                  "/>
diff --git a/.liquibase/Data_alias/changelog.xml b/.liquibase/Data_alias/changelog.xml
index 925dfaab9b..a8cc53b406 100644
--- a/.liquibase/Data_alias/changelog.xml
+++ b/.liquibase/Data_alias/changelog.xml
@@ -16,5 +16,5 @@
     <include relativeToChangelogFile="true" file="basic/2020.1.2/changelog.xml"/>
     
     <!--enable this only when you definetly want to overwrite the existing data with demo records:--> 
-    <include relativeToChangelogFile="true" file="basic/_demoData/changelog.xml" context="example"/>
+    <!--<include relativeToChangelogFile="true" file="basic/_demoData/changelog.xml" context="example"/>-->
 </databaseChangeLog>
\ No newline at end of file
-- 
GitLab


From 57f7847246daf4f300d115b9503e328c7c50eae7 Mon Sep 17 00:00:00 2001
From: "b.ulrich" <b.ulrich@adito.de>
Date: Mon, 3 Aug 2020 14:18:32 +0200
Subject: [PATCH 076/309] [Projekt: Entwicklung - Neon][TicketNr.:
 1061849][Anlage von Angebotsposition zieht falschen Preis von Produkt]

---
 process/Product_lib/process.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/process/Product_lib/process.js b/process/Product_lib/process.js
index c6e9a85c7e..ee03a52bec 100644
--- a/process/Product_lib/process.js
+++ b/process/Product_lib/process.js
@@ -291,10 +291,10 @@ ProductUtils.getProductDetails = function(pid, priceListFilter, additionalProduc
                 for(var index in priceLists)
                 {
                     
-                    if (!escape && priceLists[index]["priceList"] == priceListFilter.priceList) 
+                    if (priceLists[index]["priceList"] == priceListFilter.priceList) 
                     {
                         res = priceLists[index]; //The first time the condition is true the correct pricelist is found.
-                        escape = true;          // The object is ordered by fromQuantity descending so we have to stop after the condition is true
+                        break;                   // The object is ordered by fromQuantity descending so we have to stop after the condition is true
                     }
                 }
                 return res;
-- 
GitLab


From 9c83a64b9940a307eca473957e9ceaf9d3ce1860 Mon Sep 17 00:00:00 2001
From: "b.ulrich" <b.ulrich@adito.de>
Date: Mon, 3 Aug 2020 15:18:25 +0200
Subject: [PATCH 077/309] [Projekt: Entwicklung - Neon][TicketNr.:
 1053788][Notifications: Buttonlabel inkonsistent zu Statusnamen]

---
 .liquibase/Data_alias/basic/2020.1.2/changelog.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.liquibase/Data_alias/basic/2020.1.2/changelog.xml b/.liquibase/Data_alias/basic/2020.1.2/changelog.xml
index 9ca6f43076..204b6bbe8b 100644
--- a/.liquibase/Data_alias/basic/2020.1.2/changelog.xml
+++ b/.liquibase/Data_alias/basic/2020.1.2/changelog.xml
@@ -3,6 +3,5 @@
                    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
     <include file="AlterDatatypeOfKeyColumnsToChar/changelog.xml" relativeToChangelogFile="true"/>
     <include file="AddNullableToDateNew.xml" relativeToChangelogFile="true" />
-    <include file="AddNullableToDateNew.xml" relativeToChangelogFile="true" />
     <include file="AlterButtonLabelTitles/AlterButtonLabelTitles.xml" relativeToChangelogFile="true" />
 </databaseChangeLog>
-- 
GitLab


From dfc308b890fbbf1585fd159a6a7221ca0ec6b562 Mon Sep 17 00:00:00 2001
From: Johannes Goderbauer <j.goderbauer@adito.de>
Date: Mon, 3 Aug 2020 15:21:20 +0200
Subject: [PATCH 078/309] Removed unused view CampaignStepMembers_view

---
 neonContext/CampaignStep/CampaignStep.aod                    | 4 ----
 .../CampaignStepMembers_view/CampaignStepMembers_view.aod    | 5 -----
 2 files changed, 9 deletions(-)
 delete mode 100644 neonView/CampaignStepMembers_view/CampaignStepMembers_view.aod

diff --git a/neonContext/CampaignStep/CampaignStep.aod b/neonContext/CampaignStep/CampaignStep.aod
index 99969c1dc8..6e9810b632 100644
--- a/neonContext/CampaignStep/CampaignStep.aod
+++ b/neonContext/CampaignStep/CampaignStep.aod
@@ -45,9 +45,5 @@
       <name>99367402-93e6-49d4-b60c-143b6e71df00</name>
       <view>CampaignStepsGantt_view</view>
     </neonViewReference>
-    <neonViewReference>
-      <name>f146ea29-77d2-4141-b04a-36c29594e670</name>
-      <view>CampaignStepMembers_view</view>
-    </neonViewReference>
   </references>
 </neonContext>
diff --git a/neonView/CampaignStepMembers_view/CampaignStepMembers_view.aod b/neonView/CampaignStepMembers_view/CampaignStepMembers_view.aod
deleted file mode 100644
index f66c1629d8..0000000000
--- a/neonView/CampaignStepMembers_view/CampaignStepMembers_view.aod
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.6">
-  <name>CampaignStepMembers_view</name>
-  <majorModelMode>DISTRIBUTED</majorModelMode>
-</neonView>
-- 
GitLab


From 47a61c7254b5a3d9affac57d516b1a637578b17c Mon Sep 17 00:00:00 2001
From: Johannes Goderbauer <j.goderbauer@adito.de>
Date: Mon, 3 Aug 2020 15:24:18 +0200
Subject: [PATCH 079/309] updated aliasDefinition: Data_alias

---
 aliasDefinition/Data_alias/Data_alias.aod | 92 +++++++++++------------
 1 file changed, 46 insertions(+), 46 deletions(-)

diff --git a/aliasDefinition/Data_alias/Data_alias.aod b/aliasDefinition/Data_alias/Data_alias.aod
index dbe878d7be..6e685b98b7 100644
--- a/aliasDefinition/Data_alias/Data_alias.aod
+++ b/aliasDefinition/Data_alias/Data_alias.aod
@@ -8237,9 +8237,9 @@
                 <name>DATE_EDIT</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="91" />
-                <size v="10" />
-                <scale v="0" />
+                <columnType v="93" />
+                <size v="29" />
+                <scale v="9" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -8272,9 +8272,9 @@
                 <name>DATE_NEW</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="91" />
-                <size v="10" />
-                <scale v="0" />
+                <columnType v="93" />
+                <size v="29" />
+                <scale v="9" />
                 <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -8382,13 +8382,13 @@
               <entityFieldDb>
                 <name>DOCUMENTTEMPLATEID</name>
                 <dbName></dbName>
-                <primaryKey v="true" />
+                <primaryKey v="false" />
                 <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
-                <notNull v="true" />
-                <isUnique v="true" />
-                <index v="true" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
@@ -8529,9 +8529,9 @@
                 <name>DATE_EDIT</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="91" />
-                <size v="10" />
-                <scale v="0" />
+                <columnType v="93" />
+                <size v="29" />
+                <scale v="9" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -8557,9 +8557,9 @@
                 <name>DATE_NEW</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="91" />
-                <size v="10" />
-                <scale v="0" />
+                <columnType v="93" />
+                <size v="29" />
+                <scale v="9" />
                 <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -8647,9 +8647,9 @@
                 <name>DATE_EDIT</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="91" />
-                <size v="10" />
-                <scale v="0" />
+                <columnType v="93" />
+                <size v="29" />
+                <scale v="9" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -8696,9 +8696,9 @@
                 <name>DATE_NEW</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="91" />
-                <size v="10" />
-                <scale v="0" />
+                <columnType v="93" />
+                <size v="29" />
+                <scale v="9" />
                 <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -8835,9 +8835,9 @@
                 <name>DATE_EDIT</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="91" />
-                <size v="10" />
-                <scale v="0" />
+                <columnType v="93" />
+                <size v="29" />
+                <scale v="9" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -8954,9 +8954,9 @@
                 <name>DATE_NEW</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="91" />
-                <size v="10" />
-                <scale v="0" />
+                <columnType v="93" />
+                <size v="29" />
+                <scale v="9" />
                 <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -9267,9 +9267,9 @@
                 <name>DATE_EDIT</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="91" />
-                <size v="10" />
-                <scale v="0" />
+                <columnType v="93" />
+                <size v="29" />
+                <scale v="9" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -9309,9 +9309,9 @@
                 <name>DATE_NEW</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="91" />
-                <size v="10" />
-                <scale v="0" />
+                <columnType v="93" />
+                <size v="29" />
+                <scale v="9" />
                 <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -11573,9 +11573,9 @@
                 <name>DATE_EDIT</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="91" />
-                <size v="10" />
-                <scale v="0" />
+                <columnType v="93" />
+                <size v="29" />
+                <scale v="9" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -11601,9 +11601,9 @@
                 <name>DATE_NEW</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="91" />
-                <size v="10" />
-                <scale v="0" />
+                <columnType v="93" />
+                <size v="29" />
+                <scale v="9" />
                 <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -11885,9 +11885,9 @@
                 <name>DATE_EDIT</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="91" />
-                <size v="10" />
-                <scale v="0" />
+                <columnType v="93" />
+                <size v="29" />
+                <scale v="9" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -11920,9 +11920,9 @@
                 <name>DATE_NEW</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="91" />
-                <size v="10" />
-                <scale v="0" />
+                <columnType v="93" />
+                <size v="29" />
+                <scale v="9" />
                 <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
-- 
GitLab


From c7c453f0506692909bc3570dbfc92c8ed57eeabc Mon Sep 17 00:00:00 2001
From: "b.ulrich" <b.ulrich@adito.de>
Date: Mon, 3 Aug 2020 16:01:37 +0200
Subject: [PATCH 080/309] =?UTF-8?q?[Projekt:=20Entwicklung=20-=20Neon][Tic?=
 =?UTF-8?q?ketNr.:=201059557]["Untergeordnete=20Eigenschaft=20anlegen"-But?=
 =?UTF-8?q?ton=20f=C3=BCr=20den=20Typ=20"Auswahl"=20nicht=20aktiv]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../attributeactions/children/newchildattribute/stateProcess.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/entity/Attribute_entity/entityfields/attributeactions/children/newchildattribute/stateProcess.js b/entity/Attribute_entity/entityfields/attributeactions/children/newchildattribute/stateProcess.js
index 89793c57e8..a1ee18e84b 100644
--- a/entity/Attribute_entity/entityfields/attributeactions/children/newchildattribute/stateProcess.js
+++ b/entity/Attribute_entity/entityfields/attributeactions/children/newchildattribute/stateProcess.js
@@ -3,7 +3,7 @@ import("system.result");
 import("system.vars");
 import("system.neon");
 
-if(vars.get("$sys.selection").length == 1 && vars.get("$field.ATTRIBUTE_TYPE") != $AttributeTypes.OBJECTSELECTION.toString())
+if(vars.get("$sys.selection").length == 1 && AttributeTypeUtil.isGroupType(vars.get("$field.ATTRIBUTE_TYPE")))
     result.string(neon.COMPONENTSTATE_EDITABLE);
 else
     result.string(neon.COMPONENTSTATE_DISABLED);
\ No newline at end of file
-- 
GitLab


From 2946deeaa3f505c6ad6983942581a8e70b0089df Mon Sep 17 00:00:00 2001
From: Johannes Goderbauer <j.goderbauer@adito.de>
Date: Mon, 3 Aug 2020 16:33:24 +0200
Subject: [PATCH 081/309] Fixed scanservice-error: a table lost its primarykey
 on derby

---
 .../alter_DocumentTemplatePlaceOfUseDatatype.xml          | 3 +++
 aliasDefinition/Data_alias/Data_alias.aod                 | 8 ++++----
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/.liquibase/Data_alias/basic/2020.1.2/AlterDatatypeOfKeyColumnsToChar/alter_DocumentTemplatePlaceOfUseDatatype.xml b/.liquibase/Data_alias/basic/2020.1.2/AlterDatatypeOfKeyColumnsToChar/alter_DocumentTemplatePlaceOfUseDatatype.xml
index ec607aa938..2cfda5e78c 100644
--- a/.liquibase/Data_alias/basic/2020.1.2/AlterDatatypeOfKeyColumnsToChar/alter_DocumentTemplatePlaceOfUseDatatype.xml
+++ b/.liquibase/Data_alias/basic/2020.1.2/AlterDatatypeOfKeyColumnsToChar/alter_DocumentTemplatePlaceOfUseDatatype.xml
@@ -2,11 +2,14 @@
 <databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
                    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
     <changeSet dbms="derby" author="b.ulrich" id="83c25119-cf41-42ab-b42f-370195f9de87">
+        <!--not null must be set in derby before adding a primary key constraint-->
         <sql>
             ALTER TABLE DOCUMENTTEMPLATE ADD COLUMN DOCUMENTTEMPLATEID_NEW CHAR(36);
             UPDATE DOCUMENTTEMPLATE SET DOCUMENTTEMPLATEID_NEW=DOCUMENTTEMPLATEID;
             ALTER TABLE DOCUMENTTEMPLATE DROP COLUMN DOCUMENTTEMPLATEID;
             RENAME COLUMN DOCUMENTTEMPLATE.DOCUMENTTEMPLATEID_NEW TO DOCUMENTTEMPLATEID;
+            ALTER TABLE DOCUMENTTEMPLATE ALTER COLUMN DOCUMENTTEMPLATEID NOT NULL;
+            ALTER TABLE DOCUMENTTEMPLATE ADD CONSTRAINT PK_DOCUMENTTEMPLATE_DOCUMENTTEMPLATEID  PRIMARY KEY (DOCUMENTTEMPLATEID);
         </sql>
     </changeSet>
     
diff --git a/aliasDefinition/Data_alias/Data_alias.aod b/aliasDefinition/Data_alias/Data_alias.aod
index 6e685b98b7..324bae9d14 100644
--- a/aliasDefinition/Data_alias/Data_alias.aod
+++ b/aliasDefinition/Data_alias/Data_alias.aod
@@ -8382,13 +8382,13 @@
               <entityFieldDb>
                 <name>DOCUMENTTEMPLATEID</name>
                 <dbName></dbName>
-                <primaryKey v="false" />
+                <primaryKey v="true" />
                 <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
-                <notNull v="false" />
-                <isUnique v="false" />
-                <index v="false" />
+                <notNull v="true" />
+                <isUnique v="true" />
+                <index v="true" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
-- 
GitLab


From cb8e4d76153d04305647a9a212d2d940253080c4 Mon Sep 17 00:00:00 2001
From: Benjamin Ulrich <b.ulrich@adito.de>
Date: Mon, 3 Aug 2020 14:40:13 +0000
Subject: [PATCH 082/309] =?UTF-8?q?[Projekt:=20Entwicklung=20-=20Neon][Tic?=
 =?UTF-8?q?ketNr.:=201061658][Besuchsvorschlag=20-=20neuer=20Wochenplanein?=
 =?UTF-8?q?trag:=20Kontakt=20nicht=20ausw=C3=A4hlbar=20obwohl=20vorhanden]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../rename_VisitPlanEntry_ORGANISATION_ID.xml | 11 +++
 .../Data_alias/basic/2020.1.2/changelog.xml   |  1 +
 .../_demoData/generatedData/visitplan.xml     | 14 +--
 aliasDefinition/Data_alias/Data_alias.aod     | 92 +++++++++----------
 .../organisation_id/displayValueProcess.js    |  4 +-
 .../VisitPlanEntry_entity.aod                 | 14 +--
 .../VisitPlanEntry_entity/documentation.adoc  |  3 +-
 .../entityfields/contact_id/onValidation.js   |  2 +-
 .../entityfields/contact_id/valueProcess.js   |  2 +-
 .../children/newactivity/onActionProcess.js   |  4 +-
 .../newappointment/onActionProcess.js         | 10 +-
 .../children/openroute/onActionProcess.js     |  2 +-
 .../displayValueProcess.js                    |  2 +-
 .../documentation.adoc                        |  0
 .../stateProcess.js                           |  0
 .../valueProcess.js                           |  0
 .../excludedcontactids_param/valueProcess.js  |  2 +-
 .../recordcontainers/jdito/contentProcess.js  | 10 +-
 .../recordcontainers/jdito/onInsert.js        |  4 +-
 .../recordcontainers/jdito/onUpdate.js        |  4 +-
 .../recordcontainers/jdito/contentProcess.js  |  8 +-
 21 files changed, 101 insertions(+), 88 deletions(-)
 create mode 100644 .liquibase/Data_alias/basic/2020.1.2/VisitPlanEntry/rename_VisitPlanEntry_ORGANISATION_ID.xml
 rename entity/VisitPlanEntry_entity/entityfields/{organisation_id => organisation_contact_id}/displayValueProcess.js (74%)
 rename entity/VisitPlanEntry_entity/entityfields/{organisation_id => organisation_contact_id}/documentation.adoc (100%)
 rename entity/VisitPlanEntry_entity/entityfields/{organisation_id => organisation_contact_id}/stateProcess.js (100%)
 rename entity/VisitPlanEntry_entity/entityfields/{organisation_id => organisation_contact_id}/valueProcess.js (100%)

diff --git a/.liquibase/Data_alias/basic/2020.1.2/VisitPlanEntry/rename_VisitPlanEntry_ORGANISATION_ID.xml b/.liquibase/Data_alias/basic/2020.1.2/VisitPlanEntry/rename_VisitPlanEntry_ORGANISATION_ID.xml
new file mode 100644
index 0000000000..0603638910
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2020.1.2/VisitPlanEntry/rename_VisitPlanEntry_ORGANISATION_ID.xml
@@ -0,0 +1,11 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+                   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+        <changeSet id="3d7f038c-04f1-45a2-9a1c-73c1a8666fea" author="b.ulrich" >
+    <renameColumn
+            columnDataType="CHAR(36)"  
+            newColumnName="ORGANISATION_CONTACT_ID"  
+            oldColumnName="ORGANISATION_ID"  
+            tableName="VISITPLANENTRY"/>  
+    </changeSet>
+</databaseChangeLog>
diff --git a/.liquibase/Data_alias/basic/2020.1.2/changelog.xml b/.liquibase/Data_alias/basic/2020.1.2/changelog.xml
index 8a20273d61..9cb45a60cf 100644
--- a/.liquibase/Data_alias/basic/2020.1.2/changelog.xml
+++ b/.liquibase/Data_alias/basic/2020.1.2/changelog.xml
@@ -2,5 +2,6 @@
 <databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
                    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
     <include file="AlterDatatypeOfKeyColumnsToChar/changelog.xml" relativeToChangelogFile="true"/>
+    <include file="VisitPlanEntry/rename_VisitPlanEntry_ORGANISATION_ID.xml" relativeToChangelogFile="true"/>
     <include file="AddNullableToDateNew.xml" relativeToChangelogFile="true" />
 </databaseChangeLog>
diff --git a/.liquibase/Data_alias/basic/_demoData/generatedData/visitplan.xml b/.liquibase/Data_alias/basic/_demoData/generatedData/visitplan.xml
index af7e5d06f6..76b2a507a6 100644
--- a/.liquibase/Data_alias/basic/_demoData/generatedData/visitplan.xml
+++ b/.liquibase/Data_alias/basic/_demoData/generatedData/visitplan.xml
@@ -15,7 +15,7 @@
           <column name="ENTRYDATE" valueDate="2020-05-18"/>
           <column name="BEGIN_TIME" value="10:00"/>
           <column name="END_TIME" value="11:00"/>
-          <column name="ORGANISATION_ID" value="fc465f2f-803b-4a1f-b79d-7b466d7ecff4"/>
+          <column name="ORGANISATION_CONTACT_ID" value="fc465f2f-803b-4a1f-b79d-7b466d7ecff4"/>
           <column name ="CONTACT_ID" value="6c612f91-0160-4f09-9103-dccee7f7a6b7"/>
           <column name="VISITPLANEMPLOYEEWEEK_ID" value="821b3424-b6d2-41f8-b0b2-6a7c2c050214"/>
           <column name="STATUS" value="VISITSTATUSPLANNED                  "/>
@@ -25,7 +25,7 @@
           <column name="ENTRYDATE" valueDate="2020-05-19"/>
           <column name="BEGIN_TIME" value="14:00"/>
           <column name="END_TIME" value="17:00"/>
-          <column name="ORGANISATION_ID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
+          <column name="ORGANISATION_CONTACT_ID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
           <column name ="CONTACT_ID" value="45635aca-7971-43df-a683-c80c86cb58cc"/>
           <column name="VISITPLANEMPLOYEEWEEK_ID" value="821b3424-b6d2-41f8-b0b2-6a7c2c050214"/>
           <column name="STATUS" value="VISITSTATUSPLANNED                  "/>
@@ -35,7 +35,7 @@
           <column name="ENTRYDATE" valueDate="2020-05-19"/>
           <column name="BEGIN_TIME" value="10:00"/>
           <column name="END_TIME" value="11:00"/>
-          <column name="ORGANISATION_ID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
+          <column name="ORGANISATION_CONTACT_ID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
           <column name ="CONTACT_ID" value="ef345d11-a40d-59e0-a24c-afcb6095d2cb"/>
           <column name="VISITPLANEMPLOYEEWEEK_ID" value="821b3424-b6d2-41f8-b0b2-6a7c2c050214"/>
           <column name="STATUS" value="VISITSTATUSPLANNED                  "/>
@@ -45,7 +45,7 @@
           <column name="ENTRYDATE" valueDate="2020-05-20"/>
           <column name="BEGIN_TIME" value="10:00"/>
           <column name="END_TIME" value="11:00"/>
-          <column name="ORGANISATION_ID" value="8707accf-b1fd-4bde-97b1-ab44b75f66f9"/>
+          <column name="ORGANISATION_CONTACT_ID" value="8707accf-b1fd-4bde-97b1-ab44b75f66f9"/>
           <column name ="CONTACT_ID" value="79ce56fc-0022-4d5c-91b1-080c0f1e2191"/>
           <column name="VISITPLANEMPLOYEEWEEK_ID" value="821b3424-b6d2-41f8-b0b2-6a7c2c050214"/>
           <column name="STATUS" value="VISITSTATUSPLANNED                  "/>
@@ -64,7 +64,7 @@
           <column name="ENTRYDATE" valueDate="2020-05-25"/>
           <column name="BEGIN_TIME" value="10:00"/>
           <column name="END_TIME" value="11:00"/>
-          <column name="ORGANISATION_ID" value="fc465f2f-803b-4a1f-b79d-7b466d7ecff4"/>
+          <column name="ORGANISATION_CONTACT_ID" value="fc465f2f-803b-4a1f-b79d-7b466d7ecff4"/>
           <column name="VISITPLANEMPLOYEEWEEK_ID" value="73fbf25a-5668-411f-9ef5-42603d163a77"/>
           <column name="STATUS" value="VISITSTATUSPLANNED                  "/>
         </insert>
@@ -73,7 +73,7 @@
           <column name="ENTRYDATE" valueDate="2020-05-26"/>
           <column name="BEGIN_TIME" value="10:00"/>
           <column name="END_TIME" value="11:00"/>
-          <column name="ORGANISATION_ID" value="fd082db5-be43-4219-a705-588f9c06e59b"/>
+          <column name="ORGANISATION_CONTACT_ID" value="fd082db5-be43-4219-a705-588f9c06e59b"/>
           <column name="VISITPLANEMPLOYEEWEEK_ID" value="73fbf25a-5668-411f-9ef5-42603d163a77"/>
           <column name="STATUS" value="VISITSTATUSPLANNED                  "/>
         </insert>
@@ -82,7 +82,7 @@
           <column name="ENTRYDATE" valueDate="2020-05-27"/>
           <column name="BEGIN_TIME" value="10:00"/>
           <column name="END_TIME" value="11:00"/>
-          <column name="ORGANISATION_ID" value="a3fd3c23-12e1-4820-b76e-2cd70103d94d"/>
+          <column name="ORGANISATION_CONTACT_ID" value="a3fd3c23-12e1-4820-b76e-2cd70103d94d"/>
           <column name="VISITPLANEMPLOYEEWEEK_ID" value="73fbf25a-5668-411f-9ef5-42603d163a77"/>
           <column name="STATUS" value="VISITSTATUSPLANNED                  "/>
         </insert>
diff --git a/aliasDefinition/Data_alias/Data_alias.aod b/aliasDefinition/Data_alias/Data_alias.aod
index dbe878d7be..6e685b98b7 100644
--- a/aliasDefinition/Data_alias/Data_alias.aod
+++ b/aliasDefinition/Data_alias/Data_alias.aod
@@ -8237,9 +8237,9 @@
                 <name>DATE_EDIT</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="91" />
-                <size v="10" />
-                <scale v="0" />
+                <columnType v="93" />
+                <size v="29" />
+                <scale v="9" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -8272,9 +8272,9 @@
                 <name>DATE_NEW</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="91" />
-                <size v="10" />
-                <scale v="0" />
+                <columnType v="93" />
+                <size v="29" />
+                <scale v="9" />
                 <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -8382,13 +8382,13 @@
               <entityFieldDb>
                 <name>DOCUMENTTEMPLATEID</name>
                 <dbName></dbName>
-                <primaryKey v="true" />
+                <primaryKey v="false" />
                 <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
-                <notNull v="true" />
-                <isUnique v="true" />
-                <index v="true" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
@@ -8529,9 +8529,9 @@
                 <name>DATE_EDIT</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="91" />
-                <size v="10" />
-                <scale v="0" />
+                <columnType v="93" />
+                <size v="29" />
+                <scale v="9" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -8557,9 +8557,9 @@
                 <name>DATE_NEW</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="91" />
-                <size v="10" />
-                <scale v="0" />
+                <columnType v="93" />
+                <size v="29" />
+                <scale v="9" />
                 <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -8647,9 +8647,9 @@
                 <name>DATE_EDIT</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="91" />
-                <size v="10" />
-                <scale v="0" />
+                <columnType v="93" />
+                <size v="29" />
+                <scale v="9" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -8696,9 +8696,9 @@
                 <name>DATE_NEW</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="91" />
-                <size v="10" />
-                <scale v="0" />
+                <columnType v="93" />
+                <size v="29" />
+                <scale v="9" />
                 <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -8835,9 +8835,9 @@
                 <name>DATE_EDIT</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="91" />
-                <size v="10" />
-                <scale v="0" />
+                <columnType v="93" />
+                <size v="29" />
+                <scale v="9" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -8954,9 +8954,9 @@
                 <name>DATE_NEW</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="91" />
-                <size v="10" />
-                <scale v="0" />
+                <columnType v="93" />
+                <size v="29" />
+                <scale v="9" />
                 <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -9267,9 +9267,9 @@
                 <name>DATE_EDIT</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="91" />
-                <size v="10" />
-                <scale v="0" />
+                <columnType v="93" />
+                <size v="29" />
+                <scale v="9" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -9309,9 +9309,9 @@
                 <name>DATE_NEW</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="91" />
-                <size v="10" />
-                <scale v="0" />
+                <columnType v="93" />
+                <size v="29" />
+                <scale v="9" />
                 <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -11573,9 +11573,9 @@
                 <name>DATE_EDIT</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="91" />
-                <size v="10" />
-                <scale v="0" />
+                <columnType v="93" />
+                <size v="29" />
+                <scale v="9" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -11601,9 +11601,9 @@
                 <name>DATE_NEW</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="91" />
-                <size v="10" />
-                <scale v="0" />
+                <columnType v="93" />
+                <size v="29" />
+                <scale v="9" />
                 <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -11885,9 +11885,9 @@
                 <name>DATE_EDIT</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="91" />
-                <size v="10" />
-                <scale v="0" />
+                <columnType v="93" />
+                <size v="29" />
+                <scale v="9" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -11920,9 +11920,9 @@
                 <name>DATE_NEW</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="91" />
-                <size v="10" />
-                <scale v="0" />
+                <columnType v="93" />
+                <size v="29" />
+                <scale v="9" />
                 <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
diff --git a/entity/Contact_entity/entityfields/organisation_id/displayValueProcess.js b/entity/Contact_entity/entityfields/organisation_id/displayValueProcess.js
index 460b39849d..25f85ab396 100644
--- a/entity/Contact_entity/entityfields/organisation_id/displayValueProcess.js
+++ b/entity/Contact_entity/entityfields/organisation_id/displayValueProcess.js
@@ -3,7 +3,7 @@ import("system.db");
 import("system.vars");
 import("Contact_lib");
 
-var organisationId = vars.get("$field.ORGANISATION_ID");
-var res = OrganisationUtils.getNameByOrganisationId(organisationId);
+var organisationContactId = vars.get("$field.ORGANISATION_CONTACTID");
+var res = OrganisationUtils.getNameByContactId(organisationContactId);
 
 result.string(res);
\ No newline at end of file
diff --git a/entity/VisitPlanEntry_entity/VisitPlanEntry_entity.aod b/entity/VisitPlanEntry_entity/VisitPlanEntry_entity.aod
index 4674027075..1af833e9b8 100644
--- a/entity/VisitPlanEntry_entity/VisitPlanEntry_entity.aod
+++ b/entity/VisitPlanEntry_entity/VisitPlanEntry_entity.aod
@@ -30,14 +30,14 @@
       <displayValueProcess>%aditoprj%/entity/VisitPlanEntry_entity/entityfields/status/displayValueProcess.js</displayValueProcess>
     </entityField>
     <entityField>
-      <name>ORGANISATION_ID</name>
-      <documentation>%aditoprj%/entity/VisitPlanEntry_entity/entityfields/organisation_id/documentation.adoc</documentation>
+      <name>ORGANISATION_CONTACT_ID</name>
+      <documentation>%aditoprj%/entity/VisitPlanEntry_entity/entityfields/organisation_contact_id/documentation.adoc</documentation>
       <title>Organisation</title>
       <consumer>Organisations</consumer>
       <mandatory v="true" />
-      <stateProcess>%aditoprj%/entity/VisitPlanEntry_entity/entityfields/organisation_id/stateProcess.js</stateProcess>
-      <valueProcess>%aditoprj%/entity/VisitPlanEntry_entity/entityfields/organisation_id/valueProcess.js</valueProcess>
-      <displayValueProcess>%aditoprj%/entity/VisitPlanEntry_entity/entityfields/organisation_id/displayValueProcess.js</displayValueProcess>
+      <stateProcess>%aditoprj%/entity/VisitPlanEntry_entity/entityfields/organisation_contact_id/stateProcess.js</stateProcess>
+      <valueProcess>%aditoprj%/entity/VisitPlanEntry_entity/entityfields/organisation_contact_id/valueProcess.js</valueProcess>
+      <displayValueProcess>%aditoprj%/entity/VisitPlanEntry_entity/entityfields/organisation_contact_id/displayValueProcess.js</displayValueProcess>
     </entityField>
     <entityField>
       <name>ENTRYDATE</name>
@@ -247,10 +247,10 @@
           <name>END_TIME.value</name>
         </jDitoRecordFieldMapping>
         <jDitoRecordFieldMapping>
-          <name>ORGANISATION_ID.value</name>
+          <name>ORGANISATION_CONTACT_ID.value</name>
         </jDitoRecordFieldMapping>
         <jDitoRecordFieldMapping>
-          <name>ORGANISATION_ID.displayValue</name>
+          <name>ORGANISATION_CONTACT_ID.displayValue</name>
         </jDitoRecordFieldMapping>
         <jDitoRecordFieldMapping>
           <name>CONTACT_ID.value</name>
diff --git a/entity/VisitPlanEntry_entity/documentation.adoc b/entity/VisitPlanEntry_entity/documentation.adoc
index fe840f04ec..13c58c22da 100644
--- a/entity/VisitPlanEntry_entity/documentation.adoc
+++ b/entity/VisitPlanEntry_entity/documentation.adoc
@@ -2,7 +2,8 @@
 
 For storing Visitentries with their information(date, time, contact, and most importantly: it's Status).
 Linked to VisitPlanEmployeeWeek_entity so you only see the entries in the chosen week.
-ORGANISATION_ID is used to store the company that's being visited, CONTACT_ID to Store the Point-of-Contact, 
+ORGANISATION_CONTACT_ID is used to store the company that's being visited, 
+CONTACT_ID to Store the Point-of-Contact, 
 since you are normally visiting one specific person.
 
 Keep in mind, that only the organization is important for the visitRecommendations and not the Point of Contact.
\ No newline at end of file
diff --git a/entity/VisitPlanEntry_entity/entityfields/contact_id/onValidation.js b/entity/VisitPlanEntry_entity/entityfields/contact_id/onValidation.js
index 03f6b80142..bf3542dc52 100644
--- a/entity/VisitPlanEntry_entity/entityfields/contact_id/onValidation.js
+++ b/entity/VisitPlanEntry_entity/entityfields/contact_id/onValidation.js
@@ -3,7 +3,7 @@ import("system.result");
 import("Contact_lib");
 import("system.vars");
 
-var orgId = vars.get("$field.ORGANISATION_ID");
+var orgId = vars.get("$field.ORGANISATION_CONTACT_ID");
 var contactId = vars.get("$field.CONTACT_ID");
 var orgContactId = ContactUtils.getPersOrgIds(contactId)[2];
 
diff --git a/entity/VisitPlanEntry_entity/entityfields/contact_id/valueProcess.js b/entity/VisitPlanEntry_entity/entityfields/contact_id/valueProcess.js
index fe203ca7a7..0c443c0434 100644
--- a/entity/VisitPlanEntry_entity/entityfields/contact_id/valueProcess.js
+++ b/entity/VisitPlanEntry_entity/entityfields/contact_id/valueProcess.js
@@ -12,6 +12,6 @@ if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.get("$this.v
                             .from("CONTACT")
                             .where("CONTACT.CONTACTID", contactId)
                             .cell();
-    neon.setFieldValue("$field.ORGANISATION_ID", orgId);
+    neon.setFieldValue("$field.ORGANISATION_CONTACT_ID", orgId);
     result.string(vars.get("$param.ContactId_param"));
 }
\ No newline at end of file
diff --git a/entity/VisitPlanEntry_entity/entityfields/entityactiongroup/children/newactivity/onActionProcess.js b/entity/VisitPlanEntry_entity/entityfields/entityactiongroup/children/newactivity/onActionProcess.js
index 0af8e295e6..5fdb3779fc 100644
--- a/entity/VisitPlanEntry_entity/entityfields/entityactiongroup/children/newactivity/onActionProcess.js
+++ b/entity/VisitPlanEntry_entity/entityfields/entityactiongroup/children/newactivity/onActionProcess.js
@@ -17,7 +17,7 @@ var pointOfContact = newSelect("CONTACT.CONTACTID", db.getCurrentAlias())
                                 .leftJoin("AB_ATTRIBUTE", "AB_ATTRIBUTE.AB_ATTRIBUTEID = AB_ATTRIBUTERELATION.AB_ATTRIBUTE_ID")
                                 .leftJoin("ORGANISATION", "ORGANISATION.ORGANISATIONID = CONTACT.ORGANISATION_ID")
                                 .where("AB_ATTRIBUTE.AB_ATTRIBUTEID", $AttributeRegistry.visitPlanPointOfContact()) 
-                                .and("CONTACT.CONTACTID", vars.get("$field.ORGANISATION_ID"))
+                                .and("CONTACT.CONTACTID", vars.get("$field.ORGANISATION_CONTACT_ID"))
                                 .cell();
 var context;
 
@@ -25,7 +25,7 @@ if(pointOfContact)
     links.push([ContactUtils.getContextByContactId(pointOfContact), pointOfContact]);
 else
 {
-    var contactId = vars.get("$field.ORGANISATION_ID");
+    var contactId = vars.get("$field.ORGANISATION_CONTACT_ID");
     context = ContactUtils.getContextByContactId(contactId);
     if(context == 'Person')
     {
diff --git a/entity/VisitPlanEntry_entity/entityfields/entityactiongroup/children/newappointment/onActionProcess.js b/entity/VisitPlanEntry_entity/entityfields/entityactiongroup/children/newappointment/onActionProcess.js
index e9a7e5846d..12468e7c64 100644
--- a/entity/VisitPlanEntry_entity/entityfields/entityactiongroup/children/newappointment/onActionProcess.js
+++ b/entity/VisitPlanEntry_entity/entityfields/entityactiongroup/children/newappointment/onActionProcess.js
@@ -40,8 +40,8 @@ var entryDateAsLong = selectionRowData[0].ENTRYDATE;
 var entryDate = datetime.toDate(entryDateAsLong, "dd-MM-yyyy");
 var startTime = selectionRowData[0].BEGIN_TIME;
 var endTime = selectionRowData[0].END_TIME;
-var organisation_id = selectionRowData[0].ORGANISATION_ID;
-var organisationName = OrganisationUtils.getNameByOrganisationId(organisation_id);
+var organisationContact_id = selectionRowData[0].ORGANISATION_CONTACT_ID;
+var organisationName = OrganisationUtils.getNameByContactId(organisationContact_id);
 var contact_id = selectionRowData[0].CONTACT_ID;
 var contactName = ContactUtils.getFullTitleByContactId(contact_id);
 var contactMail = CommUtil.getStandardSubSqlMail(contact_id)
@@ -53,9 +53,9 @@ var department = contactData[0];
 var contactRole = contactData[1];
 var addressId = newSelect("CONTACT.ADDRESS_ID")
                             .from("CONTACT")
-                            .where("CONTACT.CONTACTID", organisation_id)
+                            .where("CONTACT.CONTACTID", organisationContact_id)
                             .cell();
-var organisationAddress = new AddrObject(organisation_id);
+var organisationAddress = new AddrObject(organisationContact_id);
 var organisationAddressFormatted = organisationAddress.getFormattedAddress(false, "{salutation_name}\n {street} {buildingno}\n {country_short} - {zip} {city}");
 var contactCommunication = newSelect("COMMUNICATION.MEDIUM_ID, COMMUNICATION.ADDR")
                                         .from("COMMUNICATION")
@@ -105,7 +105,7 @@ columnTypes = db.getColumnTypes("AB_APPOINTMENTLINK", columns, db.getCurrentAlia
 values = [util.getNewUUID(),
           uidAppointment[0],
           "Organisation",
-          organisation_id]
+          organisationContact_id]
 insert = db.insertData("AB_APPOINTMENTLINK", columns, columnTypes, values)
     
 values = [util.getNewUUID(),
diff --git a/entity/VisitPlanEntry_entity/entityfields/entityactiongroup/children/openroute/onActionProcess.js b/entity/VisitPlanEntry_entity/entityfields/entityactiongroup/children/openroute/onActionProcess.js
index b926fc89ff..dc5b0f0706 100644
--- a/entity/VisitPlanEntry_entity/entityfields/entityactiongroup/children/openroute/onActionProcess.js
+++ b/entity/VisitPlanEntry_entity/entityfields/entityactiongroup/children/openroute/onActionProcess.js
@@ -59,7 +59,7 @@ if(vars.exists("$param.Entries_param") && vars.get("$param.Entries_param"))
     var childAddresses = newSelect("ADDRESS, BUILDINGNO, ZIP, CITY, COUNTRY")
                                     .from("ADDRESS")
                                     .leftJoin("VISITPLANENTRY", "ADDRESS.ADDRESSID = (select ADDRESS_ID from CONTACT where CONTACT.CONTACTID \n\
-                                                = VISITPLANENTRY.ORGANISATION_ID)")
+                                                = VISITPLANENTRY.ORGANISATION_CONTACT_ID)")
                                     .where("VISITPLANENTRY.VISITPLANEMPLOYEEWEEK_ID", entryid)
                                     .and("VISITPLANENTRY.ENTRYDATE", entrydateDB)
                                     .table();
diff --git a/entity/VisitPlanEntry_entity/entityfields/organisation_id/displayValueProcess.js b/entity/VisitPlanEntry_entity/entityfields/organisation_contact_id/displayValueProcess.js
similarity index 74%
rename from entity/VisitPlanEntry_entity/entityfields/organisation_id/displayValueProcess.js
rename to entity/VisitPlanEntry_entity/entityfields/organisation_contact_id/displayValueProcess.js
index 4a069cec9d..a5833c922a 100644
--- a/entity/VisitPlanEntry_entity/entityfields/organisation_id/displayValueProcess.js
+++ b/entity/VisitPlanEntry_entity/entityfields/organisation_contact_id/displayValueProcess.js
@@ -3,7 +3,7 @@ import("system.db");
 import("system.vars");
 import("Contact_lib");
 
-var contactid = vars.get("$field.ORGANISATION_ID");
+var contactid = vars.get("$field.ORGANISATION_CONTACT_ID");
 var res = ContactUtils.getFullTitleByContactId(contactid);
 
 result.string(res);
\ No newline at end of file
diff --git a/entity/VisitPlanEntry_entity/entityfields/organisation_id/documentation.adoc b/entity/VisitPlanEntry_entity/entityfields/organisation_contact_id/documentation.adoc
similarity index 100%
rename from entity/VisitPlanEntry_entity/entityfields/organisation_id/documentation.adoc
rename to entity/VisitPlanEntry_entity/entityfields/organisation_contact_id/documentation.adoc
diff --git a/entity/VisitPlanEntry_entity/entityfields/organisation_id/stateProcess.js b/entity/VisitPlanEntry_entity/entityfields/organisation_contact_id/stateProcess.js
similarity index 100%
rename from entity/VisitPlanEntry_entity/entityfields/organisation_id/stateProcess.js
rename to entity/VisitPlanEntry_entity/entityfields/organisation_contact_id/stateProcess.js
diff --git a/entity/VisitPlanEntry_entity/entityfields/organisation_id/valueProcess.js b/entity/VisitPlanEntry_entity/entityfields/organisation_contact_id/valueProcess.js
similarity index 100%
rename from entity/VisitPlanEntry_entity/entityfields/organisation_id/valueProcess.js
rename to entity/VisitPlanEntry_entity/entityfields/organisation_contact_id/valueProcess.js
diff --git a/entity/VisitPlanEntry_entity/entityfields/persons/children/excludedcontactids_param/valueProcess.js b/entity/VisitPlanEntry_entity/entityfields/persons/children/excludedcontactids_param/valueProcess.js
index ec94b86401..e6afefc861 100644
--- a/entity/VisitPlanEntry_entity/entityfields/persons/children/excludedcontactids_param/valueProcess.js
+++ b/entity/VisitPlanEntry_entity/entityfields/persons/children/excludedcontactids_param/valueProcess.js
@@ -4,6 +4,6 @@ import("Sql_lib");
 
 var contactIdArray = newSelect("CONTACT.CONTACTID")
                                 .from("CONTACT")
-                                .where("CONTACT.ORGANISATION_ID", vars.get("$field.ORGANISATION_ID"), SqlBuilder.NOT_EQUAL())
+                                .where("CONTACT.ORGANISATION_ID", vars.get("$field.ORGANISATION_CONTACT_ID"), SqlBuilder.NOT_EQUAL())
                                 .arrayColumn()
 result.object(contactIdArray)
\ No newline at end of file
diff --git a/entity/VisitPlanEntry_entity/recordcontainers/jdito/contentProcess.js b/entity/VisitPlanEntry_entity/recordcontainers/jdito/contentProcess.js
index 9711f6208c..ce8bb62314 100644
--- a/entity/VisitPlanEntry_entity/recordcontainers/jdito/contentProcess.js
+++ b/entity/VisitPlanEntry_entity/recordcontainers/jdito/contentProcess.js
@@ -16,7 +16,7 @@ var items = [];
 var group = [];
 var entryData = "";
 
-var entrySQL = newSelect("ENTRYDATE, VISITPLANENTRYID, BEGIN_TIME, END_TIME, ORGANISATION_ID, CONTACT_ID,STATUS, VISITPLANEMPLOYEEWEEK_ID, APPOINTMENT_ID")
+var entrySQL = newSelect("ENTRYDATE, VISITPLANENTRYID, BEGIN_TIME, END_TIME, ORGANISATION_CONTACT_ID, CONTACT_ID,STATUS, VISITPLANEMPLOYEEWEEK_ID, APPOINTMENT_ID")
                             .from("VISITPLANENTRY");
 
 if (vars.exists("$local.idvalues") && vars.get("$local.idvalues"))
@@ -46,11 +46,11 @@ if(entryData.length > 0)
 {
     for(var i = 0; i < entryData.length; i++)
     {
-        var entryDateRaw, visitPlanEntryId, beginn_time, end_time, organisation_id, contact_id, status, visitplanemployeeweek_id, appointmentid;
-        [entryDateRaw, visitPlanEntryId, beginn_time, end_time, organisation_id, contact_id, status, visitplanemployeeweek_id, appointmentid] = entryData[i]
+        var entryDateRaw, visitPlanEntryId, beginn_time, end_time, organisationContact_id, contact_id, status, visitplanemployeeweek_id, appointmentid;
+        [entryDateRaw, visitPlanEntryId, beginn_time, end_time, organisationContact_id, contact_id, status, visitplanemployeeweek_id, appointmentid] = entryData[i]
         
         var contactname = db.cell(PersUtils.getResolvingDisplaySubSql("'" + contact_id + "'"));
-        var orgname = OrganisationUtils.getNameByOrganisationId(organisation_id);
+        var orgname = OrganisationUtils.getNameByContactId(organisationContact_id);
         var parentName = translate.text(datetime.toDate(entryDateRaw, "EEEE"));
         entryDate = datetime.toDate(entryDateRaw, "dd.MM.yyyy");
 
@@ -58,7 +58,7 @@ if(entryData.length > 0)
         var alias = SqlUtils.getSystemAlias();
 
         items.push([visitPlanEntryId, false, parentName + "#" + entryDate, "",  beginn_time
-            , end_time, organisation_id, orgname, contact_id, contactname, entryDateRaw, status, visitplanemployeeweek_id, appointmentid, statusDisplay]);
+            , end_time, organisationContact_id, orgname, contact_id, contactname, entryDateRaw, status, visitplanemployeeweek_id, appointmentid, statusDisplay]);
 
         if(!vars.get("$local.idvalues"))
         {
diff --git a/entity/VisitPlanEntry_entity/recordcontainers/jdito/onInsert.js b/entity/VisitPlanEntry_entity/recordcontainers/jdito/onInsert.js
index c0f1048f29..16ad70016e 100644
--- a/entity/VisitPlanEntry_entity/recordcontainers/jdito/onInsert.js
+++ b/entity/VisitPlanEntry_entity/recordcontainers/jdito/onInsert.js
@@ -58,7 +58,7 @@ var valuesEntry = [
     rowData["ENTRYDATE.value"],
     rowData["BEGIN_TIME.value"],
     rowData["END_TIME.value"],
-    rowData["ORGANISATION_ID.value"],
+    rowData["ORGANISATION_CONTACT_ID.value"],
     rowData["CONTACT_ID.value"],
     visitPlanEmployeeWeekID,
     rowData["STATUS.value"]
@@ -69,7 +69,7 @@ var columnsEntry = [
     "ENTRYDATE",
     "BEGIN_TIME",
     "END_TIME",
-    "ORGANISATION_ID",
+    "ORGANISATION_CONTACT_ID",
     "CONTACT_ID",
     "VISITPLANEMPLOYEEWEEK_ID",
     "STATUS"
diff --git a/entity/VisitPlanEntry_entity/recordcontainers/jdito/onUpdate.js b/entity/VisitPlanEntry_entity/recordcontainers/jdito/onUpdate.js
index 412b364410..fd92c0fd0b 100644
--- a/entity/VisitPlanEntry_entity/recordcontainers/jdito/onUpdate.js
+++ b/entity/VisitPlanEntry_entity/recordcontainers/jdito/onUpdate.js
@@ -10,7 +10,7 @@ var values = [
     rowData["ENTRYDATE.value"],
     rowData["BEGIN_TIME.value"],
     rowData["END_TIME.value"],
-    rowData["ORGANISATION_ID.value"],
+    rowData["ORGANISATION_CONTACT_ID.value"],
     rowData["STATUS"]
 ];
 
@@ -18,7 +18,7 @@ var columns = [
     "ENTRYDATE",
     "BEGIN_TIME",
     "END_TIME",
-    "ORGANISATION_ID",
+    "ORGANISATION_CONTACT_ID",
     "STATUS"
 ];
 
diff --git a/entity/VisitRecommendation_entity/recordcontainers/jdito/contentProcess.js b/entity/VisitRecommendation_entity/recordcontainers/jdito/contentProcess.js
index 26a88f9571..4ec4a7d08e 100644
--- a/entity/VisitRecommendation_entity/recordcontainers/jdito/contentProcess.js
+++ b/entity/VisitRecommendation_entity/recordcontainers/jdito/contentProcess.js
@@ -47,12 +47,12 @@ if(idValues == false)
                                                         "visitPlanFrequency.ID_VALUE", "'VISITFREQUENCY                      '", activitySubQuery, "CONTACTID",
                                             newSelect("min(ENTRYDATE)")
                                                         .from("VISITPLANENTRY") 
-                                                        .where("CONTACT.CONTACTID", "VISITPLANENTRY.ORGANISATION_ID") 
+                                                        .where("CONTACT.CONTACTID", "VISITPLANENTRY.ORGANISATION_CONTACT_ID") 
                                                         .and(newWhere("VISITPLANENTRY.STATUS", $KeywordRegistry.visitPlanEntryStatus$planned())
                                                             .or("VISITPLANENTRY.STATUS", $KeywordRegistry.visitPlanEntryStatus$Appointmentarranged()))
                                                         .and("VISITPLANENTRY.ENTRYDATE", newSelect("min(vp.ENTRYDATE)")
                                                                                                     .from("VISITPLANENTRY", "vp")
-                                                                                                    .where(["VISITPLANENTRY", "ORGANISATION_ID", "vp"], "visitplanentry.ORGANISATION_ID")
+                                                                                                    .where(["VISITPLANENTRY", "ORGANISATION_CONTACT_ID", "vp"], "visitplanentry.ORGANISATION_CONTACT_ID")
                                                                                                     .and(["VISITPLANENTRY", "ENTRYDATE", "vp"], datetime.today())
                                                                                                     .and(newWhere(["VISITPLANENTRY", "STATUS", "vp"], 
                                                                                                     $KeywordRegistry.visitPlanEntryStatus$planned())
@@ -80,7 +80,7 @@ var recommendationSQLData = newSelect(["VISITRECOMMENDATIONID", "VISITRECOMMENDA
                 
     newSelect("min(ENTRYDATE)")
                 .from("VISITPLANENTRY")
-                .where("VISITPLANENTRY.ORGANISATION_ID", "VISITRECOMMENDATION.CONTACT_ID")
+                .where("VISITPLANENTRY.ORGANISATION_CONTACT_ID = VISITRECOMMENDATION.CONTACT_ID")
                 .and("VISITPLANENTRY.STATUS", $KeywordRegistry.visitPlanEntryStatus$planned())
                 .or("VISITPLANENTRY.STATUS", $KeywordRegistry.visitPlanEntryStatus$Appointmentarranged())
                 .and("VISITPLANENTRY.entrydate", datetime.today(), SqlBuilder.GREATER())
@@ -89,7 +89,7 @@ var recommendationSQLData = newSelect(["VISITRECOMMENDATIONID", "VISITRECOMMENDA
     newSelect("VISITRECOMMENDATION.CONTACT_ID")
                 .from("VISITPLANEMPLOYEEWEEK, VISITPLANENTRY")
                 .where("VISITPLANENTRY.VISITPLANEMPLOYEEWEEK_ID", "VISITPLANEMPLOYEEWEEKID")
-                .and("VISITRECOMMENDATION.CONTACT_ID", "VISITPLANENTRY.ORGANISATION_ID")
+                .and("VISITRECOMMENDATION.CONTACT_ID = VISITPLANENTRY.ORGANISATION_CONTACT_ID")
                 .and(newWhere("VISITPLANENTRY.STATUS", $KeywordRegistry.visitPlanEntryStatus$planned())
                 .or("VISITPLANENTRY.STATUS", $KeywordRegistry.visitPlanEntryStatus$Appointmentarranged()))
                 .and("VISITPLANENTRY.entrydate", newSelect("min(vp.entrydate)")
-- 
GitLab


From 2f2451edff0b61f177c59f95535f3c41ff552c43 Mon Sep 17 00:00:00 2001
From: "b.ulrich" <b.ulrich@adito.de>
Date: Mon, 3 Aug 2020 16:48:05 +0200
Subject: [PATCH 083/309] =?UTF-8?q?[Projekt:=20Entwicklung=20-=20Neon][Tic?=
 =?UTF-8?q?ketNr.:=201062998][Angebot=20-=20Angebot=20anzeigen=20-=20als?=
 =?UTF-8?q?=20Email=20versenden=20-=20Status=20versendet=20wird=20zu=20fr?=
 =?UTF-8?q?=C3=BCh=20gesetzt]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 entity/Email_entity/Email_entity.aod                  |  6 ++++++
 .../entityfields/offerid_param/documentation.adoc     |  3 +++
 .../entityfields/sendmail/onActionProcess.js          |  7 +++++++
 .../children/dispatchofferreport/onActionProcess.js   |  8 ++------
 process/Email_lib/process.js                          | 11 +++++++----
 5 files changed, 25 insertions(+), 10 deletions(-)
 create mode 100644 entity/Email_entity/entityfields/offerid_param/documentation.adoc

diff --git a/entity/Email_entity/Email_entity.aod b/entity/Email_entity/Email_entity.aod
index fc65d44a8a..f3a15f3c8a 100644
--- a/entity/Email_entity/Email_entity.aod
+++ b/entity/Email_entity/Email_entity.aod
@@ -128,6 +128,12 @@
       <name>AdditionalPlaceholders_param</name>
       <expose v="true" />
     </entityParameter>
+    <entityParameter>
+      <name>OfferId_param</name>
+      <expose v="true" />
+      <mandatory v="true" />
+      <documentation>%aditoprj%/entity/Email_entity/entityfields/offerid_param/documentation.adoc</documentation>
+    </entityParameter>
   </entityFields>
   <recordContainers>
     <datalessRecordContainer>
diff --git a/entity/Email_entity/entityfields/offerid_param/documentation.adoc b/entity/Email_entity/entityfields/offerid_param/documentation.adoc
new file mode 100644
index 0000000000..cc60a8f815
--- /dev/null
+++ b/entity/Email_entity/entityfields/offerid_param/documentation.adoc
@@ -0,0 +1,3 @@
+=OfferId_pram
+
+optional param needed for the offerEmails, to change the status of the offer
\ No newline at end of file
diff --git a/entity/Email_entity/entityfields/sendmail/onActionProcess.js b/entity/Email_entity/entityfields/sendmail/onActionProcess.js
index a7bdf5af90..74810743f4 100644
--- a/entity/Email_entity/entityfields/sendmail/onActionProcess.js
+++ b/entity/Email_entity/entityfields/sendmail/onActionProcess.js
@@ -1,3 +1,5 @@
+import("KeywordRegistry_basic");
+import("Sql_lib");
 import("system.translate");
 import("ActivityTask_lib");
 import("system.neon");
@@ -38,6 +40,11 @@ var eml = EmailWritingUtils.openMailTemplate(
     additionalPlaceholders
 );
 
+if(vars.get("$param.ComingFrom_param") == "Offer")
+{
+    newWhere("OFFER.OFFERID", vars.get("$param.OfferId_param"))
+    .updateData(true, "OFFER", ["STATUS"], null, [$KeywordRegistry.offerStatus$sent()]);
+}
 
 if (notificationMsg)
     question.showMessage(notificationMsg, question.INFORMATION, notificationTitle);
\ No newline at end of file
diff --git a/entity/Offer_entity/entityfields/offerreportdispatch/children/dispatchofferreport/onActionProcess.js b/entity/Offer_entity/entityfields/offerreportdispatch/children/dispatchofferreport/onActionProcess.js
index a5b761ab29..108e16a156 100644
--- a/entity/Offer_entity/entityfields/offerreportdispatch/children/dispatchofferreport/onActionProcess.js
+++ b/entity/Offer_entity/entityfields/offerreportdispatch/children/dispatchofferreport/onActionProcess.js
@@ -27,9 +27,5 @@ attachmentArray[0] = offerReport;
 var additionalPlaceholders = [
     new Placeholder("offerCode", Placeholder.types.FIXEDVALUE, vars.get("$field.FullOfferCode"))
 ];
-
-EmailWritingUtils.sendReportAsMail(contactId, attachmentArray, "Offer", notificationMsg, emailFilename, additionalPlaceholders);
-
-newWhere("OFFER.OFFERID", "$field.OFFERID")
-    .updateData(true, "OFFER", ["STATUS"], null, [$KeywordRegistry.offerStatus$sent()]);
-
+var offerId = vars.get("$field.OFFERID")
+EmailWritingUtils.sendReportAsMail(contactId, attachmentArray, "Offer", notificationMsg, emailFilename, additionalPlaceholders, offerId);
\ No newline at end of file
diff --git a/process/Email_lib/process.js b/process/Email_lib/process.js
index 94a4ab8ba9..34ae40ebfa 100644
--- a/process/Email_lib/process.js
+++ b/process/Email_lib/process.js
@@ -78,8 +78,9 @@ EmailWritingUtils.openMailTemplate = function (pToRecipients, pSenderContactId,
  * @param {String} pComingFrom source from where you started (e.g. "Person", "Organisation" )
  * @param {String} pEmailFilename optional file name of the email.
  * @param {String} [pAdditionalPlaceholders] additional placeholders for the email
+ * @param {String} [pOfferId] optional needed for the offerEmails, to change the status of the offer
  */
-EmailWritingUtils.openNewMail = function (pToContactId, pToEmailAddress, pComingFrom, pAttachmentArray, pNotificationMsg, pEmailFilename, pAdditionalPlaceholders)
+EmailWritingUtils.openNewMail = function (pToContactId, pToEmailAddress, pComingFrom, pAttachmentArray, pNotificationMsg, pEmailFilename, pAdditionalPlaceholders, pOfferId)
 {
     var params = {
         "ContactId_param" : pToContactId,
@@ -87,7 +88,8 @@ EmailWritingUtils.openNewMail = function (pToContactId, pToEmailAddress, pComing
         "ComingFrom_param" : pComingFrom,
         "NotificationMsg_param" : pNotificationMsg,
         "EmailFilename" : pEmailFilename,
-        "AdditionalPlaceholders_param" : JSON.stringify(pAdditionalPlaceholders)
+        "AdditionalPlaceholders_param" : JSON.stringify(pAdditionalPlaceholders),
+        "OfferId_param" : pOfferId
     };
     
     if (pToEmailAddress)
@@ -111,14 +113,15 @@ EmailWritingUtils.getMailbridgeAddress = function ()
  * @param {String} pNotificationMsg message which will be shown after the operation is done.
  * @param {String} pEmailFilename optional file name of the email.
  * @param {String} [pAdditionalPlaceholders] additional placeholders for the email
+ * @param {String} [pOfferId] optional needed for the offerEmails, to change the status of the offer
  * Report have to be a object with these attrs: content (base64 encoded report), contentType (mimeType of the report), filename (complete filename with filending)
  */
-EmailWritingUtils.sendReportAsMail = function (pRecipient, pReportArray, pComingFrom, pNotificationMsg, pEmailFilename, pAdditionalPlaceholders)
+EmailWritingUtils.sendReportAsMail = function (pRecipient, pReportArray, pComingFrom, pNotificationMsg, pEmailFilename, pAdditionalPlaceholders, pOfferId)
 {
     var pRecpientEmail = newSelect("COMMUNICATION.ADDR").from("COMMUNICATION")
     .where("COMMUNICATION.CONTACT_ID", pRecipient).and("COMMUNICATION.MEDIUM_ID", "COMMEMAIL").cell();
             
-    EmailWritingUtils.openNewMail(pRecipient, pRecpientEmail, pComingFrom, pReportArray, pNotificationMsg, pEmailFilename, pAdditionalPlaceholders);
+    EmailWritingUtils.openNewMail(pRecipient, pRecpientEmail, pComingFrom, pReportArray, pNotificationMsg, pEmailFilename, pAdditionalPlaceholders, pOfferId);
 }
 
 /**
-- 
GitLab


From 73c6d76f3339717486927ff258386ae6368f65f9 Mon Sep 17 00:00:00 2001
From: Benjamin Ulrich <b.ulrich@adito.de>
Date: Tue, 4 Aug 2020 07:45:42 +0000
Subject: [PATCH 084/309] =?UTF-8?q?[Projekt:=20Entwicklung=20-=20Neon][Tic?=
 =?UTF-8?q?ketNr.:=201059182][Teilnehmer=20k=C3=B6nnen=20in=20Kampagne=20n?=
 =?UTF-8?q?icht=20hinzugef=C3=BCgt=20werden]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../entityfields/campaign_id/onValueChange.js               | 2 +-
 .../CampaignParticipantFilter_view.aod                      | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/entity/CampaignParticipant_entity/entityfields/campaign_id/onValueChange.js b/entity/CampaignParticipant_entity/entityfields/campaign_id/onValueChange.js
index 07c57c1e19..6db4d90300 100644
--- a/entity/CampaignParticipant_entity/entityfields/campaign_id/onValueChange.js
+++ b/entity/CampaignParticipant_entity/entityfields/campaign_id/onValueChange.js
@@ -4,6 +4,6 @@ import("system.vars");
 
 if(vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_NEW)
 {
-    var stepId = CampaignUtils.getDefaultCampaignStep(vars.get("local.value"));
+    var stepId = CampaignUtils.getDefaultCampaignStep(vars.get("$local.value"));
     neon.setFieldValue("$field.CAMPAIGNSTEP_ID", stepId);
 }
\ No newline at end of file
diff --git a/neonView/CampaignParticipantFilter_view/CampaignParticipantFilter_view.aod b/neonView/CampaignParticipantFilter_view/CampaignParticipantFilter_view.aod
index 7d4a4e5d2a..3dde5d4e26 100644
--- a/neonView/CampaignParticipantFilter_view/CampaignParticipantFilter_view.aod
+++ b/neonView/CampaignParticipantFilter_view/CampaignParticipantFilter_view.aod
@@ -4,7 +4,7 @@
   <title></title>
   <description></description>
   <majorModelMode>DISTRIBUTED</majorModelMode>
-  <filterable v="false" />
+  <filterable v="true" />
   <layout>
     <groupLayout>
       <name>layout</name>
@@ -15,8 +15,8 @@
       <name>ParticipantsTable</name>
       <favoriteActionGroup1>FilterViewActionGroup</favoriteActionGroup1>
       <entityField>#ENTITY</entityField>
-      <isCreatable v="false" />
-      <isEditable v="false" />
+      <isCreatable v="true" />
+      <isEditable v="true" />
       <columns>
         <neonTableColumn>
           <name>1bd3a82e-89c1-4b3b-809b-b9bac7f78e58</name>
-- 
GitLab


From f674c21eed4efc0fcc78228fd12336bda92d8bcb Mon Sep 17 00:00:00 2001
From: Sebastian Pongratz <s.pongratz@adito.de>
Date: Tue, 4 Aug 2020 08:09:37 +0000
Subject: [PATCH 085/309] =?UTF-8?q?#1057786=20=C3=A4nderungen=20notificati?=
 =?UTF-8?q?ons?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../basic/2020.1.1/Notification/changelog.xml |  6 ++
 .../Notification/init_NotificationType.xml    | 85 +++++++++++++++++++
 .../Notification/insert_NotificationState.xml | 15 ++++
 .../Data_alias/basic/2020.1.1/changelog.xml   |  1 +
 .../KeywordEntry_entity.aod                   |  6 ++
 .../Notification_entity.aod                   | 17 +++-
 .../children/setread/onActionProcess.js       |  9 ++
 .../entityfields/state/displayValueProcess.js | 24 +-----
 .../containername_param/valueProcess.js       |  3 +-
 .../typecode/displayValueProcess.js           | 28 +-----
 .../containername_param/valueProcess.js       |  5 ++
 .../_____LANGUAGE_de/_____LANGUAGE_de.aod     | 57 +++++++------
 .../NotificationFilter_view.aod               |  5 +-
 process/KeywordData_lib/process.js            |  2 +-
 process/KeywordRegistry_basic/process.js      |  5 +-
 process/ctiServerEvents/process.js            |  2 +
 16 files changed, 192 insertions(+), 78 deletions(-)
 create mode 100644 .liquibase/Data_alias/basic/2020.1.1/Notification/changelog.xml
 create mode 100644 .liquibase/Data_alias/basic/2020.1.1/Notification/init_NotificationType.xml
 create mode 100644 .liquibase/Data_alias/basic/2020.1.1/Notification/insert_NotificationState.xml
 create mode 100644 entity/Notification_entity/entityfields/typekeywords/children/containername_param/valueProcess.js

diff --git a/.liquibase/Data_alias/basic/2020.1.1/Notification/changelog.xml b/.liquibase/Data_alias/basic/2020.1.1/Notification/changelog.xml
new file mode 100644
index 0000000000..1c9de62045
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2020.1.1/Notification/changelog.xml
@@ -0,0 +1,6 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+                   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+                   <include relativeToChangelogFile="true" file="init_NotificationType.xml"/>
+                   <include relativeToChangelogFile="true" file="insert_NotificationState.xml"/>
+</databaseChangeLog>
diff --git a/.liquibase/Data_alias/basic/2020.1.1/Notification/init_NotificationType.xml b/.liquibase/Data_alias/basic/2020.1.1/Notification/init_NotificationType.xml
new file mode 100644
index 0000000000..3d8f901c79
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2020.1.1/Notification/init_NotificationType.xml
@@ -0,0 +1,85 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+                   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+    <changeSet author="s.pongratz" id="b2894de0-4a19-4fcb-9412-0a5e91bfec80">
+        <insert tableName="AB_KEYWORD_ENTRY">
+            <column name="AB_KEYWORD_ENTRYID" value="f862f71e-9155-4e88-8158-170ddfa4dbf3"/>
+            <column name="KEYID" value="_____SYSTEM_NOTIFICATION_PHONECALL"/>
+            <column name="TITLE" value="Phonecall"/>
+            <column name="CONTAINER" value="NotificationType"/>
+            <column name="SORTING" valueNumeric="0"/>
+            <column name="ISACTIVE" valueNumeric="1"/>
+            <column name="ISESSENTIAL" valueNumeric="1"/>
+        </insert>
+        
+        <insert tableName="AB_KEYWORD_ENTRY">
+            <column name="AB_KEYWORD_ENTRYID" value="19876b72-cd7d-4916-b853-22c4d9fe49c2"/>
+            <column name="KEYID" value="_____SYSTEM_NOTIFICATION_EMAIL"/>
+            <column name="TITLE" value="Email"/>
+            <column name="CONTAINER" value="NotificationType"/>
+            <column name="SORTING" valueNumeric="1"/>
+            <column name="ISACTIVE" valueNumeric="1"/>
+            <column name="ISESSENTIAL" valueNumeric="1"/>
+        </insert>
+        
+        <insert tableName="AB_KEYWORD_ENTRY">
+            <column name="AB_KEYWORD_ENTRYID" value="16f9fbb5-9b8a-4908-babd-06c86032a22b"/>
+            <column name="KEYID" value="_____SYSTEM_NOTIFICATION_APPOINTMENT"/>
+            <column name="TITLE" value="Appointment"/>
+            <column name="CONTAINER" value="NotificationType"/>
+            <column name="SORTING" valueNumeric="2"/>
+            <column name="ISACTIVE" valueNumeric="1"/>
+            <column name="ISESSENTIAL" valueNumeric="1"/>
+        </insert>
+        
+        <insert tableName="AB_KEYWORD_ENTRY">
+            <column name="AB_KEYWORD_ENTRYID" value="53458dba-80f5-427c-a44c-3fc8e74f3380"/>
+            <column name="KEYID" value="_____SYSTEM_NOTIFICATION_TODO"/>
+            <column name="TITLE" value="ToDo"/>
+            <column name="CONTAINER" value="NotificationType"/>
+            <column name="SORTING" valueNumeric="3"/>
+            <column name="ISACTIVE" valueNumeric="1"/>
+            <column name="ISESSENTIAL" valueNumeric="1"/>
+        </insert>
+        
+        <insert tableName="AB_KEYWORD_ENTRY">
+            <column name="AB_KEYWORD_ENTRYID" value="3d2393b3-ed13-44d6-9a6f-9280d84252cb"/>
+            <column name="KEYID" value="DownloadReady"/>
+            <column name="TITLE" value="download ready"/>
+            <column name="CONTAINER" value="NotificationType"/>
+            <column name="SORTING" valueNumeric="4"/>
+            <column name="ISACTIVE" valueNumeric="1"/>
+            <column name="ISESSENTIAL" valueNumeric="1"/>
+        </insert>
+        
+        <insert tableName="AB_KEYWORD_ENTRY">
+            <column name="AB_KEYWORD_ENTRYID" value="09ce4611-3254-4590-958a-79178924188b"/>
+            <column name="KEYID" value="BulkMailSent"/>
+            <column name="TITLE" value="bulk mail sent"/>
+            <column name="CONTAINER" value="NotificationType"/>
+            <column name="SORTING" valueNumeric="5"/>
+            <column name="ISACTIVE" valueNumeric="1"/>
+            <column name="ISESSENTIAL" valueNumeric="1"/>
+        </insert>
+        
+        <insert tableName="AB_KEYWORD_ENTRY">
+            <column name="AB_KEYWORD_ENTRYID" value="df47c6db-2a72-464a-b155-c4e33a4294ba"/>
+            <column name="KEYID" value="Leadimport_Notification"/>
+            <column name="TITLE" value="leadimport notification"/>
+            <column name="CONTAINER" value="NotificationType"/>
+            <column name="SORTING" valueNumeric="6"/>
+            <column name="ISACTIVE" valueNumeric="1"/>
+            <column name="ISESSENTIAL" valueNumeric="1"/>
+        </insert>
+        
+        <insert tableName="AB_KEYWORD_ENTRY">
+            <column name="AB_KEYWORD_ENTRYID" value="58281d88-71a7-4fa7-8ef8-9289fc904697"/>
+            <column name="KEYID" value="WorkflowNotification"/>
+            <column name="TITLE" value="workflow notification"/>
+            <column name="CONTAINER" value="NotificationType"/>
+            <column name="SORTING" valueNumeric="7"/>
+            <column name="ISACTIVE" valueNumeric="1"/>
+            <column name="ISESSENTIAL" valueNumeric="1"/>
+        </insert>
+    </changeSet>
+</databaseChangeLog>
diff --git a/.liquibase/Data_alias/basic/2020.1.1/Notification/insert_NotificationState.xml b/.liquibase/Data_alias/basic/2020.1.1/Notification/insert_NotificationState.xml
new file mode 100644
index 0000000000..35501bf169
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2020.1.1/Notification/insert_NotificationState.xml
@@ -0,0 +1,15 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+                   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+    <changeSet author="s.pongratz" id="b2894de0-4a19-4fcb-9412-0a5e91bfec80">
+        <insert tableName="AB_KEYWORD_ENTRY">
+            <column name="AB_KEYWORD_ENTRYID" value="daa6d8d8-fdc6-4fb2-9677-9ccc1f8a9b81"/>
+            <column name="KEYID" value="TODELETE"/>
+            <column name="TITLE" value="TODELETE"/>
+            <column name="CONTAINER" value="NotificationState"/>
+            <column name="SORTING" valueNumeric="4"/>
+            <column name="ISACTIVE" valueNumeric="1"/>
+            <column name="ISESSENTIAL" valueNumeric="1"/>
+        </insert>
+    </changeSet>
+</databaseChangeLog>
diff --git a/.liquibase/Data_alias/basic/2020.1.1/changelog.xml b/.liquibase/Data_alias/basic/2020.1.1/changelog.xml
index f5686ce22c..7070cb88cf 100644
--- a/.liquibase/Data_alias/basic/2020.1.1/changelog.xml
+++ b/.liquibase/Data_alias/basic/2020.1.1/changelog.xml
@@ -2,4 +2,5 @@
 <databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
                    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
     <include relativeToChangelogFile="true" file="AlterTablesToDatetime.xml"/>
+    <include relativeToChangelogFile="true" file="Notification/changelog.xml"/>
 </databaseChangeLog>
diff --git a/entity/KeywordEntry_entity/KeywordEntry_entity.aod b/entity/KeywordEntry_entity/KeywordEntry_entity.aod
index 2d0edd64d5..33635f5756 100644
--- a/entity/KeywordEntry_entity/KeywordEntry_entity.aod
+++ b/entity/KeywordEntry_entity/KeywordEntry_entity.aod
@@ -583,6 +583,12 @@
           <fieldName>CategoryKeyword</fieldName>
           <isConsumer v="false" />
         </entityDependency>
+        <entityDependency>
+          <name>644a6101-6b11-4998-bd8d-b799c6f376fa</name>
+          <entityName>Notification_entity</entityName>
+          <fieldName>TypeKeywords</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
       </dependencies>
       <children>
         <entityParameter>
diff --git a/entity/Notification_entity/Notification_entity.aod b/entity/Notification_entity/Notification_entity.aod
index a3dad29fd3..4f16a89da7 100644
--- a/entity/Notification_entity/Notification_entity.aod
+++ b/entity/Notification_entity/Notification_entity.aod
@@ -68,6 +68,7 @@
     <entityField>
       <name>TYPECODE</name>
       <title>Type</title>
+      <consumer>TypeKeywords</consumer>
       <groupable v="true" />
       <displayValueProcess>%aditoprj%/entity/Notification_entity/entityfields/typecode/displayValueProcess.js</displayValueProcess>
     </entityField>
@@ -103,7 +104,7 @@
           <title>set Read</title>
           <description></description>
           <onActionProcess>%aditoprj%/entity/Notification_entity/entityfields/setnotificationstate/children/setread/onActionProcess.js</onActionProcess>
-          <isSelectionAction v="true" />
+          <isSelectionAction v="false" />
           <iconId>VAADIN:OPEN_BOOK</iconId>
           <tooltip></tooltip>
           <tooltipProcess>%aditoprj%/entity/Notification_entity/entityfields/setnotificationstate/children/setread/tooltipProcess.js</tooltipProcess>
@@ -158,6 +159,20 @@
         </entityParameter>
       </children>
     </entityConsumer>
+    <entityConsumer>
+      <name>TypeKeywords</name>
+      <dependency>
+        <name>dependency</name>
+        <entityName>KeywordEntry_entity</entityName>
+        <fieldName>SpecificContainerKeywords</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>ContainerName_param</name>
+          <valueProcess>%aditoprj%/entity/Notification_entity/entityfields/typekeywords/children/containername_param/valueProcess.js</valueProcess>
+        </entityParameter>
+      </children>
+    </entityConsumer>
   </entityFields>
   <recordContainers>
     <dbRecordContainer>
diff --git a/entity/Notification_entity/entityfields/setnotificationstate/children/setread/onActionProcess.js b/entity/Notification_entity/entityfields/setnotificationstate/children/setread/onActionProcess.js
index 5ee955fd63..d9ff8a7c8f 100644
--- a/entity/Notification_entity/entityfields/setnotificationstate/children/setread/onActionProcess.js
+++ b/entity/Notification_entity/entityfields/setnotificationstate/children/setread/onActionProcess.js
@@ -1,11 +1,20 @@
+import("Sql_lib");
 import("system.vars");
 import("system.tools");
 import("system.notification");
 import("system.neon");
+import("KeywordRegistry_basic");
 
 var user = tools.getCurrentUser();
 var selectedNotifications = vars.get("$sys.selection");
 
+if (selectedNotifications.length == 0){
+    selectedNotifications = newSelect("ASYS_NOTIFICATIONS.ID")
+    .from("ASYS_NOTIFICATIONS")
+    .where("ASYS_NOTIFICATIONS.STATE", [notification.STATE_SEEN.toString(), notification.STATE_UNSEEN.toString()], SqlBuilder.IN())
+    .arrayColumn();
+}
+
 for(var i = 0; i < selectedNotifications.length; i++)
     notification.updateUserNotificationState(user["name"], selectedNotifications[i], notification.STATE_CONFIRMED);
 
diff --git a/entity/Notification_entity/entityfields/state/displayValueProcess.js b/entity/Notification_entity/entityfields/state/displayValueProcess.js
index fcd088324b..277c05aab1 100644
--- a/entity/Notification_entity/entityfields/state/displayValueProcess.js
+++ b/entity/Notification_entity/entityfields/state/displayValueProcess.js
@@ -1,24 +1,6 @@
-import("system.translate");
+import("Keyword_lib");
 import("system.result");
 import("system.vars");
+import("KeywordRegistry_basic");
 
-var value = vars.get("$field.STATE");
-
-switch(value)
-{
-    case "SEEN":
-        result.string(translate.text("Seen"));
-        break;
-    case "CONFIRMED":
-        result.string(translate.text("Confirmed"));
-        break;
-    case "TODELETE":
-        result.string(translate.text("To Delete"));
-        break;
-    case "ARCHIVE":
-        result.string(translate.text("Archive"));
-        break;
-    default:
-        result.string(translate.text("Unseen"));
-        break;
-}
\ No newline at end of file
+result.string(KeywordUtils.getViewValue($KeywordRegistry.notificationState(), vars.get("$field.STATE")));
\ No newline at end of file
diff --git a/entity/Notification_entity/entityfields/statekeywords/children/containername_param/valueProcess.js b/entity/Notification_entity/entityfields/statekeywords/children/containername_param/valueProcess.js
index a5407effb7..f39ea4075a 100644
--- a/entity/Notification_entity/entityfields/statekeywords/children/containername_param/valueProcess.js
+++ b/entity/Notification_entity/entityfields/statekeywords/children/containername_param/valueProcess.js
@@ -1,4 +1,5 @@
 import("system.result");
+import("KeywordRegistry_basic");
 
 
-result.string("NotificationState");
\ No newline at end of file
+result.string($KeywordRegistry.notificationState());
\ No newline at end of file
diff --git a/entity/Notification_entity/entityfields/typecode/displayValueProcess.js b/entity/Notification_entity/entityfields/typecode/displayValueProcess.js
index 76e8d769dc..fcf893072c 100644
--- a/entity/Notification_entity/entityfields/typecode/displayValueProcess.js
+++ b/entity/Notification_entity/entityfields/typecode/displayValueProcess.js
@@ -1,28 +1,6 @@
+import("Keyword_lib");
 import("system.result");
-import("system.translate");
 import("system.vars");
+import("KeywordRegistry_basic");
 
-var PREFIX = "_____SYSTEM_";
-var typecode = vars.get("$field.TYPECODE");
-
-switch(typecode)
-{
-    case PREFIX + "NOTIFICATION_PHONECALL":
-        result.string(translate.text("Phonecall"));
-        break;
-        
-    case PREFIX + "NOTIFICATION_EMAIL":
-        result.string(translate.text("Email"));
-        break;
-        
-    case PREFIX + "NOTIFICATION_APPOINTMENT":
-        result.string(translate.text("Appointment"));
-        break;
-        
-    case PREFIX + "NOTIFICATION_TODO":
-        result.string(translate.text("Todo"));
-        break;
-        
-    default: 
-        result.string(typecode);
-}
\ No newline at end of file
+result.string(KeywordUtils.getViewValue($KeywordRegistry.notificationType(), vars.get("$field.TYPECODE")));
\ No newline at end of file
diff --git a/entity/Notification_entity/entityfields/typekeywords/children/containername_param/valueProcess.js b/entity/Notification_entity/entityfields/typekeywords/children/containername_param/valueProcess.js
new file mode 100644
index 0000000000..8ccc4158b0
--- /dev/null
+++ b/entity/Notification_entity/entityfields/typekeywords/children/containername_param/valueProcess.js
@@ -0,0 +1,5 @@
+import("system.result");
+import("KeywordRegistry_basic");
+
+
+result.string($KeywordRegistry.notificationType());
\ No newline at end of file
diff --git a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
index 04af5e1dd1..45bc63f8fe 100644
--- a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
+++ b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
@@ -8187,7 +8187,6 @@ Bitte Datumseingabe prüfen</value>
     </entry>
     <entry>
       <key>Send email</key>
-      <value>E-Mail losschicken</value>
     </entry>
     <entry>
       <key>Activites</key>
@@ -8579,7 +8578,6 @@ Bitte Datumseingabe prüfen</value>
     </entry>
     <entry>
       <key>Zip</key>
-      <value>PLZ</value>
     </entry>
     <entry>
       <key>type</key>
@@ -8736,63 +8734,68 @@ Bitte Datumseingabe prüfen</value>
       <value>gültig ab (in </value>
     </entry>
     <entry>
-      <key>No new recipients found that can be added to the bulk mail.</key>
-      <value>Keine neuen Empfänger, die zur Serienmail hinzugefügt werden können, gefunden.</value>
+      <key>workflow notification</key>
+      <value>Workflow Benachrichtigung</value>
     </entry>
     <entry>
-      <key>Add Recipients</key>
-      <value>Empfänger hinzufügen</value>
+      <key>leadimport notification</key>
+      <value>Leadimport Benachrichtigung</value>
     </entry>
     <entry>
-      <key>Add Participants</key>
-      <value>Teilnehmer hinzufügen</value>
+      <key>bulk mail sent</key>
+      <value>Serienmail versendet</value>
     </entry>
     <entry>
-      <key>Download letter and create Activity</key>
-      <value>Brief herunterladen und Aktivität erstellen</value>
+      <key>download ready</key>
+      <value>Download bereit</value>
     </entry>
     <entry>
-      <key>and open Report</key>
-      <value>und Report öffnen</value>
+      <key>No new recipients found that can be added to the bulk mail.</key>
+      <value>Keine neuen Empfänger, die zur Serienmail hinzugefügt werden können, gefunden.</value>
     </entry>
     <entry>
-      <key>export</key>
+      <key>Permission received</key>
+      <value>erhaltene Berechtigung</value>
     </entry>
     <entry>
-      <key>export using the selected  template</key>
-      <value>Mit der ausgewählten Vorlage Exportieren</value>
+      <key>leadimport notification</key>
     </entry>
     <entry>
-      <key>No new recipients found that can be added to the serial letter.</key>
-      <value>Keine neuen Empfänger, die zum  Serienbrief werden können, gefunden.</value>
+      <key>granted permission</key>
+      <value>vergebene Berechtigung</value>
     </entry>
     <entry>
-      <key>send mail</key>
-      <value>E-Mail losschicken</value>
+      <key>bulk mail sent</key>
     </entry>
     <entry>
-      <key>Receive new Department Permission</key>
+      <key>download ready</key>
     </entry>
     <entry>
-      <key>Receive new User Permission</key>
+      <key>Receive new Department Permission</key>
+      <value>Neue Abteilungs-Berechtigung erhalten</value>
     </entry>
     <entry>
-      <key>workflow notification</key>
+      <key>Receive new User Permission</key>
+      <value>Neue Benutzer-Berechtigung erhalten</value>
     </entry>
     <entry>
-      <key>Permission received</key>
+      <key>export</key>
     </entry>
     <entry>
-      <key>leadimport notification</key>
+      <key>No new recipients found that can be added to the serial letter.</key>
+      <value>Keine neuen Empfänger, die zum  Serienbrief werden können, gefunden.</value>
     </entry>
     <entry>
-      <key>granted permission</key>
+      <key>No new recipients found that can be added to the bulk mail.</key>
+      <value>Keine neuen Empfänger, die zur Serienmail hinzugefügt werden können, gefunden.</value>
     </entry>
     <entry>
-      <key>bulk mail sent</key>
+      <key>export using the selected  template</key>
+      <value>Mit der ausgewählten Vorlage Exportieren</value>
     </entry>
     <entry>
-      <key>download ready</key>
+      <key>send mail</key>
+      <value>E-Mail losschicken</value>
     </entry>
     <entry>
       <key>Download letter and create Activity</key>
diff --git a/neonView/NotificationFilter_view/NotificationFilter_view.aod b/neonView/NotificationFilter_view/NotificationFilter_view.aod
index bb14afb0a2..65c5f94e79 100644
--- a/neonView/NotificationFilter_view/NotificationFilter_view.aod
+++ b/neonView/NotificationFilter_view/NotificationFilter_view.aod
@@ -28,17 +28,18 @@
   <children>
     <timelineViewTemplate>
       <name>NotificationTimeline</name>
+      <favoriteActionGroup1>setNotificationState</favoriteActionGroup1>
       <dateField>CREATIONDATE</dateField>
       <titleField>CAPTION</titleField>
       <descriptionField>DESCRIPTION</descriptionField>
       <iconIdField>ICON</iconIdField>
       <entityField>#ENTITY</entityField>
+      <isEditable v="false" />
     </timelineViewTemplate>
     <tableViewTemplate>
       <name>NotificationTable</name>
       <favoriteActionGroup1>setNotificationState</favoriteActionGroup1>
       <inlineEdit v="true" />
-      <entryAction>rowClickAction</entryAction>
       <iconField>ICON</iconField>
       <titleField>CAPTION</titleField>
       <subtitleField>RESOLVEDPRIORITY</subtitleField>
@@ -71,7 +72,9 @@
     </tableViewTemplate>
     <treeTableViewTemplate>
       <name>NotificationTreeTable</name>
+      <favoriteActionGroup1>setNotificationState</favoriteActionGroup1>
       <entityField>#ENTITY</entityField>
+      <isEditable v="false" />
       <columns>
         <neonTreeTableColumn>
           <name>c8799a54-569a-4667-9bdd-aa11a2f6e21e</name>
diff --git a/process/KeywordData_lib/process.js b/process/KeywordData_lib/process.js
index 9997efa529..a4fbd6bd4e 100644
--- a/process/KeywordData_lib/process.js
+++ b/process/KeywordData_lib/process.js
@@ -20,7 +20,7 @@ KeywordData.getSimpleData = function (pKeywordContainer, pLocale, pOnlyActives)
     var identifier = "KeywordSimpleData_" + pKeywordContainer + flags;
     var cache = new CachedData(identifier, true, pLocale);
     return cache.load(function (pTranslationNecessary, pLocale){
-        var keywordEntrySelect = newSelect("AB_KEYWORD_ENTRY.KEYID, AB_KEYWORD_ENTRY.TITLE")
+        var keywordEntrySelect = newSelect("AB_KEYWORD_ENTRY.KEYID, AB_KEYWORD_ENTRY.TITLE", "Data_alias")
                                     .from("AB_KEYWORD_ENTRY")
                                     .orderBy("AB_KEYWORD_ENTRY.SORTING asc, AB_KEYWORD_ENTRY.TITLE asc")
                                     .where("AB_KEYWORD_ENTRY.CONTAINER", pKeywordContainer);
diff --git a/process/KeywordRegistry_basic/process.js b/process/KeywordRegistry_basic/process.js
index 2ae7c40b6e..b4d74a2a8f 100644
--- a/process/KeywordRegistry_basic/process.js
+++ b/process/KeywordRegistry_basic/process.js
@@ -286,4 +286,7 @@ $KeywordRegistry.visitRecommendationPrioSource = function(){return $KeywordRegis
 $KeywordRegistry.visitRecommendationPrioSource$visitFrequency = function(){return $KeywordRegistry._autoPad("VISITFREQUENCY");};
 $KeywordRegistry.visitRecommendationPrioSource$manual = function(){return $KeywordRegistry._autoPad("MANUAL");};
 
-$KeywordRegistry.workflowCategory = function(){return "WorkflowCategory";};
\ No newline at end of file
+$KeywordRegistry.workflowCategory = function(){return "WorkflowCategory";};
+
+$KeywordRegistry.notificationState = function () { return "NotificationState";};
+$KeywordRegistry.notificationType = function () { return "NotificationType";};
diff --git a/process/ctiServerEvents/process.js b/process/ctiServerEvents/process.js
index ecb4f7e361..e0df2b323d 100644
--- a/process/ctiServerEvents/process.js
+++ b/process/ctiServerEvents/process.js
@@ -62,6 +62,8 @@ var ringingHandlerFn = function()
                 var affectedContext = this.contactsCall[0].PERSON_ID.trim() == "" ? "Organisation" : "Person";
                 notificationConfig.linkInfo(text.encodeMS([affectedContext, affectedContactId]));
             }
+            
+            notificationConfig.initialState(notification.STATE_CONFIRMED);
 
             
             notification.addNotificationWith(notificationConfig);
-- 
GitLab


From 645046c7fe773bb6a3851ef56aa6025039121f4a Mon Sep 17 00:00:00 2001
From: "S.Listl" <S.Listl@SLISTL.aditosoftware.local>
Date: Tue, 4 Aug 2020 11:31:39 +0200
Subject: [PATCH 086/309] Workflow imageProcess bugfix

---
 .../WorkflowStartConfig_entity/imageProcess.js |  2 +-
 language/_____LANGUAGE_de/_____LANGUAGE_de.aod | 17 +----------------
 .../WorkflowStartConfigFilter_view.aod         | 18 ++----------------
 3 files changed, 4 insertions(+), 33 deletions(-)

diff --git a/entity/WorkflowStartConfig_entity/imageProcess.js b/entity/WorkflowStartConfig_entity/imageProcess.js
index 34147b89bd..8b918cbc28 100644
--- a/entity/WorkflowStartConfig_entity/imageProcess.js
+++ b/entity/WorkflowStartConfig_entity/imageProcess.js
@@ -2,5 +2,5 @@ import("system.result");
 import("system.vars");
 import("system.project");
 
-var contextModel = project.getDataModel(project.DATAMODEL_KIND_CONTEXT, vars.get("$field.OBJECT_TYPE"));
+var contextModel = vars.get("$field.OBJECT_TYPE") && project.getDataModel(project.DATAMODEL_KIND_CONTEXT, vars.get("$field.OBJECT_TYPE"));
 result.string(contextModel ? contextModel[5] : "");
\ No newline at end of file
diff --git a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
index 45bc63f8fe..a0f4cebe76 100644
--- a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
+++ b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
@@ -32,6 +32,7 @@
     </entry>
     <entry>
       <key>Finished</key>
+      <value>Abgeschlossen</value>
     </entry>
     <entry>
       <key>Show my organisations</key>
@@ -8739,15 +8740,12 @@ Bitte Datumseingabe prüfen</value>
     </entry>
     <entry>
       <key>leadimport notification</key>
-      <value>Leadimport Benachrichtigung</value>
     </entry>
     <entry>
       <key>bulk mail sent</key>
-      <value>Serienmail versendet</value>
     </entry>
     <entry>
       <key>download ready</key>
-      <value>Download bereit</value>
     </entry>
     <entry>
       <key>No new recipients found that can be added to the bulk mail.</key>
@@ -8757,19 +8755,10 @@ Bitte Datumseingabe prüfen</value>
       <key>Permission received</key>
       <value>erhaltene Berechtigung</value>
     </entry>
-    <entry>
-      <key>leadimport notification</key>
-    </entry>
     <entry>
       <key>granted permission</key>
       <value>vergebene Berechtigung</value>
     </entry>
-    <entry>
-      <key>bulk mail sent</key>
-    </entry>
-    <entry>
-      <key>download ready</key>
-    </entry>
     <entry>
       <key>Receive new Department Permission</key>
       <value>Neue Abteilungs-Berechtigung erhalten</value>
@@ -8785,10 +8774,6 @@ Bitte Datumseingabe prüfen</value>
       <key>No new recipients found that can be added to the serial letter.</key>
       <value>Keine neuen Empfänger, die zum  Serienbrief werden können, gefunden.</value>
     </entry>
-    <entry>
-      <key>No new recipients found that can be added to the bulk mail.</key>
-      <value>Keine neuen Empfänger, die zur Serienmail hinzugefügt werden können, gefunden.</value>
-    </entry>
     <entry>
       <key>export using the selected  template</key>
       <value>Mit der ausgewählten Vorlage Exportieren</value>
diff --git a/neonView/WorkflowStartConfigFilter_view/WorkflowStartConfigFilter_view.aod b/neonView/WorkflowStartConfigFilter_view/WorkflowStartConfigFilter_view.aod
index 9c98d1fe51..cdac1faccf 100644
--- a/neonView/WorkflowStartConfigFilter_view/WorkflowStartConfigFilter_view.aod
+++ b/neonView/WorkflowStartConfigFilter_view/WorkflowStartConfigFilter_view.aod
@@ -3,9 +3,9 @@
   <name>WorkflowStartConfigFilter_view</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <layout>
-    <groupLayout>
+    <boxLayout>
       <name>layout</name>
-    </groupLayout>
+    </boxLayout>
   </layout>
   <children>
     <tableViewTemplate>
@@ -24,19 +24,5 @@
         </neonTableColumn>
       </columns>
     </tableViewTemplate>
-    <treeTableViewTemplate>
-      <name>Treetable</name>
-      <entityField>#ENTITY</entityField>
-      <columns>
-        <neonTreeTableColumn>
-          <name>4874074f-80af-4e99-8449-2a4dc4428360</name>
-          <entityField>OBJECT_TYPE</entityField>
-        </neonTreeTableColumn>
-        <neonTreeTableColumn>
-          <name>d479a082-ea95-40c6-81a2-9318fcf9ce98</name>
-          <entityField>TRIGGER_EVENT</entityField>
-        </neonTreeTableColumn>
-      </columns>
-    </treeTableViewTemplate>
   </children>
 </neonView>
-- 
GitLab


From 17f5d5092c4303818739530566c8d005253c6b74 Mon Sep 17 00:00:00 2001
From: "a.schindlbeck" <a.schindlbeck@adito.de>
Date: Tue, 4 Aug 2020 14:35:00 +0200
Subject: [PATCH 087/309] #1063130 Notifications: Appointment-contents won't be
 deleted when orphan, because they would appear again as a notification

---
 .../Notification_entity/recordcontainers/db/onDBDelete.js   | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/entity/Notification_entity/recordcontainers/db/onDBDelete.js b/entity/Notification_entity/recordcontainers/db/onDBDelete.js
index 05d1a30c0a..54618e0f77 100644
--- a/entity/Notification_entity/recordcontainers/db/onDBDelete.js
+++ b/entity/Notification_entity/recordcontainers/db/onDBDelete.js
@@ -1,5 +1,7 @@
 import("system.vars");
 import("system.notification");
 
-// Deletes notificationContents from its table, if there are no
-notification.deleteContentIfOrphan(vars.get("$field.ID"), vars.get("$field.CONTENTID"));
\ No newline at end of file
+// Deletes notificationContents from its table, if there are no user notification left
+// Only AppointmentContents need to stay, because they would appear again after every deletion.
+if(vars.get("$field.TYPECODE") != "_____SYSTEM_NOTIFICATION_APPOINTMENT")
+    notification.deleteContentIfOrphan(vars.get("$field.ID"), vars.get("$field.CONTENTID"));
\ No newline at end of file
-- 
GitLab


From 82ec62a797a80a961d22c090da3d0bd4040821cc Mon Sep 17 00:00:00 2001
From: "S.Listl" <S.Listl@SLISTL.aditosoftware.local>
Date: Tue, 4 Aug 2020 16:21:02 +0200
Subject: [PATCH 088/309] 1059861 missing liqibase script restored

---
 .../Data_alias/basic/2020.1.2/changelog.xml   |  3 ++-
 .../insert_workflowCategory_keyword.xml       | 24 +++++++++++++++++++
 2 files changed, 26 insertions(+), 1 deletion(-)
 create mode 100644 .liquibase/Data_alias/basic/2020.1.2/insert_workflowCategory_keyword.xml

diff --git a/.liquibase/Data_alias/basic/2020.1.2/changelog.xml b/.liquibase/Data_alias/basic/2020.1.2/changelog.xml
index 8a20273d61..fc8ca2b1db 100644
--- a/.liquibase/Data_alias/basic/2020.1.2/changelog.xml
+++ b/.liquibase/Data_alias/basic/2020.1.2/changelog.xml
@@ -2,5 +2,6 @@
 <databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
                    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
     <include file="AlterDatatypeOfKeyColumnsToChar/changelog.xml" relativeToChangelogFile="true"/>
-    <include file="AddNullableToDateNew.xml" relativeToChangelogFile="true" />
+    <include file="AddNullableToDateNew.xml" relativeToChangelogFile="true" />    
+    <include file="insert_workflowCategory_keyword.xml" relativeToChangelogFile="true"/>
 </databaseChangeLog>
diff --git a/.liquibase/Data_alias/basic/2020.1.2/insert_workflowCategory_keyword.xml b/.liquibase/Data_alias/basic/2020.1.2/insert_workflowCategory_keyword.xml
new file mode 100644
index 0000000000..a4bbbd1638
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2020.1.2/insert_workflowCategory_keyword.xml
@@ -0,0 +1,24 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+                   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+    <changeSet author="s.listl" id="38b13161-5163-48d9-9791-f9c7027cac62">
+        <insert tableName="AB_KEYWORD_ENTRY">
+            <column name="AB_KEYWORD_ENTRYID" value="f241b36a-c2fe-40be-9e2e-8293c700d096"/>
+            <column name="KEYID" value="WORKFLOWCATEGORYMARKETING"/>
+            <column name="TITLE" value="Marketing"/>
+            <column name="CONTAINER" value="WorkflowCategory"/>
+            <column name="SORTING" valueNumeric="1"/>
+            <column name="ISACTIVE" valueNumeric="1"/>
+            <column name="ISESSENTIAL" valueNumeric="0"/>
+        </insert>
+        <insert tableName="AB_KEYWORD_ENTRY">
+            <column name="AB_KEYWORD_ENTRYID" value="00a72718-554e-46ab-b83c-fb9b81be4be6"/>
+            <column name="KEYID" value="WORKFLOWCATEGORYRELEASE"/>
+            <column name="TITLE" value="Release"/>
+            <column name="CONTAINER" value="WorkflowCategory"/>
+            <column name="SORTING" valueNumeric="2"/>
+            <column name="ISACTIVE" valueNumeric="1"/>
+            <column name="ISESSENTIAL" valueNumeric="0"/>
+        </insert>
+    </changeSet>
+</databaseChangeLog>
-- 
GitLab


From 4c6bd562813dca02ecc8739d59688885102f41a6 Mon Sep 17 00:00:00 2001
From: "a.schindlbeck" <a.schindlbeck@adito.de>
Date: Wed, 5 Aug 2020 09:29:40 +0200
Subject: [PATCH 089/309] Notifications: paging disabled, maxDBRows 200;
 master-checkbox for selection usable

---
 entity/Notification_entity/Notification_entity.aod | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/entity/Notification_entity/Notification_entity.aod b/entity/Notification_entity/Notification_entity.aod
index 4f16a89da7..6bd8dd7d6e 100644
--- a/entity/Notification_entity/Notification_entity.aod
+++ b/entity/Notification_entity/Notification_entity.aod
@@ -178,6 +178,8 @@
     <dbRecordContainer>
       <name>db</name>
       <alias>_____SYSTEMALIAS</alias>
+      <maximumDbRows v="200" />
+      <isPageable v="false" />
       <fromClauseProcess>%aditoprj%/entity/Notification_entity/recordcontainers/db/fromClauseProcess.js</fromClauseProcess>
       <conditionProcess>%aditoprj%/entity/Notification_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
       <orderClauseProcess>%aditoprj%/entity/Notification_entity/recordcontainers/db/orderClauseProcess.js</orderClauseProcess>
-- 
GitLab


From 22c7fb19a4b5539f249e564b82a545afb9685fc8 Mon Sep 17 00:00:00 2001
From: "a.schindlbeck" <a.schindlbeck@adito.de>
Date: Wed, 5 Aug 2020 09:29:40 +0200
Subject: [PATCH 090/309] Notifications: paging disabled, maxDBRows 200;
 master-checkbox for selection usable

---
 entity/Notification_entity/Notification_entity.aod | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/entity/Notification_entity/Notification_entity.aod b/entity/Notification_entity/Notification_entity.aod
index 5214df23fa..3f08a4f669 100644
--- a/entity/Notification_entity/Notification_entity.aod
+++ b/entity/Notification_entity/Notification_entity.aod
@@ -175,6 +175,8 @@
     <dbRecordContainer>
       <name>db</name>
       <alias>_____SYSTEMALIAS</alias>
+      <maximumDbRows v="200" />
+      <isPageable v="false" />
       <fromClauseProcess>%aditoprj%/entity/Notification_entity/recordcontainers/db/fromClauseProcess.js</fromClauseProcess>
       <conditionProcess>%aditoprj%/entity/Notification_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
       <orderClauseProcess>%aditoprj%/entity/Notification_entity/recordcontainers/db/orderClauseProcess.js</orderClauseProcess>
-- 
GitLab


From fa77c582f990c4d55085dfe091ecbf08f60f09e8 Mon Sep 17 00:00:00 2001
From: "S.Listl" <S.Listl@SLISTL.aditosoftware.local>
Date: Wed, 5 Aug 2020 10:05:32 +0200
Subject: [PATCH 091/309] #1062830 Order views like Offer

---
 .../OrderDetail_view/OrderDetail_view.aod     |  2 +-
 neonView/OrderMain_view/OrderMain_view.aod    | 10 +++---
 .../OrderitemFilter_view.aod                  | 32 +++++++++----------
 3 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/neonView/OrderDetail_view/OrderDetail_view.aod b/neonView/OrderDetail_view/OrderDetail_view.aod
index 9e876a6e5c..6e749e3cfb 100644
--- a/neonView/OrderDetail_view/OrderDetail_view.aod
+++ b/neonView/OrderDetail_view/OrderDetail_view.aod
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.6">
   <name>OrderDetail_view</name>
-  <title>Texts</title>
+  <title>Cover letter</title>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <layout>
     <noneLayout>
diff --git a/neonView/OrderMain_view/OrderMain_view.aod b/neonView/OrderMain_view/OrderMain_view.aod
index b76b54dcaa..428d0c02e0 100644
--- a/neonView/OrderMain_view/OrderMain_view.aod
+++ b/neonView/OrderMain_view/OrderMain_view.aod
@@ -29,16 +29,16 @@
       <entityField>#ENTITY</entityField>
       <view>OrderDetail_view</view>
     </neonViewReference>
-    <neonViewReference>
-      <name>b3014999-da86-45ae-86ae-feb738d62906</name>
-      <entityField>Documents</entityField>
-      <view>DocumentFilter_view</view>
-    </neonViewReference>
     <neonViewReference>
       <name>7ec102f5-fb45-44a7-9bbf-0eba7f1536d7</name>
       <entityField>Activities</entityField>
       <view>ActivityFilter_view</view>
     </neonViewReference>
+    <neonViewReference>
+      <name>b3014999-da86-45ae-86ae-feb738d62906</name>
+      <entityField>Documents</entityField>
+      <view>DocumentFilter_view</view>
+    </neonViewReference>
     <neonViewReference>
       <name>351a9b5d-a050-4fb9-b3e4-402dcd84b331</name>
       <entityField>Tasks</entityField>
diff --git a/neonView/OrderitemFilter_view/OrderitemFilter_view.aod b/neonView/OrderitemFilter_view/OrderitemFilter_view.aod
index e6eaeeb9f9..844d20f858 100644
--- a/neonView/OrderitemFilter_view/OrderitemFilter_view.aod
+++ b/neonView/OrderitemFilter_view/OrderitemFilter_view.aod
@@ -31,6 +31,10 @@
           <name>a8dcb2bb-bb09-4a6e-b0f0-1b4d1111eb22</name>
           <entityField>UNIT</entityField>
         </neonTableColumn>
+        <neonTableColumn>
+          <name>bfd34c94-1a5f-4caf-ae6e-2c09375c023c</name>
+          <entityField>VAT</entityField>
+        </neonTableColumn>
         <neonTableColumn>
           <name>33ef0703-d4ea-4187-b555-648a1733ee99</name>
           <entityField>PRICE</entityField>
@@ -39,22 +43,18 @@
           <name>61a39c6b-f7dd-487c-bc5f-c2e95376ec37</name>
           <entityField>DISCOUNT</entityField>
         </neonTableColumn>
-        <neonTableColumn>
-          <name>bfd34c94-1a5f-4caf-ae6e-2c09375c023c</name>
-          <entityField>VAT</entityField>
-        </neonTableColumn>
         <neonTableColumn>
           <name>89fd18d0-f6ee-4323-9277-464dee6da625</name>
           <entityField>OPTIONAL</entityField>
         </neonTableColumn>
-        <neonTableColumn>
-          <name>03a15cab-67d9-4e9d-b911-0d5599c87671</name>
-          <entityField>INFO</entityField>
-        </neonTableColumn>
         <neonTableColumn>
           <name>eecc066d-e380-4fe7-9e9b-99d80842981d</name>
           <entityField>TotalPrice</entityField>
         </neonTableColumn>
+        <neonTableColumn>
+          <name>03a15cab-67d9-4e9d-b911-0d5599c87671</name>
+          <entityField>INFO</entityField>
+        </neonTableColumn>
       </columns>
     </tableViewTemplate>
     <treeTableViewTemplate>
@@ -77,6 +77,10 @@
           <name>4998fc65-67b7-465d-9891-808dcf0fe080</name>
           <entityField>UNIT</entityField>
         </neonTreeTableColumn>
+        <neonTreeTableColumn>
+          <name>e545cb87-e4a5-4154-89b1-1f88a6d59fde</name>
+          <entityField>VAT</entityField>
+        </neonTreeTableColumn>
         <neonTreeTableColumn>
           <name>b4470ca6-89e8-421b-bb91-7d32f9c48aa2</name>
           <entityField>PRICE</entityField>
@@ -85,22 +89,18 @@
           <name>0c533079-4b39-4412-8de5-086bf7a08706</name>
           <entityField>DISCOUNT</entityField>
         </neonTreeTableColumn>
-        <neonTreeTableColumn>
-          <name>e545cb87-e4a5-4154-89b1-1f88a6d59fde</name>
-          <entityField>VAT</entityField>
-        </neonTreeTableColumn>
         <neonTreeTableColumn>
           <name>9ac44050-ea77-43d2-b0fe-f7ca411b91e7</name>
           <entityField>OPTIONAL</entityField>
         </neonTreeTableColumn>
-        <neonTreeTableColumn>
-          <name>4d4f204a-1c2b-4587-93b9-df03f31da38e</name>
-          <entityField>INFO</entityField>
-        </neonTreeTableColumn>
         <neonTreeTableColumn>
           <name>c44b5bc2-4283-4dca-bd20-bd048e05fe45</name>
           <entityField>TotalPrice</entityField>
         </neonTreeTableColumn>
+        <neonTreeTableColumn>
+          <name>4d4f204a-1c2b-4587-93b9-df03f31da38e</name>
+          <entityField>INFO</entityField>
+        </neonTreeTableColumn>
       </columns>
     </treeTableViewTemplate>
   </children>
-- 
GitLab


From 05272b13a56f1d1586cd34ff4a3c3ba0ddcf782a Mon Sep 17 00:00:00 2001
From: Daniel Tran <d.tran@adito.de>
Date: Wed, 5 Aug 2020 08:07:37 +0000
Subject: [PATCH 092/309] #1062997: Changed naming for email sent button in
 EmailEdit_view.

---
 .liquibase/Data_alias/changelog.xml                |  2 +-
 aliasDefinition/Data_alias/Data_alias.aod          | 14 +++++++-------
 entity/Email_entity/Email_entity.aod               |  2 +-
 .../_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod    | 12 +++++++++---
 language/_____LANGUAGE_de/_____LANGUAGE_de.aod     | 13 +++++--------
 language/_____LANGUAGE_en/_____LANGUAGE_en.aod     | 13 +++++++++++++
 6 files changed, 36 insertions(+), 20 deletions(-)

diff --git a/.liquibase/Data_alias/changelog.xml b/.liquibase/Data_alias/changelog.xml
index a8cc53b406..24d4ba7c1a 100644
--- a/.liquibase/Data_alias/changelog.xml
+++ b/.liquibase/Data_alias/changelog.xml
@@ -14,7 +14,7 @@
     <include relativeToChangelogFile="true" file="basic/2020.1.0/changelog.xml"/>
     <include relativeToChangelogFile="true" file="basic/2020.1.1/changelog.xml"/>
     <include relativeToChangelogFile="true" file="basic/2020.1.2/changelog.xml"/>
-    
+    <include relativeToChangelogFile="true" file="basic/2020.1.3/changelog.xml"/>
     <!--enable this only when you definetly want to overwrite the existing data with demo records:--> 
     <!--<include relativeToChangelogFile="true" file="basic/_demoData/changelog.xml" context="example"/>-->
 </databaseChangeLog>
\ No newline at end of file
diff --git a/aliasDefinition/Data_alias/Data_alias.aod b/aliasDefinition/Data_alias/Data_alias.aod
index 324bae9d14..b5691bb450 100644
--- a/aliasDefinition/Data_alias/Data_alias.aod
+++ b/aliasDefinition/Data_alias/Data_alias.aod
@@ -6339,10 +6339,10 @@
                 <name>ACTIVITY_ID</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="1" />
-                <size v="36" />
+                <columnType v="12" />
+                <size v="63" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="true" />
                 <documentation></documentation>
@@ -8382,13 +8382,13 @@
               <entityFieldDb>
                 <name>DOCUMENTTEMPLATEID</name>
                 <dbName></dbName>
-                <primaryKey v="true" />
+                <primaryKey v="false" />
                 <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
-                <notNull v="true" />
-                <isUnique v="true" />
-                <index v="true" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
diff --git a/entity/Email_entity/Email_entity.aod b/entity/Email_entity/Email_entity.aod
index fc65d44a8a..ba88dbf6fb 100644
--- a/entity/Email_entity/Email_entity.aod
+++ b/entity/Email_entity/Email_entity.aod
@@ -119,7 +119,7 @@
     </entityParameter>
     <entityActionField>
       <name>sendMail</name>
-      <title>send mail</title>
+      <title>{SEND_MAIL}</title>
       <onActionProcess>%aditoprj%/entity/Email_entity/entityfields/sendmail/onActionProcess.js</onActionProcess>
       <iconId>VAADIN:AT</iconId>
       <stateProcess>%aditoprj%/entity/Email_entity/entityfields/sendmail/stateProcess.js</stateProcess>
diff --git a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
index 42409fc7a7..e3bb15b7fc 100644
--- a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
+++ b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
@@ -6867,10 +6867,16 @@
       <key>download ready</key>
     </entry>
     <entry>
-      <key>Add new Department Permission</key>
+      <key>Workflow Model</key>
     </entry>
-     <entry>
-      <key>Add new User Permission</key>
+    <entry>
+      <key>{SENT_MAIL}</key>
+    </entry>
+    <entry>
+      <key>The workflow could not be deployed</key>
+    </entry>
+    <entry>
+      <key>Workflow deploy failed</key>
     </entry>
   </keyValueMap>
   <font name="Dialog" style="0" size="11" />
diff --git a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
index a0f4cebe76..473942e04d 100644
--- a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
+++ b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
@@ -8783,20 +8783,17 @@ Bitte Datumseingabe prüfen</value>
       <value>E-Mail losschicken</value>
     </entry>
     <entry>
-      <key>Download letter and create Activity</key>
-      <value>Brief herunterladen und Aktivität erstellen</value>
+      <key>Workflow Model</key>
     </entry>
     <entry>
-      <key>Add Participants</key>
-      <value>Teilnehmer hinzufügen</value>
+      <key>{SEND_MAIL}</key>
+      <value>Email versenden</value>
     </entry>
     <entry>
-      <key>and open Report</key>
-      <value>und Report öffnen</value>
+      <key>The workflow could not be deployed</key>
     </entry>
     <entry>
-      <key>Add Recipients</key>
-      <value>Empfänger hinzufügen</value>
+      <key>Workflow deploy failed</key>
     </entry>
   </keyValueMap>
   <font name="Dialog" style="0" size="11" />
diff --git a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
index 831943f96a..3d79166f31 100644
--- a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
+++ b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
@@ -6932,6 +6932,19 @@
     <entry>
       <key>download ready</key>
     </entry>
+    <entry>
+      <key>Workflow Model</key>
+    </entry>
+    <entry>
+      <key>{SEND_MAIL}</key>
+      <value>Send mail</value>
+    </entry>
+    <entry>
+      <key>The workflow could not be deployed</key>
+    </entry>
+    <entry>
+      <key>Workflow deploy failed</key>
+    </entry>
   </keyValueMap>
   <font name="Dialog" style="0" size="11" />
 </language>
-- 
GitLab


From 956e6b88fd20c5a993195b356049eedc3463c356 Mon Sep 17 00:00:00 2001
From: Benjamin Ulrich <b.ulrich@adito.de>
Date: Wed, 5 Aug 2020 08:49:22 +0000
Subject: [PATCH 093/309] [Projekt: Entwicklung - Neon][TicketNr.:
 1060841][Benachrichtungen: Filter in englischem Client sehen unsauber aus]

---
 entity/Notification_entity/Notification_entity.aod | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/entity/Notification_entity/Notification_entity.aod b/entity/Notification_entity/Notification_entity.aod
index 4f16a89da7..567da1e48b 100644
--- a/entity/Notification_entity/Notification_entity.aod
+++ b/entity/Notification_entity/Notification_entity.aod
@@ -34,7 +34,7 @@
     </entityField>
     <entityField>
       <name>CAPTION</name>
-      <title>title</title>
+      <title>Title</title>
     </entityField>
     <entityField>
       <name>CREATIONDATE</name>
@@ -45,7 +45,7 @@
     </entityField>
     <entityField>
       <name>DESCRIPTION</name>
-      <title>description</title>
+      <title>Description</title>
     </entityField>
     <entityField>
       <name>FORCEDPRIORITY</name>
@@ -127,7 +127,7 @@
     </entityActionField>
     <entityField>
       <name>RESOLVEDPRIORITY</name>
-      <title>priority</title>
+      <title>Priority</title>
       <consumer>PrioKeywords</consumer>
       <textInputAllowed v="false" />
     </entityField>
-- 
GitLab


From 40476e089d96ab11d9dd8a8841aea009cde44521 Mon Sep 17 00:00:00 2001
From: Benjamin Ulrich <b.ulrich@adito.de>
Date: Wed, 5 Aug 2020 08:56:59 +0000
Subject: [PATCH 094/309] =?UTF-8?q?[Projekt:=20Entwicklung=20-=20Neon][Tic?=
 =?UTF-8?q?ketNr.:=201055138][KeywordRegistry=20-=20Eintr=C3=A4ge=20fehlen?=
 =?UTF-8?q?=20f=C3=BCr=20Schl=C3=BCsselwortattribute]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 process/KeywordRegistry_basic/process.js | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/process/KeywordRegistry_basic/process.js b/process/KeywordRegistry_basic/process.js
index b4d74a2a8f..04e469c42d 100644
--- a/process/KeywordRegistry_basic/process.js
+++ b/process/KeywordRegistry_basic/process.js
@@ -21,6 +21,11 @@ $KeywordRegistry._autoPad = function(pKey){return (pKey + "
 
 $KeywordRegistry.attributeType = function(){return "AttributeType";};
 $KeywordRegistry.keywordAttributeType = function(){return "KeywordAttributeType";};
+$KeywordRegistry.keywordAttributeType$char = function(){return "CHAR";};
+$KeywordRegistry.keywordAttributeType$number = function(){return "NUMBER";};
+$KeywordRegistry.keywordAttributeType$bool = function(){return "BOOLEAN";};
+$KeywordRegistry.keywordAttributeType$longChar = function(){return "LONGCHAR";};
+
 $KeywordRegistry.contractPayment = function(){return "ContractPayment";};
 
 $KeywordRegistry.contractStatus = function(){return "ContractStatus";};
-- 
GitLab


From 004d10696c9376bf9417eaa3b0706107e219756f Mon Sep 17 00:00:00 2001
From: "a.schindlbeck" <a.schindlbeck@adito.de>
Date: Wed, 5 Aug 2020 13:29:51 +0200
Subject: [PATCH 095/309] Calendar: single-appointment to recurring fix

---
 entity/Appointment_entity/recordcontainers/jdito/onUpdate.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/entity/Appointment_entity/recordcontainers/jdito/onUpdate.js b/entity/Appointment_entity/recordcontainers/jdito/onUpdate.js
index d9c947a770..32ea225c34 100644
--- a/entity/Appointment_entity/recordcontainers/jdito/onUpdate.js
+++ b/entity/Appointment_entity/recordcontainers/jdito/onUpdate.js
@@ -56,7 +56,7 @@ if(event)
             event[calendars.REMINDER_DURATION] = fields["REMINDER.value"];
         }
         
-        if(event[calendars.RRULE])
+        if(fields["RRULE.value"])
             event[calendars.RRULE] = [fields["RRULE.value"]];
         
         // Adds the required X-Header for status actions needed by Exchange and Domino
-- 
GitLab


From 5a10fbd13fbf1c2c37e14c3b8122581e5e4e334c Mon Sep 17 00:00:00 2001
From: "a.schindlbeck" <a.schindlbeck@adito.de>
Date: Wed, 5 Aug 2020 11:29:51 +0000
Subject: [PATCH 096/309] Calendar: single-appointment to recurring fix

(cherry picked from commit 004d10696c9376bf9417eaa3b0706107e219756f)
---
 entity/Appointment_entity/recordcontainers/jdito/onUpdate.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/entity/Appointment_entity/recordcontainers/jdito/onUpdate.js b/entity/Appointment_entity/recordcontainers/jdito/onUpdate.js
index d9c947a770..32ea225c34 100644
--- a/entity/Appointment_entity/recordcontainers/jdito/onUpdate.js
+++ b/entity/Appointment_entity/recordcontainers/jdito/onUpdate.js
@@ -56,7 +56,7 @@ if(event)
             event[calendars.REMINDER_DURATION] = fields["REMINDER.value"];
         }
         
-        if(event[calendars.RRULE])
+        if(fields["RRULE.value"])
             event[calendars.RRULE] = [fields["RRULE.value"]];
         
         // Adds the required X-Header for status actions needed by Exchange and Domino
-- 
GitLab


From 84187473b7596749f4fc876b853ad6c416123b55 Mon Sep 17 00:00:00 2001
From: "a.schindlbeck" <a.schindlbeck@adito.de>
Date: Wed, 5 Aug 2020 11:29:51 +0000
Subject: [PATCH 097/309] Calendar: single-appointment to recurring fix

(cherry picked from commit 004d10696c9376bf9417eaa3b0706107e219756f)
---
 entity/Appointment_entity/recordcontainers/jdito/onUpdate.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/entity/Appointment_entity/recordcontainers/jdito/onUpdate.js b/entity/Appointment_entity/recordcontainers/jdito/onUpdate.js
index d9c947a770..32ea225c34 100644
--- a/entity/Appointment_entity/recordcontainers/jdito/onUpdate.js
+++ b/entity/Appointment_entity/recordcontainers/jdito/onUpdate.js
@@ -56,7 +56,7 @@ if(event)
             event[calendars.REMINDER_DURATION] = fields["REMINDER.value"];
         }
         
-        if(event[calendars.RRULE])
+        if(fields["RRULE.value"])
             event[calendars.RRULE] = [fields["RRULE.value"]];
         
         // Adds the required X-Header for status actions needed by Exchange and Domino
-- 
GitLab


From abd78c8fbf38b9cb3daaf5933bd9fdd90574e43a Mon Sep 17 00:00:00 2001
From: "a.schindlbeck" <a.schindlbeck@adito.de>
Date: Wed, 5 Aug 2020 11:29:51 +0000
Subject: [PATCH 098/309] Calendar: single-appointment to recurring fix

(cherry picked from commit 004d10696c9376bf9417eaa3b0706107e219756f)
---
 entity/Appointment_entity/recordcontainers/jdito/onUpdate.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/entity/Appointment_entity/recordcontainers/jdito/onUpdate.js b/entity/Appointment_entity/recordcontainers/jdito/onUpdate.js
index d9c947a770..32ea225c34 100644
--- a/entity/Appointment_entity/recordcontainers/jdito/onUpdate.js
+++ b/entity/Appointment_entity/recordcontainers/jdito/onUpdate.js
@@ -56,7 +56,7 @@ if(event)
             event[calendars.REMINDER_DURATION] = fields["REMINDER.value"];
         }
         
-        if(event[calendars.RRULE])
+        if(fields["RRULE.value"])
             event[calendars.RRULE] = [fields["RRULE.value"]];
         
         // Adds the required X-Header for status actions needed by Exchange and Domino
-- 
GitLab


From dd8f36e14c129b169dbcac7c150f854930d6bb2f Mon Sep 17 00:00:00 2001
From: Johannes Goderbauer <j.goderbauer@adito.de>
Date: Wed, 5 Aug 2020 13:35:59 +0200
Subject: [PATCH 099/309] Removed wrong entry in liquibase changelog

---
 .liquibase/Data_alias/changelog.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.liquibase/Data_alias/changelog.xml b/.liquibase/Data_alias/changelog.xml
index 24d4ba7c1a..415dcce416 100644
--- a/.liquibase/Data_alias/changelog.xml
+++ b/.liquibase/Data_alias/changelog.xml
@@ -14,7 +14,7 @@
     <include relativeToChangelogFile="true" file="basic/2020.1.0/changelog.xml"/>
     <include relativeToChangelogFile="true" file="basic/2020.1.1/changelog.xml"/>
     <include relativeToChangelogFile="true" file="basic/2020.1.2/changelog.xml"/>
-    <include relativeToChangelogFile="true" file="basic/2020.1.3/changelog.xml"/>
+
     <!--enable this only when you definetly want to overwrite the existing data with demo records:--> 
     <!--<include relativeToChangelogFile="true" file="basic/_demoData/changelog.xml" context="example"/>-->
 </databaseChangeLog>
\ No newline at end of file
-- 
GitLab


From 3ea694f8279a0e2f7e088012ac4c4078bb717126 Mon Sep 17 00:00:00 2001
From: Johannes Goderbauer <j.goderbauer@adito.de>
Date: Wed, 5 Aug 2020 13:44:57 +0200
Subject: [PATCH 100/309] Moved some liquibase changes in already finished
 files to the correct folder (2020.1.1 to 2020.1.2)

---
 .liquibase/Data_alias/basic/2020.1.1/changelog.xml               | 1 -
 .../basic/{2020.1.1 => 2020.1.2}/Notification/changelog.xml      | 0
 .../Notification/init_NotificationType.xml                       | 0
 .../Notification/insert_NotificationState.xml                    | 0
 .liquibase/Data_alias/basic/2020.1.2/changelog.xml               | 1 +
 5 files changed, 1 insertion(+), 1 deletion(-)
 rename .liquibase/Data_alias/basic/{2020.1.1 => 2020.1.2}/Notification/changelog.xml (100%)
 rename .liquibase/Data_alias/basic/{2020.1.1 => 2020.1.2}/Notification/init_NotificationType.xml (100%)
 rename .liquibase/Data_alias/basic/{2020.1.1 => 2020.1.2}/Notification/insert_NotificationState.xml (100%)

diff --git a/.liquibase/Data_alias/basic/2020.1.1/changelog.xml b/.liquibase/Data_alias/basic/2020.1.1/changelog.xml
index 7070cb88cf..f5686ce22c 100644
--- a/.liquibase/Data_alias/basic/2020.1.1/changelog.xml
+++ b/.liquibase/Data_alias/basic/2020.1.1/changelog.xml
@@ -2,5 +2,4 @@
 <databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
                    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
     <include relativeToChangelogFile="true" file="AlterTablesToDatetime.xml"/>
-    <include relativeToChangelogFile="true" file="Notification/changelog.xml"/>
 </databaseChangeLog>
diff --git a/.liquibase/Data_alias/basic/2020.1.1/Notification/changelog.xml b/.liquibase/Data_alias/basic/2020.1.2/Notification/changelog.xml
similarity index 100%
rename from .liquibase/Data_alias/basic/2020.1.1/Notification/changelog.xml
rename to .liquibase/Data_alias/basic/2020.1.2/Notification/changelog.xml
diff --git a/.liquibase/Data_alias/basic/2020.1.1/Notification/init_NotificationType.xml b/.liquibase/Data_alias/basic/2020.1.2/Notification/init_NotificationType.xml
similarity index 100%
rename from .liquibase/Data_alias/basic/2020.1.1/Notification/init_NotificationType.xml
rename to .liquibase/Data_alias/basic/2020.1.2/Notification/init_NotificationType.xml
diff --git a/.liquibase/Data_alias/basic/2020.1.1/Notification/insert_NotificationState.xml b/.liquibase/Data_alias/basic/2020.1.2/Notification/insert_NotificationState.xml
similarity index 100%
rename from .liquibase/Data_alias/basic/2020.1.1/Notification/insert_NotificationState.xml
rename to .liquibase/Data_alias/basic/2020.1.2/Notification/insert_NotificationState.xml
diff --git a/.liquibase/Data_alias/basic/2020.1.2/changelog.xml b/.liquibase/Data_alias/basic/2020.1.2/changelog.xml
index fc8ca2b1db..f8307f5735 100644
--- a/.liquibase/Data_alias/basic/2020.1.2/changelog.xml
+++ b/.liquibase/Data_alias/basic/2020.1.2/changelog.xml
@@ -4,4 +4,5 @@
     <include file="AlterDatatypeOfKeyColumnsToChar/changelog.xml" relativeToChangelogFile="true"/>
     <include file="AddNullableToDateNew.xml" relativeToChangelogFile="true" />    
     <include file="insert_workflowCategory_keyword.xml" relativeToChangelogFile="true"/>
+    <include file="Notification/changelog.xml" relativeToChangelogFile="true" />
 </databaseChangeLog>
-- 
GitLab


From 112074f8c64c81538fa4e50f7536e27baee83b16 Mon Sep 17 00:00:00 2001
From: Johannes Goderbauer <j.goderbauer@adito.de>
Date: Wed, 5 Aug 2020 13:46:04 +0200
Subject: [PATCH 101/309] updated data_alias

---
 aliasDefinition/Data_alias/Data_alias.aod | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/aliasDefinition/Data_alias/Data_alias.aod b/aliasDefinition/Data_alias/Data_alias.aod
index b5691bb450..324bae9d14 100644
--- a/aliasDefinition/Data_alias/Data_alias.aod
+++ b/aliasDefinition/Data_alias/Data_alias.aod
@@ -6339,10 +6339,10 @@
                 <name>ACTIVITY_ID</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="63" />
+                <columnType v="1" />
+                <size v="36" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="true" />
                 <documentation></documentation>
@@ -8382,13 +8382,13 @@
               <entityFieldDb>
                 <name>DOCUMENTTEMPLATEID</name>
                 <dbName></dbName>
-                <primaryKey v="false" />
+                <primaryKey v="true" />
                 <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
-                <notNull v="false" />
-                <isUnique v="false" />
-                <index v="false" />
+                <notNull v="true" />
+                <isUnique v="true" />
+                <index v="true" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
-- 
GitLab


From c953b91e64b6961f7e52687a6eed086e8adcd587 Mon Sep 17 00:00:00 2001
From: "S.Listl" <S.Listl@SLISTL.aditosoftware.local>
Date: Wed, 5 Aug 2020 15:33:54 +0200
Subject: [PATCH 102/309] Conditional workflow form fields fix

---
 .../WorkflowTask_entity.aod                   |  1 +
 .../entityfields/formresult/onValueChange.js  | 25 +++++++++++++++++++
 2 files changed, 26 insertions(+)
 create mode 100644 entity/WorkflowTask_entity/entityfields/formresult/onValueChange.js

diff --git a/entity/WorkflowTask_entity/WorkflowTask_entity.aod b/entity/WorkflowTask_entity/WorkflowTask_entity.aod
index 3ffbe846c7..938fbcdc99 100644
--- a/entity/WorkflowTask_entity/WorkflowTask_entity.aod
+++ b/entity/WorkflowTask_entity/WorkflowTask_entity.aod
@@ -31,6 +31,7 @@
     </entityField>
     <entityField>
       <name>FORMRESULT</name>
+      <onValueChange>%aditoprj%/entity/WorkflowTask_entity/entityfields/formresult/onValueChange.js</onValueChange>
     </entityField>
     <entityField>
       <name>NAME</name>
diff --git a/entity/WorkflowTask_entity/entityfields/formresult/onValueChange.js b/entity/WorkflowTask_entity/entityfields/formresult/onValueChange.js
new file mode 100644
index 0000000000..249aba04bb
--- /dev/null
+++ b/entity/WorkflowTask_entity/entityfields/formresult/onValueChange.js
@@ -0,0 +1,25 @@
+import("system.result");
+import("system.vars");
+import("system.workflow");
+import("system.neon");
+
+var taskId = vars.get("$field.UID");
+var newResult = vars.get("$local.value");
+var oldResult = vars.get("$field.FORMRESULT");
+
+if (newResult && newResult !== oldResult)
+{
+    /*
+     * fieldListeners = all fields that are used inside a visibility expression
+     * -> if one of these fields is changed, set the new FORMDEFINITION
+     */
+    var fieldListeners = JSON.parse(workflow.getFormFieldListeners(taskId));
+    newResult = newResult ? JSON.parse(newResult) : {};
+    oldResult = oldResult ? JSON.parse(oldResult) : {};
+    var isRefreshRequired = fieldListeners.some(function (fieldId)
+    {
+        return newResult[fieldId] !== oldResult[fieldId];
+    });
+    if (isRefreshRequired)
+        neon.setFieldValue("$field.FORMDEFINITION", workflow.getFormProperties(taskId, newResult));
+}
-- 
GitLab


From 074fe42f8434dcddd63abdd29d0aee1869ccde53 Mon Sep 17 00:00:00 2001
From: "b.ulrich" <b.ulrich@adito.de>
Date: Wed, 5 Aug 2020 15:51:26 +0200
Subject: [PATCH 103/309] [Projekt: Entwicklung - Neon][TicketNr.:
 1057353][Language: Lookup von ISO3 funktioniert nicht]

---
 entity/Language_entity/Language_entity.aod | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/entity/Language_entity/Language_entity.aod b/entity/Language_entity/Language_entity.aod
index 4511f71a29..a103f19dab 100644
--- a/entity/Language_entity/Language_entity.aod
+++ b/entity/Language_entity/Language_entity.aod
@@ -121,6 +121,7 @@
     <dbRecordContainer>
       <name>db</name>
       <alias>Data_alias</alias>
+      <isPageable v="false" />
       <conditionProcess>%aditoprj%/entity/Language_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
       <linkInformation>
         <linkInformation>
@@ -143,16 +144,20 @@
         <dbRecordFieldMapping>
           <name>ISO3.value</name>
           <recordfield>AB_LANGUAGE.ISO3</recordfield>
-          <isFilterable v="true" />
-          <isLookupFilter v="true" />
+          <isFilterable v="false" />
+          <isLookupFilter v="false" />
         </dbRecordFieldMapping>
         <dbRecordFieldMapping>
           <name>NAME_LATIN.value</name>
           <recordfield>AB_LANGUAGE.NAME_LATIN</recordfield>
+          <isFilterable v="true" />
+          <isLookupFilter v="true" />
         </dbRecordFieldMapping>
         <dbRecordFieldMapping>
           <name>NAME_NATIVE.value</name>
           <recordfield>AB_LANGUAGE.NAME_NATIVE</recordfield>
+          <isFilterable v="false" />
+          <isLookupFilter v="false" />
         </dbRecordFieldMapping>
       </recordFieldMappings>
     </dbRecordContainer>
-- 
GitLab


From a33791483577f9a68a91b9cdcfe0b9801b0859ee Mon Sep 17 00:00:00 2001
From: Johannes Goderbauer <j.goderbauer@adito.de>
Date: Wed, 5 Aug 2020 16:18:33 +0200
Subject: [PATCH 104/309] fixed wrong liquibase scripts

---
 .liquibase/Data_alias/basic/2020.1.2/changelog.xml         | 1 -
 .../AlterButtonlabelTitles/AlterButtonLabelTitles.xml      | 0
 .../rename_VisitPlanEntry_ORGANISATION_ID.xml              | 0
 .liquibase/Data_alias/basic/2020.1.3/changelog.xml         | 7 +++++++
 4 files changed, 7 insertions(+), 1 deletion(-)
 rename .liquibase/Data_alias/basic/{2020.1.2 => 2020.1.3}/AlterButtonlabelTitles/AlterButtonLabelTitles.xml (100%)
 rename .liquibase/Data_alias/basic/{2020.1.2 => 2020.1.3}/VisitPlanEntry/rename_VisitPlanEntry_ORGANISATION_ID.xml (100%)
 create mode 100644 .liquibase/Data_alias/basic/2020.1.3/changelog.xml

diff --git a/.liquibase/Data_alias/basic/2020.1.2/changelog.xml b/.liquibase/Data_alias/basic/2020.1.2/changelog.xml
index 1f2c05d8e7..f8307f5735 100644
--- a/.liquibase/Data_alias/basic/2020.1.2/changelog.xml
+++ b/.liquibase/Data_alias/basic/2020.1.2/changelog.xml
@@ -5,5 +5,4 @@
     <include file="AddNullableToDateNew.xml" relativeToChangelogFile="true" />    
     <include file="insert_workflowCategory_keyword.xml" relativeToChangelogFile="true"/>
     <include file="Notification/changelog.xml" relativeToChangelogFile="true" />
-    <include file="AlterButtonLabelTitles/AlterButtonLabelTitles.xml" relativeToChangelogFile="true" />
 </databaseChangeLog>
diff --git a/.liquibase/Data_alias/basic/2020.1.2/AlterButtonlabelTitles/AlterButtonLabelTitles.xml b/.liquibase/Data_alias/basic/2020.1.3/AlterButtonlabelTitles/AlterButtonLabelTitles.xml
similarity index 100%
rename from .liquibase/Data_alias/basic/2020.1.2/AlterButtonlabelTitles/AlterButtonLabelTitles.xml
rename to .liquibase/Data_alias/basic/2020.1.3/AlterButtonlabelTitles/AlterButtonLabelTitles.xml
diff --git a/.liquibase/Data_alias/basic/2020.1.2/VisitPlanEntry/rename_VisitPlanEntry_ORGANISATION_ID.xml b/.liquibase/Data_alias/basic/2020.1.3/VisitPlanEntry/rename_VisitPlanEntry_ORGANISATION_ID.xml
similarity index 100%
rename from .liquibase/Data_alias/basic/2020.1.2/VisitPlanEntry/rename_VisitPlanEntry_ORGANISATION_ID.xml
rename to .liquibase/Data_alias/basic/2020.1.3/VisitPlanEntry/rename_VisitPlanEntry_ORGANISATION_ID.xml
diff --git a/.liquibase/Data_alias/basic/2020.1.3/changelog.xml b/.liquibase/Data_alias/basic/2020.1.3/changelog.xml
new file mode 100644
index 0000000000..ac6898c7f1
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2020.1.3/changelog.xml
@@ -0,0 +1,7 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+                   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+    <include file="AlterButtonLabelTitles/AlterButtonLabelTitles.xml" relativeToChangelogFile="true" />
+    <!--    disabled the following script since it is WIP-->
+    <!--<include file="VisitPlanEntry/rename_VisitPlanEntry_ORGANISATION_ID.xml" relativeToChangelogFile="true" />-->
+</databaseChangeLog>
-- 
GitLab


From 6cdd6f7ddbb2784142c61653b7be3585eb57593b Mon Sep 17 00:00:00 2001
From: Tom Lutzenberger <t.lutzenberger@adito.de>
Date: Thu, 6 Aug 2020 09:31:15 +0200
Subject: [PATCH 105/309] #1058862: User-Settings Implementierung (WiP)

---
 .aditoprj/UUIDNameMap.txt                     |  98 ++++++++++++
 .../Usersettings_entity.aod                   |  82 ++++++++++
 entity/Usersettings_entity/afterUiInit.js     |   4 +
 .../calhourdivider/dropDownProcess.js         |  10 ++
 .../calmaintimeend/dropDownProcess.js         |  19 +++
 .../calmaintimeend/onValidation.js            |  11 ++
 .../calmaintimestart/dropDownProcess.js       |  19 +++
 .../calmaintimestart/onValidation.js          |  11 ++
 .../currentpassword/onValidation.js           |  13 ++
 .../entityfields/jpassword/onValidation.js    |  13 ++
 .../jpasswordrepeat/onValidation.js           |  13 ++
 .../selectionignorecase/dropDownProcess.js    |   8 +
 .../selectionplaceholder/dropDownProcess.js   |  12 ++
 .../recordcontainers/jdito/onInsert.js        |   5 +-
 .../_____LANGUAGE_EXTRA.aod                   |  60 ++++++++
 .../_____LANGUAGE_de/_____LANGUAGE_de.aod     |  64 ++++++++
 .../_____LANGUAGE_en/_____LANGUAGE_en.aod     |  60 ++++++++
 .../UsersettingsEdit_view.aod                 |  35 +++++
 process/Date_lib/process.js                   |  69 +++++++++
 process/UserSettings_lib/UserSettings_lib.aod |   9 ++
 process/UserSettings_lib/process.js           | 144 ++++++++++++++++++
 21 files changed, 758 insertions(+), 1 deletion(-)
 create mode 100644 .aditoprj/UUIDNameMap.txt
 create mode 100644 entity/Usersettings_entity/afterUiInit.js
 create mode 100644 entity/Usersettings_entity/entityfields/calhourdivider/dropDownProcess.js
 create mode 100644 entity/Usersettings_entity/entityfields/calmaintimeend/dropDownProcess.js
 create mode 100644 entity/Usersettings_entity/entityfields/calmaintimeend/onValidation.js
 create mode 100644 entity/Usersettings_entity/entityfields/calmaintimestart/dropDownProcess.js
 create mode 100644 entity/Usersettings_entity/entityfields/calmaintimestart/onValidation.js
 create mode 100644 entity/Usersettings_entity/entityfields/currentpassword/onValidation.js
 create mode 100644 entity/Usersettings_entity/entityfields/jpassword/onValidation.js
 create mode 100644 entity/Usersettings_entity/entityfields/jpasswordrepeat/onValidation.js
 create mode 100644 entity/Usersettings_entity/entityfields/selectionignorecase/dropDownProcess.js
 create mode 100644 entity/Usersettings_entity/entityfields/selectionplaceholder/dropDownProcess.js
 create mode 100644 process/UserSettings_lib/UserSettings_lib.aod
 create mode 100644 process/UserSettings_lib/process.js

diff --git a/.aditoprj/UUIDNameMap.txt b/.aditoprj/UUIDNameMap.txt
new file mode 100644
index 0000000000..afd666e317
--- /dev/null
+++ b/.aditoprj/UUIDNameMap.txt
@@ -0,0 +1,98 @@
+*************************************************
+*                                               *
+* This is a generated file, please do not edit! *
+*                                               *
+*************************************************
+ 5
+ 6
+ 7
+ 8
+ 9
+ 10
+ 11
+ 12
+ 13
+ 14
+ 15
+ 16
+ 17
+ 18
+ 19
+ 20
+ 21
+ 22
+ 23
+ 24
+ 25
+ 26
+ 27
+ 28
+ 29
+ 30
+ 31
+ 32
+ 33
+ 34
+ 35
+ 36
+ 37
+ 38
+ 39
+ 40
+ 41
+1.0.0
+1596634257480
+#ENTITY
+#ENTITY
+#PROVIDER_FIELD
+#PROVIDER_FIELD
+#CONTENTTITLE
+#CONTENTTITLE
+#TITLE
+#TITLE
+#INDEX_GROUP
+#INDEX_GROUP
+#TARGETCONTEXT
+#TARGETCONTEXT
+INTERNAL_ADMINISTRATOR
+INTERNAL_ADMINISTRATOR
+INTERNAL_WEBSERVICE
+INTERNAL_WEBSERVICE
+#DESCRIPTION
+#DESCRIPTION
+INTERNAL_GROUPWARE
+INTERNAL_GROUPWARE
+INTERNAL_TECHNICAL
+INTERNAL_TECHNICAL
+#MAPPING
+#MAPPING
+#LOCATION
+#LOCATION
+#PROVIDER
+#PROVIDER
+INTERNAL_DESIGNER
+INTERNAL_DESIGNER
+#USERHELP
+#USERHELP
+#TARGETID
+#TARGETID
+#CONTENTDESCRIPTION
+#CONTENTDESCRIPTION
+#LOOKUPID
+#LOOKUPID
+#GROUPING
+#GROUPING
+#ICON
+#ICON
+INTERNAL_DASHBOARDSTOREADMIN
+INTERNAL_DASHBOARDSTOREADMIN
+#IMAGE
+#IMAGE
+#UID
+#UID
+INTERNAL_SNMP
+INTERNAL_SNMP
+#TARGETCONSUMER
+#TARGETCONSUMER
+INTERNAL_EVERYONE
+INTERNAL_EVERYONE
\ No newline at end of file
diff --git a/entity/Usersettings_entity/Usersettings_entity.aod b/entity/Usersettings_entity/Usersettings_entity.aod
index eb65941d79..969bd62d6e 100644
--- a/entity/Usersettings_entity/Usersettings_entity.aod
+++ b/entity/Usersettings_entity/Usersettings_entity.aod
@@ -3,14 +3,72 @@
   <name>Usersettings_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <title>Settings</title>
+  <grantDelete v="false" />
+  <afterUiInit>%aditoprj%/entity/Usersettings_entity/afterUiInit.js</afterUiInit>
   <titlePlural>Settings</titlePlural>
   <recordContainer>jdito</recordContainer>
   <entityFields>
     <entityProvider>
       <name>#PROVIDER</name>
     </entityProvider>
+    <entityField>
+      <name>calHourdivider</name>
+      <title>Calendar hour divider</title>
+      <contentType>NUMBER</contentType>
+      <dropDownProcess>%aditoprj%/entity/Usersettings_entity/entityfields/calhourdivider/dropDownProcess.js</dropDownProcess>
+    </entityField>
+    <entityField>
+      <name>calMaintimeEnd</name>
+      <title>Calendar maintime end</title>
+      <contentType>NUMBER</contentType>
+      <placeholder>HH:mm</placeholder>
+      <dropDownProcess>%aditoprj%/entity/Usersettings_entity/entityfields/calmaintimeend/dropDownProcess.js</dropDownProcess>
+      <onValidation>%aditoprj%/entity/Usersettings_entity/entityfields/calmaintimeend/onValidation.js</onValidation>
+    </entityField>
+    <entityField>
+      <name>calMaintimeStart</name>
+      <title>Calendar maintime start</title>
+      <contentType>NUMBER</contentType>
+      <placeholder>HH:mm</placeholder>
+      <dropDownProcess>%aditoprj%/entity/Usersettings_entity/entityfields/calmaintimestart/dropDownProcess.js</dropDownProcess>
+      <onValidation>%aditoprj%/entity/Usersettings_entity/entityfields/calmaintimestart/onValidation.js</onValidation>
+    </entityField>
     <entityField>
       <name>UID</name>
+      <title>UID</title>
+    </entityField>
+    <entityField>
+      <name>selectionIgnoreCase</name>
+      <title>Selection ignore case</title>
+      <contentType>BOOLEAN</contentType>
+      <dropDownProcess>%aditoprj%/entity/Usersettings_entity/entityfields/selectionignorecase/dropDownProcess.js</dropDownProcess>
+    </entityField>
+    <entityField>
+      <name>selectionPlaceholder</name>
+      <title>Selection placeholder</title>
+      <contentType>NUMBER</contentType>
+      <dropDownProcess>%aditoprj%/entity/Usersettings_entity/entityfields/selectionplaceholder/dropDownProcess.js</dropDownProcess>
+    </entityField>
+    <entityField>
+      <name>jPassword</name>
+      <title>New password</title>
+      <contentType>PASSWORD</contentType>
+      <onValidation>%aditoprj%/entity/Usersettings_entity/entityfields/jpassword/onValidation.js</onValidation>
+    </entityField>
+    <entityField>
+      <name>jPasswordRepeat</name>
+      <title>Repeat password</title>
+      <contentType>PASSWORD</contentType>
+      <onValidation>%aditoprj%/entity/Usersettings_entity/entityfields/jpasswordrepeat/onValidation.js</onValidation>
+    </entityField>
+    <entityField>
+      <name>jPasswordSave</name>
+    </entityField>
+    <entityField>
+      <name>currentPassword</name>
+      <title>Current password</title>
+      <contentType>PASSWORD</contentType>
+      <onValidation>%aditoprj%/entity/Usersettings_entity/entityfields/currentpassword/onValidation.js</onValidation>
     </entityField>
   </entityFields>
   <recordContainers>
@@ -19,6 +77,30 @@
       <jDitoRecordAlias>_____SYSTEMALIAS</jDitoRecordAlias>
       <onInsert>%aditoprj%/entity/Usersettings_entity/recordcontainers/jdito/onInsert.js</onInsert>
       <recordFieldMappings>
+        <jDitoRecordFieldMapping>
+          <name>calHourdivider.value</name>
+        </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>calMaintimeEnd.value</name>
+        </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>calMaintimeStart.value</name>
+        </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>jPassword.value</name>
+        </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>jPasswordRepeat.value</name>
+        </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>jPasswordSave.value</name>
+        </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>selectionIgnoreCase.value</name>
+        </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>selectionPlaceholder.value</name>
+        </jDitoRecordFieldMapping>
         <jDitoRecordFieldMapping>
           <name>UID.value</name>
         </jDitoRecordFieldMapping>
diff --git a/entity/Usersettings_entity/afterUiInit.js b/entity/Usersettings_entity/afterUiInit.js
new file mode 100644
index 0000000000..7549fc5459
--- /dev/null
+++ b/entity/Usersettings_entity/afterUiInit.js
@@ -0,0 +1,4 @@
+import("UserSettings_lib");
+
+
+UserSettingUtil.initSettings();
diff --git a/entity/Usersettings_entity/entityfields/calhourdivider/dropDownProcess.js b/entity/Usersettings_entity/entityfields/calhourdivider/dropDownProcess.js
new file mode 100644
index 0000000000..8bca50580e
--- /dev/null
+++ b/entity/Usersettings_entity/entityfields/calhourdivider/dropDownProcess.js
@@ -0,0 +1,10 @@
+import("system.result");
+import("system.translate");
+
+
+result.object([
+    ["1", "1 " + translate.text("hour")],
+    ["2", "2 " + translate.text("hours")],
+    ["4", "4 " + translate.text("hours")],
+    ["6", "6 " + translate.text("hours")]
+]);
\ No newline at end of file
diff --git a/entity/Usersettings_entity/entityfields/calmaintimeend/dropDownProcess.js b/entity/Usersettings_entity/entityfields/calmaintimeend/dropDownProcess.js
new file mode 100644
index 0000000000..03c7b1f31d
--- /dev/null
+++ b/entity/Usersettings_entity/entityfields/calmaintimeend/dropDownProcess.js
@@ -0,0 +1,19 @@
+import("system.result");
+
+
+const hourStart = 0;
+const hourEnd = 23;
+const minuteSteps = [0, 15, 30, 45];
+let dropdown = [];
+
+for(let h = hourStart; h <= hourEnd; h++) {
+    for(let mIndex in minuteSteps) {
+        let m = minuteSteps[mIndex];
+        let timestamp = (new Date(1970, 0, 1, h, m)).getTime();
+        let displayTime = h.toString().padStart(2, '0') + ":" + m.toString().padStart(2, '0');
+        
+        dropdown.push([timestamp, displayTime]);
+    }   
+}
+
+result.object(dropdown);
diff --git a/entity/Usersettings_entity/entityfields/calmaintimeend/onValidation.js b/entity/Usersettings_entity/entityfields/calmaintimeend/onValidation.js
new file mode 100644
index 0000000000..71eae42d8b
--- /dev/null
+++ b/entity/Usersettings_entity/entityfields/calmaintimeend/onValidation.js
@@ -0,0 +1,11 @@
+import("system.result");
+import("system.translate");
+import("system.vars");
+
+
+let endValue = vars.get("$local.value");
+let startValue = vars.get("$field.calMaintimeStart");
+
+if(endValue && startValue && parseFloat(startValue) >= parseFloat(endValue)) {
+    result.string(translate.text("End time must be later than start time"));
+}
diff --git a/entity/Usersettings_entity/entityfields/calmaintimestart/dropDownProcess.js b/entity/Usersettings_entity/entityfields/calmaintimestart/dropDownProcess.js
new file mode 100644
index 0000000000..03c7b1f31d
--- /dev/null
+++ b/entity/Usersettings_entity/entityfields/calmaintimestart/dropDownProcess.js
@@ -0,0 +1,19 @@
+import("system.result");
+
+
+const hourStart = 0;
+const hourEnd = 23;
+const minuteSteps = [0, 15, 30, 45];
+let dropdown = [];
+
+for(let h = hourStart; h <= hourEnd; h++) {
+    for(let mIndex in minuteSteps) {
+        let m = minuteSteps[mIndex];
+        let timestamp = (new Date(1970, 0, 1, h, m)).getTime();
+        let displayTime = h.toString().padStart(2, '0') + ":" + m.toString().padStart(2, '0');
+        
+        dropdown.push([timestamp, displayTime]);
+    }   
+}
+
+result.object(dropdown);
diff --git a/entity/Usersettings_entity/entityfields/calmaintimestart/onValidation.js b/entity/Usersettings_entity/entityfields/calmaintimestart/onValidation.js
new file mode 100644
index 0000000000..7a6d7dd248
--- /dev/null
+++ b/entity/Usersettings_entity/entityfields/calmaintimestart/onValidation.js
@@ -0,0 +1,11 @@
+import("system.result");
+import("system.translate");
+import("system.vars");
+
+
+let startValue = vars.get("$local.value");
+let endValue = vars.get("$field.calMaintimeEnd");
+
+if(startValue && endValue && parseFloat(endValue) <= parseFloat(startValue)) {
+    result.string(translate.text("Start time must be earlier than end time"));
+}
diff --git a/entity/Usersettings_entity/entityfields/currentpassword/onValidation.js b/entity/Usersettings_entity/entityfields/currentpassword/onValidation.js
new file mode 100644
index 0000000000..2aff40611b
--- /dev/null
+++ b/entity/Usersettings_entity/entityfields/currentpassword/onValidation.js
@@ -0,0 +1,13 @@
+import("system.result");
+import("system.translate");
+import("system.tools");
+import("system.vars");
+import("UserSettings_lib");
+
+
+let login = UserSettingUtil.getValue("title");
+let password = vars.get("$local.value");
+
+if(password && !tools.verifyPassword(login, password)) {
+    result.string(translate.text("Wrong password"));
+}
diff --git a/entity/Usersettings_entity/entityfields/jpassword/onValidation.js b/entity/Usersettings_entity/entityfields/jpassword/onValidation.js
new file mode 100644
index 0000000000..26773ba48b
--- /dev/null
+++ b/entity/Usersettings_entity/entityfields/jpassword/onValidation.js
@@ -0,0 +1,13 @@
+import("system.result");
+import("system.translate");
+import("system.vars");
+
+
+let newPassword = vars.get("$local.value");
+let currentPassword = vars.get("$field.currentPassword");
+
+if(newPassword) {
+    if(newPassword === currentPassword) {
+        result.string(translate.text("New password must not be the same as the current password"));
+    }
+}
diff --git a/entity/Usersettings_entity/entityfields/jpasswordrepeat/onValidation.js b/entity/Usersettings_entity/entityfields/jpasswordrepeat/onValidation.js
new file mode 100644
index 0000000000..9fa42ffff6
--- /dev/null
+++ b/entity/Usersettings_entity/entityfields/jpasswordrepeat/onValidation.js
@@ -0,0 +1,13 @@
+import("system.result");
+import("system.translate");
+import("system.vars");
+
+
+let passwordRepeat = vars.get("$local.value");
+let newPassword = vars.get("$field.jPassword");
+
+if(passwordRepeat) {
+    if(newPassword !== passwordRepeat) {
+        result.string(translate.text("Passwords do not match"));
+    }
+}
diff --git a/entity/Usersettings_entity/entityfields/selectionignorecase/dropDownProcess.js b/entity/Usersettings_entity/entityfields/selectionignorecase/dropDownProcess.js
new file mode 100644
index 0000000000..b73697eca4
--- /dev/null
+++ b/entity/Usersettings_entity/entityfields/selectionignorecase/dropDownProcess.js
@@ -0,0 +1,8 @@
+import("system.result");
+import("system.translate");
+
+ 
+result.object([
+    ["true", translate.text("True")],
+    ["false", translate.text("False")]
+]);
diff --git a/entity/Usersettings_entity/entityfields/selectionplaceholder/dropDownProcess.js b/entity/Usersettings_entity/entityfields/selectionplaceholder/dropDownProcess.js
new file mode 100644
index 0000000000..5872dc3e28
--- /dev/null
+++ b/entity/Usersettings_entity/entityfields/selectionplaceholder/dropDownProcess.js
@@ -0,0 +1,12 @@
+import("system.translate");
+import("system.tools");
+import("system.result");
+
+
+result.object([
+    [tools.SELECTION_POSTFIX, translate.text("SELECTION_POSTFIX")],
+    [tools.SELECTION_PREFIX, translate.text("SELECTION_PREFIX")],
+    [tools.SELECTION_BOTH, translate.text("SELECTION_BOTH")],
+    [tools.SELECTION_NEITHER, translate.text("SELECTION_NEITHER")],
+    [tools.SELECTION_NULL, translate.text("SELECTION_NULL")]
+]);
diff --git a/entity/Usersettings_entity/recordcontainers/jdito/onInsert.js b/entity/Usersettings_entity/recordcontainers/jdito/onInsert.js
index 0ffdd02fcb..a99cd8a770 100644
--- a/entity/Usersettings_entity/recordcontainers/jdito/onInsert.js
+++ b/entity/Usersettings_entity/recordcontainers/jdito/onInsert.js
@@ -1 +1,4 @@
-// TODO
\ No newline at end of file
+import("UserSettings_lib");
+
+
+UserSettingUtil.updateSettings();
\ No newline at end of file
diff --git a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
index f32d5f97f0..19d06a930f 100644
--- a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
+++ b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
@@ -6833,6 +6833,66 @@
     <entry>
       <key>send mail</key>
     </entry>
+    <entry>
+      <key>and open modeler</key>
+    </entry>
+    <entry>
+      <key>Selection placeholder</key>
+    </entry>
+    <entry>
+      <key>Current password</key>
+    </entry>
+    <entry>
+      <key>Calendar maintime start</key>
+    </entry>
+    <entry>
+      <key>Repeat password</key>
+    </entry>
+    <entry>
+      <key>SELECTION_NULL</key>
+    </entry>
+    <entry>
+      <key>Selection ignore case</key>
+    </entry>
+    <entry>
+      <key>Calendar maintime end</key>
+    </entry>
+    <entry>
+      <key>Create model</key>
+    </entry>
+    <entry>
+      <key>SELECTION_NEITHER</key>
+    </entry>
+    <entry>
+      <key>Edit workflow</key>
+    </entry>
+    <entry>
+      <key>New password</key>
+    </entry>
+    <entry>
+      <key>Calendar hour divider</key>
+    </entry>
+    <entry>
+      <key>SELECTION_BOTH</key>
+    </entry>
+    <entry>
+      <key>SELECTION_POSTFIX</key>
+    </entry>
+    <entry>
+      <key>SELECTION_PREFIX</key>
+    </entry>
+    <entry>
+      <key>favorites</key>
+    </entry>
+    <entry>
+      <key>favorite</key>
+    </entry>
+    <entry>
+      <key>favorties</key>
+    </entry>
+    <entry>
+      <key>Workflow Model</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 7d8ec08a7b..4e124f18e5 100644
--- a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
+++ b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
@@ -8769,6 +8769,70 @@ Bitte Datumseingabe prüfen</value>
       <key>send mail</key>
       <value>E-Mail losschicken</value>
     </entry>
+    <entry>
+      <key>Selection placeholder</key>
+      <value>Suche Platzhalter</value>
+    </entry>
+    <entry>
+      <key>SELECTION_POSTFIX</key>
+      <value>Hinten</value>
+    </entry>
+    <entry>
+      <key>SELECTION_PREFIX</key>
+      <value>Vorne</value>
+    </entry>
+    <entry>
+      <key>SELECTION_BOTH</key>
+      <value>Vorne und hinten</value>
+    </entry>
+    <entry>
+      <key>SELECTION_NEITHER</key>
+      <value>Berücksichtigen</value>
+    </entry>
+    <entry>
+      <key>SELECTION_NULL</key>
+      <value>Ignorieren</value>
+    </entry>
+    <entry>
+      <key>Selection ignore case</key>
+      <value>Suche Groß-/Kleinschreibung ignorieren</value>
+    </entry>
+    <entry>
+      <key>Calendar hour divider</key>
+      <value>Kalender Stundenunterteilung</value>
+    </entry>
+    <entry>
+      <key>Calendar maintime start</key>
+      <value>Kalender Kernzeit Beginn</value>
+    </entry>
+    <entry>
+      <key>Calendar maintime end</key>
+      <value>Kalender Kernzeit Ende</value>
+    </entry>
+    <entry>
+      <key>New password</key>
+      <value>Neues Passwort</value>
+    </entry>
+    <entry>
+      <key>Repeat password</key>
+      <value>Passwort wiederholen</value>
+    </entry>
+    <entry>
+      <key>Current password</key>
+      <value>Aktuelles Passwort</value>
+    </entry>
+    <entry>
+      <key>favorites</key>
+    </entry>
+    <entry>
+      <key>favorite</key>
+    </entry>
+    <entry>
+      <key>favorties</key>
+    </entry>
+    <entry>
+      <key>Workflow Model</key>
+    </entry>
   </keyValueMap>
   <font name="Dialog" style="0" size="11" />
 </language>
diff --git a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
index 40c367a50d..8beaf1c843 100644
--- a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
+++ b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
@@ -6899,6 +6899,66 @@
     <entry>
       <key>send mail</key>
     </entry>
+    <entry>
+      <key>Selection placeholder</key>
+    </entry>
+    <entry>
+      <key>Selection ignore case</key>
+    </entry>
+    <entry>
+      <key>Calendar maintime end</key>
+    </entry>
+    <entry>
+      <key>Calendar maintime start</key>
+    </entry>
+    <entry>
+      <key>Calendar hour divider</key>
+    </entry>
+    <entry>
+      <key>New password</key>
+    </entry>
+    <entry>
+      <key>Repeat password</key>
+    </entry>
+    <entry>
+      <key>Current password</key>
+    </entry>
+    <entry>
+      <key>and open modeler</key>
+    </entry>
+    <entry>
+      <key>SELECTION_NULL</key>
+    </entry>
+    <entry>
+      <key>Create model</key>
+    </entry>
+    <entry>
+      <key>SELECTION_NEITHER</key>
+    </entry>
+    <entry>
+      <key>Edit workflow</key>
+    </entry>
+    <entry>
+      <key>SELECTION_BOTH</key>
+    </entry>
+    <entry>
+      <key>SELECTION_POSTFIX</key>
+    </entry>
+    <entry>
+      <key>SELECTION_PREFIX</key>
+    </entry>
+    <entry>
+      <key>favorites</key>
+    </entry>
+    <entry>
+      <key>favorite</key>
+    </entry>
+    <entry>
+      <key>favorties</key>
+    </entry>
+    <entry>
+      <key>Workflow Model</key>
+    </entry>
   </keyValueMap>
   <font name="Dialog" style="0" size="11" />
 </language>
diff --git a/neonView/UsersettingsEdit_view/UsersettingsEdit_view.aod b/neonView/UsersettingsEdit_view/UsersettingsEdit_view.aod
index 2625a04f4d..663f3fc283 100644
--- a/neonView/UsersettingsEdit_view/UsersettingsEdit_view.aod
+++ b/neonView/UsersettingsEdit_view/UsersettingsEdit_view.aod
@@ -15,6 +15,41 @@
       <hideEmptyFields v="false" />
       <entityField>#ENTITY</entityField>
       <isEditable v="true" />
+      <title>Settings</title>
+      <fields>
+        <entityFieldLink>
+          <name>f1f04b31-7ca3-4183-9b26-1726caf3e0b8</name>
+          <entityField>currentPassword</entityField>
+        </entityFieldLink>
+        <entityFieldLink>
+          <name>203ba8b9-2004-40e4-9612-b3e8089fb827</name>
+          <entityField>jPassword</entityField>
+        </entityFieldLink>
+        <entityFieldLink>
+          <name>d4f20a8d-edf8-468b-870e-43dec3fb6d3b</name>
+          <entityField>jPasswordRepeat</entityField>
+        </entityFieldLink>
+        <entityFieldLink>
+          <name>d9a71143-449a-4b39-8e21-c68024fb1d5b</name>
+          <entityField>selectionIgnoreCase</entityField>
+        </entityFieldLink>
+        <entityFieldLink>
+          <name>70a95008-7ecc-4ffb-bcce-cbc4c80e0fb5</name>
+          <entityField>selectionPlaceholder</entityField>
+        </entityFieldLink>
+        <entityFieldLink>
+          <name>5f7214d7-4ccd-4e7e-98e1-f5f9fe362d6e</name>
+          <entityField>calMaintimeStart</entityField>
+        </entityFieldLink>
+        <entityFieldLink>
+          <name>1fb97320-fddf-4ed1-a4f8-428a6a162b36</name>
+          <entityField>calMaintimeEnd</entityField>
+        </entityFieldLink>
+        <entityFieldLink>
+          <name>aecba9f5-0d12-455b-806c-a3a93589ffc1</name>
+          <entityField>calHourdivider</entityField>
+        </entityFieldLink>
+      </fields>
     </genericViewTemplate>
   </children>
 </neonView>
diff --git a/process/Date_lib/process.js b/process/Date_lib/process.js
index 998f823f49..bb454d912a 100644
--- a/process/Date_lib/process.js
+++ b/process/Date_lib/process.js
@@ -170,6 +170,75 @@ DateUtils.getCurrentYear = function ()
 }
 
 
+
+/**
+ * Provides methods for interactions with time
+ * Do not create an instance of this
+ * 
+ * @class
+ */
+function TimeUtils() {}
+
+/**
+ * Validates if a given string is a valid time representation
+ * 
+ * @param pTime {String}
+ * 
+ * @result {Boolean} True if pTime has the format "HH:mm"
+ */
+TimeUtils.validateTimeFormat = function(pTime)
+{
+    const expr = /^\d{2}:\d{2}$/;
+    
+    return expr.test(pTime);
+}
+
+/**
+ * Validates if a given value is a valid hour representation
+ * 
+ * @param pHours {String|Number}
+ * 
+ * @result {Boolean} True if value is between 0 and 23
+ */
+TimeUtils.validateHours = function(pHours)
+{
+    let hours = pHours;
+    
+    if (typeof pHours === 'string' || pHours instanceof String) {
+        if(isNaN(parseFloat(pHours)) || !isFinite(pHours)) {
+            return false;
+        }
+        
+        hours = parseInt(pHours);
+    }
+    
+    return hours >= 0 && hours < 24;
+}
+
+/**
+ * Validates if a given value is a valid minute representation
+ * 
+ * @param pMinutes {String|Number}
+ * 
+ * @result {Boolean} True if value is between 0 and 59
+ */
+TimeUtils.validateMinutes = function(pMinutes)
+{
+    let minutes = pMinutes;
+    
+    if (typeof pMinutes === 'string' || pMinutes instanceof String) {
+        if(isNaN(parseFloat(pMinutes)) || !isFinite(pMinutes)) {
+            return false;
+        }
+        
+        minutes = parseInt(pMinutes);
+    }
+    
+    return minutes >= 0 && minutes < 60;
+}
+
+
+
 /**
  * Object for handling durations. It consists of months (a year = 12 months), days and milliseconds. Because hours, minutes and seconds have fixed 
  * lengths, these are all added to the milliseconds part, but months can have different amounts of days, so they are stored separately.
diff --git a/process/UserSettings_lib/UserSettings_lib.aod b/process/UserSettings_lib/UserSettings_lib.aod
new file mode 100644
index 0000000000..41d85657ed
--- /dev/null
+++ b/process/UserSettings_lib/UserSettings_lib.aod
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.1">
+  <name>UserSettings_lib</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <process>%aditoprj%/process/UserSettings_lib/process.js</process>
+  <variants>
+    <element>LIBRARY</element>
+  </variants>
+</process>
diff --git a/process/UserSettings_lib/process.js b/process/UserSettings_lib/process.js
new file mode 100644
index 0000000000..c33e0cda84
--- /dev/null
+++ b/process/UserSettings_lib/process.js
@@ -0,0 +1,144 @@
+import("system.logging");
+import("system.neon");
+import("system.tools");
+import("system.vars");
+
+
+/**
+ * Provides functionality to handle UserSettings
+ * 
+ * @class
+ */
+function UserSettingUtil () {}
+
+
+{ //block where variables declared with let are available to avoid unexpected side-effects
+
+    let _currentSettings = {};
+    let allowedSettings = [
+        tools.PASSWORD,
+    ];
+    let paramSettings = [
+        "calHourdivider",
+        "calMaintimeEnd",
+        "calMaintimeStart",
+        "selectionIgnoreCase",
+        "selectionPlaceholder",
+    ];
+
+
+    /**
+     * Initializes the entity fields with the current settings
+     *
+     * @result {void}
+     */
+    UserSettingUtil.initSettings = function ()
+    {
+        UserSettingUtil.getLoadCurrentSettings();
+        
+        for(let i = 0; i < paramSettings.length; i++) {
+            let key = paramSettings[i];
+            neon.setFieldValue("$field." + key, UserSettingUtil.getValue(key));
+        }
+        for(let i = 0; i < allowedSettings.length; i++) {
+            let key = allowedSettings[i];
+            neon.setFieldValue("$field." + key, UserSettingUtil.getValue(key));
+        }
+    }
+
+
+    /**
+     * (Re-)Loads the current user settings
+     *
+     * @result {Object}
+     */
+    UserSettingUtil.getLoadCurrentSettings = function ()
+    {
+        const user = tools.getCurrentUser();
+        
+        _currentSettings = Object.assign({}, user.params);
+        delete user.params;
+        _currentSettings = Object.assign(_currentSettings, user);
+        
+        return _currentSettings;
+    }
+    
+    /**
+     * Returns the setting value by a given key
+     *
+     * @param {String} pKey name of the setting key
+     *
+     * @result {String|undefined} the value of a setting or undefined if it dies not exist
+     */
+    UserSettingUtil.getValue = function (pKey)
+    {
+        if(Object.keys(_currentSettings).length === 0) {
+            UserSettingUtil.getLoadCurrentSettings();
+        }
+        
+        if(_currentSettings.hasOwnProperty(pKey)) {
+            return _currentSettings[pKey];
+        }
+        
+        return undefined;
+    }
+
+
+    /**
+     * Updates the changed settings of the current user
+     *
+     * @result {void}
+     */
+    UserSettingUtil.updateSettings = function ()
+    {
+        let data = {};
+        let paramData = [];
+        let changedFields = UserSettingUtil.getChangedFields();
+        
+        if(Object.keys(changedFields).length < 1) {
+            logging.log("No user settings changed");
+            return;
+        }
+        
+        for(let key in changedFields) {
+            if(paramSettings.indexOf(key) != -1) {
+                paramData.push([key, changedFields[key]]);
+            } else if(allowedSettings.indexOf(key) != -1) {
+                data[key] = changedFields[key];
+            }
+        }
+        
+        let fullObj = Object.assign({"params": paramData}, data);
+        
+        tools.updateCurrentUser(fullObj);
+        tools.refreshCurrentUser();
+        
+        UserSettingUtil.getLoadCurrentSettings();
+    }
+    
+    /**
+     * Returns an array with all changed fields and their values
+     *
+     * @result {Object} the changed fields
+     */
+    UserSettingUtil.getChangedFields = function ()
+    {
+        const currentSettings = UserSettingUtil.getLoadCurrentSettings();
+        const rowData = vars.get("$local.rowdata");
+        let changedFields = {};
+        
+        for(let rawKey in rowData) {
+            let key = rawKey.split(".")[0];
+            let value = UserSettingUtil.getValue(key);
+            
+            if(paramSettings.indexOf(key) != -1 || allowedSettings.indexOf(key) != -1) {
+                if(value !== undefined && value !== rowData[rawKey]) {
+                    changedFields[key] = rowData[rawKey];
+                }
+            }
+        }
+        
+        return changedFields;
+    }
+    
+} //end of block
-- 
GitLab


From 96b73c1e739a77ecd080ad4b84c47dbd4b1f30da Mon Sep 17 00:00:00 2001
From: "b.ulrich" <b.ulrich@adito.de>
Date: Thu, 6 Aug 2020 11:15:25 +0200
Subject: [PATCH 106/309] =?UTF-8?q?[Projekt:=20Entwicklung=20-=20Neon][Tic?=
 =?UTF-8?q?ketNr.:=201059627][LEADIMPORT=20-=20=C3=9Cbersetzung=20von=20Sc?=
 =?UTF-8?q?hl=C3=BCsselwort=20"Zip"=20fehlt]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../_____LANGUAGE_EXTRA.aod                   | 12 +++++++++
 .../_____LANGUAGE_de/_____LANGUAGE_de.aod     | 25 +++++++++++++++++++
 .../_____LANGUAGE_en/_____LANGUAGE_en.aod     | 13 +++++++++-
 3 files changed, 49 insertions(+), 1 deletion(-)

diff --git a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
index aac9f1e3a8..7d7faf2906 100644
--- a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
+++ b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
@@ -6884,6 +6884,18 @@
     <entry>
       <key>Workflow deploy failed</key>
     </entry>
+    <entry>
+      <key>{SEND_MAIL}</key>
+    </entry>
+    <entry>
+      <key>New</key>
+    </entry>
+    <entry>
+      <key>Release</key>
+    </entry>
+    <entry>
+      <key>Archived</key>
+    </entry>
   </keyValueMap>
   <font name="Dialog" style="0" size="11" />
   <sqlModels>
diff --git a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
index e5de76bd0b..ea4c97cbf6 100644
--- a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
+++ b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
@@ -8583,6 +8583,7 @@ Bitte Datumseingabe prüfen</value>
     </entry>
     <entry>
       <key>Zip</key>
+      <value>Plz</value>
     </entry>
     <entry>
       <key>type</key>
@@ -8802,6 +8803,30 @@ Bitte Datumseingabe prüfen</value>
     <entry>
       <key>Workflow deploy failed</key>
     </entry>
+    <entry>
+      <key>Download letter and create Activity</key>
+    </entry>
+    <entry>
+      <key>{SENT_MAIL}</key>
+    </entry>
+    <entry>
+      <key>Add Participants</key>
+    </entry>
+    <entry>
+      <key>and open Report</key>
+    </entry>
+    <entry>
+      <key>Add Recipients</key>
+    </entry>
+    <entry>
+      <key>New</key>
+    </entry>
+    <entry>
+      <key>Release</key>
+    </entry>
+    <entry>
+      <key>Archived</key>
+    </entry>
   </keyValueMap>
   <font name="Dialog" style="0" size="11" />
 </language>
diff --git a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
index f2827dd55b..a36b9b673f 100644
--- a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
+++ b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
@@ -6941,7 +6941,6 @@
     <entry>
       <key>The Sales Project can only be filled when a company has been specified</key>
     </entry>
-
     <entry>
       <key>{SEND_MAIL}</key>
       <value>Send mail</value>
@@ -6952,6 +6951,18 @@
     <entry>
       <key>Workflow deploy failed</key>
     </entry>
+    <entry>
+      <key>{SENT_MAIL}</key>
+    </entry>
+    <entry>
+      <key>New</key>
+    </entry>
+    <entry>
+      <key>Release</key>
+    </entry>
+    <entry>
+      <key>Archived</key>
+    </entry>
   </keyValueMap>
   <font name="Dialog" style="0" size="11" />
 </language>
-- 
GitLab


From e0b5ff426789e97ef4bdce188dc08966ad9514ed Mon Sep 17 00:00:00 2001
From: "s.pongratz" <s.pongratz@adito.de>
Date: Thu, 6 Aug 2020 11:55:44 +0200
Subject: [PATCH 107/309] #1063252-Eigenschaften_leer

---
 process/Leadimport_lib/process.js | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/process/Leadimport_lib/process.js b/process/Leadimport_lib/process.js
index 9e8c67db43..e5ee4080fb 100644
--- a/process/Leadimport_lib/process.js
+++ b/process/Leadimport_lib/process.js
@@ -381,8 +381,14 @@ LeadImportUtils.insertAttr = function(pDataFields, pDataTypes, pFieldDef, pLeadV
         if (pFieldDef[i][1].substr(0, 9) == "ATTRIBUTE" && pFieldDef[i][2] != undefined)//if Attribute
         {
             var attrdata = pFieldDef[i][2];
+            
+            let countAttributes = newSelect("count(*)")
+                        .from("AB_ATTRIBUTERELATION")
+                        .where("AB_ATTRIBUTERELATION.OBJECT_ROWID", pContactId)
+                        .and("AB_ATTRIBUTERELATION.AB_ATTRIBUTE_ID", attrdata[1][0])
+                        .cell();
 
-            if (attrdata[2][pObjectID] != undefined)//e. g. if attrdata[2]["Organisation"] != undefined
+            if (attrdata[2][pObjectID] != undefined && countAttributes == 0)//e. g. if attrdata[2]["Organisation"] != undefined
             {
                 var DataValues = new Object();
                 var value = pLeadValues[pFieldDef[i][1]];
@@ -694,7 +700,15 @@ LeadImportUtils.sqlInsertAttr = function(pAttrObject, pAttrValues, pUser, pDate)
     pAttrValues[9] = pUser;
     pAttrValues[10] = pDate;
     
-    db.insertData("AB_ATTRIBUTERELATION", pAttrObject["Fields"] , pAttrObject["Types"], pAttrValues);
+    let countAttributes = newSelect("count(*)")
+                        .from("AB_ATTRIBUTERELATION")
+                        .where("AB_ATTRIBUTERELATION.OBJECT_ROWID", AttrValues[7])
+                        .and("AB_ATTRIBUTERELATION.AB_ATTRIBUTE_ID", attrdata[1][0])
+                        .cell();
+    if (countAttributes == 0) {
+        db.insertData("AB_ATTRIBUTERELATION", pAttrObject["Fields"] , pAttrObject["Types"], pAttrValues);
+    }
+   
 }
 
 /**
-- 
GitLab


From 25e37fc86db00149547db9c5d13164aae133534b Mon Sep 17 00:00:00 2001
From: "s.pongratz" <s.pongratz@adito.de>
Date: Thu, 6 Aug 2020 13:55:57 +0200
Subject: [PATCH 108/309] =?UTF-8?q?#1063252-Eigenschaften=5Fleer=20hinzuf?=
 =?UTF-8?q?=C3=BCgen=20der=20Attributusage=20und=20Kewords?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../basic/2020.2.0/ImportFields/changelog.xml |  6 ++++
 .../ImportFields/insertAttributeUsage.xml     | 16 +++++++++
 .../insertKewordsImportFields.xml             | 33 +++++++++++++++++++
 .../Data_alias/basic/2020.2.0/changelog.xml   |  5 +++
 .liquibase/Data_alias/changelog.xml           |  1 +
 5 files changed, 61 insertions(+)
 create mode 100644 .liquibase/Data_alias/basic/2020.2.0/ImportFields/changelog.xml
 create mode 100644 .liquibase/Data_alias/basic/2020.2.0/ImportFields/insertAttributeUsage.xml
 create mode 100644 .liquibase/Data_alias/basic/2020.2.0/ImportFields/insertKewordsImportFields.xml
 create mode 100644 .liquibase/Data_alias/basic/2020.2.0/changelog.xml

diff --git a/.liquibase/Data_alias/basic/2020.2.0/ImportFields/changelog.xml b/.liquibase/Data_alias/basic/2020.2.0/ImportFields/changelog.xml
new file mode 100644
index 0000000000..b0848318ed
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2020.2.0/ImportFields/changelog.xml
@@ -0,0 +1,6 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+                   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+    <include file="insertAttributeUsage.xml" relativeToChangelogFile="true"/>
+    <include file="insertKewordsImportFields.xml" relativeToChangelogFile="true"/>
+</databaseChangeLog>
diff --git a/.liquibase/Data_alias/basic/2020.2.0/ImportFields/insertAttributeUsage.xml b/.liquibase/Data_alias/basic/2020.2.0/ImportFields/insertAttributeUsage.xml
new file mode 100644
index 0000000000..e30595dade
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2020.2.0/ImportFields/insertAttributeUsage.xml
@@ -0,0 +1,16 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+                   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+    <changeSet author="s.pongratz" id="2cc85c98-51e4-48c6-bb22-bf0bee6055f7">
+        <insert tableName="AB_ATTRIBUTEUSAGE">
+            <column name="AB_ATTRIBUTEUSAGEID" value="b0d675fc-0f86-476d-89d2-64d8273f9644"/>
+            <column name="AB_ATTRIBUTE_ID" value="7e9927a4-41e4-426f-bddd-c3e9ee3b093e"/>
+            <column name="OBJECT_TYPE" value="Leadimport"/>
+        </insert>
+        <insert tableName="AB_ATTRIBUTEUSAGE">
+            <column name="AB_ATTRIBUTEUSAGEID" value="01d6548e-c73f-4d61-8407-ba815d07fee7"/>
+            <column name="AB_ATTRIBUTE_ID" value="e73ed929-8631-46de-b28f-eb1423abb808"/>
+            <column name="OBJECT_TYPE" value="Leadimport"/>
+        </insert>
+    </changeSet>
+</databaseChangeLog>
diff --git a/.liquibase/Data_alias/basic/2020.2.0/ImportFields/insertKewordsImportFields.xml b/.liquibase/Data_alias/basic/2020.2.0/ImportFields/insertKewordsImportFields.xml
new file mode 100644
index 0000000000..4ddb3cbeed
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2020.2.0/ImportFields/insertKewordsImportFields.xml
@@ -0,0 +1,33 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+                   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+    <changeSet author="s.pongratz" id="d058a476-66c8-414e-ab2e-d132513d90ad">
+        <insert tableName="AB_KEYWORD_ENTRY">
+            <column name="AB_KEYWORD_ENTRYID" value="8c24ac4a-23cc-4a16-98a0-362e72b77977"/>
+            <column name="KEYID" value="ATTRIBUTE_Loyalty"/>
+            <column name="TITLE" value="Loyalty"/>
+            <column name="CONTAINER" value="ImportFields"/>
+            <column name="SORTING" valueNumeric="26"/>
+            <column name="ISACTIVE" valueNumeric="1"/>
+            <column name="ISESSENTIAL" valueNumeric="0"/>
+        </insert>
+        <insert tableName="AB_KEYWORD_ENTRY">
+            <column name="AB_KEYWORD_ENTRYID" value="cb227318-924a-4df4-af98-eb6814ce21a1"/>
+            <column name="KEYID" value="ATTRIBUTE_Industry"/>
+            <column name="TITLE" value="Industry"/>
+            <column name="CONTAINER" value="ImportFields"/>
+            <column name="SORTING" valueNumeric="27"/>
+            <column name="ISACTIVE" valueNumeric="1"/>
+            <column name="ISESSENTIAL" valueNumeric="0"/>
+        </insert>
+        <insert tableName="AB_KEYWORD_ENTRY">
+            <column name="AB_KEYWORD_ENTRYID" value="b1cdbbda-5181-4dbd-b786-4d180c1248aa"/>
+            <column name="KEYID" value="CONTACTROLE"/>
+            <column name="TITLE" value="contactrole"/>
+            <column name="CONTAINER" value="ImportFields"/>
+            <column name="SORTING" valueNumeric="28"/>
+            <column name="ISACTIVE" valueNumeric="1"/>
+            <column name="ISESSENTIAL" valueNumeric="0"/>
+        </insert>
+    </changeSet>
+</databaseChangeLog>
diff --git a/.liquibase/Data_alias/basic/2020.2.0/changelog.xml b/.liquibase/Data_alias/basic/2020.2.0/changelog.xml
new file mode 100644
index 0000000000..75282fcf5a
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2020.2.0/changelog.xml
@@ -0,0 +1,5 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+                   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+    <include file="ImportFields/changelog.xml" relativeToChangelogFile="true"/>
+</databaseChangeLog>
diff --git a/.liquibase/Data_alias/changelog.xml b/.liquibase/Data_alias/changelog.xml
index a8cc53b406..8ca51cfaeb 100644
--- a/.liquibase/Data_alias/changelog.xml
+++ b/.liquibase/Data_alias/changelog.xml
@@ -14,6 +14,7 @@
     <include relativeToChangelogFile="true" file="basic/2020.1.0/changelog.xml"/>
     <include relativeToChangelogFile="true" file="basic/2020.1.1/changelog.xml"/>
     <include relativeToChangelogFile="true" file="basic/2020.1.2/changelog.xml"/>
+    <include relativeToChangelogFile="true" file="basic/2020.2.0/changelog.xml"/>
     
     <!--enable this only when you definetly want to overwrite the existing data with demo records:--> 
     <!--<include relativeToChangelogFile="true" file="basic/_demoData/changelog.xml" context="example"/>-->
-- 
GitLab


From 6679a63b4c422c7145118492cb09cd6d85369ba9 Mon Sep 17 00:00:00 2001
From: Tobias Feldmann <t.feldmann@adito.de>
Date: Thu, 6 Aug 2020 14:22:39 +0200
Subject: [PATCH 109/309] =?UTF-8?q?[Projekt:=20Entwicklung=20-=20Neon][Tic?=
 =?UTF-8?q?ketNr.:=201060604][PreviewMultiple=20f=C3=BCr=20Angebot]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 entity/Offer_entity/Offer_entity.aod          | 14 +++++
 .../probability_aggregate.value/expression.js |  6 ++
 .../_____LANGUAGE_de/_____LANGUAGE_de.aod     |  4 ++
 .../_____LANGUAGE_en/_____LANGUAGE_en.aod     |  4 +-
 neonContext/Offer/Offer.aod                   |  5 ++
 .../OfferPreviewMultiple_view.aod             | 55 +++++++++++++++++++
 6 files changed, 87 insertions(+), 1 deletion(-)
 create mode 100644 entity/Offer_entity/recordcontainers/db/recordfieldmappings/probability_aggregate.value/expression.js
 create mode 100644 neonView/OfferPreviewMultiple_view/OfferPreviewMultiple_view.aod

diff --git a/entity/Offer_entity/Offer_entity.aod b/entity/Offer_entity/Offer_entity.aod
index ef4dc76656..8d82f2247f 100644
--- a/entity/Offer_entity/Offer_entity.aod
+++ b/entity/Offer_entity/Offer_entity.aod
@@ -1023,6 +1023,7 @@
     <entityAggregateField>
       <name>NET_aggregate</name>
       <parentField>NET</parentField>
+      <title>Sum</title>
     </entityAggregateField>
     <entityField>
       <name>OFFER_OBJECTTYPE</name>
@@ -1038,6 +1039,15 @@
       <parentField>COUNT</parentField>
       <title>Count</title>
     </entityAggregateField>
+    <entityAggregateField>
+      <name>PROBABILITY_aggregate</name>
+      <parentField>PROBABILITY</parentField>
+      <title>Ø Probability</title>
+    </entityAggregateField>
+    <entityProvider>
+      <name>OfferAggregates</name>
+      <useAggregates v="true" />
+    </entityProvider>
   </entityFields>
   <recordContainers>
     <dbRecordContainer>
@@ -1285,6 +1295,10 @@
           <recordfield>OFFER.OFFER_ID</recordfield>
           <aggregateType>COUNT</aggregateType>
         </aggregateFieldDbMapping>
+        <aggregateFieldDbMapping>
+          <name>PROBABILITY_aggregate.value</name>
+          <expression>%aditoprj%/entity/Offer_entity/recordcontainers/db/recordfieldmappings/probability_aggregate.value/expression.js</expression>
+        </aggregateFieldDbMapping>
       </recordFieldMappings>
       <filterExtensions>
         <filterExtensionSet>
diff --git a/entity/Offer_entity/recordcontainers/db/recordfieldmappings/probability_aggregate.value/expression.js b/entity/Offer_entity/recordcontainers/db/recordfieldmappings/probability_aggregate.value/expression.js
new file mode 100644
index 0000000000..25f76f1801
--- /dev/null
+++ b/entity/Offer_entity/recordcontainers/db/recordfieldmappings/probability_aggregate.value/expression.js
@@ -0,0 +1,6 @@
+import("system.SQLTYPES");
+import("system.result");
+import("Sql_lib");
+
+var helper = new SqlMaskingUtils();
+result.string("AVG("+ helper.cast("OFFER.PROBABILITY", SQLTYPES.INTEGER)  + ")");
\ No newline at end of file
diff --git a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
index e5de76bd0b..2fcc603b77 100644
--- a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
+++ b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
@@ -3530,6 +3530,10 @@
       <key>Gambia</key>
       <value>Gambia</value>
     </entry>
+    <entry>
+      <key>Ø Probability</key>
+      <value>Ø Wahrscheinlichkeit</value>
+    </entry>
     <entry>
       <key>Qatar</key>
       <value>Katar</value>
diff --git a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
index f2827dd55b..1098a3b1d2 100644
--- a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
+++ b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
@@ -2661,6 +2661,9 @@
     <entry>
       <key>Locked</key>
     </entry>
+    <entry>
+      <key>Ø Probability</key>
+    </entry>
     <entry>
       <key>Timetracking Id</key>
     </entry>
@@ -6941,7 +6944,6 @@
     <entry>
       <key>The Sales Project can only be filled when a company has been specified</key>
     </entry>
-
     <entry>
       <key>{SEND_MAIL}</key>
       <value>Send mail</value>
diff --git a/neonContext/Offer/Offer.aod b/neonContext/Offer/Offer.aod
index 2a823d8bf9..e8a6d8d34e 100644
--- a/neonContext/Offer/Offer.aod
+++ b/neonContext/Offer/Offer.aod
@@ -8,6 +8,7 @@
   <filterView>OfferFilter_view</filterView>
   <editView>OfferEdit_view</editView>
   <previewView>OfferPreview_view</previewView>
+  <previewMultipleView>OfferPreviewMultiple_view</previewMultipleView>
   <lookupView>OfferFilter_view</lookupView>
   <entity>Offer_entity</entity>
   <references>
@@ -39,5 +40,9 @@
       <name>02938f44-bc24-4542-916b-8db5d1976b40</name>
       <view>OfferReport_view</view>
     </neonViewReference>
+    <neonViewReference>
+      <name>136dceaa-0eca-452a-9757-132fd54e8c55</name>
+      <view>OfferPreviewMultiple_view</view>
+    </neonViewReference>
   </references>
 </neonContext>
diff --git a/neonView/OfferPreviewMultiple_view/OfferPreviewMultiple_view.aod b/neonView/OfferPreviewMultiple_view/OfferPreviewMultiple_view.aod
new file mode 100644
index 0000000000..d9949333d9
--- /dev/null
+++ b/neonView/OfferPreviewMultiple_view/OfferPreviewMultiple_view.aod
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.6">
+  <name>OfferPreviewMultiple_view</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <layout>
+    <headerFooterLayout>
+      <name>layout</name>
+      <footer>Scorecard</footer>
+    </headerFooterLayout>
+  </layout>
+  <children>
+    <dynamicMultiDataChartViewTemplate>
+      <name>OfferChart</name>
+      <chartType>BAR</chartType>
+      <shareParent v="false" />
+      <entityField>#ENTITY</entityField>
+      <columns>
+        <neonDynamicMultiDataChartColumn>
+          <name>53b01786-bb5d-41f2-8c30-36bff460b82b</name>
+          <entityField>NET</entityField>
+        </neonDynamicMultiDataChartColumn>
+      </columns>
+    </dynamicMultiDataChartViewTemplate>
+    <treeTableViewTemplate>
+      <name>StatusTreeTable</name>
+      <defaultGroupFields>
+        <element>STATUS</element>
+      </defaultGroupFields>
+      <hideActions v="true" />
+      <entityField>#ENTITY</entityField>
+      <linkedColumns />
+      <columns>
+        <neonTreeTableColumn>
+          <name>5cd9839b-0dea-44e8-9e2f-8f75a7e9cb16</name>
+          <entityField>NET</entityField>
+          <aggregateEntityField>NET_aggregate</aggregateEntityField>
+        </neonTreeTableColumn>
+      </columns>
+    </treeTableViewTemplate>
+    <scoreCardViewTemplate>
+      <name>AggregatedValues</name>
+      <entityField>OfferAggregates</entityField>
+      <fields>
+        <entityFieldLink>
+          <name>71cd7dd5-c142-4b4c-8a6b-ca5ed8acf92e</name>
+          <entityField>NET_aggregate</entityField>
+        </entityFieldLink>
+        <entityFieldLink>
+          <name>e76a8a8c-529a-457f-bb23-4dcef79f6f0f</name>
+          <entityField>PROBABILITY_aggregate</entityField>
+        </entityFieldLink>
+      </fields>
+    </scoreCardViewTemplate>
+  </children>
+</neonView>
-- 
GitLab


From bb5924d0e3af539fc06d48d2505627d2e31cc602 Mon Sep 17 00:00:00 2001
From: "s.pongratz" <s.pongratz@adito.de>
Date: Thu, 6 Aug 2020 15:06:08 +0200
Subject: [PATCH 110/309] #1063252-Eigenschaften_leer Schreibfehler

---
 .../basic/2020.2.0/ImportFields/insertKewordsImportFields.xml   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.liquibase/Data_alias/basic/2020.2.0/ImportFields/insertKewordsImportFields.xml b/.liquibase/Data_alias/basic/2020.2.0/ImportFields/insertKewordsImportFields.xml
index 4ddb3cbeed..e415e56a3e 100644
--- a/.liquibase/Data_alias/basic/2020.2.0/ImportFields/insertKewordsImportFields.xml
+++ b/.liquibase/Data_alias/basic/2020.2.0/ImportFields/insertKewordsImportFields.xml
@@ -23,7 +23,7 @@
         <insert tableName="AB_KEYWORD_ENTRY">
             <column name="AB_KEYWORD_ENTRYID" value="b1cdbbda-5181-4dbd-b786-4d180c1248aa"/>
             <column name="KEYID" value="CONTACTROLE"/>
-            <column name="TITLE" value="contactrole"/>
+            <column name="TITLE" value="Contactrole"/>
             <column name="CONTAINER" value="ImportFields"/>
             <column name="SORTING" valueNumeric="28"/>
             <column name="ISACTIVE" valueNumeric="1"/>
-- 
GitLab


From 441a7c5b540120ec4320c1b7bbf9306224c9039d Mon Sep 17 00:00:00 2001
From: Tobias Feldmann <t.feldmann@adito.de>
Date: Thu, 6 Aug 2020 15:47:38 +0200
Subject: [PATCH 111/309] #1058838 salesproject ai probability translation

---
 entity/Salesproject_entity/Salesproject_entity.aod   | 2 +-
 language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod | 6 ++++++
 language/_____LANGUAGE_de/_____LANGUAGE_de.aod       | 4 ++++
 language/_____LANGUAGE_en/_____LANGUAGE_en.aod       | 3 +++
 4 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/entity/Salesproject_entity/Salesproject_entity.aod b/entity/Salesproject_entity/Salesproject_entity.aod
index 0c511382e3..5aee7c6855 100644
--- a/entity/Salesproject_entity/Salesproject_entity.aod
+++ b/entity/Salesproject_entity/Salesproject_entity.aod
@@ -752,7 +752,7 @@
     </entityActionField>
     <entityField>
       <name>PROBABILITY_AI</name>
-      <title>Wahrscheinlichkeit KI</title>
+      <title>Probability AI</title>
       <state>READONLY</state>
       <stateProcess>%aditoprj%/entity/Salesproject_entity/entityfields/probability_ai/stateProcess.js</stateProcess>
       <valueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/probability_ai/valueProcess.js</valueProcess>
diff --git a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
index aac9f1e3a8..fdd95ea3c0 100644
--- a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
+++ b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
@@ -6884,6 +6884,12 @@
     <entry>
       <key>Workflow deploy failed</key>
     </entry>
+    <entry>
+      <key>Ø Probability</key>
+    </entry>
+    <entry>
+      <key>Probability AI</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 2fcc603b77..a073f74c70 100644
--- a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
+++ b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
@@ -6,6 +6,10 @@
   <country></country>
   <variant></variant>
   <keyValueMap>
+    <entry>
+      <key>Probability AI</key>
+      <value>Wahrscheinlichkeit KI</value>
+    </entry>
     <entry>
       <key>Settings</key>
       <value>Einstellungen</value>
diff --git a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
index 1098a3b1d2..e3bcf535eb 100644
--- a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
+++ b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
@@ -6954,6 +6954,9 @@
     <entry>
       <key>Workflow deploy failed</key>
     </entry>
+    <entry>
+      <key>Probability AI</key>
+    </entry>
   </keyValueMap>
   <font name="Dialog" style="0" size="11" />
 </language>
-- 
GitLab


From 4b66ea530912fbc928a847e68523084831761588 Mon Sep 17 00:00:00 2001
From: "s.pongratz" <s.pongratz@adito.de>
Date: Thu, 6 Aug 2020 17:27:59 +0200
Subject: [PATCH 112/309] =?UTF-8?q?#1063252-Eigenschaften=5Fleer=20hinzuf?=
 =?UTF-8?q?=C3=BCgen=20Spalte=20Lead?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../basic/2020.2.0/ImportFields/alterLead.xml |  9 +++++++
 .../basic/2020.2.0/ImportFields/changelog.xml |  1 +
 process/autostartNeon/process.js              | 25 +++++++++++++++++--
 3 files changed, 33 insertions(+), 2 deletions(-)
 create mode 100644 .liquibase/Data_alias/basic/2020.2.0/ImportFields/alterLead.xml

diff --git a/.liquibase/Data_alias/basic/2020.2.0/ImportFields/alterLead.xml b/.liquibase/Data_alias/basic/2020.2.0/ImportFields/alterLead.xml
new file mode 100644
index 0000000000..1c2fd454c2
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2020.2.0/ImportFields/alterLead.xml
@@ -0,0 +1,9 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+                   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+    <changeSet author="s.pongratz" id="99f19a82-62aa-41fc-b756-da4da3be45de">
+         <sql>
+            ALTER TABLE LEAD ADD COLUMN ATTRIBUTE_Industry VARCHAR(100);
+        </sql>
+    </changeSet>
+</databaseChangeLog>
diff --git a/.liquibase/Data_alias/basic/2020.2.0/ImportFields/changelog.xml b/.liquibase/Data_alias/basic/2020.2.0/ImportFields/changelog.xml
index b0848318ed..47f650dddb 100644
--- a/.liquibase/Data_alias/basic/2020.2.0/ImportFields/changelog.xml
+++ b/.liquibase/Data_alias/basic/2020.2.0/ImportFields/changelog.xml
@@ -3,4 +3,5 @@
                    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
     <include file="insertAttributeUsage.xml" relativeToChangelogFile="true"/>
     <include file="insertKewordsImportFields.xml" relativeToChangelogFile="true"/>
+    <include file="alterLead.xml" relativeToChangelogFile="true"/>
 </databaseChangeLog>
diff --git a/process/autostartNeon/process.js b/process/autostartNeon/process.js
index eec238d38e..ecb9f9d403 100644
--- a/process/autostartNeon/process.js
+++ b/process/autostartNeon/process.js
@@ -3,10 +3,31 @@ import("PermissionCalendar_lib");
 import("Employee_lib");
 import("system.calendars");
 
+ 
+
+
 calendars.setCheckAttendeesOnWrite(false);
 
+
 var userContactId = EmployeeUtils.getCurrentContactId();
 vars.set("$global.user.contactId", userContactId);
 
-var currentUser = EmployeeUtils.sliceUserId(EmployeeUtils.getCurrentUserId());
-PermissionCalendar.setPermissions(currentUser);
\ No newline at end of file
+ 
+
+var usersTools = tools.getStoredUsers();
+var users = [];
+
+ 
+
+for(var i = 0; i < usersTools.length; i++)
+{
+    users.push(usersTools[i][1]);
+}
+
+ 
+
+calendars.setCalendarUser(users, calendars.RIGHT_READ | calendars.RIGHT_WRITE, false, calendars.SORTSTRATEGY_NATURAL);
+
+ 
+
+var currentUser = EmployeeUtils.sliceUserId(EmployeeUtils.getCurrentUserId());
\ No newline at end of file
-- 
GitLab


From 5c1f3cc9a467f25b0edf7861a8b660d4a4ce9321 Mon Sep 17 00:00:00 2001
From: Sebastian Pongratz <s.pongratz@adito.de>
Date: Thu, 6 Aug 2020 15:49:04 +0000
Subject: [PATCH 113/309] #1063252-Eigenschaften_leer Revert Changes autostart

---
 process/autostartNeon/process.js | 25 ++-----------------------
 1 file changed, 2 insertions(+), 23 deletions(-)

diff --git a/process/autostartNeon/process.js b/process/autostartNeon/process.js
index ecb9f9d403..eec238d38e 100644
--- a/process/autostartNeon/process.js
+++ b/process/autostartNeon/process.js
@@ -3,31 +3,10 @@ import("PermissionCalendar_lib");
 import("Employee_lib");
 import("system.calendars");
 
- 
-
-
 calendars.setCheckAttendeesOnWrite(false);
 
-
 var userContactId = EmployeeUtils.getCurrentContactId();
 vars.set("$global.user.contactId", userContactId);
 
- 
-
-var usersTools = tools.getStoredUsers();
-var users = [];
-
- 
-
-for(var i = 0; i < usersTools.length; i++)
-{
-    users.push(usersTools[i][1]);
-}
-
- 
-
-calendars.setCalendarUser(users, calendars.RIGHT_READ | calendars.RIGHT_WRITE, false, calendars.SORTSTRATEGY_NATURAL);
-
- 
-
-var currentUser = EmployeeUtils.sliceUserId(EmployeeUtils.getCurrentUserId());
\ No newline at end of file
+var currentUser = EmployeeUtils.sliceUserId(EmployeeUtils.getCurrentUserId());
+PermissionCalendar.setPermissions(currentUser);
\ No newline at end of file
-- 
GitLab


From 8b89a8c95046f52a89eb29b8f679bcc0060d4d5b Mon Sep 17 00:00:00 2001
From: "S.Listl" <S.Listl@SLISTL.aditosoftware.local>
Date: Fri, 7 Aug 2020 11:36:14 +0200
Subject: [PATCH 114/309] #1063319 Address fields for lat and lon, location
 added to Organisation index

---
 .../basic/2020.1.3/add_Address_LatLon.xml     | 10 +++
 .../Data_alias/basic/2020.1.3/changelog.xml   |  1 +
 .../Data_alias/basic/_demoData/changelog.xml  |  2 +-
 .liquibase/Data_alias/changelog.xml           |  1 +
 aliasDefinition/Data_alias/Data_alias.aod     | 28 ++++++++
 entity/Address_entity/Address_entity.aod      | 18 +++++
 .../Organisation_entity.aod                   |  6 ++
 .../recordcontainers/index/query.js           | 66 +++++++++----------
 8 files changed, 98 insertions(+), 34 deletions(-)
 create mode 100644 .liquibase/Data_alias/basic/2020.1.3/add_Address_LatLon.xml

diff --git a/.liquibase/Data_alias/basic/2020.1.3/add_Address_LatLon.xml b/.liquibase/Data_alias/basic/2020.1.3/add_Address_LatLon.xml
new file mode 100644
index 0000000000..cb352481af
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2020.1.3/add_Address_LatLon.xml
@@ -0,0 +1,10 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+                   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+    <changeSet author="s.listl" id="2f2d806c-8aab-42f0-91c2-c7d15322d89f">
+        <addColumn tableName="ADDRESS">
+            <column name="LAT" type="DECIMAL(10,8)"/>
+            <column name="LON" type="DECIMAL(11,8)"/>
+        </addColumn>
+    </changeSet>
+</databaseChangeLog>
diff --git a/.liquibase/Data_alias/basic/2020.1.3/changelog.xml b/.liquibase/Data_alias/basic/2020.1.3/changelog.xml
index ac6898c7f1..bd8e2232fe 100644
--- a/.liquibase/Data_alias/basic/2020.1.3/changelog.xml
+++ b/.liquibase/Data_alias/basic/2020.1.3/changelog.xml
@@ -2,6 +2,7 @@
 <databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
                    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
     <include file="AlterButtonLabelTitles/AlterButtonLabelTitles.xml" relativeToChangelogFile="true" />
+    <include file="add_Address_LatLon.xml" relativeToChangelogFile="true"/>
     <!--    disabled the following script since it is WIP-->
     <!--<include file="VisitPlanEntry/rename_VisitPlanEntry_ORGANISATION_ID.xml" relativeToChangelogFile="true" />-->
 </databaseChangeLog>
diff --git a/.liquibase/Data_alias/basic/_demoData/changelog.xml b/.liquibase/Data_alias/basic/_demoData/changelog.xml
index e6850dd5b6..e0d3d57558 100644
--- a/.liquibase/Data_alias/basic/_demoData/changelog.xml
+++ b/.liquibase/Data_alias/basic/_demoData/changelog.xml
@@ -50,5 +50,5 @@
   <include file="generatedData/exporttemplatefield.xml" relativeToChangelogFile="true"/>
   <include file="generatedData/exporttemplateplaceofuse.xml" relativeToChangelogFile="true"/>
   <include file="generatedData/documenttemplateplaceofuse.xml" relativeToChangelogFile="true"/>
-  <include file="generatedData/visitplan.xml" relativeToChangelogFile="true"/>
+  <!--<include file="generatedData/visitplan.xml" relativeToChangelogFile="true"/>-->
 </databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/changelog.xml b/.liquibase/Data_alias/changelog.xml
index 415dcce416..b3fee691bd 100644
--- a/.liquibase/Data_alias/changelog.xml
+++ b/.liquibase/Data_alias/changelog.xml
@@ -14,6 +14,7 @@
     <include relativeToChangelogFile="true" file="basic/2020.1.0/changelog.xml"/>
     <include relativeToChangelogFile="true" file="basic/2020.1.1/changelog.xml"/>
     <include relativeToChangelogFile="true" file="basic/2020.1.2/changelog.xml"/>
+    <include relativeToChangelogFile="true" file="basic/2020.1.3/changelog.xml"/>
 
     <!--enable this only when you definetly want to overwrite the existing data with demo records:--> 
     <!--<include relativeToChangelogFile="true" file="basic/_demoData/changelog.xml" context="example"/>-->
diff --git a/aliasDefinition/Data_alias/Data_alias.aod b/aliasDefinition/Data_alias/Data_alias.aod
index 6e685b98b7..b42801cfda 100644
--- a/aliasDefinition/Data_alias/Data_alias.aod
+++ b/aliasDefinition/Data_alias/Data_alias.aod
@@ -1143,6 +1143,34 @@
                 <title>Creation user</title>
                 <description></description>
               </entityFieldDb>
+              <entityFieldDb>
+                <name>LON</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="3" />
+                <size v="11" />
+                <scale v="8" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>LAT</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="3" />
+                <size v="10" />
+                <scale v="8" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
             </entityFields>
           </entityDb>
           <entityDb>
diff --git a/entity/Address_entity/Address_entity.aod b/entity/Address_entity/Address_entity.aod
index 0b6f95c995..e0515671c3 100644
--- a/entity/Address_entity/Address_entity.aod
+++ b/entity/Address_entity/Address_entity.aod
@@ -469,6 +469,16 @@
       <name>ReplaceStandardAddress_param</name>
       <expose v="true" />
     </entityParameter>
+    <entityField>
+      <name>LAT</name>
+      <title>Latitude</title>
+      <contentType>NUMBER</contentType>
+    </entityField>
+    <entityField>
+      <name>LON</name>
+      <title>Longitude</title>
+      <contentType>NUMBER</contentType>
+    </entityField>
   </entityFields>
   <recordContainers>
     <dbRecordContainer>
@@ -577,6 +587,14 @@
           <name>COUNTRY.displayValue</name>
           <expression>%aditoprj%/entity/Address_entity/recordcontainers/db/recordfieldmappings/country.displayvalue/expression.js</expression>
         </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>LAT.value</name>
+          <recordfield>ADDRESS.LAT</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>LON.value</name>
+          <recordfield>ADDRESS.LON</recordfield>
+        </dbRecordFieldMapping>
       </recordFieldMappings>
     </dbRecordContainer>
   </recordContainers>
diff --git a/entity/Organisation_entity/Organisation_entity.aod b/entity/Organisation_entity/Organisation_entity.aod
index cbd7cb44ef..2586777683 100644
--- a/entity/Organisation_entity/Organisation_entity.aod
+++ b/entity/Organisation_entity/Organisation_entity.aod
@@ -1353,6 +1353,12 @@
       </affectedTables>
       <affectedIds>%aditoprj%/entity/Organisation_entity/recordcontainers/index/affectedIds.js</affectedIds>
       <indexFieldMappings>
+        <indexRecordFieldMapping>
+          <name>#LOCATION</name>
+          <systemField>LOCATION</systemField>
+          <isFilterable v="false" />
+          <isLookupFilter v="false" />
+        </indexRecordFieldMapping>
         <indexRecordFieldMapping>
           <name>NAME.value</name>
           <indexFieldType>PROPER_NAME</indexFieldType>
diff --git a/entity/Organisation_entity/recordcontainers/index/query.js b/entity/Organisation_entity/recordcontainers/index/query.js
index eeb55badd1..278616e222 100644
--- a/entity/Organisation_entity/recordcontainers/index/query.js
+++ b/entity/Organisation_entity/recordcontainers/index/query.js
@@ -5,6 +5,7 @@ import("system.calendars");
 import("system.db");
 import("Sql_lib");
 import("Communication_lib");
+import("system.SQLTYPES");
 
 /*
 Before changing the results that are returned here:
@@ -12,40 +13,39 @@ Please keep in mind that some of the indexfields are used in other modules (like
 You may want to check out if your change affects other modules. However adding more fields should not be a problem therefor.
  */
 
-var sqlQuery, sqlHelper, queryCondition, affectedIds;
-var CommMediumPhoneIds = db.array( db.COLUMN, "select KEYID from AB_KEYWORD_ENTRY join ab_keyword_attributerelation on AB_KEYWORD_ENTRYID = AB_KEYWORD_ENTRY_ID "
-        + " join ab_keyword_attribute on AB_KEYWORD_ATTRIBUTEID = AB_KEYWORD_ATTRIBUTE_ID and CHAR_VALUE = 'TELEPHONE' and AB_KEYWORD_ATTRIBUTE.CONTAINER = 'CommunicationMedium'");
-sqlHelper = new SqlMaskingUtils();
-var querySelect = newSelect("CONTACT.CONTACTID "
-                        + ", " + sqlHelper.concat(["ORGANISATION.NAME", "'|'", "ORGANISATION.CUSTOMERCODE"])
-                        + ", " + sqlHelper.concat([
-                             sqlHelper.concat(["defaultAddress.ADDRESS", "defaultAddress.BUILDINGNO", "'-'"
-                                ,"defaultAddress.COUNTRY", "defaultAddress.ZIP", "defaultAddress.CITY"])
-                            ,sqlHelper.concat(["'" + translate.text("Phone") + ":'", "(" + CommUtil.getStandardSubSqlPhone() + ")"])
-                            ,sqlHelper.concat(["'" + translate.text("Email") + ":'", "(" + CommUtil.getStandardSubSqlMail() + ")"])
-                            ], " | ") 
-                           //additional indexed fields
-                           + ", ORGANISATION.NAME"
-                           + ", ORGANISATION.ORGANISATIONID"
-                           + ", CONTACT.CONTACTID"
-                           + ", ORGANISATION.CUSTOMERCODE"
-                           + ", ADDRESS.ADDRESS " 
-                           + ", ADDRESS.COUNTRY " 
-                           + ", ADDRESS.ZIP " 
-                           + ", ADDRESS.CITY " 
-                           + ", COMMUNICATION.ADDR " 
-                           + ", PHONE.ADDR " 
-                       )
-                    .from("ORGANISATION")
-                    .join("CONTACT", "CONTACT.ORGANISATION_ID = ORGANISATION.ORGANISATIONID and CONTACT.PERSON_ID is null")
-                    .leftJoin("ADDRESS", "defaultAddress.ADDRESSID = CONTACT.ADDRESS_ID", "defaultAddress")
-                    .leftJoin("ADDRESS", "ADDRESS.CONTACT_ID = CONTACT.CONTACTID")
-                    .leftJoin("COMMUNICATION", "COMMUNICATION.CONTACT_ID = CONTACT.CONTACTID")
-                    .leftJoin("COMMUNICATION", "PHONE.CONTACT_ID = CONTACT.CONTACTID and PHONE.MEDIUM_ID in ('" + CommMediumPhoneIds.join("', '") + "')", "PHONE")//TODO: refactor to new SqlBuilder
+var commMediumPhoneIds = CommUtil.getMediumIdsByCategory("PHONE");
+var sqlHelper = new SqlMaskingUtils();
+var querySelect = newSelect([
+        "CONTACT.CONTACTID",
+        sqlHelper.concat(["ORGANISATION.NAME", "'|'", "ORGANISATION.CUSTOMERCODE"]),
+        sqlHelper.concat([
+            sqlHelper.concat(["defaultAddress.ADDRESS", "defaultAddress.BUILDINGNO", "'-'"
+                ,"defaultAddress.COUNTRY", "defaultAddress.ZIP", "defaultAddress.CITY"]),
+            sqlHelper.concat(["'" + translate.text("Phone") + ":'", "(" + CommUtil.getStandardSubSqlPhone() + ")"]),
+            sqlHelper.concat(["'" + translate.text("Email") + ":'", "(" + CommUtil.getStandardSubSqlMail() + ")"])
+        ], " | "),
+        sqlHelper.concat([sqlHelper.cast("ADDRESS.LAT", SQLTYPES.VARCHAR, 16), sqlHelper.cast("ADDRESS.LON", SQLTYPES.VARCHAR, 16)], ","),
+        //additional indexed fields
+        "ORGANISATION.NAME",
+        "ORGANISATION.ORGANISATIONID",
+        "CONTACT.CONTACTID",
+        "ORGANISATION.CUSTOMERCODE",
+        "ADDRESS.ADDRESS",
+        "ADDRESS.COUNTRY",
+        "ADDRESS.ZIP",
+        "ADDRESS.CITY",
+        "COMMUNICATION.ADDR",
+        "PHONE.ADDR" 
+    ])
+    .from("ORGANISATION")
+    .join("CONTACT", "CONTACT.ORGANISATION_ID = ORGANISATION.ORGANISATIONID and CONTACT.PERSON_ID is null")
+    .leftJoin("ADDRESS", "defaultAddress.ADDRESSID = CONTACT.ADDRESS_ID", "defaultAddress")
+    .leftJoin("ADDRESS", "ADDRESS.CONTACT_ID = CONTACT.CONTACTID")
+    .leftJoin("COMMUNICATION", "COMMUNICATION.CONTACT_ID = CONTACT.CONTACTID")
+    .leftJoin("COMMUNICATION", newWhere("phone.CONTACT_ID = CONTACT.CONTACTID")
+        .and(["COMMUNICATION", "MEDIUM_ID", "phone"], commMediumPhoneIds, SqlBuilder.IN()), "phone");
 
 if (vars.exists("$local.idvalue") && vars.get("$local.idvalue") && vars.get("$local.idvalue").length > 0) 
-{
-    querySelect.where("CONTACT.CONTACTID", vars.get("$local.idvalue"), SqlBuilder.IN());
-}
+    querySelect.where("CONTACT.CONTACTID", "$local.idvalue", SqlBuilder.IN());
 
 result.string(querySelect.toString());
-- 
GitLab


From 99101c9a456f8c32800872cd49efbdf111126c2c Mon Sep 17 00:00:00 2001
From: "S.Listl" <S.Listl@SLISTL.aditosoftware.local>
Date: Fri, 7 Aug 2020 13:57:35 +0200
Subject: [PATCH 115/309] #1063319 Address geolocation documentation

---
 entity/Address_entity/Address_entity.aod                  | 2 ++
 entity/Address_entity/documentation.adoc                  | 1 +
 entity/Address_entity/entityfields/lat/documentation.adoc | 5 +++++
 entity/Address_entity/entityfields/lon/documentation.adoc | 5 +++++
 4 files changed, 13 insertions(+)
 create mode 100644 entity/Address_entity/entityfields/lat/documentation.adoc
 create mode 100644 entity/Address_entity/entityfields/lon/documentation.adoc

diff --git a/entity/Address_entity/Address_entity.aod b/entity/Address_entity/Address_entity.aod
index e0515671c3..659f2cb64d 100644
--- a/entity/Address_entity/Address_entity.aod
+++ b/entity/Address_entity/Address_entity.aod
@@ -471,11 +471,13 @@
     </entityParameter>
     <entityField>
       <name>LAT</name>
+      <documentation>%aditoprj%/entity/Address_entity/entityfields/lat/documentation.adoc</documentation>
       <title>Latitude</title>
       <contentType>NUMBER</contentType>
     </entityField>
     <entityField>
       <name>LON</name>
+      <documentation>%aditoprj%/entity/Address_entity/entityfields/lon/documentation.adoc</documentation>
       <title>Longitude</title>
       <contentType>NUMBER</contentType>
     </entityField>
diff --git a/entity/Address_entity/documentation.adoc b/entity/Address_entity/documentation.adoc
index e50f759d6a..af4ee8b4a1 100644
--- a/entity/Address_entity/documentation.adoc
+++ b/entity/Address_entity/documentation.adoc
@@ -7,6 +7,7 @@ an entity for logic behind a postal address
 The entity manages storing postal addresses and provides features like validation.
 
 Every `CONTACT` has one standard address value that is used by default for some actions. Keep in mind that this standard address has a special status and therefore may cannot be deleted.
+The geographical location of an address can be stored in the fields 'LAT' (latitude) and 'LON' (longitude).
 
 Webservice Validation: See WsValidation_lib
 To enable the nominatim webservice: go to Preferences -> _____PREFERENCES_PROJECT -> _____PREFERENCES_PROJECT
diff --git a/entity/Address_entity/entityfields/lat/documentation.adoc b/entity/Address_entity/entityfields/lat/documentation.adoc
new file mode 100644
index 0000000000..848d263736
--- /dev/null
+++ b/entity/Address_entity/entityfields/lat/documentation.adoc
@@ -0,0 +1,5 @@
+= Latitude
+
+The field "LAT" is used to store the geolocation latitude of the address.
+
+Currently, the field is not filled with data, this will be implemented in the future.
\ No newline at end of file
diff --git a/entity/Address_entity/entityfields/lon/documentation.adoc b/entity/Address_entity/entityfields/lon/documentation.adoc
new file mode 100644
index 0000000000..47eed872db
--- /dev/null
+++ b/entity/Address_entity/entityfields/lon/documentation.adoc
@@ -0,0 +1,5 @@
+= Longitude
+
+The field "LON" is used to store the geolocation longitude of the address.
+
+Currently, the field is not filled with data, this will be implemented in the future.
\ No newline at end of file
-- 
GitLab


From 998e3376c45c6118b55df7a376567707bc3e0742 Mon Sep 17 00:00:00 2001
From: "a.schindlbeck" <a.schindlbeck@adito.de>
Date: Fri, 7 Aug 2020 14:30:59 +0200
Subject: [PATCH 116/309] #1060652 Favorites: Filter-View various Contexts
 bound

---
 entity/Favorite_entity/Favorite_entity.aod    | 32 +++++++
 .../object_type/displayValueProcess.js        |  5 ++
 .../entityfields/row_id/onValueChange.js      | 88 +++++++++++++++++++
 .../Organisation_entity.aod                   |  1 +
 .../FavoriteFilter_view.aod                   | 42 ++++++++-
 5 files changed, 164 insertions(+), 4 deletions(-)
 create mode 100644 entity/Favorite_entity/entityfields/object_type/displayValueProcess.js
 create mode 100644 entity/Favorite_entity/entityfields/row_id/onValueChange.js

diff --git a/entity/Favorite_entity/Favorite_entity.aod b/entity/Favorite_entity/Favorite_entity.aod
index 40e467b44b..73dce01c7e 100644
--- a/entity/Favorite_entity/Favorite_entity.aod
+++ b/entity/Favorite_entity/Favorite_entity.aod
@@ -18,9 +18,11 @@
     </entityField>
     <entityField>
       <name>ROW_ID</name>
+      <onValueChange>%aditoprj%/entity/Favorite_entity/entityfields/row_id/onValueChange.js</onValueChange>
     </entityField>
     <entityField>
       <name>OBJECT_TYPE</name>
+      <displayValueProcess>%aditoprj%/entity/Favorite_entity/entityfields/object_type/displayValueProcess.js</displayValueProcess>
     </entityField>
     <entityField>
       <name>USER_ID</name>
@@ -31,6 +33,36 @@
     <entityField>
       <name>GROUP_TYPE</name>
     </entityField>
+    <entityField>
+      <name>TITLE</name>
+      <valueProcess>%aditoprj%/entity/Favorite_entity/entityfields/title/valueProcess.js</valueProcess>
+    </entityField>
+    <entityConsumer>
+      <name>Offers</name>
+      <dependency>
+        <name>dependency</name>
+        <entityName>Offer_entity</entityName>
+        <fieldName>#PROVIDER</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>OfferOriginal_Id_param</name>
+          <valueProcess>%aditoprj%/entity/Favorite_entity/entityfields/offers/children/offeroriginal_id_param/valueProcess.js</valueProcess>
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityField>
+      <name>CONSUMED_OFFER</name>
+      <consumer>Offers</consumer>
+      <onValueChangeTypes>
+        <element>MASK</element>
+        <element>PROCESS</element>
+        <element>PROCESS_SETVALUE</element>
+      </onValueChangeTypes>
+    </entityField>
+    <entityField>
+      <name>TITLE_RELATION</name>
+    </entityField>
   </entityFields>
   <recordContainers>
     <dbRecordContainer>
diff --git a/entity/Favorite_entity/entityfields/object_type/displayValueProcess.js b/entity/Favorite_entity/entityfields/object_type/displayValueProcess.js
new file mode 100644
index 0000000000..2658ccbeb3
--- /dev/null
+++ b/entity/Favorite_entity/entityfields/object_type/displayValueProcess.js
@@ -0,0 +1,5 @@
+import("system.vars");
+import("system.translate");
+import("system.result");
+
+result.string(translate.text(vars.get("$field.OBJECT_TYPE")));
\ No newline at end of file
diff --git a/entity/Favorite_entity/entityfields/row_id/onValueChange.js b/entity/Favorite_entity/entityfields/row_id/onValueChange.js
new file mode 100644
index 0000000000..d742908a8d
--- /dev/null
+++ b/entity/Favorite_entity/entityfields/row_id/onValueChange.js
@@ -0,0 +1,88 @@
+import("system.logging");
+import("Communication_lib");
+import("Sql_lib");
+import("system.vars");
+import("system.neon");
+import("system.entities");
+
+var rowid = vars.get("local.value");
+if (rowid)
+{
+    var titleFieldName;
+    var nameResult;
+    var relationResult;
+    
+    var config = entities.createConfigForLoadingRows();
+    config.uid(vars.get("$field.ROW_ID"));
+    
+    if(vars.get("$field.OBJECT_TYPE") == "Person")
+    {
+        titleFieldNames = ["FULL_NAME_fieldGroup"];
+        config.entity("Person_entity");
+        config.fields(titleFieldNames)
+        nameResult = entities.getRow(config)[titleFieldNames[0]];
+    }
+    
+    if(vars.get("$field.OBJECT_TYPE") == "Organisation")
+    {
+        titleFieldNames = ["NAME"];
+        config.entity("Organisation_entity");
+        config.fields(titleFieldNames);
+        nameResult = entities.getRow(config)[titleFieldNames[0]];
+    }
+    
+    if(vars.get("$field.OBJECT_TYPE") == "Offer")
+    {
+        titleFieldNames = ["FullOfferCode"];
+        config.entity("Offer_entity");
+        config.fields(titleFieldNames);
+        nameResult = entities.getRow(config)[titleFieldNames[0]];
+    }
+    
+    if(vars.get("$field.OBJECT_TYPE") == "Contract")
+    {
+        titleFieldNames = ["CONTRACTCODE"];
+        config.entity("Contract_entity");
+        config.fields(titleFieldNames);
+        nameResult = entities.getRow(config)[titleFieldNames[0]];
+    }
+    
+    if(vars.get("$field.OBJECT_TYPE") == "Product")
+    {
+        titleFieldNames = ["PRODUCTCODE", "PRODUCTNAME"];
+        config.entity("Contract_entity");
+        config.fields(titleFieldNames);
+        nameResult = entities.getRow(config)[titleFieldNames[0]];
+        relationResult = entities.getRow(config)[titleFieldNames[1]];
+    }
+    
+    if(vars.get("$field.OBJECT_TYPE") == "Productprice")
+    {
+        titleFieldNames = ["PRICELIST", "CONTACT_ID"];
+        config.entity("Productprice_entity");
+        config.fields(titleFieldNames);
+        var row = entities.getRow(config);
+        nameResult = row[titleFieldNames[0]];
+        
+        titleFieldNames = ["PERSON_TITLE"];
+        config.entity("Contact_entity");
+        config.uid(row[titleFieldNames[1]]);
+        config.fields(titleFieldNames);
+        relationResult = entities.getRow(config)[titleFieldNames[0]];
+    }
+    
+    if(vars.get("$field.OBJECT_TYPE") == "Salesproject")
+    {
+        titleFieldNames = ["PRICELIST"];
+        config.entity("Productprice_entity");
+        config.fields(titleFieldNames);
+        nameResult = entities.getRow(config)[titleFieldNames[0]];
+    }
+    
+    
+
+    neon.setFieldValues({
+        "$field.TITLE" : nameResult,
+        "$field.TITLE_RELATION" : relationResult != undefined && relationResult != null && relationResult != "" ? relationResult : ""
+    });
+}
\ No newline at end of file
diff --git a/entity/Organisation_entity/Organisation_entity.aod b/entity/Organisation_entity/Organisation_entity.aod
index cbd7cb44ef..e9eee92243 100644
--- a/entity/Organisation_entity/Organisation_entity.aod
+++ b/entity/Organisation_entity/Organisation_entity.aod
@@ -10,6 +10,7 @@
   <afterUiInit>%aditoprj%/entity/Organisation_entity/afterUiInit.js</afterUiInit>
   <afterOperatingState>%aditoprj%/entity/Organisation_entity/afterOperatingState.js</afterOperatingState>
   <initFilterProcess>%aditoprj%/entity/Organisation_entity/initFilterProcess.js</initFilterProcess>
+  <useFavorites v="true" />
   <iconId>VAADIN:BUILDING</iconId>
   <imageProcess>%aditoprj%/entity/Organisation_entity/imageProcess.js</imageProcess>
   <titlePlural>Companies</titlePlural>
diff --git a/neonView/FavoriteFilter_view/FavoriteFilter_view.aod b/neonView/FavoriteFilter_view/FavoriteFilter_view.aod
index bdc4d59246..c047206405 100644
--- a/neonView/FavoriteFilter_view/FavoriteFilter_view.aod
+++ b/neonView/FavoriteFilter_view/FavoriteFilter_view.aod
@@ -3,6 +3,7 @@
   <name>FavoriteFilter_view</name>
   <title>FavoriteFilter_view</title>
   <majorModelMode>DISTRIBUTED</majorModelMode>
+  <filterable v="false" />
   <layout>
     <groupLayout>
       <name>layout</name>
@@ -11,22 +12,27 @@
   <children>
     <tableViewTemplate>
       <name>FavoriteFilter</name>
-      <iconField></iconField>
+      <iconField>#IMAGE</iconField>
       <titleField>ROW_ID</titleField>
       <subtitleField>GROUP_TITLE</subtitleField>
       <descriptionField>OBJECT_TYPE</descriptionField>
       <entityField>#ENTITY</entityField>
       <linkedColumns />
       <isCreatable v="false" />
+      <isEditable v="false" />
       <title>favoriteFilter_view</title>
       <columns>
+        <neonTableColumn>
+          <name>b235f917-4c59-4b8a-be07-ea5371f69f3b</name>
+          <entityField>OBJECT_TYPE</entityField>
+        </neonTableColumn>
         <neonTableColumn>
           <name>075e4e29-515c-4d9e-b195-f481af367b42</name>
-          <entityField>ROW_ID</entityField>
+          <entityField>TITLE</entityField>
         </neonTableColumn>
         <neonTableColumn>
-          <name>b235f917-4c59-4b8a-be07-ea5371f69f3b</name>
-          <entityField>OBJECT_TYPE</entityField>
+          <name>9cd27b17-be4d-4621-91d5-42f3d1e8ee7d</name>
+          <entityField>TITLE_RELATION</entityField>
         </neonTableColumn>
         <neonTableColumn>
           <name>929170b5-b460-4558-9aa6-f7657f49098c</name>
@@ -34,5 +40,33 @@
         </neonTableColumn>
       </columns>
     </tableViewTemplate>
+    <treeTableViewTemplate>
+      <name>FavoriteTreeTable</name>
+      <parentField>UID</parentField>
+      <nodeExpandedField>OBJECT_TYPE</nodeExpandedField>
+      <defaultGroupFields />
+      <entityField>#ENTITY</entityField>
+      <linkedColumns>
+        <element>OBJECT_TYPE</element>
+        <element>GROUP_TITLE</element>
+      </linkedColumns>
+      <isCreatable v="false" />
+      <isEditable v="false" />
+      <informationField>TITLE</informationField>
+      <columns>
+        <neonTreeTableColumn>
+          <name>75cd966b-ee07-42bb-ac6b-b29d93cb4c51</name>
+          <entityField>TITLE</entityField>
+        </neonTreeTableColumn>
+        <neonTreeTableColumn>
+          <name>e5a62307-2b26-4891-9a4b-55342f693e97</name>
+          <entityField>GROUP_TITLE</entityField>
+        </neonTreeTableColumn>
+        <neonTreeTableColumn>
+          <name>3302f6db-8bb4-4e48-b89b-273439e46a31</name>
+          <entityField>OBJECT_TYPE</entityField>
+        </neonTreeTableColumn>
+      </columns>
+    </treeTableViewTemplate>
   </children>
 </neonView>
-- 
GitLab


From f76d5b4cd6dfc43724f16622797340cb02fc6fe2 Mon Sep 17 00:00:00 2001
From: "a.schindlbeck" <a.schindlbeck@adito.de>
Date: Fri, 7 Aug 2020 14:47:18 +0200
Subject: [PATCH 117/309] #1060652 Favorites: Filter-View various Contexts
 bound #2

---
 .../entityfields/row_id/onValueChange.js      | 62 ++++++++++++++++---
 1 file changed, 55 insertions(+), 7 deletions(-)

diff --git a/entity/Favorite_entity/entityfields/row_id/onValueChange.js b/entity/Favorite_entity/entityfields/row_id/onValueChange.js
index d742908a8d..4de4903145 100644
--- a/entity/Favorite_entity/entityfields/row_id/onValueChange.js
+++ b/entity/Favorite_entity/entityfields/row_id/onValueChange.js
@@ -64,17 +64,65 @@ if (rowid)
         var row = entities.getRow(config);
         nameResult = row[titleFieldNames[0]];
         
-        titleFieldNames = ["PERSON_TITLE"];
-        config.entity("Contact_entity");
-        config.uid(row[titleFieldNames[1]]);
-        config.fields(titleFieldNames);
-        relationResult = entities.getRow(config)[titleFieldNames[0]];
+//        titleFieldNames = ["PERSON_TITLE"];
+//        config.entity("Contact_entity");
+//        config.uid(row[titleFieldNames[1]]);
+//        config.fields(titleFieldNames);
+//        relationResult = entities.getRow(config)[titleFieldNames[0]];
     }
     
     if(vars.get("$field.OBJECT_TYPE") == "Salesproject")
     {
-        titleFieldNames = ["PRICELIST"];
-        config.entity("Productprice_entity");
+        titleFieldNames = ["PROJECTCODE"];
+        config.entity("Salesproject_entity");
+        config.fields(titleFieldNames);
+        nameResult = entities.getRow(config)[titleFieldNames[0]];
+    }
+    
+    if(vars.get("$field.OBJECT_TYPE") == "SupportTicket")
+    {
+        titleFieldNames = ["TASK_SUBJECT"];
+        config.entity("SupportTicket_entity");
+        config.fields(titleFieldNames);
+        nameResult = entities.getRow(config)[titleFieldNames[0]];
+    }
+    
+    if(vars.get("$field.OBJECT_TYPE") == "Leadimport")
+    {
+        titleFieldNames = ["NAME"];
+        config.entity("Leadimport_entity");
+        config.fields(titleFieldNames);
+        nameResult = entities.getRow(config)[titleFieldNames[0]];
+    }
+    
+    if(vars.get("$field.OBJECT_TYPE") == "ExportTemplate")
+    {
+        titleFieldNames = ["TITLE"];
+        config.entity("ExportTemplate_entity");
+        config.fields(titleFieldNames);
+        nameResult = entities.getRow(config)[titleFieldNames[0]];
+    }
+    
+    if(vars.get("$field.OBJECT_TYPE") == "Employee")
+    {
+        titleFieldNames = ["TITLE"];
+        config.entity("Employee_entity");
+        config.fields(titleFieldNames);
+        nameResult = entities.getRow(config)[titleFieldNames[0]];
+    }
+    
+    if(vars.get("$field.OBJECT_TYPE") == "DocumentTemplate")
+    {
+        titleFieldNames = ["NAME"];
+        config.entity("DocumentTemplate_entity");
+        config.fields(titleFieldNames);
+        nameResult = entities.getRow(config)[titleFieldNames[0]];
+    }
+    
+    if(vars.get("$field.OBJECT_TYPE") == "Campaign")
+    {
+        titleFieldNames = ["NAME"];
+        config.entity("Campaign_entity");
         config.fields(titleFieldNames);
         nameResult = entities.getRow(config)[titleFieldNames[0]];
     }
-- 
GitLab


From 914d1e3036ded17219b72eb081fbba9a8d829182 Mon Sep 17 00:00:00 2001
From: Benjamin Ulrich <b.ulrich@adito.de>
Date: Fri, 7 Aug 2020 13:15:08 +0000
Subject: [PATCH 118/309] =?UTF-8?q?[Projekt:=20Entwicklung=20-=20Neon][Tic?=
 =?UTF-8?q?ketNr.:=201061658][Besuchsvorschlag=20-=20neuer=20Wochenplanein?=
 =?UTF-8?q?trag:=20Kontakt=20nicht=20ausw=C3=A4hlbar=20obwohl=20vorhanden]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../rename_VisitPlanEntry_ORGANISATION_ID.xml             | 4 ++--
 .liquibase/Data_alias/basic/2020.1.3/changelog.xml        | 3 +--
 .../recordcontainers/jdito/contentProcess.js              | 8 ++++----
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/.liquibase/Data_alias/basic/2020.1.3/VisitPlanEntry/rename_VisitPlanEntry_ORGANISATION_ID.xml b/.liquibase/Data_alias/basic/2020.1.3/VisitPlanEntry/rename_VisitPlanEntry_ORGANISATION_ID.xml
index 0603638910..17f5ed88b3 100644
--- a/.liquibase/Data_alias/basic/2020.1.3/VisitPlanEntry/rename_VisitPlanEntry_ORGANISATION_ID.xml
+++ b/.liquibase/Data_alias/basic/2020.1.3/VisitPlanEntry/rename_VisitPlanEntry_ORGANISATION_ID.xml
@@ -3,9 +3,9 @@
                    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
         <changeSet id="3d7f038c-04f1-45a2-9a1c-73c1a8666fea" author="b.ulrich" >
     <renameColumn
-            columnDataType="CHAR(36)"  
-            newColumnName="ORGANISATION_CONTACT_ID"  
+            columnDataType="CHAR"  
             oldColumnName="ORGANISATION_ID"  
+            newColumnName="ORGANISATION_CONTACT_ID"  
             tableName="VISITPLANENTRY"/>  
     </changeSet>
 </databaseChangeLog>
diff --git a/.liquibase/Data_alias/basic/2020.1.3/changelog.xml b/.liquibase/Data_alias/basic/2020.1.3/changelog.xml
index bd8e2232fe..dd3d04e98c 100644
--- a/.liquibase/Data_alias/basic/2020.1.3/changelog.xml
+++ b/.liquibase/Data_alias/basic/2020.1.3/changelog.xml
@@ -3,6 +3,5 @@
                    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
     <include file="AlterButtonLabelTitles/AlterButtonLabelTitles.xml" relativeToChangelogFile="true" />
     <include file="add_Address_LatLon.xml" relativeToChangelogFile="true"/>
-    <!--    disabled the following script since it is WIP-->
-    <!--<include file="VisitPlanEntry/rename_VisitPlanEntry_ORGANISATION_ID.xml" relativeToChangelogFile="true" />-->
+    <include file="VisitPlanEntry/rename_VisitPlanEntry_ORGANISATION_ID.xml" relativeToChangelogFile="true" />
 </databaseChangeLog>
diff --git a/entity/VisitRecommendation_entity/recordcontainers/jdito/contentProcess.js b/entity/VisitRecommendation_entity/recordcontainers/jdito/contentProcess.js
index 4ec4a7d08e..341015c21e 100644
--- a/entity/VisitRecommendation_entity/recordcontainers/jdito/contentProcess.js
+++ b/entity/VisitRecommendation_entity/recordcontainers/jdito/contentProcess.js
@@ -62,7 +62,7 @@ if(idValues == false)
                                         .from("CONTACT")
                                         .join("ORGANISATION", "CONTACT.ORGANISATION_ID = org.ORGANISATIONID", "org")
                                         .leftJoin("PERSON", "PERSON.PERSONID = CONTACT.PERSON_ID")
-                                        .join("ADDRESS", "ADDRESS_ID = ADDRESSID")
+                                        .leftJoin("ADDRESS", "ADDRESS_ID = ADDRESSID")
                                         .join("AB_ATTRIBUTERELATION", "visitPlanFrequency.OBJECT_ROWID = CONTACT.CONTACTID", "visitPlanFrequency")
                                         .where(["AB_ATTRIBUTERELATION", "AB_ATTRIBUTE_ID", "visitPlanFrequency"], $AttributeRegistry.visitPlanFrequency())
                                         .table();
@@ -80,7 +80,7 @@ var recommendationSQLData = newSelect(["VISITRECOMMENDATIONID", "VISITRECOMMENDA
                 
     newSelect("min(ENTRYDATE)")
                 .from("VISITPLANENTRY")
-                .where("VISITPLANENTRY.ORGANISATION_CONTACT_ID = VISITRECOMMENDATION.CONTACT_ID")
+                .where("VISITPLANENTRY.ORGANISATION_CONTACT_ID", "VISITRECOMMENDATION.CONTACT_ID")
                 .and("VISITPLANENTRY.STATUS", $KeywordRegistry.visitPlanEntryStatus$planned())
                 .or("VISITPLANENTRY.STATUS", $KeywordRegistry.visitPlanEntryStatus$Appointmentarranged())
                 .and("VISITPLANENTRY.entrydate", datetime.today(), SqlBuilder.GREATER())
@@ -88,8 +88,8 @@ var recommendationSQLData = newSelect(["VISITRECOMMENDATIONID", "VISITRECOMMENDA
                 
     newSelect("VISITRECOMMENDATION.CONTACT_ID")
                 .from("VISITPLANEMPLOYEEWEEK, VISITPLANENTRY")
-                .where("VISITPLANENTRY.VISITPLANEMPLOYEEWEEK_ID", "VISITPLANEMPLOYEEWEEKID")
-                .and("VISITRECOMMENDATION.CONTACT_ID = VISITPLANENTRY.ORGANISATION_CONTACT_ID")
+                .where("VISITPLANENTRY.VISITPLANEMPLOYEEWEEK_ID", "VISITPLANEMPLOYEEWEEK.VISITPLANEMPLOYEEWEEKID")
+                .and("VISITRECOMMENDATION.CONTACT_ID", "VISITPLANENTRY.ORGANISATION_CONTACT_ID")
                 .and(newWhere("VISITPLANENTRY.STATUS", $KeywordRegistry.visitPlanEntryStatus$planned())
                 .or("VISITPLANENTRY.STATUS", $KeywordRegistry.visitPlanEntryStatus$Appointmentarranged()))
                 .and("VISITPLANENTRY.entrydate", newSelect("min(vp.entrydate)")
-- 
GitLab


From 71bc5f515fdbfb273f5be14e9a6ec311dd33a68e Mon Sep 17 00:00:00 2001
From: "s.pongratz" <s.pongratz@adito.de>
Date: Mon, 10 Aug 2020 09:43:12 +0200
Subject: [PATCH 119/309] =?UTF-8?q?#1059391-NotificationCenter=20=C3=84nde?=
 =?UTF-8?q?rung=20am=20NotificationCenter?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DeleteNotificationtypeKeywords.xml        |  9 ++++++
 .../Data_alias/basic/2020.1.3/changelog.xml   |  1 +
 .liquibase/Data_alias/changelog.xml           |  1 +
 .../KeywordEntry_entity.aod                   |  6 ----
 .../Notification_entity.aod                   | 23 +++++----------
 .../typecode/displayValueProcess.js           |  6 ----
 .../entityfields/typecode/dropDownProcess.js  | 11 ++++++++
 .../containername_param/valueProcess.js       |  5 ----
 .../_____LANGUAGE_EXTRA.aod                   | 12 ++++++++
 .../_____LANGUAGE_de/_____LANGUAGE_de.aod     | 28 ++++++++++++++++++-
 .../_____LANGUAGE_en/_____LANGUAGE_en.aod     | 13 ++++++++-
 .../NotificationFilter_view.aod               |  1 +
 process/KeywordRegistry_basic/process.js      |  1 -
 13 files changed, 81 insertions(+), 36 deletions(-)
 create mode 100644 .liquibase/Data_alias/basic/2020.1.3/DeleteNotificationtypeKeywords.xml
 delete mode 100644 entity/Notification_entity/entityfields/typecode/displayValueProcess.js
 create mode 100644 entity/Notification_entity/entityfields/typecode/dropDownProcess.js
 delete mode 100644 entity/Notification_entity/entityfields/typekeywords/children/containername_param/valueProcess.js

diff --git a/.liquibase/Data_alias/basic/2020.1.3/DeleteNotificationtypeKeywords.xml b/.liquibase/Data_alias/basic/2020.1.3/DeleteNotificationtypeKeywords.xml
new file mode 100644
index 0000000000..43d552d2ec
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2020.1.3/DeleteNotificationtypeKeywords.xml
@@ -0,0 +1,9 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+                   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+    <changeSet author="s.pongratz" id="0b393c2b-c969-41ab-9eeb-3ccaf418e069">
+        <delete  tableName="AB_KEYWORD_ENTRY" >  
+        <where>CONTAINER = 'NotificationType'</where>  
+    </delete> 
+    </changeSet>
+</databaseChangeLog>
diff --git a/.liquibase/Data_alias/basic/2020.1.3/changelog.xml b/.liquibase/Data_alias/basic/2020.1.3/changelog.xml
index ac6898c7f1..d7d38c34c2 100644
--- a/.liquibase/Data_alias/basic/2020.1.3/changelog.xml
+++ b/.liquibase/Data_alias/basic/2020.1.3/changelog.xml
@@ -2,6 +2,7 @@
 <databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
                    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
     <include file="AlterButtonLabelTitles/AlterButtonLabelTitles.xml" relativeToChangelogFile="true" />
+    <include file="DeleteNotificationtypeKeywords.xml" relativeToChangelogFile="true" />
     <!--    disabled the following script since it is WIP-->
     <!--<include file="VisitPlanEntry/rename_VisitPlanEntry_ORGANISATION_ID.xml" relativeToChangelogFile="true" />-->
 </databaseChangeLog>
diff --git a/.liquibase/Data_alias/changelog.xml b/.liquibase/Data_alias/changelog.xml
index 415dcce416..b3fee691bd 100644
--- a/.liquibase/Data_alias/changelog.xml
+++ b/.liquibase/Data_alias/changelog.xml
@@ -14,6 +14,7 @@
     <include relativeToChangelogFile="true" file="basic/2020.1.0/changelog.xml"/>
     <include relativeToChangelogFile="true" file="basic/2020.1.1/changelog.xml"/>
     <include relativeToChangelogFile="true" file="basic/2020.1.2/changelog.xml"/>
+    <include relativeToChangelogFile="true" file="basic/2020.1.3/changelog.xml"/>
 
     <!--enable this only when you definetly want to overwrite the existing data with demo records:--> 
     <!--<include relativeToChangelogFile="true" file="basic/_demoData/changelog.xml" context="example"/>-->
diff --git a/entity/KeywordEntry_entity/KeywordEntry_entity.aod b/entity/KeywordEntry_entity/KeywordEntry_entity.aod
index 33635f5756..2d0edd64d5 100644
--- a/entity/KeywordEntry_entity/KeywordEntry_entity.aod
+++ b/entity/KeywordEntry_entity/KeywordEntry_entity.aod
@@ -583,12 +583,6 @@
           <fieldName>CategoryKeyword</fieldName>
           <isConsumer v="false" />
         </entityDependency>
-        <entityDependency>
-          <name>644a6101-6b11-4998-bd8d-b799c6f376fa</name>
-          <entityName>Notification_entity</entityName>
-          <fieldName>TypeKeywords</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
       </dependencies>
       <children>
         <entityParameter>
diff --git a/entity/Notification_entity/Notification_entity.aod b/entity/Notification_entity/Notification_entity.aod
index 990b2e7777..3650308447 100644
--- a/entity/Notification_entity/Notification_entity.aod
+++ b/entity/Notification_entity/Notification_entity.aod
@@ -27,6 +27,7 @@
       <name>STATE</name>
       <title>State</title>
       <consumer>StateKeywords</consumer>
+      <groupable v="true" />
       <displayValueProcess>%aditoprj%/entity/Notification_entity/entityfields/state/displayValueProcess.js</displayValueProcess>
     </entityField>
     <entityField>
@@ -68,9 +69,8 @@
     <entityField>
       <name>TYPECODE</name>
       <title>Type</title>
-      <consumer>TypeKeywords</consumer>
       <groupable v="true" />
-      <displayValueProcess>%aditoprj%/entity/Notification_entity/entityfields/typecode/displayValueProcess.js</displayValueProcess>
+      <dropDownProcess>%aditoprj%/entity/Notification_entity/entityfields/typecode/dropDownProcess.js</dropDownProcess>
     </entityField>
     <entityField>
       <name>VERSION</name>
@@ -119,6 +119,10 @@
           <tooltip></tooltip>
           <tooltipProcess>%aditoprj%/entity/Notification_entity/entityfields/setnotificationstate/children/setnew/tooltipProcess.js</tooltipProcess>
         </entityActionField>
+        <entityActionField>
+          <name>getNotification</name>
+          <onActionProcess>%aditoprj%/entity/Notification_entity/entityfields/setnotificationstate/children/getnotification/onActionProcess.js</onActionProcess>
+        </entityActionField>
       </children>
     </entityActionGroup>
     <entityActionField>
@@ -129,6 +133,7 @@
       <name>RESOLVEDPRIORITY</name>
       <title>Priority</title>
       <consumer>PrioKeywords</consumer>
+      <groupable v="true" />
       <textInputAllowed v="false" />
     </entityField>
     <entityConsumer>
@@ -159,20 +164,6 @@
         </entityParameter>
       </children>
     </entityConsumer>
-    <entityConsumer>
-      <name>TypeKeywords</name>
-      <dependency>
-        <name>dependency</name>
-        <entityName>KeywordEntry_entity</entityName>
-        <fieldName>SpecificContainerKeywords</fieldName>
-      </dependency>
-      <children>
-        <entityParameter>
-          <name>ContainerName_param</name>
-          <valueProcess>%aditoprj%/entity/Notification_entity/entityfields/typekeywords/children/containername_param/valueProcess.js</valueProcess>
-        </entityParameter>
-      </children>
-    </entityConsumer>
   </entityFields>
   <recordContainers>
     <dbRecordContainer>
diff --git a/entity/Notification_entity/entityfields/typecode/displayValueProcess.js b/entity/Notification_entity/entityfields/typecode/displayValueProcess.js
deleted file mode 100644
index fcf893072c..0000000000
--- a/entity/Notification_entity/entityfields/typecode/displayValueProcess.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import("Keyword_lib");
-import("system.result");
-import("system.vars");
-import("KeywordRegistry_basic");
-
-result.string(KeywordUtils.getViewValue($KeywordRegistry.notificationType(), vars.get("$field.TYPECODE")));
\ No newline at end of file
diff --git a/entity/Notification_entity/entityfields/typecode/dropDownProcess.js b/entity/Notification_entity/entityfields/typecode/dropDownProcess.js
new file mode 100644
index 0000000000..b10dd33080
--- /dev/null
+++ b/entity/Notification_entity/entityfields/typecode/dropDownProcess.js
@@ -0,0 +1,11 @@
+import("system.result");
+import("system.logging");
+import("system.notification");
+
+var types = []
+
+for ( property in notification.getAllTypes()) {
+  types.push(property);
+}
+
+result.object(types);
\ No newline at end of file
diff --git a/entity/Notification_entity/entityfields/typekeywords/children/containername_param/valueProcess.js b/entity/Notification_entity/entityfields/typekeywords/children/containername_param/valueProcess.js
deleted file mode 100644
index 8ccc4158b0..0000000000
--- a/entity/Notification_entity/entityfields/typekeywords/children/containername_param/valueProcess.js
+++ /dev/null
@@ -1,5 +0,0 @@
-import("system.result");
-import("KeywordRegistry_basic");
-
-
-result.string($KeywordRegistry.notificationType());
\ No newline at end of file
diff --git a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
index aac9f1e3a8..7d7faf2906 100644
--- a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
+++ b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
@@ -6884,6 +6884,18 @@
     <entry>
       <key>Workflow deploy failed</key>
     </entry>
+    <entry>
+      <key>{SEND_MAIL}</key>
+    </entry>
+    <entry>
+      <key>New</key>
+    </entry>
+    <entry>
+      <key>Release</key>
+    </entry>
+    <entry>
+      <key>Archived</key>
+    </entry>
   </keyValueMap>
   <font name="Dialog" style="0" size="11" />
   <sqlModels>
diff --git a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
index e5de76bd0b..f3a165c300 100644
--- a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
+++ b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
@@ -298,7 +298,7 @@
     </entry>
     <entry>
       <key>SEEN</key>
-      <value>Neu</value>
+      <value>Ungelese</value>
     </entry>
     <entry>
       <key>UNSEEN</key>
@@ -8595,6 +8595,7 @@ Bitte Datumseingabe prüfen</value>
     </entry>
     <entry>
       <key>Seen</key>
+      <value></value>
     </entry>
     <entry>
       <key>Unseen</key>
@@ -8802,6 +8803,31 @@ Bitte Datumseingabe prüfen</value>
     <entry>
       <key>Workflow deploy failed</key>
     </entry>
+    <entry>
+      <key>Download letter and create Activity</key>
+    </entry>
+    <entry>
+      <key>{SENT_MAIL}</key>
+    </entry>
+    <entry>
+      <key>Add Participants</key>
+    </entry>
+    <entry>
+      <key>and open Report</key>
+    </entry>
+    <entry>
+      <key>Add Recipients</key>
+    </entry>
+    <entry>
+      <key>New</key>
+      <value>Neu</value>
+    </entry>
+    <entry>
+      <key>Release</key>
+    </entry>
+    <entry>
+      <key>Archived</key>
+    </entry>
   </keyValueMap>
   <font name="Dialog" style="0" size="11" />
 </language>
diff --git a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
index f2827dd55b..a36b9b673f 100644
--- a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
+++ b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
@@ -6941,7 +6941,6 @@
     <entry>
       <key>The Sales Project can only be filled when a company has been specified</key>
     </entry>
-
     <entry>
       <key>{SEND_MAIL}</key>
       <value>Send mail</value>
@@ -6952,6 +6951,18 @@
     <entry>
       <key>Workflow deploy failed</key>
     </entry>
+    <entry>
+      <key>{SENT_MAIL}</key>
+    </entry>
+    <entry>
+      <key>New</key>
+    </entry>
+    <entry>
+      <key>Release</key>
+    </entry>
+    <entry>
+      <key>Archived</key>
+    </entry>
   </keyValueMap>
   <font name="Dialog" style="0" size="11" />
 </language>
diff --git a/neonView/NotificationFilter_view/NotificationFilter_view.aod b/neonView/NotificationFilter_view/NotificationFilter_view.aod
index 65c5f94e79..2ff088a9cc 100644
--- a/neonView/NotificationFilter_view/NotificationFilter_view.aod
+++ b/neonView/NotificationFilter_view/NotificationFilter_view.aod
@@ -35,6 +35,7 @@
       <iconIdField>ICON</iconIdField>
       <entityField>#ENTITY</entityField>
       <isEditable v="false" />
+      <informationField>STATE</informationField>
     </timelineViewTemplate>
     <tableViewTemplate>
       <name>NotificationTable</name>
diff --git a/process/KeywordRegistry_basic/process.js b/process/KeywordRegistry_basic/process.js
index 04e469c42d..76562cebe0 100644
--- a/process/KeywordRegistry_basic/process.js
+++ b/process/KeywordRegistry_basic/process.js
@@ -294,4 +294,3 @@ $KeywordRegistry.visitRecommendationPrioSource$manual = function(){return $Keywo
 $KeywordRegistry.workflowCategory = function(){return "WorkflowCategory";};
 
 $KeywordRegistry.notificationState = function () { return "NotificationState";};
-$KeywordRegistry.notificationType = function () { return "NotificationType";};
-- 
GitLab


From 68febda92084928ac152c8a339fd3563570e8848 Mon Sep 17 00:00:00 2001
From: "S.Listl" <S.Listl@SLISTL.aditosoftware.local>
Date: Fri, 7 Aug 2020 15:44:47 +0200
Subject: [PATCH 120/309] Refactoring SqlBuilder usage

---
 .../recordcontainers/index/query.js           | 29 +++----
 .../recordcontainers/index/query.js           | 32 ++++----
 .../children/contactid_param/valueProcess.js  | 10 +--
 .../orderlanguage_param/valueProcess.js       | 12 +--
 .../recordcontainers/index/query.js           | 32 ++++----
 .../recordcontainers/index/query.js           | 75 +++++++++----------
 .../recordcontainers/index/query.js           | 22 +++---
 .../recordcontainers/jdito/onDelete.js        |  8 +-
 .../recordcontainers/jdito/onUpdate.js        |  9 ++-
 .../recordcontainers/index/query.js           | 36 ++++-----
 process/Util_lib/process.js                   | 12 +--
 .../customcomponents/button/onClick.js        |  2 +
 .../customcomponents/button/onClick.js        |  2 +
 13 files changed, 134 insertions(+), 147 deletions(-)

diff --git a/entity/Contract_entity/recordcontainers/index/query.js b/entity/Contract_entity/recordcontainers/index/query.js
index 0b7612604a..e12356c93b 100644
--- a/entity/Contract_entity/recordcontainers/index/query.js
+++ b/entity/Contract_entity/recordcontainers/index/query.js
@@ -8,20 +8,21 @@ import("Sql_lib");
 import("KeywordRegistry_basic");
 
 var sqlHelper = new SqlMaskingUtils();
-var querySelect = newSelect("CONTRACTID " //as "_uid_"
-                            + ", " + sqlHelper.concat(["CONTRACTCODE", KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.contractStatus(), "CONTRACTSTATUS")], " | ") //as "_title_"
-                            + ", " + sqlHelper.concat(["ORGANISATION.NAME", "'| " + translate.text("Type of contract") + ":'", 
-                                    KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.contractType(), "CONTRACTTYPE")]) //as "_description_"
-                            + ", CONTRACTCODE "
-                            + ", CONTACT.ORGANISATION_ID" //as CONTACT_ORG_ID
-                            + ", ORGANISATION.NAME" //as "CONTACT_ORG_ID.displayValue" 
-                            + ", CONTRACT.CONTACT_ID")
-                        .from("CONTRACT")
-                        .join("CONTACT", "CONTRACT.CONTACT_ID = CONTACTID")
-                        .join("ORGANISATION", "ORGANISATIONID = CONTACT.ORGANISATION_ID")
+var querySelect = newSelect([
+        "CONTRACTID", //#UID
+        sqlHelper.concat(["CONTRACTCODE", KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.contractStatus(), "CONTRACTSTATUS")], " | "), //#TITLE
+        sqlHelper.concat(["ORGANISATION.NAME", "'| " + translate.text("Type of contract") + ":'", 
+            KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.contractType(), "CONTRACTTYPE")]), //#DESCRIPTION
+        "CONTRACTCODE",
+        "CONTACT.ORGANISATION_ID",  //CONTACT_ORG_ID
+        "ORGANISATION.NAME",        //CONTACT_ORG_ID.displayValue 
+        "CONTRACT.CONTACT_ID"
+    ])
+    .from("CONTRACT")
+    .join("CONTACT", "CONTRACT.CONTACT_ID = CONTACTID")
+    .join("ORGANISATION", "ORGANISATIONID = CONTACT.ORGANISATION_ID");
 
-if (vars.exists("$local.idvalue") && vars.get("$local.idvalue") && vars.get("$local.idvalue").length > 0) {
-    querySelect.where("CONTRACT.CONTRACTID", vars.get("$local.idvalue"), SqlBuilder.IN())
-}
+if (vars.exists("$local.idvalue")) 
+    querySelect.whereIfSet("CONTRACT.CONTRACTID", "$local.idvalue", SqlBuilder.IN());
 
 result.string(querySelect.toString());
\ No newline at end of file
diff --git a/entity/Offer_entity/recordcontainers/index/query.js b/entity/Offer_entity/recordcontainers/index/query.js
index 6026dd62b0..32864cdd4a 100644
--- a/entity/Offer_entity/recordcontainers/index/query.js
+++ b/entity/Offer_entity/recordcontainers/index/query.js
@@ -2,28 +2,26 @@ import("system.SQLTYPES");
 import("system.translate");
 import("system.result");
 import("system.vars");
-import("system.calendars");
-import("system.db");
 import("Keyword_lib");
 import("Sql_lib");
 import("KeywordRegistry_basic");
 
 var sqlHelper = new SqlMaskingUtils();
-var querySelect = newSelect("OFFER.OFFERID " // as "_uid_", 
-                        + ", " + sqlHelper.concat([sqlHelper.cast("OFFER.OFFERCODE", SQLTYPES.CHAR, 10), KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.offerStatus(), "OFFER.STATUS")], " | ") //as "_title_"
-                        + ", " + sqlHelper.concat(["ORGANISATION.NAME", "'| " + translate.text("Description") + ":'", sqlHelper.castLob("OFFER.INFO", 250)]) // as "_description_"  
-                        + ", OFFER.OFFERCODE"
-                        + ", OFFER.CONTACT_ID "
-                        + ", CONTACT.ORGANISATION_ID " // as CONTACT_ORG_ID
-                        + ", ORGANISATION.NAME") // as "CONTACT_ORG_ID.displayValue"
-                    .from("OFFER")
-                    .join("CONTACT", "OFFER.CONTACT_ID = CONTACTID")
-                    .join("ORGANISATION", "ORGANISATIONID = CONTACT.ORGANISATION_ID")
-                    .orderBy("OFFER.OFFERCODE");
+var querySelect = newSelect([
+        "OFFER.OFFERID", //#UID 
+        sqlHelper.concat([sqlHelper.cast("OFFER.OFFERCODE", SQLTYPES.CHAR, 10), KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.offerStatus(), "OFFER.STATUS")], " | "), //#TITLE
+        sqlHelper.concat(["ORGANISATION.NAME", "'| " + translate.text("Description") + ":'", sqlHelper.castLob("OFFER.INFO", 250)]), //#DESCRIPTION
+        "OFFER.OFFERCODE",
+        "OFFER.CONTACT_ID",
+        "CONTACT.ORGANISATION_ID",  //CONTACT_ORG_ID
+        "ORGANISATION.NAME"         //CONTACT_ORG_ID.displayValue
+    ])
+    .from("OFFER")
+    .join("CONTACT", "OFFER.CONTACT_ID = CONTACTID")
+    .join("ORGANISATION", "ORGANISATIONID = CONTACT.ORGANISATION_ID")
+    .orderBy("OFFER.OFFERCODE");
 
-if (vars.exists("$local.idvalue") && vars.get("$local.idvalue") && vars.get("$local.idvalue").length > 0) 
-{
-    querySelect.where("OFFER.OFFERID", vars.get("$local.idvalue"), SqlBuilder.IN());
-}
+if (vars.exists("$local.idvalue")) 
+    querySelect.whereIfSet("OFFER.OFFERID", "$local.idvalue", SqlBuilder.IN());
 
 result.string(querySelect.toString());
\ No newline at end of file
diff --git a/entity/Order_entity/entityfields/objects/children/contactid_param/valueProcess.js b/entity/Order_entity/entityfields/objects/children/contactid_param/valueProcess.js
index 0d0a95eccc..2829b047ba 100644
--- a/entity/Order_entity/entityfields/objects/children/contactid_param/valueProcess.js
+++ b/entity/Order_entity/entityfields/objects/children/contactid_param/valueProcess.js
@@ -1,14 +1,6 @@
-import("system.db");
 import("system.result");
 import("system.vars");
 import("Contact_lib");
 
 if (vars.get("$field.CONTACT_ID"))
-{
-    var ids = ContactUtils.getPersOrgIds(vars.getString("$field.CONTACT_ID"));
-    if (ids.length >= 3 && ids[2]){
-        result.string(db.cell("select CONTACTID from CONTACT"
-+ " join ORGANISATION on ORGANISATIONID = ORGANISATION_ID"
-+ " where ORGANISATION_ID = '" + ids[2] + "'"
-+ " and PERSON_ID is null"))}
-}
\ No newline at end of file
+    result.string(ContactUtils.getOrganisationContactId(vars.get("field.CONTACT_ID")));
\ No newline at end of file
diff --git a/entity/Order_entity/entityfields/orderlanguage_param/valueProcess.js b/entity/Order_entity/entityfields/orderlanguage_param/valueProcess.js
index 28676a75ca..1da341d92c 100644
--- a/entity/Order_entity/entityfields/orderlanguage_param/valueProcess.js
+++ b/entity/Order_entity/entityfields/orderlanguage_param/valueProcess.js
@@ -1,8 +1,8 @@
-import("system.logging");
-import("system.vars");
-import("system.db");
+import("Sql_lib");
 import("system.result");
 
-var salesorderid = vars.get("$field.SALESORDERID")
-if(salesorderid)
-result.string(db.cell("select ISOLANGUAGE from SALESORDER where SALESORDERID = '" + salesorderid + "'"))
\ No newline at end of file
+var language = newSelect("ISOLANGUAGE")
+    .from("SALESORDER")
+    .whereIfSet("SALESORDER.SALESORDERID", "$field.SALESORDERID")
+    .cell(true);
+result.string(language);
\ No newline at end of file
diff --git a/entity/Order_entity/recordcontainers/index/query.js b/entity/Order_entity/recordcontainers/index/query.js
index f0f600b464..e8aa2e8036 100644
--- a/entity/Order_entity/recordcontainers/index/query.js
+++ b/entity/Order_entity/recordcontainers/index/query.js
@@ -1,28 +1,26 @@
 import("system.SQLTYPES");
 import("system.result");
 import("system.vars");
-import("system.calendars");
-import("system.db");
 import("Sql_lib");
 import("Keyword_lib");
 import("KeywordRegistry_basic");
 
 var sqlHelper = new SqlMaskingUtils();
-var querySelect = newSelect("SALESORDERID " // as "_uid_" 
-                        + ", " + sqlHelper.concat([sqlHelper.cast("SALESORDERCODE", SQLTYPES.CHAR, 10)], " | ") // as "_title_" 
-                        + ", " + sqlHelper.concat(["ORGANISATION.NAME"], " | ") // as "_description_" 
-                        + ", SALESORDERCODE" 
-                        + ", SALESORDER.CONTACT_ID"
-                        + ", CONTACT.ORGANISATION_ID " //as CONTACT_ORG_ID
-                        + ", ORGANISATION.NAME ") //as "CONTACT_ORG_ID.displayValue"
-                    .from("SALESORDER")
-                    .join("CONTACT", "SALESORDER.CONTACT_ID = CONTACTID")
-                    .join("ORGANISATION", "ORGANISATIONID = CONTACT.ORGANISATION_ID")
-                    .orderBy("SALESORDERCODE");
+var querySelect = newSelect([
+        "SALESORDERID", //#UID
+        sqlHelper.concat([sqlHelper.cast("SALESORDERCODE", SQLTYPES.CHAR, 10)], " | "), //#TITLE
+        sqlHelper.concat(["ORGANISATION.NAME"], " | "), //#DESCRIPTION
+        "SALESORDERCODE",
+        "SALESORDER.CONTACT_ID",
+        "CONTACT.ORGANISATION_ID", //as CONTACT_ORG_ID
+        "ORGANISATION.NAME" //as "CONTACT_ORG_ID.displayValue"
+    ])
+    .from("SALESORDER")
+    .join("CONTACT", "SALESORDER.CONTACT_ID = CONTACTID")
+    .join("ORGANISATION", "ORGANISATIONID = CONTACT.ORGANISATION_ID")
+    .orderBy("SALESORDERCODE");
                     
-if (vars.exists("$local.idvalue") && vars.get("$local.idvalue") && vars.get("$local.idvalue").length > 0) 
-{
-    querySelect.where("SALESORDER.SALESORDERID", vars.get("$local.idvalue"), SqlBuilder.IN());
-}
+if (vars.exists("$local.idvalue")) 
+    querySelect.whereIfSet("SALESORDER.SALESORDERID", "$local.idvalue", SqlBuilder.IN());
 
 result.string(querySelect.toString());
\ No newline at end of file
diff --git a/entity/Person_entity/recordcontainers/index/query.js b/entity/Person_entity/recordcontainers/index/query.js
index c1983f7ee8..a21cc7b2e3 100644
--- a/entity/Person_entity/recordcontainers/index/query.js
+++ b/entity/Person_entity/recordcontainers/index/query.js
@@ -13,46 +13,43 @@ You may want to check out if your change affects other modules. However adding m
  */
 
 var sqlQuery, sqlHelper, queryCondition, affectedIds;
-var CommMediumPhoneIds = db.array( db.COLUMN, "select KEYID from AB_KEYWORD_ENTRY join ab_keyword_attributerelation on AB_KEYWORD_ENTRYID = AB_KEYWORD_ENTRY_ID "
-        + " join ab_keyword_attribute on AB_KEYWORD_ATTRIBUTEID = AB_KEYWORD_ATTRIBUTE_ID and CHAR_VALUE = 'TELEPHONE' and AB_KEYWORD_ATTRIBUTE.CONTAINER = 'CommunicationMedium'");
+var commMediumPhoneIds = CommUtil.getMediumIdsByCategory("PHONE");
 sqlHelper = new SqlMaskingUtils();
-var querySelect = newSelect("CONTACT.CONTACTID "
-                        + "," + sqlHelper.concat(["PERSON.SALUTATION", "PERSON.FIRSTNAME", "PERSON.LASTNAME", "'|'", "ORGANISATION.NAME"])
-                        + "," + sqlHelper.concat([
-                             sqlHelper.concat(["defaultAddress.ADDRESS", "defaultAddress.BUILDINGNO", "'-'"
-                                ,"defaultAddress.COUNTRY", "defaultAddress.ZIP", "defaultAddress.CITY"])
-                            ,sqlHelper.concat(["'" + translate.text("Phone") + ":'", "(" + CommUtil.getStandardSubSqlPhone() + ")"])
-                            ,sqlHelper.concat(["'" + translate.text("Email") + ":'", "(" + CommUtil.getStandardSubSqlMail() + ")"])
-                            ], " | ")
-                            //additional indexed fields
-                            + ", CONTACT.CONTACTID "
-                            + ", PERSON.PERSONID "
-                            + ", PERSON.FIRSTNAME "
-                            + ", PERSON.LASTNAME "
-                            + ", TRIM(PERSON.GENDER) "
-                            + ", CONTACT.ORGANISATION_ID "
-                            + ", ORGANISATION.NAME "
-                            + ", ADDRESS.ADDRESS " 
-                            + ", ADDRESS.COUNTRY "
-                            + ", ADDRESS.ZIP " 
-                            + ", ADDRESS.CITY " 
-                            + ", COMMUNICATION.ADDR " 
-                            + ", PHONE.ADDR " 
-                        )
-                    .from("PERSON")
-                    .join("CONTACT", "CONTACT.PERSON_ID = PERSON.PERSONID")
-                    .join("ORGANISATION", "CONTACT.ORGANISATION_ID = ORGANISATION.ORGANISATIONID")
-                    .leftJoin("ADDRESS", "defaultAddress.ADDRESSID = CONTACT.ADDRESS_ID", "defaultAddress")
-                    .leftJoin("ADDRESS", "ADDRESS.CONTACT_ID = CONTACT.CONTACTID")
-                    .leftJoin("COMMUNICATION", "COMMUNICATION.CONTACT_ID = CONTACT.CONTACTID")
-                    .leftJoin("COMMUNICATION", "PHONE.CONTACT_ID = CONTACT.CONTACTID and PHONE.MEDIUM_ID in ('" + CommMediumPhoneIds.join("', '") + "')", "PHONE") //TODO: refactor to new SqlBuilder
-                    .orderBy("CONTACT.CONTACTID");
-
-if (vars.exists("$local.idvalue")) 
-{
-    affectedIds = vars.get("$local.idvalue");
-    querySelect.whereIfSet("CONTACT.CONTACTID", affectedIds, SqlBuilder.IN());
-}
+var querySelect = newSelect([
+        "CONTACT.CONTACTID", //#UID
+        sqlHelper.concat(["PERSON.SALUTATION", "PERSON.FIRSTNAME", "PERSON.LASTNAME", "'|'", "ORGANISATION.NAME"]), //#TITLE
+        sqlHelper.concat([
+            sqlHelper.concat(["defaultAddress.ADDRESS", "defaultAddress.BUILDINGNO", "'-'",
+                "defaultAddress.COUNTRY", "defaultAddress.ZIP", "defaultAddress.CITY"]),
+            sqlHelper.concat(["'" + translate.text("Phone") + ":'", "(" + CommUtil.getStandardSubSqlPhone() + ")"]),
+            sqlHelper.concat(["'" + translate.text("Email") + ":'", "(" + CommUtil.getStandardSubSqlMail() + ")"])
+        ], " | "), //#DESCRIPTION
+        //additional indexed fields
+        "CONTACT.CONTACTID",
+        "PERSON.PERSONID",
+        "PERSON.FIRSTNAME",
+        "PERSON.LASTNAME",
+        sqlHelper.trim("PERSON.GENDER"),
+        "CONTACT.ORGANISATION_ID",
+        "ORGANISATION.NAME",
+        "ADDRESS.ADDRESS",
+        "ADDRESS.COUNTRY",
+        "ADDRESS.ZIP",
+        "ADDRESS.CITY",
+        "COMMUNICATION.ADDR",
+        "PHONE.ADDR" 
+    ])
+    .from("PERSON")
+    .join("CONTACT", "CONTACT.PERSON_ID = PERSON.PERSONID")
+    .join("ORGANISATION", "CONTACT.ORGANISATION_ID = ORGANISATION.ORGANISATIONID")
+    .leftJoin("ADDRESS", "defaultAddress.ADDRESSID = CONTACT.ADDRESS_ID", "defaultAddress")
+    .leftJoin("ADDRESS", "ADDRESS.CONTACT_ID = CONTACT.CONTACTID")
+    .leftJoin("COMMUNICATION", "COMMUNICATION.CONTACT_ID = CONTACT.CONTACTID")
+    .leftJoin("COMMUNICATION", newWhere("phone.CONTACT_ID = CONTACT.CONTACTID")
+        .and(["COMMUNICATION", "MEDIUM_ID", "phone"], commMediumPhoneIds, SqlBuilder.IN()), "phone")
+    .orderBy("CONTACT.CONTACTID");
 
+if (vars.exists("$local.idvalue"))
+    querySelect.whereIfSet("CONTACT.CONTACTID", "$local.idvalue", SqlBuilder.IN());
 
 result.string(querySelect);
\ No newline at end of file
diff --git a/entity/Product_entity/recordcontainers/index/query.js b/entity/Product_entity/recordcontainers/index/query.js
index 5d811e52c4..ad3ce1ae86 100644
--- a/entity/Product_entity/recordcontainers/index/query.js
+++ b/entity/Product_entity/recordcontainers/index/query.js
@@ -1,22 +1,20 @@
 import("system.result");
 import("system.vars");
-import("system.calendars");
-import("system.db");
 import("Keyword_lib");
 import("Sql_lib");
 import("KeywordRegistry_basic");
 
 var sqlHelper = new SqlMaskingUtils();
-var sqlQuery = newSelect("PRODUCTID  as \"_uid_\""
-                        + ", " + sqlHelper.concat(["PRODUCTCODE", "PRODUCTNAME"], " | ") // as "_title_"
-                        + ", " + KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.productGroupcode(), "GROUPCODEID") // as "_description_" 
-                        + ", PRODUCTCODE ")
-                    .from("PRODUCT")
-                    .orderBy("PRODUCTCODE");
+var sqlQuery = newSelect([
+        "PRODUCTID", //#UID
+        sqlHelper.concat(["PRODUCTCODE", "PRODUCTNAME"], " | "), //#TITLE
+        KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.productGroupcode(), "GROUPCODEID"), //#DESCRIPTION
+        "PRODUCTCODE"
+    ])
+    .from("PRODUCT")
+    .orderBy("PRODUCTCODE");
 
-if (vars.exists("$local.idvalue")) {
-    var affectedIds = vars.get("$local.idvalue");
-    sqlQuery.whereIfSet("PRODUCT.PRODUCTID", affectedIds, SqlBuilder.IN());
-}
+if (vars.exists("$local.idvalue")) 
+    sqlQuery.whereIfSet("PRODUCT.PRODUCTID", "$local.idvalue", SqlBuilder.IN());
 
 result.string(sqlQuery.toString());
\ No newline at end of file
diff --git a/entity/RoleChildren_entity/recordcontainers/jdito/onDelete.js b/entity/RoleChildren_entity/recordcontainers/jdito/onDelete.js
index 778e62eb98..3135d2cddf 100644
--- a/entity/RoleChildren_entity/recordcontainers/jdito/onDelete.js
+++ b/entity/RoleChildren_entity/recordcontainers/jdito/onDelete.js
@@ -1,7 +1,5 @@
 import("Sql_lib");
-import("system.db");
-import("system.vars");
 
-var uid = vars.get("$field.UID");
-var alias = SqlUtils.getSystemAlias();
-db.deleteData("ASYS_ROLES_CHILDREN", "ID = '" + uid + "'", alias)
\ No newline at end of file
+new SqlBuilder(SqlUtils.getSystemAlias())
+    .where("ASYS_ROLES_CHILDREN.ID", "$field.UID")
+    .deleteData();
\ No newline at end of file
diff --git a/entity/RoleChildren_entity/recordcontainers/jdito/onUpdate.js b/entity/RoleChildren_entity/recordcontainers/jdito/onUpdate.js
index ef5e24b81d..a1bc13a234 100644
--- a/entity/RoleChildren_entity/recordcontainers/jdito/onUpdate.js
+++ b/entity/RoleChildren_entity/recordcontainers/jdito/onUpdate.js
@@ -7,10 +7,11 @@ import("system.vars");
 var selectedRoleName = vars.exists("$param.RoleId_param") && vars.get("$param.RoleId_param");
 var selectedRoleType = vars.exists("$param.RoleType_param") && vars.get("$param.RoleType_param");
 
-if (selectedRoleName && selectedRoleType == "CUSTOM") {
-    var alias = SqlUtils.getSystemAlias();
+if (selectedRoleName && selectedRoleType == "CUSTOM") 
+{
     var childRole = vars.get("$local.rowdata")["CHILD_ROLE.value"];
 
-    var uid = vars.get("$field.UID");
-    db.updateData("ASYS_ROLES_CHILDREN", ["CHILD_ROLE"], null, [childRole], "ID = '" + uid + "'", alias);
+    new SqlBuilder(SqlUtils.getSystemAlias())
+        .where("ASYS_ROLES_CHILDREN.ID", "$field.UID")
+        .updateFields({"CHILD_ROLE" : childRole});
 }
\ No newline at end of file
diff --git a/entity/Salesproject_entity/recordcontainers/index/query.js b/entity/Salesproject_entity/recordcontainers/index/query.js
index 1b84bf3549..b39c8d68ff 100644
--- a/entity/Salesproject_entity/recordcontainers/index/query.js
+++ b/entity/Salesproject_entity/recordcontainers/index/query.js
@@ -7,24 +7,24 @@ import("KeywordRegistry_basic");
 
 var sqlHelper = new SqlMaskingUtils();
 
-var sqlQuery = newSelect("SALESPROJECTID " // as "_uid_" 
-                        + ", PROJECTTITLE " //as "_title_" 
-                        + ", " + sqlHelper.concat([
-                            "'" + translate.text("Status") + ":'",  KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.salesprojectState(), "STATUS"),
-                            "'| " + translate.text("Phase") + ":'",  KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.salesprojectPhase(), "PHASE")
-                          ]) //as "_description_" 
-                        + ", PROJECTCODE"
-                        + ", PROJECTTITLE"
-                        + ", STATUS" 
-                        + ", " + KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.salesprojectState(), "STATUS") // as "STATUS.displayValue"
-                        + ", PHASE"
-                        + ", " + KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.salesprojectState(), "PHASE")) // as "PHASE.displayValue")
-                .from("SALESPROJECT")
-                .orderBy("PROJECTCODE");
+var sqlQuery = newSelect([
+        "SALESPROJECTID", //#UID
+        "PROJECTTITLE", //#TITLE
+        sqlHelper.concat([
+            "'" + translate.text("Status") + ":'",  KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.salesprojectState(), "STATUS"),
+            "'| " + translate.text("Phase") + ":'",  KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.salesprojectPhase(), "PHASE")
+        ]), //#DESCRIPTION
+        "PROJECTCODE",
+        "PROJECTTITLE",
+        "STATUS",
+        KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.salesprojectState(), "STATUS"), //STATUS.displayValue
+        "PHASE",
+        KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.salesprojectState(), "PHASE") //PHASE.displayValue
+    ])
+    .from("SALESPROJECT")
+    .orderBy("PROJECTCODE");
 
-if (vars.exists("$local.idvalue")) {
-    var affectedIds = vars.get("$local.idvalue");
-    sqlQuery.whereIfSet("SALESPROJECT.SALESPROJECTID", affectedIds, SqlBuilder.IN());
-}
+if (vars.exists("$local.idvalue"))
+    sqlQuery.whereIfSet("SALESPROJECT.SALESPROJECTID", "$local.idvalue", SqlBuilder.IN());
 
 result.string(sqlQuery.toString());
\ No newline at end of file
diff --git a/process/Util_lib/process.js b/process/Util_lib/process.js
index 30e6b6b27a..25765c5842 100644
--- a/process/Util_lib/process.js
+++ b/process/Util_lib/process.js
@@ -641,12 +641,12 @@ NumberSequencingUtils.validateUniqueNumber = function(pNumber, pColumn, pTable,
  * 
  * @result {String} hightest number
  */
-NumberSequencingUtils.getMaxUniqueNumber = function(pColumn, pTable, pCondition) {
-    var condition = "";
-    if(pCondition != undefined)
-        condition += " where " + pCondition;
-    var maxNum = db.cell("select max(" + pColumn + ") from " + pTable + condition);
-    return maxNum == "" ? "0" : maxNum;
+NumberSequencingUtils.getMaxUniqueNumber = function(pColumn, pTable, pCondition) 
+{
+    return newSelect(new SqlMaskingUtils().max(pColumn))
+        .from(pTable)
+        .whereIfSet(pCondition)
+        .cell() || "0";
 }
 
 /**
diff --git a/report/Offer_report/ribbon/ribbontasks/task_report/customcomponents/button/onClick.js b/report/Offer_report/ribbon/ribbontasks/task_report/customcomponents/button/onClick.js
index 4572bef869..354885d389 100644
--- a/report/Offer_report/ribbon/ribbontasks/task_report/customcomponents/button/onClick.js
+++ b/report/Offer_report/ribbon/ribbontasks/task_report/customcomponents/button/onClick.js
@@ -5,6 +5,8 @@ import("system.question");
 import("system.vars");
 import("system.db");
 
+//@TODO: remove
+
 var details = vars.get("$global.RptOfferOrderDetails");
 var orgid = db.cell("select ORGANISATION_ID from CONTACT where CONTACTID = '" + details[1] + "'");
 if (orgid.substr(0, 2) == '0 ') // Privatperson
diff --git a/report/Salesorder_report/ribbon/ribbontasks/task_report/customcomponents/button/onClick.js b/report/Salesorder_report/ribbon/ribbontasks/task_report/customcomponents/button/onClick.js
index 48fc7c800c..dad46b278a 100644
--- a/report/Salesorder_report/ribbon/ribbontasks/task_report/customcomponents/button/onClick.js
+++ b/report/Salesorder_report/ribbon/ribbontasks/task_report/customcomponents/button/onClick.js
@@ -5,6 +5,8 @@ import("system.swing");
 import("system.vars");
 import("system.db");
 
+//@TODO: remove
+
 var details = vars.get("$global.RptOfferOrderDetails");
 var orgid = db.array(db.ROW, "select ORG_ID, LANG from RELATION where RELATIONID = '" + details[1] + "'");
 if (orgid[0].substr(0, 2) == '0 ') // Privatperson
-- 
GitLab


From 77c1e3bf2a6bffa1f2b1558df906fd1dcc8e1852 Mon Sep 17 00:00:00 2001
From: "S.Listl" <S.Listl@SLISTL.aditosoftware.local>
Date: Mon, 10 Aug 2020 10:57:12 +0200
Subject: [PATCH 121/309] 1063319 only use standard address location in
 Organisation index

---
 entity/Organisation_entity/Organisation_entity.aod         | 6 +++++-
 entity/Organisation_entity/recordcontainers/index/query.js | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/entity/Organisation_entity/Organisation_entity.aod b/entity/Organisation_entity/Organisation_entity.aod
index 2586777683..75a3286746 100644
--- a/entity/Organisation_entity/Organisation_entity.aod
+++ b/entity/Organisation_entity/Organisation_entity.aod
@@ -1355,7 +1355,11 @@
       <indexFieldMappings>
         <indexRecordFieldMapping>
           <name>#LOCATION</name>
-          <systemField>LOCATION</systemField>
+          <indexFieldType>LOCATION</indexFieldType>
+          <additionalFieldNameAliases>
+            <element>location</element>
+          </additionalFieldNameAliases>
+          <isGlobalSearchField v="false" />
           <isFilterable v="false" />
           <isLookupFilter v="false" />
         </indexRecordFieldMapping>
diff --git a/entity/Organisation_entity/recordcontainers/index/query.js b/entity/Organisation_entity/recordcontainers/index/query.js
index 278616e222..79b1326651 100644
--- a/entity/Organisation_entity/recordcontainers/index/query.js
+++ b/entity/Organisation_entity/recordcontainers/index/query.js
@@ -24,7 +24,7 @@ var querySelect = newSelect([
             sqlHelper.concat(["'" + translate.text("Phone") + ":'", "(" + CommUtil.getStandardSubSqlPhone() + ")"]),
             sqlHelper.concat(["'" + translate.text("Email") + ":'", "(" + CommUtil.getStandardSubSqlMail() + ")"])
         ], " | "),
-        sqlHelper.concat([sqlHelper.cast("ADDRESS.LAT", SQLTYPES.VARCHAR, 16), sqlHelper.cast("ADDRESS.LON", SQLTYPES.VARCHAR, 16)], ","),
+        sqlHelper.concat([sqlHelper.cast("defaultAddress.LAT", SQLTYPES.VARCHAR, 16), sqlHelper.cast("defaultAddress.LON", SQLTYPES.VARCHAR, 16)], ","),
         //additional indexed fields
         "ORGANISATION.NAME",
         "ORGANISATION.ORGANISATIONID",
-- 
GitLab


From 973b987f3a4788f5e28e7313a5581c68ccfe8431 Mon Sep 17 00:00:00 2001
From: Tom Lutzenberger <t.lutzenberger@adito.de>
Date: Mon, 10 Aug 2020 13:41:47 +0200
Subject: [PATCH 122/309] #1058862: Implementierung der Passwort-Policy
 Validierung (#1063293)

---
 entity/Employee_entity/Employee_entity.aod    |  1 +
 .../entityfields/password/onValidation.js     | 23 ++++++++++++++++++
 .../entityfields/jpassword/onValidation.js    | 10 ++++++++
 .../_____LANGUAGE_EXTRA.aod                   | 18 ++++++++++++++
 .../_____LANGUAGE_de/_____LANGUAGE_de.aod     | 24 +++++++++++++++++++
 .../_____LANGUAGE_en/_____LANGUAGE_en.aod     | 18 ++++++++++++++
 6 files changed, 94 insertions(+)
 create mode 100644 entity/Employee_entity/entityfields/password/onValidation.js

diff --git a/entity/Employee_entity/Employee_entity.aod b/entity/Employee_entity/Employee_entity.aod
index d3ae09d5ec..ed1770b8c1 100644
--- a/entity/Employee_entity/Employee_entity.aod
+++ b/entity/Employee_entity/Employee_entity.aod
@@ -71,6 +71,7 @@
       <contentType>PASSWORD</contentType>
       <mandatoryProcess>%aditoprj%/entity/Employee_entity/entityfields/password/mandatoryProcess.js</mandatoryProcess>
       <stateProcess>%aditoprj%/entity/Employee_entity/entityfields/password/stateProcess.js</stateProcess>
+      <onValidation>%aditoprj%/entity/Employee_entity/entityfields/password/onValidation.js</onValidation>
     </entityField>
     <entityField>
       <name>CONFIRM_PASSWORD</name>
diff --git a/entity/Employee_entity/entityfields/password/onValidation.js b/entity/Employee_entity/entityfields/password/onValidation.js
new file mode 100644
index 0000000000..594e4ab704
--- /dev/null
+++ b/entity/Employee_entity/entityfields/password/onValidation.js
@@ -0,0 +1,23 @@
+import("system.neon");
+import("system.result");
+import("system.translate");
+import("system.tools");
+import("system.vars");
+
+
+// Because employee password can only be set on new records
+if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW) {
+    
+    let newPassword = vars.get("$local.value");
+    let policyMessages = tools.validatePasswordPolicies(newPassword);
+    let messages = [];
+
+    if(newPassword) {
+        if(Object.keys(policyMessages).length > 0) {
+            for(let msg in policyMessages) {
+                messages.push(translate.withArguments(msg, policyMessages[msg]));
+            }
+            result.string(messages.join("\n", messages));
+        }
+    }
+}
diff --git a/entity/Usersettings_entity/entityfields/jpassword/onValidation.js b/entity/Usersettings_entity/entityfields/jpassword/onValidation.js
index 26773ba48b..8186278630 100644
--- a/entity/Usersettings_entity/entityfields/jpassword/onValidation.js
+++ b/entity/Usersettings_entity/entityfields/jpassword/onValidation.js
@@ -1,13 +1,23 @@
 import("system.result");
 import("system.translate");
+import("system.tools");
 import("system.vars");
 
 
 let newPassword = vars.get("$local.value");
 let currentPassword = vars.get("$field.currentPassword");
+let policyMessages = tools.validatePasswordPolicies(newPassword);
+let messages = [];
 
 if(newPassword) {
     if(newPassword === currentPassword) {
         result.string(translate.text("New password must not be the same as the current password"));
     }
+    
+    if(Object.keys(policyMessages).length > 0) {
+        for(let msg in policyMessages) {
+            messages.push(translate.withArguments(msg, policyMessages[msg]));
+        }
+        result.string(messages.join("\n", messages));
+    }
 }
diff --git a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
index 19d06a930f..6c1dddac6a 100644
--- a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
+++ b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
@@ -6893,6 +6893,24 @@
     <entry>
       <key>Workflow Model</key>
     </entry>
+    <entry>
+      <key>Password must contain special characters</key>
+    </entry>
+    <entry>
+      <key>Password must contain numbers</key>
+    </entry>
+    <entry>
+      <key>Password must contain letters</key>
+    </entry>
+    <entry>
+      <key>Password must contain spaces</key>
+    </entry>
+    <entry>
+      <key>Password must be at least %0 characters</key>
+    </entry>
+    <entry>
+      <key>The use of any of your previous %0 passwords is prohibited</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 4e124f18e5..c5cf76e009 100644
--- a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
+++ b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
@@ -8833,6 +8833,30 @@ Bitte Datumseingabe prüfen</value>
     <entry>
       <key>Workflow Model</key>
     </entry>
+    <entry>
+      <key>The use of any of your previous %0 passwords is prohibited</key>
+      <value>Die Verwendung eines Ihrer vorherigen %0 Passwörter ist untersagt</value>
+    </entry>
+    <entry>
+      <key>Password must be at least %0 characters</key>
+      <value>Passwort muss aus mindestens %0 Zeichen bestehen</value>
+    </entry>
+    <entry>
+      <key>Password must contain letters</key>
+      <value>Passwort muss Buchstaben enhalten</value>
+    </entry>
+    <entry>
+      <key>Password must contain numbers</key>
+      <value>Passwort muss Zahlen enhalten</value>
+    </entry>
+    <entry>
+      <key>Password must contain spaces</key>
+      <value>Passwort muss Leerzeichen enhalten</value>
+    </entry>
+    <entry>
+      <key>Password must contain special characters</key>
+      <value>Passwort muss Sonderzeichen enhalten</value>
+    </entry>
   </keyValueMap>
   <font name="Dialog" style="0" size="11" />
 </language>
diff --git a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
index 8beaf1c843..6ba7f62f93 100644
--- a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
+++ b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
@@ -6959,6 +6959,24 @@
     <entry>
       <key>Workflow Model</key>
     </entry>
+    <entry>
+      <key>Password must contain special characters</key>
+    </entry>
+    <entry>
+      <key>Password must contain numbers</key>
+    </entry>
+    <entry>
+      <key>Password must contain letters</key>
+    </entry>
+    <entry>
+      <key>Password must contain spaces</key>
+    </entry>
+    <entry>
+      <key>Password must be at least %0 characters</key>
+    </entry>
+    <entry>
+      <key>The use of any of your previous %0 passwords is prohibited</key>
+    </entry>
   </keyValueMap>
   <font name="Dialog" style="0" size="11" />
 </language>
-- 
GitLab


From 67386ac4165604118d8861b153ffe3d68a96a5d3 Mon Sep 17 00:00:00 2001
From: "s.pongratz" <s.pongratz@adito.de>
Date: Mon, 10 Aug 2020 13:47:12 +0200
Subject: [PATCH 123/309] #1058737-DublettenKonfiguration Verwendung von
 local.rowdata

---
 .../recordcontainers/dbrecordcontainer/onDBInsert.js       | 7 ++++---
 .../recordcontainers/dbrecordcontainer/onDBUpdate.js       | 4 +++-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/entity/DuplicateScanner_entity/recordcontainers/dbrecordcontainer/onDBInsert.js b/entity/DuplicateScanner_entity/recordcontainers/dbrecordcontainer/onDBInsert.js
index 07ccfd896b..3c29c7e6c1 100644
--- a/entity/DuplicateScanner_entity/recordcontainers/dbrecordcontainer/onDBInsert.js
+++ b/entity/DuplicateScanner_entity/recordcontainers/dbrecordcontainer/onDBInsert.js
@@ -2,6 +2,7 @@ import("Sql_lib");
 import("system.neon");
 import("system.vars");
 
-var entity = vars.get("$field.ENTITY_TO_SCAN_NAME");
-newWhere("DUPLICATESCANNER.ID", vars.get("$field.UID"))
-.updateFields({"DUPLICATESCANNER.SCAN_PATTERN" : JSON.stringify({entity: "" + entity + "", provider: "indexP", filter: {type: "group", operator: "AND", childs: []}})}, "DUPLICATESCANNER");
\ No newline at end of file
+var rowdata = vars.get("$local.rowdata");
+
+newWhere("DUPLICATESCANNER.ID", rowdata["DUPLICATESCANNER.ID"])
+.updateFields({"DUPLICATESCANNER.SCAN_PATTERN" : JSON.stringify({entity: "" + rowdata["DUPLICATESCANNER.ENTITY_TO_SCAN_NAME"] + "", provider: "indexP", filter: {type: "group", operator: "AND", childs: []}})}, "DUPLICATESCANNER");
\ No newline at end of file
diff --git a/entity/DuplicateScanner_entity/recordcontainers/dbrecordcontainer/onDBUpdate.js b/entity/DuplicateScanner_entity/recordcontainers/dbrecordcontainer/onDBUpdate.js
index f7c88a0b02..c8e53ac00d 100644
--- a/entity/DuplicateScanner_entity/recordcontainers/dbrecordcontainer/onDBUpdate.js
+++ b/entity/DuplicateScanner_entity/recordcontainers/dbrecordcontainer/onDBUpdate.js
@@ -1,6 +1,8 @@
 import("system.vars");
 
-let scanPattern = JSON.parse(vars.get("$field.SCAN_PATTERN"));
+var rowdata = vars.get("$local.rowdata");
+
+let scanPattern = JSON.parse(rowdata["DUPLICATESCANNER.SCAN_PATTERN"]);
 if (scanPattern.provider == undefined) 
 { 
     scanPattern.provider = "indexP";
-- 
GitLab


From 56a4ca873868d6614250cd1bb29a02f3dc26cf28 Mon Sep 17 00:00:00 2001
From: "s.pongratz" <s.pongratz@adito.de>
Date: Mon, 10 Aug 2020 14:48:41 +0200
Subject: [PATCH 124/309] =?UTF-8?q?#1059391-NotificationCenter=20Coding-Gu?=
 =?UTF-8?q?idelines=20anpassungen=20und=20=C3=9Cbersetzung=20hinzugef?=
 =?UTF-8?q?=C3=BCgt?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 language/_____LANGUAGE_de/_____LANGUAGE_de.aod | 1 +
 1 file changed, 1 insertion(+)

diff --git a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
index 72d74c9102..14b87249af 100644
--- a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
+++ b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
@@ -8583,6 +8583,7 @@ Bitte Datumseingabe prüfen</value>
     </entry>
     <entry>
       <key>Zip</key>
+      <value>Plz</value>
     </entry>
     <entry>
       <key>type</key>
-- 
GitLab


From e54a07206a1b6d34f49e70f122ef08e41e3d755e Mon Sep 17 00:00:00 2001
From: "s.pongratz" <s.pongratz@adito.de>
Date: Mon, 10 Aug 2020 14:54:41 +0200
Subject: [PATCH 125/309] #1059391-NotificationCenter Coding-Guidelines
 anpassungen

---
 .../entityfields/typecode/dropDownProcess.js                   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/entity/Notification_entity/entityfields/typecode/dropDownProcess.js b/entity/Notification_entity/entityfields/typecode/dropDownProcess.js
index b10dd33080..f4800969f4 100644
--- a/entity/Notification_entity/entityfields/typecode/dropDownProcess.js
+++ b/entity/Notification_entity/entityfields/typecode/dropDownProcess.js
@@ -4,7 +4,8 @@ import("system.notification");
 
 var types = []
 
-for ( property in notification.getAllTypes()) {
+for (let property in notification.getAllTypes()) 
+{
   types.push(property);
 }
 
-- 
GitLab


From f1236ba929934e5fd995ad21753eaeba6162c088 Mon Sep 17 00:00:00 2001
From: "S.Listl" <S.Listl@SLISTL.aditosoftware.local>
Date: Mon, 10 Aug 2020 17:22:24 +0200
Subject: [PATCH 126/309] Attribute_lib small refactoring

---
 process/Attribute_lib/process.js | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/process/Attribute_lib/process.js b/process/Attribute_lib/process.js
index 9fd2230221..23fb2e7385 100644
--- a/process/Attribute_lib/process.js
+++ b/process/Attribute_lib/process.js
@@ -1528,7 +1528,7 @@ AttributeRelationQuery.prototype.includeDisplayValue = function ()
 /**
  * Executes the query and returns the result, depending on the properties of the AttributeRelationQuery object.
  * 
- * @return {Object[]}               <p>
+ * @return {AttributeRelation[]}    <p>
  *                                  Array of objects. By default, the objects contain the properties:
  *                                  <ul>
  *                                  <li>attributeId</li>
@@ -1549,8 +1549,11 @@ AttributeRelationQuery.prototype.getAttributes = function ()
         "AB_ATTRIBUTE.ATTRIBUTE_NAME",
         "COMBOVAL.ATTRIBUTE_NAME",
         "AB_ATTRIBUTE.AB_ATTRIBUTEID",
-        "AB_ATTRIBUTERELATION.AB_ATTRIBUTERELATIONID"
+        "AB_ATTRIBUTERELATION.AB_ATTRIBUTERELATIONID",
+        "AB_ATTRIBUTERELATION.OBJECT_ROWID",
+        "AB_ATTRIBUTERELATION.OBJECT_TYPE"
     ];
+
     
     var valueFields = AttributeTypeUtil.getAllDatabaseFields();
 
@@ -1564,13 +1567,8 @@ AttributeRelationQuery.prototype.getAttributes = function ()
     
     var mappingFn = function (row)
     {
-        var attrObj = {
-            attributeId : row[4],
-            value : row[AttributeTypeUtil.getTypeColumnIndex(row[0]) + defaultFields.length],
-            attributeRelationId : row[5],
-            attributeName : row[2],
-            attributeType : row[0]
-        };
+        var attrObj = new AttributeRelation(row[5], row[4], row[AttributeTypeUtil.getTypeColumnIndex(row[0]) + defaultFields.length], 
+            row[2], row[0], row[6], row[7]);
         
         if (this._includeDisplayValue)
         {
@@ -1594,7 +1592,7 @@ AttributeRelationQuery.prototype.getAttributes = function ()
  * If this method is executed on your AttributeRelationQuery<br>
  * object it will return only one attribute.
  * 
- * @return {Object}             <p>
+ * @return {AttributeRelation}  <p>
  *                              Returns the AttributeRelationQuery object<br>
  *                              with only a sinlge attribute.<br>
  */
-- 
GitLab


From 7b1ba3121e1251350520dc589bc9c83a10f33c6a Mon Sep 17 00:00:00 2001
From: "a.voegl" <a.voegl@adito.de>
Date: Tue, 11 Aug 2020 08:50:19 +0200
Subject: [PATCH 127/309] Order resolve Merge Conflicts and small Changes

---
 .liquibase/Data_alias/basic/2020.1.2/changelog.xml        | 2 --
 .liquibase/Data_alias/basic/2020.1.3/changelog.xml        | 2 ++
 .../{2020.1.2 => 2020.1.3}/drop_salesorder_unpaid.xml     | 0
 .../{2020.1.2 => 2020.1.3}/drop_salesorder_versnr.xml     | 0
 entity/Order_entity/Order_entity.aod                      | 3 ++-
 .../entityfields/copy_param/documentation.adoc            | 2 ++
 process/Order_lib/process.js                              | 8 ++++----
 7 files changed, 10 insertions(+), 7 deletions(-)
 rename .liquibase/Data_alias/basic/{2020.1.2 => 2020.1.3}/drop_salesorder_unpaid.xml (100%)
 rename .liquibase/Data_alias/basic/{2020.1.2 => 2020.1.3}/drop_salesorder_versnr.xml (100%)
 create mode 100644 entity/Order_entity/entityfields/copy_param/documentation.adoc

diff --git a/.liquibase/Data_alias/basic/2020.1.2/changelog.xml b/.liquibase/Data_alias/basic/2020.1.2/changelog.xml
index 1c85cb3902..f8307f5735 100644
--- a/.liquibase/Data_alias/basic/2020.1.2/changelog.xml
+++ b/.liquibase/Data_alias/basic/2020.1.2/changelog.xml
@@ -5,6 +5,4 @@
     <include file="AddNullableToDateNew.xml" relativeToChangelogFile="true" />    
     <include file="insert_workflowCategory_keyword.xml" relativeToChangelogFile="true"/>
     <include file="Notification/changelog.xml" relativeToChangelogFile="true" />
-    <include relativeToChangelogFile="true" file="drop_salesorder_unpaid.xml"/>
-    <include relativeToChangelogFile="true" file="drop_salesorder_versnr.xml"/>
 </databaseChangeLog>
diff --git a/.liquibase/Data_alias/basic/2020.1.3/changelog.xml b/.liquibase/Data_alias/basic/2020.1.3/changelog.xml
index 2144ba2aa0..93e891be3d 100644
--- a/.liquibase/Data_alias/basic/2020.1.3/changelog.xml
+++ b/.liquibase/Data_alias/basic/2020.1.3/changelog.xml
@@ -5,4 +5,6 @@
     <include file="DeleteNotificationtypeKeywords.xml" relativeToChangelogFile="true" />
     <include file="add_Address_LatLon.xml" relativeToChangelogFile="true"/>
     <include file="VisitPlanEntry/rename_VisitPlanEntry_ORGANISATION_ID.xml" relativeToChangelogFile="true" />
+    <include file="drop_salesorder_unpaid.xml" relativeToChangelogFile="true"/>
+    <include file="drop_salesorder_versnr.xml" relativeToChangelogFile="true"/>
 </databaseChangeLog>
diff --git a/.liquibase/Data_alias/basic/2020.1.2/drop_salesorder_unpaid.xml b/.liquibase/Data_alias/basic/2020.1.3/drop_salesorder_unpaid.xml
similarity index 100%
rename from .liquibase/Data_alias/basic/2020.1.2/drop_salesorder_unpaid.xml
rename to .liquibase/Data_alias/basic/2020.1.3/drop_salesorder_unpaid.xml
diff --git a/.liquibase/Data_alias/basic/2020.1.2/drop_salesorder_versnr.xml b/.liquibase/Data_alias/basic/2020.1.3/drop_salesorder_versnr.xml
similarity index 100%
rename from .liquibase/Data_alias/basic/2020.1.2/drop_salesorder_versnr.xml
rename to .liquibase/Data_alias/basic/2020.1.3/drop_salesorder_versnr.xml
diff --git a/entity/Order_entity/Order_entity.aod b/entity/Order_entity/Order_entity.aod
index dab543deb0..4afa1212c4 100644
--- a/entity/Order_entity/Order_entity.aod
+++ b/entity/Order_entity/Order_entity.aod
@@ -872,6 +872,7 @@
     <entityParameter>
       <name>Copy_param</name>
       <expose v="true" />
+      <documentation>%aditoprj%/entity/Order_entity/entityfields/copy_param/documentation.adoc</documentation>
     </entityParameter>
     <entityField>
       <name>COUNT</name>
@@ -1140,4 +1141,4 @@
       </indexFieldMappings>
     </indexRecordContainer>
   </recordContainers>
-</entity>
\ No newline at end of file
+</entity>
diff --git a/entity/Order_entity/entityfields/copy_param/documentation.adoc b/entity/Order_entity/entityfields/copy_param/documentation.adoc
new file mode 100644
index 0000000000..5ec36081ee
--- /dev/null
+++ b/entity/Order_entity/entityfields/copy_param/documentation.adoc
@@ -0,0 +1,2 @@
+This Param is filled after the action "new Order" is activated. It fills close to all fields with values from the order before. 
+Therefor it uses a stringified JSON-Object, look up "OrderUtils.copyOrder()" for more details
\ No newline at end of file
diff --git a/process/Order_lib/process.js b/process/Order_lib/process.js
index 73b3a8ff6f..22b0f95f8f 100644
--- a/process/Order_lib/process.js
+++ b/process/Order_lib/process.js
@@ -480,8 +480,8 @@ OrderUtils.buildReminderReport = function (pOrderID)
     var sums = [];
     var vatsum = 0;
     var printDiscount = false;
-    var brutto=eMath.addDec(orderData[16], orderData[9]);
-    var offen=eMath.subDec(brutto, orderData[15]);
+    var grossPrice=eMath.addDec(orderData[16], orderData[9]);
+    var open=eMath.subDec(grossPrice, orderData[15]);
     itemData = itemData.map(function (item)
     {
         //quantity * price
@@ -512,8 +512,8 @@ OrderUtils.buildReminderReport = function (pOrderID)
             text.formatDouble(orderData[9], "#,##0.00", true), //vat
             orderData[10], //ordercode
             orderData[16],       //net      
-            text.formatDouble(brutto, "#,##0.00", true),//brutto
-            text.formatDouble(offen, "#,##0.00", true),//offen
+            text.formatDouble(grossPrice, "#,##0.00", true),//grossPrice
+            text.formatDouble(open, "#,##0.00", true),//open
             orderData[17], //due date
             orderData[19], //dunning text
             orderData[18]  //dunninglevel
-- 
GitLab


From 05a5a12e29b6c5d3eb3ad05450606cc969c6a9c9 Mon Sep 17 00:00:00 2001
From: "a.voegl" <a.voegl@adito.de>
Date: Tue, 11 Aug 2020 08:54:27 +0200
Subject: [PATCH 128/309] Git Plugin merge

---
 .liquibase/Data_alias/basic/2020.1.2/changelog.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.liquibase/Data_alias/basic/2020.1.2/changelog.xml b/.liquibase/Data_alias/basic/2020.1.2/changelog.xml
index 04b0d92871..1498b71d12 100644
--- a/.liquibase/Data_alias/basic/2020.1.2/changelog.xml
+++ b/.liquibase/Data_alias/basic/2020.1.2/changelog.xml
@@ -3,6 +3,6 @@
                    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
     <include file="AlterDatatypeOfKeyColumnsToChar/changelog.xml" relativeToChangelogFile="true"/>
     <include file="AddNullableToDateNew.xml" relativeToChangelogFile="true" />    
-    <include file="insert_workflowCategory_keyword.xml" relativeToChangelogFile="true"/>    <include file="Notification/changelog.xml" relativeToChangelogFile="true" />
+    <include file="insert_workflowCategory_keyword.xml" relativeToChangelogFile="true"/>    
     <include file="Notification/changelog.xml" relativeToChangelogFile="true" />
 </databaseChangeLog>
-- 
GitLab


From 5695b668cbe914559c362253e828bac87d0c7020 Mon Sep 17 00:00:00 2001
From: Tom Lutzenberger <t.lutzenberger@adito.de>
Date: Tue, 11 Aug 2020 09:29:00 +0200
Subject: [PATCH 129/309] =?UTF-8?q?#1058862:=20Fix=20f=C3=BCr=20User-Setti?=
 =?UTF-8?q?ng=20Persistierung?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 process/UserSettings_lib/process.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/process/UserSettings_lib/process.js b/process/UserSettings_lib/process.js
index c33e0cda84..02bf19629a 100644
--- a/process/UserSettings_lib/process.js
+++ b/process/UserSettings_lib/process.js
@@ -91,7 +91,7 @@ function UserSettingUtil () {}
      */
     UserSettingUtil.updateSettings = function ()
     {
-        let data = {};
+        let data = {"title":vars.get("$sys.user")};
         let paramData = [];
         let changedFields = UserSettingUtil.getChangedFields();
         
@@ -110,7 +110,7 @@ function UserSettingUtil () {}
         
         let fullObj = Object.assign({"params": paramData}, data);
         
-        tools.updateCurrentUser(fullObj);
+        tools.updateUser(fullObj);
         tools.refreshCurrentUser();
         
         UserSettingUtil.getLoadCurrentSettings();
-- 
GitLab


From 4b77d747f16f1d1ea40f5a8e506a027ec2ec62c7 Mon Sep 17 00:00:00 2001
From: Tom Lutzenberger <t.lutzenberger@adito.de>
Date: Tue, 11 Aug 2020 09:29:41 +0200
Subject: [PATCH 130/309] =?UTF-8?q?#1058862:=20Fix=20f=C3=BCr=20Timestamp?=
 =?UTF-8?q?=20values?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../entityfields/calmaintimeend/dropDownProcess.js              | 2 +-
 .../entityfields/calmaintimestart/dropDownProcess.js            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/entity/Usersettings_entity/entityfields/calmaintimeend/dropDownProcess.js b/entity/Usersettings_entity/entityfields/calmaintimeend/dropDownProcess.js
index 03c7b1f31d..47b14ebf81 100644
--- a/entity/Usersettings_entity/entityfields/calmaintimeend/dropDownProcess.js
+++ b/entity/Usersettings_entity/entityfields/calmaintimeend/dropDownProcess.js
@@ -12,7 +12,7 @@ for(let h = hourStart; h <= hourEnd; h++) {
         let timestamp = (new Date(1970, 0, 1, h, m)).getTime();
         let displayTime = h.toString().padStart(2, '0') + ":" + m.toString().padStart(2, '0');
         
-        dropdown.push([timestamp, displayTime]);
+        dropdown.push([timestamp.toString(), displayTime]);
     }   
 }
 
diff --git a/entity/Usersettings_entity/entityfields/calmaintimestart/dropDownProcess.js b/entity/Usersettings_entity/entityfields/calmaintimestart/dropDownProcess.js
index 03c7b1f31d..47b14ebf81 100644
--- a/entity/Usersettings_entity/entityfields/calmaintimestart/dropDownProcess.js
+++ b/entity/Usersettings_entity/entityfields/calmaintimestart/dropDownProcess.js
@@ -12,7 +12,7 @@ for(let h = hourStart; h <= hourEnd; h++) {
         let timestamp = (new Date(1970, 0, 1, h, m)).getTime();
         let displayTime = h.toString().padStart(2, '0') + ":" + m.toString().padStart(2, '0');
         
-        dropdown.push([timestamp, displayTime]);
+        dropdown.push([timestamp.toString(), displayTime]);
     }   
 }
 
-- 
GitLab


From 048f2e0c992f8986f23333e5ff1aab215e18cca5 Mon Sep 17 00:00:00 2001
From: "S.Listl" <S.Listl@SLISTL.aditosoftware.local>
Date: Tue, 11 Aug 2020 09:57:45 +0200
Subject: [PATCH 131/309] OrderFilter_view fix

---
 neonView/OrderFilter_view/OrderFilter_view.aod | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

diff --git a/neonView/OrderFilter_view/OrderFilter_view.aod b/neonView/OrderFilter_view/OrderFilter_view.aod
index c8277419b6..e60953c96a 100644
--- a/neonView/OrderFilter_view/OrderFilter_view.aod
+++ b/neonView/OrderFilter_view/OrderFilter_view.aod
@@ -44,9 +44,9 @@
     </neonDashletConfiguration>
   </dashletConfigurations>
   <layout>
-    <boxLayout>
+    <groupLayout>
       <name>layout</name>
-    </boxLayout>
+    </groupLayout>
   </layout>
   <children>
     <tableViewTemplate>
@@ -58,7 +58,7 @@
       <descriptionField>NET</descriptionField>
       <entityField>#ENTITY</entityField>
       <linkedColumns>
-        <element>FullOrderCode</element>
+        <element>SALESORDERCODE</element>
       </linkedColumns>
       <columns>
         <neonTableColumn>
@@ -67,7 +67,7 @@
         </neonTableColumn>
         <neonTableColumn>
           <name>60b83daa-9349-4bef-94d8-5f1fc350da59</name>
-          <entityField>FullOrderCode</entityField>
+          <entityField>SALESORDERCODE</entityField>
         </neonTableColumn>
         <neonTableColumn>
           <name>dba5604f-cc1b-4083-8115-7bbe1ba07bf4</name>
@@ -103,15 +103,7 @@
       <name>tree</name>
       <entityField>#ENTITY</entityField>
       <linkedColumns>
-        <element>IMAGE</element>
         <element>SALESORDERCODE</element>
-        <element>ORDERTYPE</element>
-        <element>CONTACT_ORG_ID</element>
-        <element>CONTACT_PERSON_ID</element>
-        <element>ORDERSTATUS</element>
-        <element>SALESORDERDATE</element>
-        <element>CANCELLATION</element>
-        <element>NET</element>
       </linkedColumns>
       <columns>
         <neonTreeTableColumn>
-- 
GitLab


From 110823ada76987d9971941f5c250d9e37f9820c0 Mon Sep 17 00:00:00 2001
From: Sebastian Pongratz <s.pongratz@adito.de>
Date: Tue, 11 Aug 2020 08:43:45 +0000
Subject: [PATCH 132/309] =?UTF-8?q?#1056853=20unverkn=C3=BCpfte=20mails=20?=
 =?UTF-8?q?anpassungen?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 entity/Activity_entity/Activity_entity.aod    |  12 ++
 .../recordcontainers/db/conditionProcess.js   |   6 +-
 .../isunlinked/filterConditionProcess.js      |  23 ++++
 .../isunlinked/filterValuesProcess.js         |   3 +
 .../activityids_param/valueProcess.js         |   6 +-
 .../drop_action/onActionProcess.js            |   1 +
 .../_____LANGUAGE_EXTRA.aod                   |  29 ++++-
 .../_____LANGUAGE_de/_____LANGUAGE_de.aod     | 104 +++---------------
 .../_____LANGUAGE_en/_____LANGUAGE_en.aod     |  29 ++++-
 process/IncomingEmailExecutor_lib/process.js  |  13 ++-
 10 files changed, 130 insertions(+), 96 deletions(-)
 create mode 100644 entity/Activity_entity/recordcontainers/db/filterextensions/isunlinked/filterConditionProcess.js
 create mode 100644 entity/Activity_entity/recordcontainers/db/filterextensions/isunlinked/filterValuesProcess.js

diff --git a/entity/Activity_entity/Activity_entity.aod b/entity/Activity_entity/Activity_entity.aod
index c9558baefe..0dc1eae96a 100644
--- a/entity/Activity_entity/Activity_entity.aod
+++ b/entity/Activity_entity/Activity_entity.aod
@@ -4,6 +4,9 @@
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/Activity_entity/documentation.adoc</documentation>
   <title>Activity</title>
+  <siblings>
+    <element>ActivityLink_entity</element>
+  </siblings>
   <grantDeleteProcess>%aditoprj%/entity/Activity_entity/grantDeleteProcess.js</grantDeleteProcess>
   <contentTitleProcess>%aditoprj%/entity/Activity_entity/contentTitleProcess.js</contentTitleProcess>
   <afterUiInit>%aditoprj%/entity/Activity_entity/afterUiInit.js</afterUiInit>
@@ -740,6 +743,15 @@
           <filterConditionProcess>%aditoprj%/entity/Activity_entity/recordcontainers/db/filterextensions/attribute_filter/filterConditionProcess.js</filterConditionProcess>
           <filtertype>BASIC</filtertype>
         </filterExtensionSet>
+        <filterExtension>
+          <name>IsUnlinked</name>
+          <title>Is unlinked activity</title>
+          <contentType>BOOLEAN</contentType>
+          <filterValuesProcess>%aditoprj%/entity/Activity_entity/recordcontainers/db/filterextensions/isunlinked/filterValuesProcess.js</filterValuesProcess>
+          <filterConditionProcess>%aditoprj%/entity/Activity_entity/recordcontainers/db/filterextensions/isunlinked/filterConditionProcess.js</filterConditionProcess>
+          <isLookupFilter v="false" />
+          <filtertype>BASIC</filtertype>
+        </filterExtension>
       </filterExtensions>
     </dbRecordContainer>
   </recordContainers>
diff --git a/entity/Activity_entity/recordcontainers/db/conditionProcess.js b/entity/Activity_entity/recordcontainers/db/conditionProcess.js
index 6b1c96c3d1..ee923b83f2 100644
--- a/entity/Activity_entity/recordcontainers/db/conditionProcess.js
+++ b/entity/Activity_entity/recordcontainers/db/conditionProcess.js
@@ -40,7 +40,11 @@ if (vars.exists("$param.RowId_param") && vars.get("$param.RowId_param") && vars.
 if (vars.exists("$param.ActivityIDs_param") && vars.get("$param.ActivityIDs_param")) 
 {
     var acticityIds = JSON.parse(vars.get("$param.ActivityIDs_param"));
-    condition.and("ACTIVITY.ACTIVITYID", acticityIds, SqlBuilder.IN());
+    if (acticityIds.length == 0) {
+        condition.and("ACTIVITY.ACTIVITYID", ""); // Bedingung um kein Ergebnis zu bekommen
+    } else {
+        condition.and("ACTIVITY.ACTIVITYID", acticityIds, SqlBuilder.IN());
+    }
 }
 
 if (vars.getString("$param.OnlyInnate_param") == "true") 
diff --git a/entity/Activity_entity/recordcontainers/db/filterextensions/isunlinked/filterConditionProcess.js b/entity/Activity_entity/recordcontainers/db/filterextensions/isunlinked/filterConditionProcess.js
new file mode 100644
index 0000000000..3e01b63784
--- /dev/null
+++ b/entity/Activity_entity/recordcontainers/db/filterextensions/isunlinked/filterConditionProcess.js
@@ -0,0 +1,23 @@
+import("KeywordRegistry_basic");
+import("system.logging");
+import("Sql_lib");
+import("system.vars");
+import("system.result");
+
+var operator = vars.get("$local.operator");
+var rawvalue = vars.get("$local.rawvalue");
+var operator2 = vars.get("$local.operator2");
+var sqlCond = "";
+
+if(operator == "1" && rawvalue == "1" ||  operator == "2" && rawvalue == "0")
+    operator2 = SqlBuilder.IN();
+else if(operator == "1" && rawvalue == "0" ||  operator == "2" && rawvalue == "1")
+    operator2 = SqlBuilder.NOT_IN();
+else 
+    sqlCond = "1=1";
+
+if (sqlCond == "")
+    sqlCond = new SqlBuilder().where("ACTIVITY.ACTIVITYID", new SqlBuilder().select("ACTIVITYLINK.ACTIVITY_ID").from("ACTIVITYLINK").groupBy("ACTIVITYLINK.ACTIVITY_ID"), operator2);
+
+
+result.string(sqlCond);
\ No newline at end of file
diff --git a/entity/Activity_entity/recordcontainers/db/filterextensions/isunlinked/filterValuesProcess.js b/entity/Activity_entity/recordcontainers/db/filterextensions/isunlinked/filterValuesProcess.js
new file mode 100644
index 0000000000..056eacc69d
--- /dev/null
+++ b/entity/Activity_entity/recordcontainers/db/filterextensions/isunlinked/filterValuesProcess.js
@@ -0,0 +1,3 @@
+import("system.result");
+
+result.object([["true", translate.text("Yes")], ["false", translate.text("No")]]);
\ No newline at end of file
diff --git a/entity/UniversalFileProcessor_entity/entityfields/activities/children/activityids_param/valueProcess.js b/entity/UniversalFileProcessor_entity/entityfields/activities/children/activityids_param/valueProcess.js
index 826d12e6b5..005f7ca5ac 100644
--- a/entity/UniversalFileProcessor_entity/entityfields/activities/children/activityids_param/valueProcess.js
+++ b/entity/UniversalFileProcessor_entity/entityfields/activities/children/activityids_param/valueProcess.js
@@ -1,4 +1,8 @@
 import("system.vars");
 import("system.result");
 
-result.string(vars.exists("$global.ACTIVITY_IDS")? vars.get("$global.ACTIVITY_IDS"):"[]");
\ No newline at end of file
+if (vars.exists("$global.ACTIVITY_IDS") && vars.get("$global.ACTIVITY_IDS")) {
+    result.string(vars.get("$global.ACTIVITY_IDS"));
+} else {
+    result.string("[]");
+}
\ No newline at end of file
diff --git a/entity/UniversalFileProcessor_entity/entityfields/drop_action/onActionProcess.js b/entity/UniversalFileProcessor_entity/entityfields/drop_action/onActionProcess.js
index 43feeb0289..8f1c9f0ead 100644
--- a/entity/UniversalFileProcessor_entity/entityfields/drop_action/onActionProcess.js
+++ b/entity/UniversalFileProcessor_entity/entityfields/drop_action/onActionProcess.js
@@ -32,6 +32,7 @@ for (var i = 0, l = files.length; i < l; i++)
             var mailObj = _getMailObj(files[i]);
             if (mailObj)
             {
+                mailObj.filename = files[i].filename;
                 var incomingMailExec = new IncomingEmailExecutor(mailObj);
                 incomingMailExec.setAlias(dbAlias);
                 var mailImportResult = incomingMailExec.autoProcess()
diff --git a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
index 7d7faf2906..977fdd9d8d 100644
--- a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
+++ b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
@@ -6804,7 +6804,34 @@
       <key>${SQL_LIB_FIELD_WRONG_FORMAT}</key>
     </entry>
     <entry>
-      <key>Settings</key>
+      <key>yellow</key>
+    </entry>
+    <entry>
+      <key>Borrow</key>
+    </entry>
+    <entry>
+      <key>Is unlinked activity</key>
+    </entry>
+    <entry>
+      <key>Fantasy</key>
+    </entry>
+    <entry>
+      <key>Extend</key>
+    </entry>
+    <entry>
+      <key>Krimi</key>
+    </entry>
+    <entry>
+      <key>red</key>
+    </entry>
+    <entry>
+      <key>Return</key>
+    </entry>
+    <entry>
+      <key>green</key>
+    </entry>
+    <entry>
+      <key>Actionthriller</key>
     </entry>
     <entry>
       <key>No new recipients found that can be added to the bulk mail.</key>
diff --git a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
index 14b87249af..b5e2a98425 100644
--- a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
+++ b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
@@ -32,7 +32,6 @@
     </entry>
     <entry>
       <key>Finished</key>
-      <value>Abgeschlossen</value>
     </entry>
     <entry>
       <key>Show my organisations</key>
@@ -82,10 +81,6 @@
       <key>Has marketing approved this step?</key>
       <value>Hat das Marketing diesem Schritt zugestimmt?</value>
     </entry>
-    <entry>
-      <key>Create model</key>
-      <value>Modell erstellen</value>
-    </entry>
     <entry>
       <key>Task done</key>
       <value>Aufgabe abgeschlossen</value>
@@ -700,10 +695,6 @@
       <key>None</key>
       <value>Keine</value>
     </entry>
-    <entry>
-      <key>Edit workflow</key>
-      <value>Workflow bearbeiten</value>
-    </entry>
     <entry>
       <key>Date of request</key>
       <value>Datum der Anforderung</value>
@@ -2098,10 +2089,6 @@
       <key>{$TASK_STATUS}</key>
       <value>Status</value>
     </entry>
-    <entry>
-      <key>and open modeler</key>
-      <value>und Modeler öffnen</value>
-    </entry>
     <entry>
       <key>Task</key>
       <value>Aufgabe</value>
@@ -4017,9 +4004,11 @@
     </entry>
     <entry>
       <key>false</key>
+      <value>falsch</value>
     </entry>
     <entry>
       <key>true</key>
+      <value>wahr</value>
     </entry>
     <entry>
       <key>${MIN_MAX_ERROR} field: %0, value: %1, min: %2, max: %3</key>
@@ -5063,7 +5052,7 @@
     </entry>
     <entry>
       <key>Read</key>
-      <value>Gelesen</value>
+      <value>gelesen</value>
     </entry>
     <entry>
       <key>Permission Set ID</key>
@@ -6738,7 +6727,7 @@
     </entry>
     <entry>
       <key>archive</key>
-      <value>Archivieren</value>
+      <value>archivieren</value>
     </entry>
     <entry>
       <key>Bangladesh</key>
@@ -8265,10 +8254,6 @@ Bitte Datumseingabe prüfen</value>
       <key>Contactreport</key>
       <value>Kontaktbericht</value>
     </entry>
-    <entry>
-      <key>The Sales Project can only be filled when a company has been specified</key>
-      <value>Das Vertriebsprojekt kann nur ausgefüllt werden, wenn eine Firma angegeben ist</value>
-    </entry>
     <entry>
       <key>Appointment planned</key>
       <value>Termin vereinbart</value>
@@ -8583,7 +8568,6 @@ Bitte Datumseingabe prüfen</value>
     </entry>
     <entry>
       <key>Zip</key>
-      <value>Plz</value>
     </entry>
     <entry>
       <key>type</key>
@@ -8740,93 +8724,35 @@ Bitte Datumseingabe prüfen</value>
       <value>gültig ab (in </value>
     </entry>
     <entry>
-      <key>workflow notification</key>
-      <value>Workflow Benachrichtigung</value>
-    </entry>
-    <entry>
-      <key>leadimport notification</key>
-    </entry>
-    <entry>
-      <key>bulk mail sent</key>
-    </entry>
-    <entry>
-      <key>download ready</key>
-    </entry>
-    <entry>
-      <key>No new recipients found that can be added to the bulk mail.</key>
-      <value>Keine neuen Empfänger, die zur Serienmail hinzugefügt werden können, gefunden.</value>
-    </entry>
-    <entry>
-      <key>Permission received</key>
-      <value>erhaltene Berechtigung</value>
-    </entry>
-    <entry>
-      <key>granted permission</key>
-      <value>vergebene Berechtigung</value>
-    </entry>
-    <entry>
-      <key>Receive new Department Permission</key>
-      <value>Neue Abteilungs-Berechtigung erhalten</value>
-    </entry>
-    <entry>
-      <key>Receive new User Permission</key>
-      <value>Neue Benutzer-Berechtigung erhalten</value>
-    </entry>
-    <entry>
-      <key>export</key>
-    </entry>
-    <entry>
-      <key>No new recipients found that can be added to the serial letter.</key>
-      <value>Keine neuen Empfänger, die zum  Serienbrief werden können, gefunden.</value>
-    </entry>
-    <entry>
-      <key>export using the selected  template</key>
-      <value>Mit der ausgewählten Vorlage Exportieren</value>
+      <key>yellow</key>
     </entry>
     <entry>
-      <key>send mail</key>
-      <value>E-Mail losschicken</value>
+      <key>Borrow</key>
     </entry>
     <entry>
-      <key>Total in euros</key>
+      <key>Is unlinked activity</key>
+      <value>Ist eine unverknüpfte Aktivität</value>
     </entry>
     <entry>
-      <key>Workflow Model</key>
+      <key>Fantasy</key>
     </entry>
     <entry>
-      <key>{SEND_MAIL}</key>
-      <value>Email versenden</value>
+      <key>Extend</key>
     </entry>
     <entry>
-      <key>The workflow could not be deployed</key>
+      <key>Krimi</key>
     </entry>
     <entry>
-      <key>Workflow deploy failed</key>
+      <key>red</key>
     </entry>
     <entry>
-      <key>Download letter and create Activity</key>
-    </entry>
-    <entry>
-      <key>{SENT_MAIL}</key>
-    </entry>
-    <entry>
-      <key>Add Participants</key>
-    </entry>
-    <entry>
-      <key>and open Report</key>
-    </entry>
-    <entry>
-      <key>Add Recipients</key>
-    </entry>
-    <entry>
-      <key>New</key>
-      <value>Neu</value>
+      <key>Return</key>
     </entry>
     <entry>
-      <key>Release</key>
+      <key>green</key>
     </entry>
     <entry>
-      <key>Archived</key>
+      <key>Actionthriller</key>
     </entry>
   </keyValueMap>
   <font name="Dialog" style="0" size="11" />
diff --git a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
index a36b9b673f..1db9b01933 100644
--- a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
+++ b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
@@ -6870,7 +6870,34 @@
       <key>Valid from (as </key>
     </entry>
     <entry>
-      <key>Settings</key>
+      <key>yellow</key>
+    </entry>
+    <entry>
+      <key>Borrow</key>
+    </entry>
+    <entry>
+      <key>Is unlinked activity</key>
+    </entry>
+    <entry>
+      <key>Fantasy</key>
+    </entry>
+    <entry>
+      <key>Extend</key>
+    </entry>
+    <entry>
+      <key>Krimi</key>
+    </entry>
+    <entry>
+      <key>red</key>
+    </entry>
+    <entry>
+      <key>Return</key>
+    </entry>
+    <entry>
+      <key>green</key>
+    </entry>
+    <entry>
+      <key>Actionthriller</key>
     </entry>
     <entry>
       <key>No new recipients found that can be added to the bulk mail.</key>
diff --git a/process/IncomingEmailExecutor_lib/process.js b/process/IncomingEmailExecutor_lib/process.js
index a43fbc1f56..555f4f161b 100644
--- a/process/IncomingEmailExecutor_lib/process.js
+++ b/process/IncomingEmailExecutor_lib/process.js
@@ -28,6 +28,7 @@ function IncomingEmailExecutor(pMail)
     this.mailSubject = this.rawMail[mail.MAIL_SUBJECT] || "";
     this.mailSender = this.rawMail[mail.MAIL_SENDER];
     this.mailSentDate = this.rawMail[mail.MAIL_SENTDATE];
+    this.filename = this.rawMail.filename;
 
     var mailRecipientsTo = this.rawMail[mail.RECIPIENT_TO].split(";");
     var mailRecipientsCc = this.rawMail[mail.RECIPIENT_CC].split(";");
@@ -194,14 +195,20 @@ IncomingEmailExecutor.prototype.createActivity = function(pAdditionalLinks)
         subject: this.mailSubject,
         content: this.getMailtextAsHtml(),
         categoryKeywordId: $KeywordRegistry.activityCategory$mail(),
-        directionKeywordId: this.activityData.direction || this.failbackActivityData.direction,
-        responsibleContactId: this.activityData.employeeContactId || this.failbackActivityData.employeeContactId
+        directionKeywordId: this.activityData.direction || this.failbackActivityData.direction
     };
+    
+    if (vars.get("$sys.isclient")){
+        activityDataForInsert.responsibleContactId = EmployeeUtils.getCurrentContactId();
+    } else {
+        activityDataForInsert.responsibleContactId = this.activityData.employeeContactId || this.failbackActivityData.employeeContactId;
+    }
+    
     var activityLinks = this.activityData.links || this.failbackActivityData.links;
     if (pAdditionalLinks)
         activityLinks = activityLinks.concat(pAdditionalLinks);
     activityLinks = ArrayUtils.distinct2d(activityLinks);//TODO: better check before adding the elements into the array if it already exists there
-    var activityDocs = [["mail.eml", util.encodeBase64String(mail.toRFC(this.rawMail)), true]];
+    var activityDocs = [[this.filename || "mail.eml", util.encodeBase64String(mail.toRFC(this.rawMail)), true]];
     
     var activityRes = ActivityUtils.insertNewActivity(activityDataForInsert, activityLinks, activityDocs, this._alias, this.mailSentDate);
     return activityRes;
-- 
GitLab


From 8437dda72eff112e5a259b33dcbaf815441b22e4 Mon Sep 17 00:00:00 2001
From: Benjamin Ulrich <b.ulrich@adito.de>
Date: Tue, 11 Aug 2020 08:57:49 +0000
Subject: [PATCH 133/309] =?UTF-8?q?[Projekt:=20Entwicklung=20-=20Neon][Tic?=
 =?UTF-8?q?ketNr.:=201057177][Schl=C3=BCsselwort-Eigenschaft,=20die=20in?=
 =?UTF-8?q?=20Verwendung=20ist,=20darf=20nicht=20gel=C3=B6scht=20werden=20?=
 =?UTF-8?q?k=C3=B6nnen]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../KeywordAttribute_entity.aod                |  1 +
 .../grantDeleteProcess.js                      | 18 ++++++++++++++++++
 2 files changed, 19 insertions(+)
 create mode 100644 entity/KeywordAttribute_entity/grantDeleteProcess.js

diff --git a/entity/KeywordAttribute_entity/KeywordAttribute_entity.aod b/entity/KeywordAttribute_entity/KeywordAttribute_entity.aod
index 3c1336f58b..ac1185cf4b 100644
--- a/entity/KeywordAttribute_entity/KeywordAttribute_entity.aod
+++ b/entity/KeywordAttribute_entity/KeywordAttribute_entity.aod
@@ -4,6 +4,7 @@
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/KeywordAttribute_entity/documentation.adoc</documentation>
   <title>Keyword Attribute</title>
+  <grantDeleteProcess>%aditoprj%/entity/KeywordAttribute_entity/grantDeleteProcess.js</grantDeleteProcess>
   <contentTitleProcess>%aditoprj%/entity/KeywordAttribute_entity/contentTitleProcess.js</contentTitleProcess>
   <iconId>VAADIN:KEY_O</iconId>
   <iconIdProcess>%aditoprj%/entity/KeywordAttribute_entity/iconIdProcess.js</iconIdProcess>
diff --git a/entity/KeywordAttribute_entity/grantDeleteProcess.js b/entity/KeywordAttribute_entity/grantDeleteProcess.js
new file mode 100644
index 0000000000..d7194ae0db
--- /dev/null
+++ b/entity/KeywordAttribute_entity/grantDeleteProcess.js
@@ -0,0 +1,18 @@
+import("system.result");
+import("Attribute_lib");
+import("system.vars");
+import("Sql_lib");
+import("Entity_lib");
+
+var id = vars.get("$field.AB_KEYWORD_ATTRIBUTEID");
+
+var countSql = newSelect("count(*)")
+                            .from("AB_KEYWORD_ATTRIBUTERELATION")
+                            .where("AB_KEYWORD_ATTRIBUTERELATION.AB_KEYWORD_ATTRIBUTE_ID", id)
+
+var canDelete = new HasLinkedObjectTester()
+    .andSqlYieldsZero(countSql)
+    .andNoEntityRows("KeywordAttributeRelation_entity", "AttributesForKeywordEntry", {KeywordEntryId_param: id})
+    .validate();
+    
+result.string(canDelete);
-- 
GitLab


From 3434de81349c2d0628222ccb24245aeadc5a30c8 Mon Sep 17 00:00:00 2001
From: Benjamin Ulrich <b.ulrich@adito.de>
Date: Tue, 11 Aug 2020 09:05:08 +0000
Subject: [PATCH 134/309] =?UTF-8?q?[Projekt:=20Entwicklung=20-=20Neon][Tic?=
 =?UTF-8?q?ketNr.:=201060687][Supportticket=20-=20Neuanlage=20-=20Kontakt?=
 =?UTF-8?q?=20mit=20Firma=20-=20Firma=20wird=20nicht=20bei=20Verkn=C3=BCpf?=
 =?UTF-8?q?ung=20gelistet]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 entity/SupportTicket_entity/afterUiInit.js | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/entity/SupportTicket_entity/afterUiInit.js b/entity/SupportTicket_entity/afterUiInit.js
index 0e588e61aa..9080cb34c8 100644
--- a/entity/SupportTicket_entity/afterUiInit.js
+++ b/entity/SupportTicket_entity/afterUiInit.js
@@ -1,3 +1,4 @@
+import("Contact_lib");
 import("Ticket_lib");
 import("Context_lib");
 import("Attribute_lib");
@@ -7,6 +8,16 @@ import("ActivityTask_lib");
 
 if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
 {
-    TaskUtils.addLinkRecords("$param.ObjectId_param", "$param.RowId_param", "$param.PresetLinks_param", "$field.TASK_PARENT_CONTEXT", "$field.TASK_PARENT_ID");
+    var presetLinks = JSON.parse(vars.getString("$param.PresetLinks_param"));
+        if(presetLinks[0][0] == "Person")
+        {
+            var contactId = presetLinks[0][1];
+
+            var orgContactId = ContactUtils.getOrganisationContactId(contactId);
+            
+            presetLinks[1] =  ["Organisation", orgContactId];
+        }
+    
+    TaskUtils.addLinkRecords("$param.ObjectId_param", "$param.RowId_param", presetLinks, "$field.TASK_PARENT_CONTEXT", "$field.TASK_PARENT_ID");
     AttributeRelationUtils.presetMandatoryAttributes(ContextUtils.getCurrentContextId(), "Attributes", TicketUtils.begin(vars.get("$field.TICKETTYPE")).getTypeAttributes());
 }
\ No newline at end of file
-- 
GitLab


From eb08508e3f52fc5a224acfe5fe85db8cbdfd8178 Mon Sep 17 00:00:00 2001
From: "a.schindlbeck" <a.schindlbeck@adito.de>
Date: Tue, 11 Aug 2020 14:11:37 +0200
Subject: [PATCH 135/309] #1060652 Favorites: changes contentProcess

---
 entity/Favorite_entity/Favorite_entity.aod    | 121 ++++++----------
 .../entityfields/row_id/onValueChange.js      | 136 ------------------
 .../dbrecordcontainer/conditionProcess.js     |  12 --
 .../dbrecordcontainer/fromClauseProcess.js    |   3 -
 .../dbrecordcontainer/orderClauseProcess.js   |   7 -
 .../jditorecordcontainer/contentProcess.js    |  66 +++++++++
 .../jditorecordcontainer/onDelete.js          |   4 +
 .../jditorecordcontainer/rowCountProcess.js   |   5 +
 .../FavoriteFilter_view.aod                   |  50 ++-----
 9 files changed, 132 insertions(+), 272 deletions(-)
 delete mode 100644 entity/Favorite_entity/entityfields/row_id/onValueChange.js
 delete mode 100644 entity/Favorite_entity/recordcontainers/dbrecordcontainer/conditionProcess.js
 delete mode 100644 entity/Favorite_entity/recordcontainers/dbrecordcontainer/fromClauseProcess.js
 delete mode 100644 entity/Favorite_entity/recordcontainers/dbrecordcontainer/orderClauseProcess.js
 create mode 100644 entity/Favorite_entity/recordcontainers/jditorecordcontainer/contentProcess.js
 create mode 100644 entity/Favorite_entity/recordcontainers/jditorecordcontainer/onDelete.js
 create mode 100644 entity/Favorite_entity/recordcontainers/jditorecordcontainer/rowCountProcess.js

diff --git a/entity/Favorite_entity/Favorite_entity.aod b/entity/Favorite_entity/Favorite_entity.aod
index 73dce01c7e..30d6d10d52 100644
--- a/entity/Favorite_entity/Favorite_entity.aod
+++ b/entity/Favorite_entity/Favorite_entity.aod
@@ -2,7 +2,13 @@
 <entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
   <name>Favorite_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
-  <recordContainer>dbRecordContainer</recordContainer>
+  <icon>VAADIN:STAR</icon>
+  <title>Favorite</title>
+  <grantCreate v="true" />
+  <grantUpdate v="true" />
+  <grantDelete v="true" />
+  <titlePlural>Favorites</titlePlural>
+  <recordContainer>jDitoRecordContainer</recordContainer>
   <entityFields>
     <entityProvider>
       <name>#PROVIDER</name>
@@ -18,7 +24,6 @@
     </entityField>
     <entityField>
       <name>ROW_ID</name>
-      <onValueChange>%aditoprj%/entity/Favorite_entity/entityfields/row_id/onValueChange.js</onValueChange>
     </entityField>
     <entityField>
       <name>OBJECT_TYPE</name>
@@ -37,88 +42,50 @@
       <name>TITLE</name>
       <valueProcess>%aditoprj%/entity/Favorite_entity/entityfields/title/valueProcess.js</valueProcess>
     </entityField>
-    <entityConsumer>
-      <name>Offers</name>
-      <dependency>
-        <name>dependency</name>
-        <entityName>Offer_entity</entityName>
-        <fieldName>#PROVIDER</fieldName>
-      </dependency>
-      <children>
-        <entityParameter>
-          <name>OfferOriginal_Id_param</name>
-          <valueProcess>%aditoprj%/entity/Favorite_entity/entityfields/offers/children/offeroriginal_id_param/valueProcess.js</valueProcess>
-        </entityParameter>
-      </children>
-    </entityConsumer>
     <entityField>
-      <name>CONSUMED_OFFER</name>
-      <consumer>Offers</consumer>
-      <onValueChangeTypes>
-        <element>MASK</element>
-        <element>PROCESS</element>
-        <element>PROCESS_SETVALUE</element>
-      </onValueChangeTypes>
-    </entityField>
-    <entityField>
-      <name>TITLE_RELATION</name>
+      <name>PICTURE</name>
+      <title>favos</title>
+      <contentType>IMAGE</contentType>
     </entityField>
   </entityFields>
   <recordContainers>
-    <dbRecordContainer>
-      <name>dbRecordContainer</name>
-      <alias>_____SYSTEMALIAS</alias>
-      <isReadOnly v="true" />
-      <hasDependentRecords v="true" />
-      <fromClauseProcess>%aditoprj%/entity/Favorite_entity/recordcontainers/dbrecordcontainer/fromClauseProcess.js</fromClauseProcess>
-      <conditionProcess>%aditoprj%/entity/Favorite_entity/recordcontainers/dbrecordcontainer/conditionProcess.js</conditionProcess>
-      <orderClauseProcess>%aditoprj%/entity/Favorite_entity/recordcontainers/dbrecordcontainer/orderClauseProcess.js</orderClauseProcess>
-      <linkInformation>
-        <linkInformation>
-          <name>ad8d8f1b-d086-433f-80b7-116b99a983af</name>
-          <tableName>ASYS_RECORD</tableName>
-          <primaryKey>ID</primaryKey>
-          <isUIDTable v="true" />
-          <readonly v="true" />
-        </linkInformation>
-        <linkInformation>
-          <name>d4bb5cdf-dc73-4906-b4c4-40c963cbdbc1</name>
-          <tableName>ASYS_RECORDGROUP</tableName>
-          <primaryKey>ID</primaryKey>
-          <isUIDTable v="false" />
-          <readonly v="true" />
-        </linkInformation>
-      </linkInformation>
+    <jDitoRecordContainer>
+      <name>jDitoRecordContainer</name>
+      <jDitoRecordAlias>Data_alias</jDitoRecordAlias>
+      <isFilterable v="true" />
+      <isSortable v="true" />
+      <contentProcess>%aditoprj%/entity/Favorite_entity/recordcontainers/jditorecordcontainer/contentProcess.js</contentProcess>
+      <rowCountProcess>%aditoprj%/entity/Favorite_entity/recordcontainers/jditorecordcontainer/rowCountProcess.js</rowCountProcess>
+      <onDelete>%aditoprj%/entity/Favorite_entity/recordcontainers/jditorecordcontainer/onDelete.js</onDelete>
       <recordFieldMappings>
-        <dbRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>GROUP_ID.value</name>
+        </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>GROUP_TITLE.value</name>
+        </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>GROUP_TYPE.value</name>
+        </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>OBJECT_TYPE.value</name>
+        </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>PICTURE.value</name>
+        </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>ROW_ID.value</name>
+        </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>TITLE.value</name>
+        </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
           <name>UID.value</name>
-          <recordfield>ASYS_RECORD.ID</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
+        </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
           <name>USER_ID.value</name>
-          <recordfield>ASYS_RECORDGROUP.USER_ID</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>ROW_ID.value</name>
-          <recordfield>ASYS_RECORD.ROW_ID</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>OBJECT_TYPE.value</name>
-          <recordfield>ASYS_RECORD.OBJECT_TYPE</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>GROUP_TYPE.value</name>
-          <recordfield>ASYS_RECORDGROUP.GROUP_TYPE</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>GROUP_TITLE.value</name>
-          <recordfield>ASYS_RECORDGROUP.TITLE</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>GROUP_ID.value</name>
-          <recordfield>ASYS_RECORDGROUP.ID</recordfield>
-        </dbRecordFieldMapping>
+        </jDitoRecordFieldMapping>
       </recordFieldMappings>
-    </dbRecordContainer>
+    </jDitoRecordContainer>
   </recordContainers>
 </entity>
diff --git a/entity/Favorite_entity/entityfields/row_id/onValueChange.js b/entity/Favorite_entity/entityfields/row_id/onValueChange.js
deleted file mode 100644
index 4de4903145..0000000000
--- a/entity/Favorite_entity/entityfields/row_id/onValueChange.js
+++ /dev/null
@@ -1,136 +0,0 @@
-import("system.logging");
-import("Communication_lib");
-import("Sql_lib");
-import("system.vars");
-import("system.neon");
-import("system.entities");
-
-var rowid = vars.get("local.value");
-if (rowid)
-{
-    var titleFieldName;
-    var nameResult;
-    var relationResult;
-    
-    var config = entities.createConfigForLoadingRows();
-    config.uid(vars.get("$field.ROW_ID"));
-    
-    if(vars.get("$field.OBJECT_TYPE") == "Person")
-    {
-        titleFieldNames = ["FULL_NAME_fieldGroup"];
-        config.entity("Person_entity");
-        config.fields(titleFieldNames)
-        nameResult = entities.getRow(config)[titleFieldNames[0]];
-    }
-    
-    if(vars.get("$field.OBJECT_TYPE") == "Organisation")
-    {
-        titleFieldNames = ["NAME"];
-        config.entity("Organisation_entity");
-        config.fields(titleFieldNames);
-        nameResult = entities.getRow(config)[titleFieldNames[0]];
-    }
-    
-    if(vars.get("$field.OBJECT_TYPE") == "Offer")
-    {
-        titleFieldNames = ["FullOfferCode"];
-        config.entity("Offer_entity");
-        config.fields(titleFieldNames);
-        nameResult = entities.getRow(config)[titleFieldNames[0]];
-    }
-    
-    if(vars.get("$field.OBJECT_TYPE") == "Contract")
-    {
-        titleFieldNames = ["CONTRACTCODE"];
-        config.entity("Contract_entity");
-        config.fields(titleFieldNames);
-        nameResult = entities.getRow(config)[titleFieldNames[0]];
-    }
-    
-    if(vars.get("$field.OBJECT_TYPE") == "Product")
-    {
-        titleFieldNames = ["PRODUCTCODE", "PRODUCTNAME"];
-        config.entity("Contract_entity");
-        config.fields(titleFieldNames);
-        nameResult = entities.getRow(config)[titleFieldNames[0]];
-        relationResult = entities.getRow(config)[titleFieldNames[1]];
-    }
-    
-    if(vars.get("$field.OBJECT_TYPE") == "Productprice")
-    {
-        titleFieldNames = ["PRICELIST", "CONTACT_ID"];
-        config.entity("Productprice_entity");
-        config.fields(titleFieldNames);
-        var row = entities.getRow(config);
-        nameResult = row[titleFieldNames[0]];
-        
-//        titleFieldNames = ["PERSON_TITLE"];
-//        config.entity("Contact_entity");
-//        config.uid(row[titleFieldNames[1]]);
-//        config.fields(titleFieldNames);
-//        relationResult = entities.getRow(config)[titleFieldNames[0]];
-    }
-    
-    if(vars.get("$field.OBJECT_TYPE") == "Salesproject")
-    {
-        titleFieldNames = ["PROJECTCODE"];
-        config.entity("Salesproject_entity");
-        config.fields(titleFieldNames);
-        nameResult = entities.getRow(config)[titleFieldNames[0]];
-    }
-    
-    if(vars.get("$field.OBJECT_TYPE") == "SupportTicket")
-    {
-        titleFieldNames = ["TASK_SUBJECT"];
-        config.entity("SupportTicket_entity");
-        config.fields(titleFieldNames);
-        nameResult = entities.getRow(config)[titleFieldNames[0]];
-    }
-    
-    if(vars.get("$field.OBJECT_TYPE") == "Leadimport")
-    {
-        titleFieldNames = ["NAME"];
-        config.entity("Leadimport_entity");
-        config.fields(titleFieldNames);
-        nameResult = entities.getRow(config)[titleFieldNames[0]];
-    }
-    
-    if(vars.get("$field.OBJECT_TYPE") == "ExportTemplate")
-    {
-        titleFieldNames = ["TITLE"];
-        config.entity("ExportTemplate_entity");
-        config.fields(titleFieldNames);
-        nameResult = entities.getRow(config)[titleFieldNames[0]];
-    }
-    
-    if(vars.get("$field.OBJECT_TYPE") == "Employee")
-    {
-        titleFieldNames = ["TITLE"];
-        config.entity("Employee_entity");
-        config.fields(titleFieldNames);
-        nameResult = entities.getRow(config)[titleFieldNames[0]];
-    }
-    
-    if(vars.get("$field.OBJECT_TYPE") == "DocumentTemplate")
-    {
-        titleFieldNames = ["NAME"];
-        config.entity("DocumentTemplate_entity");
-        config.fields(titleFieldNames);
-        nameResult = entities.getRow(config)[titleFieldNames[0]];
-    }
-    
-    if(vars.get("$field.OBJECT_TYPE") == "Campaign")
-    {
-        titleFieldNames = ["NAME"];
-        config.entity("Campaign_entity");
-        config.fields(titleFieldNames);
-        nameResult = entities.getRow(config)[titleFieldNames[0]];
-    }
-    
-    
-
-    neon.setFieldValues({
-        "$field.TITLE" : nameResult,
-        "$field.TITLE_RELATION" : relationResult != undefined && relationResult != null && relationResult != "" ? relationResult : ""
-    });
-}
\ No newline at end of file
diff --git a/entity/Favorite_entity/recordcontainers/dbrecordcontainer/conditionProcess.js b/entity/Favorite_entity/recordcontainers/dbrecordcontainer/conditionProcess.js
deleted file mode 100644
index 94f570ca54..0000000000
--- a/entity/Favorite_entity/recordcontainers/dbrecordcontainer/conditionProcess.js
+++ /dev/null
@@ -1,12 +0,0 @@
-import("Sql_lib");
-import("system.result");
-import("system.vars");
-import("system.util");
-import("system.tools");
-
-var user = tools.getCurrentUser();
-var userid = user["name"];
-
-var cond = newWhereIfSet("ASYS_RECORDGROUP.USER_ID", userid)
-
-result.string(cond.toString());
\ No newline at end of file
diff --git a/entity/Favorite_entity/recordcontainers/dbrecordcontainer/fromClauseProcess.js b/entity/Favorite_entity/recordcontainers/dbrecordcontainer/fromClauseProcess.js
deleted file mode 100644
index f89516ba42..0000000000
--- a/entity/Favorite_entity/recordcontainers/dbrecordcontainer/fromClauseProcess.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import("system.result");
-
-result.string("ASYS_RECORD left join ASYS_RECORDGROUP on ASYS_RECORD.RECORDGROUP_ID = ASYS_RECORDGROUP.ID");
\ No newline at end of file
diff --git a/entity/Favorite_entity/recordcontainers/dbrecordcontainer/orderClauseProcess.js b/entity/Favorite_entity/recordcontainers/dbrecordcontainer/orderClauseProcess.js
deleted file mode 100644
index 638f4d1422..0000000000
--- a/entity/Favorite_entity/recordcontainers/dbrecordcontainer/orderClauseProcess.js
+++ /dev/null
@@ -1,7 +0,0 @@
-import("system.result");
-import("system.db");
-
-result.object({
-    "ASYS_RECORD.OBJECT_TYPE": db.DESCENDING,
-    "ASYS_RECORDGROUP.TITLE": db.DESCENDING
-    });
\ No newline at end of file
diff --git a/entity/Favorite_entity/recordcontainers/jditorecordcontainer/contentProcess.js b/entity/Favorite_entity/recordcontainers/jditorecordcontainer/contentProcess.js
new file mode 100644
index 0000000000..a6ab741bed
--- /dev/null
+++ b/entity/Favorite_entity/recordcontainers/jditorecordcontainer/contentProcess.js
@@ -0,0 +1,66 @@
+import("system.vars");
+import("Context_lib");
+import("system.result");
+import("system.favorite");
+import("system.tools");
+import("system.entities");
+
+var loadConfig;
+
+
+if(vars.get("$sys.selection") && vars.get("$sys.selection").length != 0)
+{
+    var selected = vars.get("$sys.selection");
+    var selectedFavos = [];
+    
+    for(i = 0; i < selected.length; i++)
+    {
+        selectedFavos.push(buildFavorite(favorite.getFavoriteById(selected[i])));
+    }
+    result.object(selectedFavos);
+}
+else
+{
+    var allFavorites = favorite.getAllFavorites(tools.getCurrentUser()["name"]);
+    var finishedFavoritesForDisplay = [];
+    
+    for(i = 0; i < allFavorites.length; i++)
+    {
+        var favo = allFavorites[i];
+        finishedFavoritesForDisplay.push(buildFavorite(favo));
+    }
+    
+    result.object(finishedFavoritesForDisplay);
+}
+
+function buildFavorite(favo)
+{
+    loadConfig = entities.createConfigForLoadingRows();
+    loadConfig.entity(ContextUtils.getEntity(favo["objecttype"]));
+    loadConfig.uid(favo["rowid"]);
+    loadConfig.fields(["#CONTENTTITLE", "#IMAGE"]);
+    var row = entities.getRow(loadConfig);
+    
+    var groupid = favo["group"]["groupid"];
+    var grouptitle = favo["group"]["grouptitle"];
+    var grouptype = favo["group"]["grouptype"];
+    var objecttype = favo["objecttype"];
+    var image = row["#IMAGE"];
+    var rowid = favo["rowid"];
+    var title = row["#CONTENTTITLE"];
+    var id = favo["id"];
+    var user = favo["group"]["groupuser"];
+    
+    return [
+        groupid,
+        grouptitle,
+        grouptype, 
+        objecttype, 
+        image,
+        rowid,
+        title,
+        id,
+        user
+    ];
+}
+
diff --git a/entity/Favorite_entity/recordcontainers/jditorecordcontainer/onDelete.js b/entity/Favorite_entity/recordcontainers/jditorecordcontainer/onDelete.js
new file mode 100644
index 0000000000..fc4c8d8f0b
--- /dev/null
+++ b/entity/Favorite_entity/recordcontainers/jditorecordcontainer/onDelete.js
@@ -0,0 +1,4 @@
+import("system.vars");
+import("system.favorite");
+
+favorite.removeFavoriteById(vars.get("$local.uid"));
\ No newline at end of file
diff --git a/entity/Favorite_entity/recordcontainers/jditorecordcontainer/rowCountProcess.js b/entity/Favorite_entity/recordcontainers/jditorecordcontainer/rowCountProcess.js
new file mode 100644
index 0000000000..cfea6a5728
--- /dev/null
+++ b/entity/Favorite_entity/recordcontainers/jditorecordcontainer/rowCountProcess.js
@@ -0,0 +1,5 @@
+import("system.tools");
+import("system.result");
+import("system.favorite");
+
+result.string(favorite.getAllFavorites(tools.getCurrentUser()["name"]).length);
\ No newline at end of file
diff --git a/neonView/FavoriteFilter_view/FavoriteFilter_view.aod b/neonView/FavoriteFilter_view/FavoriteFilter_view.aod
index c047206405..f24dbfa624 100644
--- a/neonView/FavoriteFilter_view/FavoriteFilter_view.aod
+++ b/neonView/FavoriteFilter_view/FavoriteFilter_view.aod
@@ -3,7 +3,7 @@
   <name>FavoriteFilter_view</name>
   <title>FavoriteFilter_view</title>
   <majorModelMode>DISTRIBUTED</majorModelMode>
-  <filterable v="false" />
+  <filterable v="true" />
   <layout>
     <groupLayout>
       <name>layout</name>
@@ -13,15 +13,23 @@
     <tableViewTemplate>
       <name>FavoriteFilter</name>
       <iconField>#IMAGE</iconField>
-      <titleField>ROW_ID</titleField>
-      <subtitleField>GROUP_TITLE</subtitleField>
-      <descriptionField>OBJECT_TYPE</descriptionField>
+      <titleField>TITLE</titleField>
       <entityField>#ENTITY</entityField>
-      <linkedColumns />
+      <linkedColumns>
+        <element>PICTURE</element>
+        <element>OBJECT_TYPE</element>
+        <element>TITLE</element>
+        <element>GROUP_TITLE</element>
+      </linkedColumns>
+      <fixedFilterFields />
       <isCreatable v="false" />
       <isEditable v="false" />
       <title>favoriteFilter_view</title>
       <columns>
+        <neonTableColumn>
+          <name>a87e6491-7d8a-4009-9da8-c72348c22b4a</name>
+          <entityField>PICTURE</entityField>
+        </neonTableColumn>
         <neonTableColumn>
           <name>b235f917-4c59-4b8a-be07-ea5371f69f3b</name>
           <entityField>OBJECT_TYPE</entityField>
@@ -30,43 +38,11 @@
           <name>075e4e29-515c-4d9e-b195-f481af367b42</name>
           <entityField>TITLE</entityField>
         </neonTableColumn>
-        <neonTableColumn>
-          <name>9cd27b17-be4d-4621-91d5-42f3d1e8ee7d</name>
-          <entityField>TITLE_RELATION</entityField>
-        </neonTableColumn>
         <neonTableColumn>
           <name>929170b5-b460-4558-9aa6-f7657f49098c</name>
           <entityField>GROUP_TITLE</entityField>
         </neonTableColumn>
       </columns>
     </tableViewTemplate>
-    <treeTableViewTemplate>
-      <name>FavoriteTreeTable</name>
-      <parentField>UID</parentField>
-      <nodeExpandedField>OBJECT_TYPE</nodeExpandedField>
-      <defaultGroupFields />
-      <entityField>#ENTITY</entityField>
-      <linkedColumns>
-        <element>OBJECT_TYPE</element>
-        <element>GROUP_TITLE</element>
-      </linkedColumns>
-      <isCreatable v="false" />
-      <isEditable v="false" />
-      <informationField>TITLE</informationField>
-      <columns>
-        <neonTreeTableColumn>
-          <name>75cd966b-ee07-42bb-ac6b-b29d93cb4c51</name>
-          <entityField>TITLE</entityField>
-        </neonTreeTableColumn>
-        <neonTreeTableColumn>
-          <name>e5a62307-2b26-4891-9a4b-55342f693e97</name>
-          <entityField>GROUP_TITLE</entityField>
-        </neonTreeTableColumn>
-        <neonTreeTableColumn>
-          <name>3302f6db-8bb4-4e48-b89b-273439e46a31</name>
-          <entityField>OBJECT_TYPE</entityField>
-        </neonTreeTableColumn>
-      </columns>
-    </treeTableViewTemplate>
   </children>
 </neonView>
-- 
GitLab


From b48ec5e0c63476ae1a406e3c1b3623925403c9b8 Mon Sep 17 00:00:00 2001
From: "a.schindlbeck" <a.schindlbeck@adito.de>
Date: Tue, 11 Aug 2020 14:15:14 +0200
Subject: [PATCH 136/309] #1060652 Favorites: Organisation / Person changes

---
 entity/Organisation_entity/Organisation_entity.aod | 4 ++++
 entity/Person_entity/Person_entity.aod             | 5 +++++
 2 files changed, 9 insertions(+)

diff --git a/entity/Organisation_entity/Organisation_entity.aod b/entity/Organisation_entity/Organisation_entity.aod
index e9eee92243..7e2c3a6c38 100644
--- a/entity/Organisation_entity/Organisation_entity.aod
+++ b/entity/Organisation_entity/Organisation_entity.aod
@@ -1115,6 +1115,10 @@
       <parentField>COUNT</parentField>
       <title>Count</title>
     </entityAggregateField>
+    <entityField>
+      <name>ORGANISATION_OBJECTTYPE</name>
+      <valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/organisation_objecttype/valueProcess.js</valueProcess>
+    </entityField>
   </entityFields>
   <recordContainers>
     <dbRecordContainer>
diff --git a/entity/Person_entity/Person_entity.aod b/entity/Person_entity/Person_entity.aod
index 907d1408a4..5a8ddf59f0 100644
--- a/entity/Person_entity/Person_entity.aod
+++ b/entity/Person_entity/Person_entity.aod
@@ -14,6 +14,7 @@
   <onValidation>%aditoprj%/entity/Person_entity/onValidation.js</onValidation>
   <afterOperatingState>%aditoprj%/entity/Person_entity/afterOperatingState.js</afterOperatingState>
   <initFilterProcess>%aditoprj%/entity/Person_entity/initFilterProcess.js</initFilterProcess>
+  <useFavorites v="true" />
   <iconId>VAADIN:USERS</iconId>
   <imageProcess>%aditoprj%/entity/Person_entity/imageProcess.js</imageProcess>
   <usePermissions v="false" />
@@ -1277,6 +1278,10 @@
       <parentField>COUNT</parentField>
       <title>Count</title>
     </entityAggregateField>
+    <entityField>
+      <name>PERSON_OBJECTTYPE</name>
+      <valueProcess>%aditoprj%/entity/Person_entity/entityfields/person_objecttype/valueProcess.js</valueProcess>
+    </entityField>
   </entityFields>
   <recordContainers>
     <dbRecordContainer>
-- 
GitLab


From b759aaac2b791185ad3ba16b7ae46a85356506bc Mon Sep 17 00:00:00 2001
From: "a.schindlbeck" <a.schindlbeck@adito.de>
Date: Tue, 11 Aug 2020 14:34:49 +0200
Subject: [PATCH 137/309] #1060652 Favorites: selection to idvalues

---
 .../recordcontainers/jditorecordcontainer/contentProcess.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/entity/Favorite_entity/recordcontainers/jditorecordcontainer/contentProcess.js b/entity/Favorite_entity/recordcontainers/jditorecordcontainer/contentProcess.js
index a6ab741bed..0e0c24c33e 100644
--- a/entity/Favorite_entity/recordcontainers/jditorecordcontainer/contentProcess.js
+++ b/entity/Favorite_entity/recordcontainers/jditorecordcontainer/contentProcess.js
@@ -7,10 +7,10 @@ import("system.entities");
 
 var loadConfig;
 
-
-if(vars.get("$sys.selection") && vars.get("$sys.selection").length != 0)
+//$local.idvalues
+if(vars.get("$local.idvalues") && vars.get("$local.idvalues").length != 0)
 {
-    var selected = vars.get("$sys.selection");
+    var selected = vars.get("$local.idvalues");
     var selectedFavos = [];
     
     for(i = 0; i < selected.length; i++)
-- 
GitLab


From d92caed3951dbe2c41763232f90b05f59957fa70 Mon Sep 17 00:00:00 2001
From: "a.schindlbeck" <a.schindlbeck@adito.de>
Date: Tue, 11 Aug 2020 14:48:12 +0200
Subject: [PATCH 138/309] #1060652 Favorites: Columnnames

---
 entity/Favorite_entity/Favorite_entity.aod                  | 6 +++++-
 .../entityfields/group_title/titleProcess.js                | 4 ++++
 .../entityfields/object_type/titleProcess.js                | 4 ++++
 entity/Favorite_entity/entityfields/picture/titleProcess.js | 4 ++++
 entity/Favorite_entity/entityfields/title/titleProcess.js   | 4 ++++
 5 files changed, 21 insertions(+), 1 deletion(-)
 create mode 100644 entity/Favorite_entity/entityfields/group_title/titleProcess.js
 create mode 100644 entity/Favorite_entity/entityfields/object_type/titleProcess.js
 create mode 100644 entity/Favorite_entity/entityfields/picture/titleProcess.js
 create mode 100644 entity/Favorite_entity/entityfields/title/titleProcess.js

diff --git a/entity/Favorite_entity/Favorite_entity.aod b/entity/Favorite_entity/Favorite_entity.aod
index 30d6d10d52..8c07dbcfa3 100644
--- a/entity/Favorite_entity/Favorite_entity.aod
+++ b/entity/Favorite_entity/Favorite_entity.aod
@@ -27,6 +27,7 @@
     </entityField>
     <entityField>
       <name>OBJECT_TYPE</name>
+      <titleProcess>%aditoprj%/entity/Favorite_entity/entityfields/object_type/titleProcess.js</titleProcess>
       <displayValueProcess>%aditoprj%/entity/Favorite_entity/entityfields/object_type/displayValueProcess.js</displayValueProcess>
     </entityField>
     <entityField>
@@ -34,18 +35,21 @@
     </entityField>
     <entityField>
       <name>GROUP_TITLE</name>
+      <titleProcess>%aditoprj%/entity/Favorite_entity/entityfields/group_title/titleProcess.js</titleProcess>
     </entityField>
     <entityField>
       <name>GROUP_TYPE</name>
     </entityField>
     <entityField>
       <name>TITLE</name>
+      <title></title>
+      <titleProcess>%aditoprj%/entity/Favorite_entity/entityfields/title/titleProcess.js</titleProcess>
       <valueProcess>%aditoprj%/entity/Favorite_entity/entityfields/title/valueProcess.js</valueProcess>
     </entityField>
     <entityField>
       <name>PICTURE</name>
-      <title>favos</title>
       <contentType>IMAGE</contentType>
+      <titleProcess>%aditoprj%/entity/Favorite_entity/entityfields/picture/titleProcess.js</titleProcess>
     </entityField>
   </entityFields>
   <recordContainers>
diff --git a/entity/Favorite_entity/entityfields/group_title/titleProcess.js b/entity/Favorite_entity/entityfields/group_title/titleProcess.js
new file mode 100644
index 0000000000..3e8ef82777
--- /dev/null
+++ b/entity/Favorite_entity/entityfields/group_title/titleProcess.js
@@ -0,0 +1,4 @@
+import("system.result");
+import("system.translate");
+
+result.string(translate.text("Group name"));
\ No newline at end of file
diff --git a/entity/Favorite_entity/entityfields/object_type/titleProcess.js b/entity/Favorite_entity/entityfields/object_type/titleProcess.js
new file mode 100644
index 0000000000..e3c4a0c310
--- /dev/null
+++ b/entity/Favorite_entity/entityfields/object_type/titleProcess.js
@@ -0,0 +1,4 @@
+import("system.result");
+import("system.translate");
+
+result.string(translate.text("Object type"));
\ No newline at end of file
diff --git a/entity/Favorite_entity/entityfields/picture/titleProcess.js b/entity/Favorite_entity/entityfields/picture/titleProcess.js
new file mode 100644
index 0000000000..0eb9d89690
--- /dev/null
+++ b/entity/Favorite_entity/entityfields/picture/titleProcess.js
@@ -0,0 +1,4 @@
+import("system.result");
+import("system.translate");
+
+result.string(translate.text("Picture"));
\ No newline at end of file
diff --git a/entity/Favorite_entity/entityfields/title/titleProcess.js b/entity/Favorite_entity/entityfields/title/titleProcess.js
new file mode 100644
index 0000000000..2beec1320b
--- /dev/null
+++ b/entity/Favorite_entity/entityfields/title/titleProcess.js
@@ -0,0 +1,4 @@
+import("system.result");
+import("system.translate");
+
+result.string(translate.text("Name"));
\ No newline at end of file
-- 
GitLab


From ff017916d830e544c1d8b1cdb084906aa1ef5242 Mon Sep 17 00:00:00 2001
From: Johannes Goderbauer <j.goderbauer@adito.de>
Date: Tue, 11 Aug 2020 17:35:50 +0200
Subject: [PATCH 139/309] [Projekt: Entwicklung - Neon][TicketNr.:
 1063603][Importer: ProgressCallback hat fehlerhaften Aufruf und ist nicht
 dokumentiert]

---
 process/Importer_lib/documentation.adoc | 102 +++++++++++++++++++++++-
 process/Importer_lib/process.js         |  11 ++-
 2 files changed, 106 insertions(+), 7 deletions(-)

diff --git a/process/Importer_lib/documentation.adoc b/process/Importer_lib/documentation.adoc
index d02ea9aed6..f12700b132 100644
--- a/process/Importer_lib/documentation.adoc
+++ b/process/Importer_lib/documentation.adoc
@@ -311,10 +311,110 @@ imp.process();
 
 <<<
 
+== Advanced features
+
+=== ProgressCallback
+Sometimes, it's necessary to react on every input row that has been processed.
+This is what the `ProgressCallback` is for: It is a callback function that is called *after* an input row has been processed (whether successfully or not)
+
+The following parameters are passed onto the callback function:
+
+* Boolean value if the import row was skipped (`true`) or not (`false`). A row is skipped for example when an error occurred while importing the row.
+* Number value with  the current batch run (starts at zero)
+* Object value with  the following properties:
+** `exception`: Array with several exception messages and/or error hints
+** `sourceDataSet`: Array with the current processed source row (this is basically the same as accessing `this.InputRecord`
+   Be careful: This is a reference and therefore you are able to modify the data of the source row
+** `insertData`: Object with the following properties (this sums up the insert efforts):
+*** `successful`: Boolean if the insert was successfull or not
+*** `array`: Array of the requested inserts that were sent to the database as accepted by `db.inserts`
+** `updateData`: Object with the following properties (this sums up the update efforts):
+*** `successful`: Boolean if the update was successfull or not
+*** `array`: Array of the requested updates that were sent to the database as accepted by `db.updates`
+
+You have full access to the whole `Importer`-object via the `this` reference. 
+Via the reference it's possible to access for example the Importer-configuration or the input data row.
+See the following examples (which is *not* a complete list):
+
+[source,javascript]
+--
+this.Config //the whole configuration object
+
+this.Config.AliasFrom //the name of the alias that was specified in the config as data source
+
+this.Config.AliasTo //the name of the alias that was specified in the config as target alias
+
+this.Config.ImportCommand //the configured ImportCommand, e.g "insert", "update", "insert+update"
+
+this.recordCounts //object with the amount of the already processed records
+
+this.getConfiguredTimeout(pTimeoutType) //function that returns the configured db timeout time (see the function description for more details)
+
+this.LogLevels //an object with all possible loglevels
+
+this.LogLevels.Error //constant like value for the error log level
+
+this.writeLog(pLevel, pMessage) //function that writes into the configured log output (see the function description for more details)
+--
+
+CAUTION: There is no write protection in changing the properties of the `Importer`-object. Modifying the properties may cause errors and results in unwanted behavior.
+
+The ProgressCallback property can be set in the instance of an Importer:
+[source,javascript]
+--
+var imp = new Importer(yourConfig);
+imp.Log = "CONSOLE";  
+imp.ImportUser = "IMPORT";
+imp.Preview = false;  
+imp.Debug = true;
+imp.ProgressCallback = function(pSkipped, pBatchIndex, pRecordStack){
+    //do sth here
+};
+imp.skipEmptyValue = false;
+imp.BatchSize = 100;
+imp.process(); 
+--
+
+Here is an example:
+
+[source,javascript]
+--
+var progressCallbackFn = function (pSkipped, pBatchIndex, pRecordStack) 
+{
+    /*
+    if importing a source row was successful we have to notify the source-database
+    by setting a "PROCESSED"-column which may have a value of 1 or 0 (this is basically a flag)
+    */
+
+    if (pSkipped)
+        return;
+
+    //The "Callback" property in the importer config object was added to provide additional information for different callbacks like the ProgressCallback
+    
+    var sourceTableName = this.Config.Callback.sourceTable;//get the source tablename so that we know which table needs to be updated
+    var idPosistion = this.Config.Callback.idPosistion;
+    var sourceNumericId = this.InputRecord[idPosistion];
+
+    var cols = ["PROCESSED"];
+    var vals = ["1"];
+
+    var cond = "ID = " + sourceNumericId;
+    db.updateData(sourceTableName, cols, null, vals, cond, this.AliasFrom);
+}
+        
+var organisationImporter = new Importer(organisationImportConfig);
+organisationImporter.Log = "CONSOLE";
+organisationImporter.Preview = false;
+organisationImporter.ProgressCallback = progressCallbackFn;
+organisationImporter.LogLevel = imp.LogLevels.Info;
+organisationImporter.TableCase = imp.Cases.Upper;
+
+organisationImporter.process();//actual starting the import here
+--
 
 == FAQ
 
-- Q: How can set my own timeout?
+- Q: How can I configure the timeout-time-limit for database queries triggered by the Importer?
 A: Use setTimeout in your configuration (E.g., imp.setTimeout(123))
 
 [source,javascript]
diff --git a/process/Importer_lib/process.js b/process/Importer_lib/process.js
index bf55280364..d1b033012d 100644
--- a/process/Importer_lib/process.js
+++ b/process/Importer_lib/process.js
@@ -354,7 +354,7 @@ function Importer(pConfig)
             // import each row of the current batch
             for(var bi=0; bi < daten.length; bi++)
             {
-                recordStack.exception ="";
+                recordStack.exception = [];
                 recordStack.sourceDataSet = daten[bi];
                 recordStack.insertData  = {
                     successful: true, 
@@ -411,7 +411,7 @@ function Importer(pConfig)
                         if(mapresult == false)
                         {
                             this.writeLog(this.LogLevels.Error, "Mapping function " + fname + " failed for row " + this.recordCounts.total);
-                            recordStack.exception = "Fehler Zeile: " + this.recordCounts.total + " - Info:  Mapping function " + fname + " failed for row " + this.recordCounts.total + " Column: " + this.Config.Mapping[i][1]["Target"]; 
+                            recordStack.exception.push("Error at  row: " + this.recordCounts.total + " - Info:  Mapping function " + fname + " failed for row " + this.recordCounts.total + " Column: " + this.Config.Mapping[i][1]["Target"]); 
                             skip = true;
                         }
                     }
@@ -419,9 +419,8 @@ function Importer(pConfig)
                     {
                         logging.log(ex["rhinoException"] != undefined ? ex["rhinoException"] : ex)
                         this.writeLog(this.LogLevels.Error, "Exception in mapping function [" + fname + "] for input row " + this.recordCounts.total+ " - " + this.Config.Mapping[i][1]["Target"]);                       
-                        recordStack.exception = logging.toLogString(ex["rhinoException"] != undefined ? ex["rhinoException"] : ex, true) +  " -  Column: " + this.Config.Mapping[i][1]["Target"];
+                        recordStack.exception.push(logging.toLogString(ex["rhinoException"] != undefined ? ex["rhinoException"] : ex, true) +  " -  Column: " + this.Config.Mapping[i][1]["Target"]);
                         skip = true;
-
                     }
                 }
                 exectimer.mapPerRecordTime += datetime.date() - mapRecordMapTimeStart;
@@ -667,7 +666,7 @@ function Importer(pConfig)
                         this.writeLog(this.LogLevels.Error, "Error at " + (insertSuccessfull ? "" : "Insert") + (updateSuccessfull ? "": "Update") + ":" + logging.toLogString(ex));
                         logging.log(ex["rhinoException"] != undefined ? ex["rhinoException"] : ex)
                         this.recordCounts.skip++;
-                        recordStack.exception = logging.toLogString(ex["rhinoException"] != undefined ? ex["rhinoException"] : ex, true);
+                        recordStack.exception.push(logging.toLogString(ex["rhinoException"] != undefined ? ex["rhinoException"] : ex, true));
                         
                         if(this.insertArray.length > 0 && !insertSuccessfull) {
                             this.writeLog(this.LogLevels.Info, "Insert array: " + JSON.stringify(this.insertArray, null, " "));
@@ -694,7 +693,7 @@ function Importer(pConfig)
                 // if a progress callback function has been defined, call it
                 if(this.ProgressCallback != null && typeof(this.ProgressCallback) == "function")
                 {
-                    this.ProgressCallback(skip, bi, recordStack, this.Config.AliasFrom, this.Config.Callback.TableFrom, this.Config.Callback.IDColumn, this.Config.Callback.IDColumnIndex);
+                    this.ProgressCallback.call(this, skip, bi, recordStack);
                 }
 
                 if(this.MaxRows > 0 && this.recordCounts.total >= this.MaxRows)
-- 
GitLab


From 6f01359defe2fa353c9be564d447201ff20c09d4 Mon Sep 17 00:00:00 2001
From: Benjamin Ulrich <b.ulrich@adito.de>
Date: Wed, 12 Aug 2020 10:37:30 +0000
Subject: [PATCH 140/309] Classification rework: [Projekt: Entwicklung -
 Neon][TicketNr.: 1058842][Definition der Klassifizierung flexibler machen]
 [Projekt: Entwicklung - Neon][TicketNr.: 1058839][Erweiterung der
 Klassifizierungsmodule]

---
 .aditoprj/UUIDNameMap.txt                     | 102 ++++
 .../add_classificationGrading.xml             |  14 +
 .../2020.2.0/Classification/changelog.xml     |   6 +
 ...date_keywordClassificationOrganisation.xml |  15 +
 .../Data_alias/basic/2020.2.0/changelog.xml   |   5 +
 .../Data_alias/basic/_demoData/changelog.xml  |   3 +-
 .../generatedData/classification.xml          | 450 ++++++++++++++++++
 .../generatedData/classificationgrading.xml   | 127 +++++
 .../generatedData/classificationscore.xml     | 319 ++++++++++++-
 .../generatedData/classificationtype.xml      |  56 +++
 .liquibase/Data_alias/changelog.xml           |   2 +
 aliasDefinition/Data_alias/Data_alias.aod     |  76 +++
 .../ClassificationAdmin_entity.aod            |  19 +
 .../valueProcess.js                           |   4 +
 .../classificationgroup/valueProcess.js       |   5 +
 .../classificationtype_id/valueProcess.js     |   8 -
 .../entityfields/object_rowid/valueProcess.js |   8 -
 .../entityfields/object_type/valueProcess.js  |   8 -
 .../entityfields/uid/displayValueProcess.js   |   6 -
 .../ClassificationGrading_entity.aod          |  95 ++++
 .../documentation.adoc                        |   3 +
 .../classificationgradingid/valueProcess.js   |   7 +
 .../valueProcess.js                           |   4 +
 .../classificationgradings/documentation.adoc |   3 +
 .../classificationtype_group/valueProcess.js  |   9 +
 .../maxgradeforscore/documentation.adoc       |  17 +
 .../maxgradeforscore/onValidation.js          |  12 +
 .../maxgradeforscore/valueProcess.js          |  11 +
 .../recordcontainers/db/conditionProcess.js   |   7 +
 .../recordcontainers/db/orderClauseProcess.js |   6 +
 .../ClassificationGroupAnalyses_entity.aod    |   6 +
 .../recordcontainers/jdito/contentProcess.js  |   6 +-
 .../ClassificationScore_entity.aod            |   3 +-
 .../entityfields/score/onValidation.js        |   8 -
 .../recordcontainers/db/onDBDelete.js         |  28 +-
 .../recordcontainers/db/onDBInsert.js         |  30 ++
 .../recordcontainers/db/onDBUpdate.js         |  27 ++
 .../ClassificationType_entity.aod             |   5 +
 .../valueProcess.js                           |   4 +
 .../Classification_entity.aod                 |   9 +
 .../Classification_entity/contentProcess.js   |  19 -
 .../displayValueProcess.js                    |   7 +-
 .../entityfields/points/valueProcess.js       |   4 -
 .../salesprojectid_param/valueProcess.js      |   4 -
 .../recordcontainers/jdito/contentProcess.js  |   2 +-
 .../Organisation_entity.aod                   |  50 ++
 .../classificationtype_param/valueProcess.js  |   4 +
 .../objectrowid_param}/valueProcess.js        |   4 +-
 .../children/objecttype_param/valueProcess.js |   4 +
 .../classificationtype_param/valueProcess.js  |   4 +
 .../objectrowid_param/valueProcess.js         |   4 +
 .../children/objecttype_param/valueProcess.js |   4 +
 .../filterConditionProcess.js                 |  92 ++--
 .../filterFieldsProcess.js                    |  63 +--
 .../filterValuesProcess.js                    |   8 +-
 .../_____LANGUAGE_EXTRA.aod                   |  75 +++
 .../_____LANGUAGE_de/_____LANGUAGE_de.aod     |  92 ++++
 .../_____LANGUAGE_en/_____LANGUAGE_en.aod     |  75 +++
 .../ClassificationAdmin.aod                   |   4 +
 .../ClassificationGrading.aod                 |  12 +
 neonContext/Organisation/Organisation.aod     |   8 +
 .../ClassificationAdminEdit_view.aod          |   5 +-
 .../ClassificationAdminGrading.aod            |  42 ++
 ...ssificationGradingMultiplePreview_view.aod |  25 +
 .../ClassificatonAdminPreview_view.aod        |   5 +
 .../OrganisationClassificationDrawer_view.aod |  20 +
 .../OrganisationMain_view.aod                 |   5 +
 ...ganisationtClassificationAndChart_view.aod |  24 +
 process/Classification_lib/process.js         | 222 ++++++---
 process/KeywordRegistry_basic/process.js      |   1 +
 70 files changed, 2200 insertions(+), 221 deletions(-)
 create mode 100644 .aditoprj/UUIDNameMap.txt
 create mode 100644 .liquibase/Data_alias/basic/2020.2.0/Classification/add_classificationGrading.xml
 create mode 100644 .liquibase/Data_alias/basic/2020.2.0/Classification/changelog.xml
 create mode 100644 .liquibase/Data_alias/basic/2020.2.0/Classification/update_keywordClassificationOrganisation.xml
 create mode 100644 .liquibase/Data_alias/basic/2020.2.0/changelog.xml
 create mode 100644 .liquibase/Data_alias/basic/_demoData/generatedData/classificationgrading.xml
 create mode 100644 entity/ClassificationAdmin_entity/entityfields/classificationgradings/children/classificationtypeid_param/valueProcess.js
 create mode 100644 entity/ClassificationAdmin_entity/entityfields/classificationgroup/valueProcess.js
 delete mode 100644 entity/ClassificationAdmin_entity/entityfields/classificationtype_id/valueProcess.js
 delete mode 100644 entity/ClassificationAdmin_entity/entityfields/object_rowid/valueProcess.js
 delete mode 100644 entity/ClassificationAdmin_entity/entityfields/object_type/valueProcess.js
 delete mode 100644 entity/ClassificationAdmin_entity/entityfields/uid/displayValueProcess.js
 create mode 100644 entity/ClassificationGrading_entity/ClassificationGrading_entity.aod
 create mode 100644 entity/ClassificationGrading_entity/documentation.adoc
 create mode 100644 entity/ClassificationGrading_entity/entityfields/classificationgradingid/valueProcess.js
 create mode 100644 entity/ClassificationGrading_entity/entityfields/classificationgradings/children/classificationtypeid_param/valueProcess.js
 create mode 100644 entity/ClassificationGrading_entity/entityfields/classificationgradings/documentation.adoc
 create mode 100644 entity/ClassificationGrading_entity/entityfields/classificationtype_group/valueProcess.js
 create mode 100644 entity/ClassificationGrading_entity/entityfields/maxgradeforscore/documentation.adoc
 create mode 100644 entity/ClassificationGrading_entity/entityfields/maxgradeforscore/onValidation.js
 create mode 100644 entity/ClassificationGrading_entity/entityfields/maxgradeforscore/valueProcess.js
 create mode 100644 entity/ClassificationGrading_entity/recordcontainers/db/conditionProcess.js
 create mode 100644 entity/ClassificationGrading_entity/recordcontainers/db/orderClauseProcess.js
 delete mode 100644 entity/ClassificationScore_entity/entityfields/score/onValidation.js
 create mode 100644 entity/ClassificationScore_entity/recordcontainers/db/onDBInsert.js
 create mode 100644 entity/ClassificationScore_entity/recordcontainers/db/onDBUpdate.js
 create mode 100644 entity/ClassificationType_entity/entityfields/classificationtypeids/children/classificationtypeids_param/valueProcess.js
 delete mode 100644 entity/Classification_entity/contentProcess.js
 delete mode 100644 entity/Classification_entity/entityfields/points/valueProcess.js
 delete mode 100644 entity/Classification_entity/entityfields/salesprojectclassificationentries/children/salesprojectid_param/valueProcess.js
 create mode 100644 entity/Organisation_entity/entityfields/classificationgroups/children/classificationtype_param/valueProcess.js
 rename entity/{Classification_entity/entityfields/salesprojectclassificationentries/children/classid_param => Organisation_entity/entityfields/classificationgroups/children/objectrowid_param}/valueProcess.js (52%)
 create mode 100644 entity/Organisation_entity/entityfields/classificationgroups/children/objecttype_param/valueProcess.js
 create mode 100644 entity/Organisation_entity/entityfields/classifications/children/classificationtype_param/valueProcess.js
 create mode 100644 entity/Organisation_entity/entityfields/classifications/children/objectrowid_param/valueProcess.js
 create mode 100644 entity/Organisation_entity/entityfields/classifications/children/objecttype_param/valueProcess.js
 create mode 100644 neonContext/ClassificationGrading/ClassificationGrading.aod
 create mode 100644 neonView/ClassificationAdminGrading/ClassificationAdminGrading.aod
 create mode 100644 neonView/ClassificationGradingMultiplePreview_view/ClassificationGradingMultiplePreview_view.aod
 create mode 100644 neonView/OrganisationClassificationDrawer_view/OrganisationClassificationDrawer_view.aod
 create mode 100644 neonView/OrganisationtClassificationAndChart_view/OrganisationtClassificationAndChart_view.aod

diff --git a/.aditoprj/UUIDNameMap.txt b/.aditoprj/UUIDNameMap.txt
new file mode 100644
index 0000000000..b8c3112dea
--- /dev/null
+++ b/.aditoprj/UUIDNameMap.txt
@@ -0,0 +1,102 @@
+*************************************************
+*                                               *
+* This is a generated file, please do not edit! *
+*                                               *
+*************************************************
+ 5
+ 6
+ 7
+ 8
+ 9
+ 10
+ 11
+ 12
+ 13
+ 14
+ 15
+ 16
+ 17
+ 18
+ 19
+ 20
+ 21
+ 22
+ 23
+ 24
+ 25
+ 26
+ 27
+ 28
+ 29
+ 30
+ 31
+ 32
+ 33
+ 34
+ 35
+ 36
+ 37
+ 38
+ 39
+ 40
+ 41
+1.0.0
+1597227709184
+#ENTITY
+#ENTITY
+#PROVIDER_FIELD
+#PROVIDER_FIELD
+#CONTENTTITLE
+#CONTENTTITLE
+#TITLE
+#TITLE
+#INDEX_GROUP
+#INDEX_GROUP
+#TARGETCONTEXT
+#TARGETCONTEXT
+INTERNAL_ADMINISTRATOR
+INTERNAL_ADMINISTRATOR
+INTERNAL_WEBSERVICE
+INTERNAL_WEBSERVICE
+#DESCRIPTION
+#DESCRIPTION
+INTERNAL_GROUPWARE
+INTERNAL_GROUPWARE
+INTERNAL_TECHNICAL
+INTERNAL_TECHNICAL
+#MAPPING
+#MAPPING
+#LOCATION
+#LOCATION
+#PROVIDER
+#PROVIDER
+INTERNAL_DESIGNER
+INTERNAL_DESIGNER
+#USERHELP
+#USERHELP
+#NONE
+#NONE
+#TARGETID
+#TARGETID
+#CONTENTDESCRIPTION
+#CONTENTDESCRIPTION
+#SORTING
+#SORTING
+#LOOKUPID
+#LOOKUPID
+#GROUPING
+#GROUPING
+#ICON
+#ICON
+INTERNAL_DASHBOARDSTOREADMIN
+INTERNAL_DASHBOARDSTOREADMIN
+#IMAGE
+#IMAGE
+#UID
+#UID
+INTERNAL_SNMP
+INTERNAL_SNMP
+#TARGETCONSUMER
+#TARGETCONSUMER
+INTERNAL_EVERYONE
+INTERNAL_EVERYONE
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/2020.2.0/Classification/add_classificationGrading.xml b/.liquibase/Data_alias/basic/2020.2.0/Classification/add_classificationGrading.xml
new file mode 100644
index 0000000000..c400a89f8f
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2020.2.0/Classification/add_classificationGrading.xml
@@ -0,0 +1,14 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+                   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+    <changeSet author="b.ulrich" id="094af11f-c308-42bf-a78e-99d55883900a">
+        <createTable tableName="CLASSIFICATIONGRADING">
+            <column name="CLASSIFICATIONGRADINGID" type="CHAR(36)">
+                <constraints primaryKey="true" primaryKeyName="PK_CLASSIFICATIONGRADING_CLASSIFICATIONGRADINGID"/>
+            </column>
+            <column name="GRADING" type="CHAR(1)"/>
+            <column name="MAXGRADEFORSCORE" type="INTEGER"/>
+            <column name="CLASSIFICATIONTYPE_GROUP" type="CHAR(36)"/>
+        </createTable>
+    </changeSet>
+</databaseChangeLog>
diff --git a/.liquibase/Data_alias/basic/2020.2.0/Classification/changelog.xml b/.liquibase/Data_alias/basic/2020.2.0/Classification/changelog.xml
new file mode 100644
index 0000000000..1fe0427646
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2020.2.0/Classification/changelog.xml
@@ -0,0 +1,6 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+                   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+                   <include relativeToChangelogFile="true" file="update_keywordClassificationOrganisation.xml"/>
+                   <include relativeToChangelogFile="true" file="add_classificationGrading.xml"/>
+</databaseChangeLog>
diff --git a/.liquibase/Data_alias/basic/2020.2.0/Classification/update_keywordClassificationOrganisation.xml b/.liquibase/Data_alias/basic/2020.2.0/Classification/update_keywordClassificationOrganisation.xml
new file mode 100644
index 0000000000..b08af1e779
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2020.2.0/Classification/update_keywordClassificationOrganisation.xml
@@ -0,0 +1,15 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+                   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+    <changeSet author="b.ulrich" id="41e40939-da97-4c11-8c68-9116a57b2a86">
+    <insert tableName="AB_KEYWORD_ENTRY">
+        <column name="AB_KEYWORD_ENTRYID" value="e36f44a3-88b6-4b1d-a77a-0108b8165b9b"/>
+        <column name="KEYID" value="ORGANISATION"/>
+        <column name="TITLE" value="Organisation"/>
+        <column name="CONTAINER" value="ClassificationType"/>
+        <column name="SORTING" valueNumeric="2"/>
+        <column name="ISACTIVE" valueNumeric="1"/>
+        <column name="ISESSENTIAL" valueNumeric="1"/>
+    </insert>
+    </changeSet>
+</databaseChangeLog>
diff --git a/.liquibase/Data_alias/basic/2020.2.0/changelog.xml b/.liquibase/Data_alias/basic/2020.2.0/changelog.xml
new file mode 100644
index 0000000000..68a89e3e7f
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2020.2.0/changelog.xml
@@ -0,0 +1,5 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+                   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+    <include relativeToChangelogFile="true" file="Classification/changelog.xml"/>
+</databaseChangeLog>
diff --git a/.liquibase/Data_alias/basic/_demoData/changelog.xml b/.liquibase/Data_alias/basic/_demoData/changelog.xml
index e0d3d57558..f1d01f3712 100644
--- a/.liquibase/Data_alias/basic/_demoData/changelog.xml
+++ b/.liquibase/Data_alias/basic/_demoData/changelog.xml
@@ -50,5 +50,6 @@
   <include file="generatedData/exporttemplatefield.xml" relativeToChangelogFile="true"/>
   <include file="generatedData/exporttemplateplaceofuse.xml" relativeToChangelogFile="true"/>
   <include file="generatedData/documenttemplateplaceofuse.xml" relativeToChangelogFile="true"/>
-  <!--<include file="generatedData/visitplan.xml" relativeToChangelogFile="true"/>-->
+  <include file="generatedData/visitplan.xml" relativeToChangelogFile="true"/>
+  <include file="generatedData/classificationgrading.xml" relativeToChangelogFile="true"/>
 </databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/_demoData/generatedData/classification.xml b/.liquibase/Data_alias/basic/_demoData/generatedData/classification.xml
index 2ed55d7542..be1edc314b 100644
--- a/.liquibase/Data_alias/basic/_demoData/generatedData/classification.xml
+++ b/.liquibase/Data_alias/basic/_demoData/generatedData/classification.xml
@@ -58,5 +58,455 @@
       <column name="OBJECT_ROWID" value="438537db-0dc6-4aed-b1d1-813011baf88c"/>
       <column name="OBJECT_TYPE" value="Salesproject"/>
     </insert>
+
+  <insert tableName="classification">
+      <column name="CLASSIFICATIONID" value="35b79ed1-7002-44f1-af61-891cdf863ac9"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="618bf0d1-18d4-4a96-900c-80a5a616da9b"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="d67397c5-5e05-433b-b61d-12807906aa5a"/>
+      <column name="OBJECT_ROWID" value="fc465f2f-803b-4a1f-b79d-7b466d7ecff4"/>
+      <column name="OBJECT_TYPE" value="Organisation"/>
+    </insert>
+    <insert tableName="classification">
+      <column name="CLASSIFICATIONID" value="8502a2c8-fb7e-44f2-91cb-3d44d2d50d98"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="b7b763d4-994d-483d-9a1c-6eb85786d61a"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="037a9de1-fa6d-4895-9db3-82f7769682ae"/>
+      <column name="OBJECT_ROWID" value="fc465f2f-803b-4a1f-b79d-7b466d7ecff4"/>
+      <column name="OBJECT_TYPE" value="Organisation"/>
+    </insert>
+    <insert tableName="classification">
+      <column name="CLASSIFICATIONID" value="8c133476-7e1a-4120-8127-b45228bd5403"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="47ca5b54-423f-4bf1-a4d6-a0c55a2488e6"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="970b251c-ca6e-43f4-9162-ebc5d1142a8b"/>
+      <column name="OBJECT_ROWID" value="fc465f2f-803b-4a1f-b79d-7b466d7ecff4"/>
+      <column name="OBJECT_TYPE" value="Organisation"/>
+    </insert>
+    <insert tableName="classification">
+      <column name="CLASSIFICATIONID" value="965bd86a-ad6d-4440-a7a3-e4bcf1b0a505"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="4d868dc5-747a-4f22-9134-638198d3084a"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="4b72857e-863d-4254-accf-25281bb7bb64"/>
+      <column name="OBJECT_ROWID" value="fc465f2f-803b-4a1f-b79d-7b466d7ecff4"/>
+      <column name="OBJECT_TYPE" value="Organisation"/>
+    </insert>
+    <insert tableName="classification">
+      <column name="CLASSIFICATIONID" value="0027e606-7932-4e40-9e20-43717b687a64"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="a60aaf2d-88aa-4c72-9606-0eb3ac9493cf"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="95396ee7-f0e2-41b4-995e-bac5749709ec"/>
+      <column name="OBJECT_ROWID" value="fc465f2f-803b-4a1f-b79d-7b466d7ecff4"/>
+      <column name="OBJECT_TYPE" value="Organisation"/>
+    </insert>
+    <insert tableName="classification">
+      <column name="CLASSIFICATIONID" value="2a447c40-23b0-4e45-b932-067c08515da0"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="4982ab85-0961-4d85-8fee-2b55887add96"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="be76dab1-c6ab-4b1e-8322-8b052ccda4d9"/>
+      <column name="OBJECT_ROWID" value="fc465f2f-803b-4a1f-b79d-7b466d7ecff4"/>
+      <column name="OBJECT_TYPE" value="Organisation"/>
+    </insert>
+  <insert tableName="classification">
+      <column name="CLASSIFICATIONID" value="d5db188e-4e30-4179-8c3a-339bc16fa2ab"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="07f21cf8-c369-45f3-88fe-40ca586ed11b"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="f581dcb9-db6f-4a82-995c-695d0a7393d3"/>
+      <column name="OBJECT_ROWID" value="fc465f2f-803b-4a1f-b79d-7b466d7ecff4"/>
+      <column name="OBJECT_TYPE" value="Organisation"/>
+    </insert>
+  <insert tableName="classification">
+      <column name="CLASSIFICATIONID" value="6685c781-a87d-4102-8764-27f0fcb0dc60"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="5be4d454-1f3e-4a3d-b8a4-3eb49ce1bc35"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="4d878689-15c0-46cc-acc8-3c524463db5c"/>
+      <column name="OBJECT_ROWID" value="fc465f2f-803b-4a1f-b79d-7b466d7ecff4"/>
+      <column name="OBJECT_TYPE" value="Organisation"/>
+    </insert>
+  <insert tableName="classification">
+      <column name="CLASSIFICATIONID" value="9af237aa-daa0-4195-a301-a815497a75b6"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="4285d598-06c0-435d-bb5e-28dec5f31521"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="80c6ec8b-eb54-4d25-a4f5-0adaf4cdc84e"/>
+      <column name="OBJECT_ROWID" value="fc465f2f-803b-4a1f-b79d-7b466d7ecff4"/>
+      <column name="OBJECT_TYPE" value="Organisation"/>
+    </insert>
+    
+  <insert tableName="classification">
+      <column name="CLASSIFICATIONID" value="55569485-c1f8-4bef-9e94-2b64c9b6bd4e"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="3eb18b76-f51e-4ad2-9080-74b4a603667b"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="d67397c5-5e05-433b-b61d-12807906aa5a"/>
+      <column name="OBJECT_ROWID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
+      <column name="OBJECT_TYPE" value="Organisation"/>
+    </insert>
+    <insert tableName="classification">
+      <column name="CLASSIFICATIONID" value="2800c5de-2174-46fb-a50a-d5ae4a28c28d"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="b7b763d4-994d-483d-9a1c-6eb85786d61a"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="037a9de1-fa6d-4895-9db3-82f7769682ae"/>
+      <column name="OBJECT_ROWID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
+      <column name="OBJECT_TYPE" value="Organisation"/>
+    </insert>
+    <insert tableName="classification">
+      <column name="CLASSIFICATIONID" value="12280a78-1bc8-411d-9556-57b6ea12343f"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="b41e180f-db8c-44c3-9fbb-179ab58d5852"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="970b251c-ca6e-43f4-9162-ebc5d1142a8b"/>
+      <column name="OBJECT_ROWID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
+      <column name="OBJECT_TYPE" value="Organisation"/>
+    </insert>
+    <insert tableName="classification">
+      <column name="CLASSIFICATIONID" value="c9208276-8f53-424d-821b-e37f041f864a"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="51575eb6-4005-42d2-96f3-b35dfd06a86b"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="4b72857e-863d-4254-accf-25281bb7bb64"/>
+      <column name="OBJECT_ROWID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
+      <column name="OBJECT_TYPE" value="Organisation"/>
+    </insert>
+    <insert tableName="classification">
+      <column name="CLASSIFICATIONID" value="19cd3898-cb8e-4fa3-ade8-89cacb181b7d"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="a60aaf2d-88aa-4c72-9606-0eb3ac9493cf"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="95396ee7-f0e2-41b4-995e-bac5749709ec"/>
+      <column name="OBJECT_ROWID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
+      <column name="OBJECT_TYPE" value="Organisation"/>
+    </insert>
+    <insert tableName="classification">
+      <column name="CLASSIFICATIONID" value="085d5901-9ab4-4747-a758-660d952a7a2c"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="4982ab85-0961-4d85-8fee-2b55887add96"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="be76dab1-c6ab-4b1e-8322-8b052ccda4d9"/>
+      <column name="OBJECT_ROWID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
+      <column name="OBJECT_TYPE" value="Organisation"/>
+    </insert>
+  <insert tableName="classification">
+      <column name="CLASSIFICATIONID" value="fcdedb8a-a863-47a8-93af-379c451fedb0"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="07f21cf8-c369-45f3-88fe-40ca586ed11b"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="f581dcb9-db6f-4a82-995c-695d0a7393d3"/>
+      <column name="OBJECT_ROWID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
+      <column name="OBJECT_TYPE" value="Organisation"/>
+    </insert>
+  <insert tableName="classification">
+      <column name="CLASSIFICATIONID" value="971cee9d-9b1f-4b57-9635-9bbfdb792958"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="5be4d454-1f3e-4a3d-b8a4-3eb49ce1bc35"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="4d878689-15c0-46cc-acc8-3c524463db5c"/>
+      <column name="OBJECT_ROWID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
+      <column name="OBJECT_TYPE" value="Organisation"/>
+    </insert>
+  <insert tableName="classification">
+      <column name="CLASSIFICATIONID" value="39dc9940-eb00-4ed5-82ec-521f5cc62239"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="4285d598-06c0-435d-bb5e-28dec5f31521"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="80c6ec8b-eb54-4d25-a4f5-0adaf4cdc84e"/>
+      <column name="OBJECT_ROWID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
+      <column name="OBJECT_TYPE" value="Organisation"/>
+    </insert>
+    
+  <insert tableName="classification">
+      <column name="CLASSIFICATIONID" value="f7f7022f-57a2-4944-a9d3-e092e1be43b3"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="3eb18b76-f51e-4ad2-9080-74b4a603667b"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="d67397c5-5e05-433b-b61d-12807906aa5a"/>
+      <column name="OBJECT_ROWID" value="019651a4-503e-4e06-aefd-e7e631bf3144"/>
+      <column name="OBJECT_TYPE" value="Organisation"/>
+    </insert>
+    <insert tableName="classification">
+      <column name="CLASSIFICATIONID" value="6dadd578-7e24-41cd-ab27-7baa29e4691b"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="b7b763d4-994d-483d-9a1c-6eb85786d61a"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="037a9de1-fa6d-4895-9db3-82f7769682ae"/>
+      <column name="OBJECT_ROWID" value="019651a4-503e-4e06-aefd-e7e631bf3144"/>
+      <column name="OBJECT_TYPE" value="Organisation"/>
+    </insert>
+    <insert tableName="classification">
+      <column name="CLASSIFICATIONID" value="008ac315-31ab-4320-bf29-6681708eda88"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="b41e180f-db8c-44c3-9fbb-179ab58d5852"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="970b251c-ca6e-43f4-9162-ebc5d1142a8b"/>
+      <column name="OBJECT_ROWID" value="019651a4-503e-4e06-aefd-e7e631bf3144"/>
+      <column name="OBJECT_TYPE" value="Organisation"/>
+    </insert>
+    <insert tableName="classification">
+      <column name="CLASSIFICATIONID" value="568cebf1-2494-44e0-9eb8-91bbcf1189eb"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="51575eb6-4005-42d2-96f3-b35dfd06a86b"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="4b72857e-863d-4254-accf-25281bb7bb64"/>
+      <column name="OBJECT_ROWID" value="019651a4-503e-4e06-aefd-e7e631bf3144"/>
+      <column name="OBJECT_TYPE" value="Organisation"/>
+    </insert>
+    <insert tableName="classification">
+      <column name="CLASSIFICATIONID" value="d3932d83-8afe-47ff-aff9-7d23bd443669"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="4ed5e22f-222a-4a51-83d3-597fa035d2df"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="95396ee7-f0e2-41b4-995e-bac5749709ec"/>
+      <column name="OBJECT_ROWID" value="019651a4-503e-4e06-aefd-e7e631bf3144"/>
+      <column name="OBJECT_TYPE" value="Organisation"/>
+    </insert>
+    <insert tableName="classification">
+      <column name="CLASSIFICATIONID" value="e567dc3e-fb98-4b17-b503-499497b691a6"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="4982ab85-0961-4d85-8fee-2b55887add96"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="be76dab1-c6ab-4b1e-8322-8b052ccda4d9"/>
+      <column name="OBJECT_ROWID" value="019651a4-503e-4e06-aefd-e7e631bf3144"/>
+      <column name="OBJECT_TYPE" value="Organisation"/>
+    </insert>
+  <insert tableName="classification">
+      <column name="CLASSIFICATIONID" value="5f0cdce4-81b4-4c05-9011-4d76bdc21b65"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="07f21cf8-c369-45f3-88fe-40ca586ed11b"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="f581dcb9-db6f-4a82-995c-695d0a7393d3"/>
+      <column name="OBJECT_ROWID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
+      <column name="OBJECT_TYPE" value="Organisation"/>
+    </insert>
+  <insert tableName="classification">
+      <column name="CLASSIFICATIONID" value="1af00ea1-11fe-49d7-8a21-29bee4f31991"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="5be4d454-1f3e-4a3d-b8a4-3eb49ce1bc35"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="4d878689-15c0-46cc-acc8-3c524463db5c"/>
+      <column name="OBJECT_ROWID" value="019651a4-503e-4e06-aefd-e7e631bf3144"/>
+      <column name="OBJECT_TYPE" value="Organisation"/>
+    </insert>
+  <insert tableName="classification">
+      <column name="CLASSIFICATIONID" value="f724bcdf-ac46-4296-be41-2febc7747ce1"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="4285d598-06c0-435d-bb5e-28dec5f31521"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="80c6ec8b-eb54-4d25-a4f5-0adaf4cdc84e"/>
+      <column name="OBJECT_ROWID" value="019651a4-503e-4e06-aefd-e7e631bf3144"/>
+      <column name="OBJECT_TYPE" value="Organisation"/>
+    </insert>
+    
+      <insert tableName="classification">
+      <column name="CLASSIFICATIONID" value="79cc0205-25f8-44a9-b682-a31df2068e3f"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="3eb18b76-f51e-4ad2-9080-74b4a603667b"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="d67397c5-5e05-433b-b61d-12807906aa5a"/>
+      <column name="OBJECT_ROWID" value="449080f6-b714-4189-a261-37439d0d4010"/>
+      <column name="OBJECT_TYPE" value="Organisation"/>
+    </insert>
+    <insert tableName="classification">
+      <column name="CLASSIFICATIONID" value="f7118dce-dac9-4821-a709-bb7e9db8170a"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="b7b763d4-994d-483d-9a1c-6eb85786d61a"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="037a9de1-fa6d-4895-9db3-82f7769682ae"/>
+      <column name="OBJECT_ROWID" value="449080f6-b714-4189-a261-37439d0d4010"/>
+      <column name="OBJECT_TYPE" value="Organisation"/>
+    </insert>
+    <insert tableName="classification">
+      <column name="CLASSIFICATIONID" value="3561883e-bec9-4be7-8f0f-985ca694ff04"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="b41e180f-db8c-44c3-9fbb-179ab58d5852"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="970b251c-ca6e-43f4-9162-ebc5d1142a8b"/>
+      <column name="OBJECT_ROWID" value="449080f6-b714-4189-a261-37439d0d4010"/>
+      <column name="OBJECT_TYPE" value="Organisation"/>
+    </insert>
+    <insert tableName="classification">
+      <column name="CLASSIFICATIONID" value="98d2e3c1-f308-4a7a-a12f-4d24b45d4db9"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="51575eb6-4005-42d2-96f3-b35dfd06a86b"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="4b72857e-863d-4254-accf-25281bb7bb64"/>
+      <column name="OBJECT_ROWID" value="449080f6-b714-4189-a261-37439d0d4010"/>
+      <column name="OBJECT_TYPE" value="Organisation"/>
+    </insert>
+    <insert tableName="classification">
+      <column name="CLASSIFICATIONID" value="bb5ee550-320f-491a-a48f-b1ecf41ef90c"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="a60aaf2d-88aa-4c72-9606-0eb3ac9493cf"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="95396ee7-f0e2-41b4-995e-bac5749709ec"/>
+      <column name="OBJECT_ROWID" value="449080f6-b714-4189-a261-37439d0d4010"/>
+      <column name="OBJECT_TYPE" value="Organisation"/>
+    </insert>
+    <insert tableName="classification">
+      <column name="CLASSIFICATIONID" value="0759e286-007b-4568-b4d6-0542900d7ba1"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="4982ab85-0961-4d85-8fee-2b55887add96"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="be76dab1-c6ab-4b1e-8322-8b052ccda4d9"/>
+      <column name="OBJECT_ROWID" value="449080f6-b714-4189-a261-37439d0d4010"/>
+      <column name="OBJECT_TYPE" value="Organisation"/>
+    </insert>
+  <insert tableName="classification">
+      <column name="CLASSIFICATIONID" value="94bbfbe5-136f-40f2-af1f-8a47e1414a8c"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="29134094-66f2-4331-9f14-fc6a27ab111e"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="f581dcb9-db6f-4a82-995c-695d0a7393d3"/>
+      <column name="OBJECT_ROWID" value="449080f6-b714-4189-a261-37439d0d4010"/>
+      <column name="OBJECT_TYPE" value="Organisation"/>
+    </insert>
+  <insert tableName="classification">
+      <column name="CLASSIFICATIONID" value="84ca4de3-ba44-40b4-8727-c5e23861c2c9"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="5be4d454-1f3e-4a3d-b8a4-3eb49ce1bc35"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="4d878689-15c0-46cc-acc8-3c524463db5c"/>
+      <column name="OBJECT_ROWID" value="449080f6-b714-4189-a261-37439d0d4010"/>
+      <column name="OBJECT_TYPE" value="Organisation"/>
+    </insert>
+  <insert tableName="classification">
+      <column name="CLASSIFICATIONID" value="efe87026-b813-4bb7-a3c8-4ef72e2076b8"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="5564a330-8c13-424f-a24b-5f97185a9036"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="80c6ec8b-eb54-4d25-a4f5-0adaf4cdc84e"/>
+      <column name="OBJECT_ROWID" value="449080f6-b714-4189-a261-37439d0d4010"/>
+      <column name="OBJECT_TYPE" value="Organisation"/>
+    </insert>
+    
+    <insert tableName="classification">
+      <column name="CLASSIFICATIONID" value="e14fd7cc-abca-4296-bbd6-d9605d1e6f00"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="3eb18b76-f51e-4ad2-9080-74b4a603667b"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="d67397c5-5e05-433b-b61d-12807906aa5a"/>
+      <column name="OBJECT_ROWID" value="fb07cb0e-c391-4503-9c47-a39ec7388f4f"/>
+      <column name="OBJECT_TYPE" value="Organisation"/>
+    </insert>
+    <insert tableName="classification">
+      <column name="CLASSIFICATIONID" value="ddb5083d-9410-4b9c-82a4-496370b868e3"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="b7b763d4-994d-483d-9a1c-6eb85786d61a"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="037a9de1-fa6d-4895-9db3-82f7769682ae"/>
+      <column name="OBJECT_ROWID" value="fb07cb0e-c391-4503-9c47-a39ec7388f4f"/>
+      <column name="OBJECT_TYPE" value="Organisation"/>
+    </insert>
+    <insert tableName="classification">
+      <column name="CLASSIFICATIONID" value="4a61a0fe-394e-4b2f-897a-092fc2c109b2"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="b41e180f-db8c-44c3-9fbb-179ab58d5852"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="970b251c-ca6e-43f4-9162-ebc5d1142a8b"/>
+      <column name="OBJECT_ROWID" value="fb07cb0e-c391-4503-9c47-a39ec7388f4f"/>
+      <column name="OBJECT_TYPE" value="Organisation"/>
+    </insert>
+    <insert tableName="classification">
+      <column name="CLASSIFICATIONID" value="55401dae-a111-4e69-9c26-21fa9badd973"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="51575eb6-4005-42d2-96f3-b35dfd06a86b"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="4b72857e-863d-4254-accf-25281bb7bb64"/>
+      <column name="OBJECT_ROWID" value="fb07cb0e-c391-4503-9c47-a39ec7388f4f"/>
+      <column name="OBJECT_TYPE" value="Organisation"/>
+    </insert>
+    <insert tableName="classification">
+      <column name="CLASSIFICATIONID" value="6048f088-dde7-4134-a101-f5e8f8b70cf5"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="a60aaf2d-88aa-4c72-9606-0eb3ac9493cf"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="95396ee7-f0e2-41b4-995e-bac5749709ec"/>
+      <column name="OBJECT_ROWID" value="fb07cb0e-c391-4503-9c47-a39ec7388f4f"/>
+      <column name="OBJECT_TYPE" value="Organisation"/>
+    </insert>
+    <insert tableName="classification">
+      <column name="CLASSIFICATIONID" value="ccaea5d2-64c3-4255-9825-c91784ba5f54"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="4982ab85-0961-4d85-8fee-2b55887add96"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="be76dab1-c6ab-4b1e-8322-8b052ccda4d9"/>
+      <column name="OBJECT_ROWID" value="fb07cb0e-c391-4503-9c47-a39ec7388f4f"/>
+      <column name="OBJECT_TYPE" value="Organisation"/>
+    </insert>
+  <insert tableName="classification">
+      <column name="CLASSIFICATIONID" value="048a95bd-0a82-494d-b7fd-90f5d750f2c7"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="29134094-66f2-4331-9f14-fc6a27ab111e"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="f581dcb9-db6f-4a82-995c-695d0a7393d3"/>
+      <column name="OBJECT_ROWID" value="fb07cb0e-c391-4503-9c47-a39ec7388f4f"/>
+      <column name="OBJECT_TYPE" value="Organisation"/>
+    </insert>
+  <insert tableName="classification">
+      <column name="CLASSIFICATIONID" value="8fbd5ec4-bb9a-4c33-aa8d-73185d4b0746"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="5be4d454-1f3e-4a3d-b8a4-3eb49ce1bc35"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="4d878689-15c0-46cc-acc8-3c524463db5c"/>
+      <column name="OBJECT_ROWID" value="fb07cb0e-c391-4503-9c47-a39ec7388f4f"/>
+      <column name="OBJECT_TYPE" value="Organisation"/>
+    </insert>
+  <insert tableName="classification">
+      <column name="CLASSIFICATIONID" value="1249cfe4-d2cd-42c2-9df8-93b8f6c1f272"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="5564a330-8c13-424f-a24b-5f97185a9036"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="80c6ec8b-eb54-4d25-a4f5-0adaf4cdc84e"/>
+      <column name="OBJECT_ROWID" value="fb07cb0e-c391-4503-9c47-a39ec7388f4f"/>
+      <column name="OBJECT_TYPE" value="Organisation"/>
+    </insert>
+  <insert tableName="classification">
+      <column name="CLASSIFICATIONID" value="2e3d4c1e-24b2-4362-bee9-b11fa9847d42"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="618bf0d1-18d4-4a96-900c-80a5a616da9b"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="d67397c5-5e05-433b-b61d-12807906aa5a"/>
+      <column name="OBJECT_ROWID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
+      <column name="OBJECT_TYPE" value="Organisation"/>
+    </insert>
+    <insert tableName="classification">
+      <column name="CLASSIFICATIONID" value="8b59888b-ba5c-4a77-b06d-d522037fe3b3"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="b7b763d4-994d-483d-9a1c-6eb85786d61a"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="037a9de1-fa6d-4895-9db3-82f7769682ae"/>
+      <column name="OBJECT_ROWID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
+      <column name="OBJECT_TYPE" value="Organisation"/>
+    </insert>
+    <insert tableName="classification">
+      <column name="CLASSIFICATIONID" value="bc4a31b1-f2e2-4caf-8dcd-ac754c1d7290"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="47ca5b54-423f-4bf1-a4d6-a0c55a2488e6"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="970b251c-ca6e-43f4-9162-ebc5d1142a8b"/>
+      <column name="OBJECT_ROWID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
+      <column name="OBJECT_TYPE" value="Organisation"/>
+    </insert>
+    <insert tableName="classification">
+      <column name="CLASSIFICATIONID" value="813a990d-a17a-4481-a49d-7fb3a9c6513a"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="4d868dc5-747a-4f22-9134-638198d3084a"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="4b72857e-863d-4254-accf-25281bb7bb64"/>
+      <column name="OBJECT_ROWID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
+      <column name="OBJECT_TYPE" value="Organisation"/>
+    </insert>
+    <insert tableName="classification">
+      <column name="CLASSIFICATIONID" value="d6bf1068-83a5-4bcc-9d97-2efc72cc57a8"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="a60aaf2d-88aa-4c72-9606-0eb3ac9493cf"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="95396ee7-f0e2-41b4-995e-bac5749709ec"/>
+      <column name="OBJECT_ROWID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
+      <column name="OBJECT_TYPE" value="Organisation"/>
+    </insert>
+    <insert tableName="classification">
+      <column name="CLASSIFICATIONID" value="c5d4a548-7a5a-4695-b746-526ef41f5035"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="4982ab85-0961-4d85-8fee-2b55887add96"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="be76dab1-c6ab-4b1e-8322-8b052ccda4d9"/>
+      <column name="OBJECT_ROWID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
+      <column name="OBJECT_TYPE" value="Organisation"/>
+    </insert>
+  <insert tableName="classification">
+      <column name="CLASSIFICATIONID" value="1897cf27-f472-4d25-88fe-64bd08915817"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="07f21cf8-c369-45f3-88fe-40ca586ed11b"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="f581dcb9-db6f-4a82-995c-695d0a7393d3"/>
+      <column name="OBJECT_ROWID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
+      <column name="OBJECT_TYPE" value="Organisation"/>
+    </insert>
+  <insert tableName="classification">
+      <column name="CLASSIFICATIONID" value="75fd708e-78a9-442f-8ddb-913b8fd29cdf"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="5be4d454-1f3e-4a3d-b8a4-3eb49ce1bc35"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="4d878689-15c0-46cc-acc8-3c524463db5c"/>
+      <column name="OBJECT_ROWID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
+      <column name="OBJECT_TYPE" value="Organisation"/>
+    </insert>
+  <insert tableName="classification">
+      <column name="CLASSIFICATIONID" value="5bb7b949-cc0b-4724-a5e9-37bfcfe55813"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="4285d598-06c0-435d-bb5e-28dec5f31521"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="80c6ec8b-eb54-4d25-a4f5-0adaf4cdc84e"/>
+      <column name="OBJECT_ROWID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
+      <column name="OBJECT_TYPE" value="Organisation"/>
+    </insert>
+    
+    <insert tableName="classification">
+      <column name="CLASSIFICATIONID" value="d70e23a7-bc3c-43ae-8b2c-44d85fc7a2d3"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="3eb18b76-f51e-4ad2-9080-74b4a603667b"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="d67397c5-5e05-433b-b61d-12807906aa5a"/>
+      <column name="OBJECT_ROWID" value="6efb4fab-64f9-4d8e-aa6f-a158d13fc273"/>
+      <column name="OBJECT_TYPE" value="Organisation"/>
+    </insert>
+    <insert tableName="classification">
+      <column name="CLASSIFICATIONID" value="4e21e953-7146-43dd-a888-92d9f55f561e"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="b7b763d4-994d-483d-9a1c-6eb85786d61a"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="037a9de1-fa6d-4895-9db3-82f7769682ae"/>
+      <column name="OBJECT_ROWID" value="6efb4fab-64f9-4d8e-aa6f-a158d13fc273"/>
+      <column name="OBJECT_TYPE" value="Organisation"/>
+    </insert>
+    <insert tableName="classification">
+      <column name="CLASSIFICATIONID" value="a63b089c-f856-4513-8691-57422e400dc4"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="b41e180f-db8c-44c3-9fbb-179ab58d5852"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="6efb4fab-64f9-4d8e-aa6f-a158d13fc273"/>
+      <column name="OBJECT_ROWID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
+      <column name="OBJECT_TYPE" value="Organisation"/>
+    </insert>
+    <insert tableName="classification">
+      <column name="CLASSIFICATIONID" value="9772b8f6-08c6-40aa-af16-df68bcecb77f"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="51575eb6-4005-42d2-96f3-b35dfd06a86b"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="4b72857e-863d-4254-accf-25281bb7bb64"/>
+      <column name="OBJECT_ROWID" value="6efb4fab-64f9-4d8e-aa6f-a158d13fc273"/>
+      <column name="OBJECT_TYPE" value="Organisation"/>
+    </insert>
+    <insert tableName="classification">
+      <column name="CLASSIFICATIONID" value="83537aae-14a3-499f-a94b-9c630745110b"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="a60aaf2d-88aa-4c72-9606-0eb3ac9493cf"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="95396ee7-f0e2-41b4-995e-bac5749709ec"/>
+      <column name="OBJECT_ROWID" value="6efb4fab-64f9-4d8e-aa6f-a158d13fc273"/>
+      <column name="OBJECT_TYPE" value="Organisation"/>
+    </insert>
+    <insert tableName="classification">
+      <column name="CLASSIFICATIONID" value="a1591490-e7c3-46b1-8d7e-843acbe93b41"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="4982ab85-0961-4d85-8fee-2b55887add96"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="be76dab1-c6ab-4b1e-8322-8b052ccda4d9"/>
+      <column name="OBJECT_ROWID" value="6efb4fab-64f9-4d8e-aa6f-a158d13fc273"/>
+      <column name="OBJECT_TYPE" value="Organisation"/>
+    </insert>
+  <insert tableName="classification">
+      <column name="CLASSIFICATIONID" value="76990230-73ec-4026-8a28-871ac5b4edc6"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="07f21cf8-c369-45f3-88fe-40ca586ed11b"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="f581dcb9-db6f-4a82-995c-695d0a7393d3"/>
+      <column name="OBJECT_ROWID" value="6efb4fab-64f9-4d8e-aa6f-a158d13fc273"/>
+      <column name="OBJECT_TYPE" value="Organisation"/>
+    </insert>
+  <insert tableName="classification">
+      <column name="CLASSIFICATIONID" value="326d5aff-cb21-4bb6-9c32-7fcac48d175c"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="5be4d454-1f3e-4a3d-b8a4-3eb49ce1bc35"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="4d878689-15c0-46cc-acc8-3c524463db5c"/>
+      <column name="OBJECT_ROWID" value="6efb4fab-64f9-4d8e-aa6f-a158d13fc273"/>
+      <column name="OBJECT_TYPE" value="Organisation"/>
+    </insert>
+  <insert tableName="classification">
+      <column name="CLASSIFICATIONID" value="8d830242-7eb6-4185-b1cc-3e7977e6c340"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="4285d598-06c0-435d-bb5e-28dec5f31521"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="80c6ec8b-eb54-4d25-a4f5-0adaf4cdc84e"/>
+      <column name="OBJECT_ROWID" value="6efb4fab-64f9-4d8e-aa6f-a158d13fc273"/>
+      <column name="OBJECT_TYPE" value="Organisation"/>
+    </insert>
+    
+    
+    
   </changeSet>
 </databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/_demoData/generatedData/classificationgrading.xml b/.liquibase/Data_alias/basic/_demoData/generatedData/classificationgrading.xml
new file mode 100644
index 0000000000..43958c7b36
--- /dev/null
+++ b/.liquibase/Data_alias/basic/_demoData/generatedData/classificationgrading.xml
@@ -0,0 +1,127 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+  <changeSet author="autogenerated" id="2365bd93-fb40-4701-b3c2-4c7fd483261">
+    <delete tableName="classificationgrading"/>
+    <insert tableName="classificationgrading">
+      <column name="CLASSIFICATIONGRADINGID" value="68dd4d91-d472-477d-935c-70cbe5606c51"/>
+      <column name="GRADING" value="A"/>
+      <column name="MAXGRADEFORSCORE" valueNumeric="100"/>
+      <column name="CLASSIFICATIONTYPE_GROUP" value="1. Classification"/>
+    </insert>
+    <insert tableName="classificationgrading">
+      <column name="CLASSIFICATIONGRADINGID" value="9437f368-bea1-47f4-b76e-d6a391af438d"/>
+      <column name="GRADING" value="B"/>
+      <column name="MAXGRADEFORSCORE" valueNumeric="75"/>
+      <column name="CLASSIFICATIONTYPE_GROUP" value="1. Classification"/>
+    </insert>
+    <insert tableName="classificationgrading">
+      <column name="CLASSIFICATIONGRADINGID" value="348a2af8-ec01-4a58-8ff6-5e3a837852a4"/>
+      <column name="GRADING" value="C"/>
+      <column name="MAXGRADEFORSCORE" valueNumeric="50"/>
+      <column name="CLASSIFICATIONTYPE_GROUP" value="1. Classification"/>
+    </insert>
+    <insert tableName="classificationgrading">
+      <column name="CLASSIFICATIONGRADINGID" value="9a823957-0ca9-4972-95df-d894d4e4fc25"/>
+      <column name="GRADING" value="D"/>
+      <column name="MAXGRADEFORSCORE" valueNumeric="25"/>
+      <column name="CLASSIFICATIONTYPE_GROUP" value="1. Classification"/>
+    </insert>
+    <insert tableName="classificationgrading">
+      <column name="CLASSIFICATIONGRADINGID" value="4ef54a02-ddf8-4238-b9fd-f5a043032b7d"/>
+      <column name="GRADING" value="A"/>
+      <column name="MAXGRADEFORSCORE" valueNumeric="100"/>
+      <column name="CLASSIFICATIONTYPE_GROUP" value="2. Classification"/>
+    </insert>
+    <insert tableName="classificationgrading">
+      <column name="CLASSIFICATIONGRADINGID" value="748ef65c-af41-42d8-8ac4-480bc9390591"/>
+      <column name="GRADING" value="B"/>
+      <column name="MAXGRADEFORSCORE" valueNumeric="75"/>
+      <column name="CLASSIFICATIONTYPE_GROUP" value="2. Classification"/>
+    </insert>
+    <insert tableName="classificationgrading">
+      <column name="CLASSIFICATIONGRADINGID" value="8e73dd97-4428-4316-882d-7b2af56330ef"/>
+      <column name="GRADING" value="C"/>
+      <column name="MAXGRADEFORSCORE" valueNumeric="50"/>
+      <column name="CLASSIFICATIONTYPE_GROUP" value="2. Classification"/>
+    </insert>
+    <insert tableName="classificationgrading">
+      <column name="CLASSIFICATIONGRADINGID" value="76af9750-a714-4a35-bfd2-6eab3c316e5b"/>
+      <column name="GRADING" value="D"/>
+      <column name="MAXGRADEFORSCORE" valueNumeric="25"/>
+      <column name="CLASSIFICATIONTYPE_GROUP" value="2. Classification"/>
+    </insert>
+    <insert tableName="classificationgrading">
+      <column name="CLASSIFICATIONGRADINGID" value="c021718f-b6ca-4d4d-87f7-e4450d103fe2"/>
+      <column name="GRADING" value="A"/>
+      <column name="MAXGRADEFORSCORE" valueNumeric="100"/>
+      <column name="CLASSIFICATIONTYPE_GROUP" value="3. Classification"/>
+    </insert>
+    <insert tableName="classificationgrading">
+      <column name="CLASSIFICATIONGRADINGID" value="8f702450-83fc-4085-92c2-ac09f96dcd6b"/>
+      <column name="GRADING" value="B"/>
+      <column name="MAXGRADEFORSCORE" valueNumeric="75"/>
+      <column name="CLASSIFICATIONTYPE_GROUP" value="3. Classification"/>
+    </insert>
+    <insert tableName="classificationgrading">
+      <column name="CLASSIFICATIONGRADINGID" value="14da2618-88be-425c-92c3-68d8584aa0bf"/>
+      <column name="GRADING" value="C"/>
+      <column name="MAXGRADEFORSCORE" valueNumeric="50"/>
+      <column name="CLASSIFICATIONTYPE_GROUP" value="3. Classification"/>
+    </insert>
+    <insert tableName="classificationgrading">
+      <column name="CLASSIFICATIONGRADINGID" value="5e5c3ffe-3fa6-41e3-8659-1b03e7e1a1cd"/>
+      <column name="GRADING" value="D"/>
+      <column name="MAXGRADEFORSCORE" valueNumeric="25"/>
+      <column name="CLASSIFICATIONTYPE_GROUP" value="3. Classification"/>
+    </insert>
+    
+    <insert tableName="classificationgrading">
+      <column name="CLASSIFICATIONGRADINGID" value="5e46e499-00c2-4cc2-9f4c-952290484623"/>
+      <column name="GRADING" value="D"/>
+      <column name="MAXGRADEFORSCORE" valueNumeric="25"/>
+      <column name="CLASSIFICATIONTYPE_GROUP" value="1. Target group"/>
+    </insert>
+    <insert tableName="classificationgrading">
+      <column name="CLASSIFICATIONGRADINGID" value="8c982beb-bc53-4bcf-8b76-7ee919bbf653"/>
+      <column name="GRADING" value="C"/>
+      <column name="MAXGRADEFORSCORE" valueNumeric="50"/>
+      <column name="CLASSIFICATIONTYPE_GROUP" value="1. Target group"/>
+    </insert>
+    <insert tableName="classificationgrading">
+      <column name="CLASSIFICATIONGRADINGID" value="a89c81df-9380-41b1-9c7c-52d3a1862ac7"/>
+      <column name="GRADING" value="B"/>
+      <column name="MAXGRADEFORSCORE" valueNumeric="75"/>
+      <column name="CLASSIFICATIONTYPE_GROUP" value="1. Target group"/>
+    </insert>
+    <insert tableName="classificationgrading">
+      <column name="CLASSIFICATIONGRADINGID" value="7afd58ad-6eae-4d6b-8d4b-2ca4bdd177e6"/>
+      <column name="GRADING" value="A"/>
+      <column name="MAXGRADEFORSCORE" valueNumeric="100"/>
+      <column name="CLASSIFICATIONTYPE_GROUP" value="1. Target group"/>
+    </insert>
+    <insert tableName="classificationgrading">
+      <column name="CLASSIFICATIONGRADINGID" value="8408ca43-a4dc-4767-8127-e52c08276815"/>
+      <column name="GRADING" value="D"/>
+      <column name="MAXGRADEFORSCORE" valueNumeric="25"/>
+      <column name="CLASSIFICATIONTYPE_GROUP" value="2. Customer value"/>
+    </insert>
+    <insert tableName="classificationgrading">
+      <column name="CLASSIFICATIONGRADINGID" value="03aa277d-873b-4913-9051-d44aa4f77627"/>
+      <column name="GRADING" value="C"/>
+      <column name="MAXGRADEFORSCORE" valueNumeric="50"/>
+      <column name="CLASSIFICATIONTYPE_GROUP" value="2. Customer value"/>
+    </insert>
+    <insert tableName="classificationgrading">
+      <column name="CLASSIFICATIONGRADINGID" value="29226adf-eb79-4696-a4b8-7be73c9488e6"/>
+      <column name="GRADING" value="B"/>
+      <column name="MAXGRADEFORSCORE" valueNumeric="75"/>
+      <column name="CLASSIFICATIONTYPE_GROUP" value="2. Customer value"/>
+    </insert>
+    <insert tableName="classificationgrading">
+      <column name="CLASSIFICATIONGRADINGID" value="f8e1c5a4-b0d0-4b73-9700-11ff916adfdd"/>
+      <column name="GRADING" value="A"/>
+      <column name="MAXGRADEFORSCORE" valueNumeric="100"/>
+      <column name="CLASSIFICATIONTYPE_GROUP" value="2. Customer value"/>
+    </insert>
+  </changeSet>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/_demoData/generatedData/classificationscore.xml b/.liquibase/Data_alias/basic/_demoData/generatedData/classificationscore.xml
index f95ec00da2..7e855d0f6b 100644
--- a/.liquibase/Data_alias/basic/_demoData/generatedData/classificationscore.xml
+++ b/.liquibase/Data_alias/basic/_demoData/generatedData/classificationscore.xml
@@ -184,13 +184,6 @@
       <column name="SORT" valueNumeric="40"/>
       <column name="TITLE" value="50 to 99T"/>
     </insert>
-    <insert tableName="classificationscore">
-      <column name="CLASSIFICATIONSCOREID" value="77a0088c-a665-4feb-9f60-99c1eb710015"/>
-      <column name="CLASSIFICATIONTYPE_ID" value="4977ba88-074c-4fe5-b04a-97c9a5eae982"/>
-      <column name="SCORE" valueNumeric="33.30"/>
-      <column name="SORT" valueNumeric="50"/>
-      <column name="TITLE" value="Lifesience"/>
-    </insert>
     <insert tableName="classificationscore">
       <column name="CLASSIFICATIONSCOREID" value="7d6f716a-97c7-417b-a8c0-3cb71e403dde"/>
       <column name="CLASSIFICATIONTYPE_ID" value="54128957-c80b-4b5a-ad1b-cfce665dfb10"/>
@@ -413,7 +406,317 @@
       <column name="CLASSIFICATIONTYPE_ID" value="f4d3791e-1717-4473-987b-0cd751805387"/>
       <column name="SCORE" valueNumeric="20.00"/>
       <column name="SORT" valueNumeric="20"/>
-      <column name="TITLE" value="Within 12 months"/>
+      <column name="TITLE" value="unknown"/>
+    </insert>
+    
+    <insert tableName="CLASSIFICATIONSCORE">
+      <column name="CLASSIFICATIONSCOREID" value="2cd8d11f-ee3f-429b-a16a-7839cf30b62d"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="4b72857e-863d-4254-accf-25281bb7bb64"/>
+      <column name="SCORE" valueNumeric="20.00"/>
+      <column name="SORT" valueNumeric="20"/>
+      <column name="TITLE" value="51-100"/>
+    </insert>
+    <insert tableName="CLASSIFICATIONSCORE">
+      <column name="CLASSIFICATIONSCOREID" value="4d868dc5-747a-4f22-9134-638198d3084a"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="4b72857e-863d-4254-accf-25281bb7bb64"/>
+      <column name="SCORE" valueNumeric="5.00"/>
+      <column name="SORT" valueNumeric="10"/>
+      <column name="TITLE" value="0-50"/>
+    </insert>
+    <insert tableName="CLASSIFICATIONSCORE">
+      <column name="CLASSIFICATIONSCOREID" value="92708239-fd7f-4699-8aaa-b6290fedaac0"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="4b72857e-863d-4254-accf-25281bb7bb64"/>
+      <column name="SCORE" valueNumeric="15.00"/>
+      <column name="SORT" valueNumeric="40"/>
+      <column name="TITLE" value="251-1000"/>
+    </insert>
+    <insert tableName="CLASSIFICATIONSCORE">
+      <column name="CLASSIFICATIONSCOREID" value="d578aa09-5d14-4ace-8cd0-572c5efcd82e"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="4b72857e-863d-4254-accf-25281bb7bb64"/>
+      <column name="SCORE" valueNumeric="5.00"/>
+      <column name="SORT" valueNumeric="50"/>
+      <column name="TITLE" value="ab 1000"/>
+    </insert>
+    <insert tableName="CLASSIFICATIONSCORE">
+      <column name="CLASSIFICATIONSCOREID" value="51575eb6-4005-42d2-96f3-b35dfd06a86b"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="4b72857e-863d-4254-accf-25281bb7bb64"/>
+      <column name="SCORE" valueNumeric="25.00"/>
+      <column name="SORT" valueNumeric="30"/>
+      <column name="TITLE" value="101-250"/>
+    </insert>
+    <insert tableName="CLASSIFICATIONSCORE">
+      <column name="CLASSIFICATIONSCOREID" value="47ca5b54-423f-4bf1-a4d6-a0c55a2488e6"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="970b251c-ca6e-43f4-9162-ebc5d1142a8b"/>
+      <column name="SCORE" valueNumeric="20.00"/>
+      <column name="SORT" valueNumeric="10"/>
+      <column name="TITLE" value="Commodity group 1"/>
+    </insert>
+    <insert tableName="CLASSIFICATIONSCORE">
+      <column name="CLASSIFICATIONSCOREID" value="fd8a348a-dc1f-414b-b95e-b1a6aeb9a8d4"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="970b251c-ca6e-43f4-9162-ebc5d1142a8b"/>
+      <column name="SCORE" valueNumeric="10.00"/>
+      <column name="SORT" valueNumeric="20"/>
+      <column name="TITLE" value="Commodity group 2"/>
+    </insert>
+    <insert tableName="CLASSIFICATIONSCORE">
+      <column name="CLASSIFICATIONSCOREID" value="b41e180f-db8c-44c3-9fbb-179ab58d5852"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="970b251c-ca6e-43f4-9162-ebc5d1142a8b"/>
+      <column name="SCORE" valueNumeric="5.00"/>
+      <column name="SORT" valueNumeric="30"/>
+      <column name="TITLE" value="Commodity group 3"/>
+    </insert>
+    <insert tableName="CLASSIFICATIONSCORE">
+      <column name="CLASSIFICATIONSCOREID" value="206fd02f-68ec-42f2-83d1-92848f51dc1a"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="037a9de1-fa6d-4895-9db3-82f7769682ae"/>
+      <column name="SCORE" valueNumeric="25.00"/>
+      <column name="SORT" valueNumeric="30"/>
+      <column name="TITLE" value="Switzerland"/>
+    </insert>
+    <insert tableName="CLASSIFICATIONSCORE">
+      <column name="CLASSIFICATIONSCOREID" value="8d7bc557-e020-42c9-83d9-ff84fcbd12b7"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="037a9de1-fa6d-4895-9db3-82f7769682ae"/>
+      <column name="SCORE" valueNumeric="35.00"/>
+      <column name="SORT" valueNumeric="20"/>
+      <column name="TITLE" value="Austria"/>
+    </insert>
+    <insert tableName="CLASSIFICATIONSCORE">
+      <column name="CLASSIFICATIONSCOREID" value="2745d6c3-fffb-4f72-8bc2-92439a14e919"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="037a9de1-fa6d-4895-9db3-82f7769682ae"/>
+      <column name="SCORE" valueNumeric="0.00"/>
+      <column name="SORT" valueNumeric="40"/>
+      <column name="TITLE" value="Other"/>
+    </insert>
+    <insert tableName="CLASSIFICATIONSCORE">
+      <column name="CLASSIFICATIONSCOREID" value="b7b763d4-994d-483d-9a1c-6eb85786d61a"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="037a9de1-fa6d-4895-9db3-82f7769682ae"/>
+      <column name="SCORE" valueNumeric="35.00"/>
+      <column name="SORT" valueNumeric="10"/>
+      <column name="TITLE" value="Germany"/>
+    </insert>
+    <insert tableName="CLASSIFICATIONSCORE">
+      <column name="CLASSIFICATIONSCOREID" value="9181a683-dcab-47fc-af7b-e282505348d6"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="d67397c5-5e05-433b-b61d-12807906aa5a"/>
+      <column name="SCORE" valueNumeric="5.00"/>
+      <column name="SORT" valueNumeric="90"/>
+      <column name="TITLE" value="Energy"/>
+    </insert>
+    <insert tableName="CLASSIFICATIONSCORE">
+      <column name="CLASSIFICATIONSCOREID" value="3eb18b76-f51e-4ad2-9080-74b4a603667b"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="d67397c5-5e05-433b-b61d-12807906aa5a"/>
+      <column name="SCORE" valueNumeric="5.00"/>
+      <column name="SORT" valueNumeric="20"/>
+      <column name="TITLE" value="Machinery and equipment"/>
+    </insert>
+    <insert tableName="CLASSIFICATIONSCORE">
+      <column name="CLASSIFICATIONSCOREID" value="618bf0d1-18d4-4a96-900c-80a5a616da9b"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="d67397c5-5e05-433b-b61d-12807906aa5a"/>
+      <column name="SCORE" valueNumeric="10.00"/>
+      <column name="SORT" valueNumeric="30"/>
+      <column name="TITLE" value="Logistics"/>
+    </insert>
+    <insert tableName="CLASSIFICATIONSCORE">
+      <column name="CLASSIFICATIONSCOREID" value="4c8cfcec-f183-4d82-8a59-ae743ec772b4"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="d67397c5-5e05-433b-b61d-12807906aa5a"/>
+      <column name="SCORE" valueNumeric="10.00"/>
+      <column name="SORT" valueNumeric="130"/>
+      <column name="TITLE" value="Trade"/>
+    </insert>
+    <insert tableName="CLASSIFICATIONSCORE">
+      <column name="CLASSIFICATIONSCOREID" value="6632b510-7094-45d6-b7ef-946e759429a3"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="d67397c5-5e05-433b-b61d-12807906aa5a"/>
+      <column name="SCORE" valueNumeric="10.00"/>
+      <column name="SORT" valueNumeric="140"/>
+      <column name="TITLE" value="Automotive"/>
+    </insert>
+    <insert tableName="CLASSIFICATIONSCORE">
+      <column name="CLASSIFICATIONSCOREID" value="22581c2e-bb4d-43cb-b6b3-80244425e209"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="d67397c5-5e05-433b-b61d-12807906aa5a"/>
+      <column name="SCORE" valueNumeric="0.00"/>
+      <column name="SORT" valueNumeric="180"/>
+      <column name="TITLE" value="Service"/>
+    </insert>
+    <insert tableName="CLASSIFICATIONSCORE">
+      <column name="CLASSIFICATIONSCOREID" value="fd022500-4cbc-461f-abb9-b0ec3d8e1dd1"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="d67397c5-5e05-433b-b61d-12807906aa5a"/>
+      <column name="SCORE" valueNumeric="5.00"/>
+      <column name="SORT" valueNumeric="80"/>
+      <column name="TITLE" value="Food"/>
+    </insert>
+    <insert tableName="CLASSIFICATIONSCORE">
+      <column name="CLASSIFICATIONSCOREID" value="904e2dbe-49a1-42a0-a5db-0f274334dd7f"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="d67397c5-5e05-433b-b61d-12807906aa5a"/>
+      <column name="SCORE" valueNumeric="10.00"/>
+      <column name="SORT" valueNumeric="160"/>
+      <column name="TITLE" value="Electric"/>
+    </insert>
+    <insert tableName="CLASSIFICATIONSCORE">
+      <column name="CLASSIFICATIONSCOREID" value="9ac96400-9c47-4d4f-be5b-e053f92a54ce"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="d67397c5-5e05-433b-b61d-12807906aa5a"/>
+      <column name="SCORE" valueNumeric="20.00"/>
+      <column name="SORT" valueNumeric="40"/>
+      <column name="TITLE" value="IT"/>
+    </insert>
+    <insert tableName="CLASSIFICATIONSCORE">
+      <column name="CLASSIFICATIONSCOREID" value="09559e61-09ed-4f85-b0cb-fa7b0c66e488"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="d67397c5-5e05-433b-b61d-12807906aa5a"/>
+      <column name="SCORE" valueNumeric="15.00"/>
+      <column name="SORT" valueNumeric="150"/>
+      <column name="TITLE" value="Publishing house"/>
+    </insert>
+    <insert tableName="CLASSIFICATIONSCORE">
+      <column name="CLASSIFICATIONSCOREID" value="d2a75f81-d0b3-48ce-be97-5e6add962cbb"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="d67397c5-5e05-433b-b61d-12807906aa5a"/>
+      <column name="SCORE" valueNumeric="15.00"/>
+      <column name="SORT" valueNumeric="70"/>
+      <column name="TITLE" value="Consultation"/>
+    </insert>
+    <insert tableName="CLASSIFICATIONSCORE">
+      <column name="CLASSIFICATIONSCOREID" value="92c8f126-b31e-4011-bbf0-cb5e57bfc3e5"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="d67397c5-5e05-433b-b61d-12807906aa5a"/>
+      <column name="SCORE" valueNumeric="10.00"/>
+      <column name="SORT" valueNumeric="60"/>
+      <column name="TITLE" value="Finance"/>
+    </insert>
+    <insert tableName="CLASSIFICATIONSCORE">
+      <column name="CLASSIFICATIONSCOREID" value="107c199b-b315-4093-add5-48c496794bc9"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="d67397c5-5e05-433b-b61d-12807906aa5a"/>
+      <column name="SCORE" valueNumeric="5.00"/>
+      <column name="SORT" valueNumeric="110"/>
+      <column name="TITLE" value="Lottery"/>
+    </insert>
+    <insert tableName="CLASSIFICATIONSCORE">
+      <column name="CLASSIFICATIONSCOREID" value="df7ea293-1fd6-4e98-ba3f-7d975fa8eaeb"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="d67397c5-5e05-433b-b61d-12807906aa5a"/>
+      <column name="SCORE" valueNumeric="5.00"/>
+      <column name="SORT" valueNumeric="170"/>
+      <column name="TITLE" value="Environment"/>
+    </insert>
+    <insert tableName="CLASSIFICATIONSCORE">
+      <column name="CLASSIFICATIONSCOREID" value="2119cb62-b57c-40be-aff8-ace8e40378d4"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="d67397c5-5e05-433b-b61d-12807906aa5a"/>
+      <column name="SCORE" valueNumeric="20.00"/>
+      <column name="SORT" valueNumeric="120"/>
+      <column name="TITLE" value="Education"/>
+    </insert>
+    
+    <insert tableName="CLASSIFICATIONSCORE">
+      <column name="CLASSIFICATIONSCOREID" value="4285d598-06c0-435d-bb5e-28dec5f31521"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="80c6ec8b-eb54-4d25-a4f5-0adaf4cdc84e"/>
+      <column name="SCORE" valueNumeric="15.00"/>
+      <column name="SORT" valueNumeric="10"/>
+      <column name="TITLE" value="high"/>
+    </insert>
+    <insert tableName="CLASSIFICATIONSCORE">
+      <column name="CLASSIFICATIONSCOREID" value="5564a330-8c13-424f-a24b-5f97185a9036"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="80c6ec8b-eb54-4d25-a4f5-0adaf4cdc84e"/>
+      <column name="SCORE" valueNumeric="0.00"/>
+      <column name="SORT" valueNumeric="30"/>
+      <column name="TITLE" value="low"/>
+    </insert>
+    <insert tableName="CLASSIFICATIONSCORE">
+      <column name="CLASSIFICATIONSCOREID" value="d0f5c576-e1cd-463e-82d2-e09c46ccb2a0"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="80c6ec8b-eb54-4d25-a4f5-0adaf4cdc84e"/>
+      <column name="SCORE" valueNumeric="5.00"/>
+      <column name="SORT" valueNumeric="20"/>
+      <column name="TITLE" value="medium"/>
+    </insert>
+      <insert tableName="CLASSIFICATIONSCORE">
+      <column name="CLASSIFICATIONSCOREID" value="893720f9-3780-4868-af0c-cbef5a564024"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="4d878689-15c0-46cc-acc8-3c524463db5c"/>
+      <column name="SCORE" valueNumeric="0.00"/>
+      <column name="SORT" valueNumeric="30"/>
+      <column name="TITLE" value="low"/>
+    </insert>
+    <insert tableName="CLASSIFICATIONSCORE">
+      <column name="CLASSIFICATIONSCOREID" value="0b671383-ecc3-440c-aff4-ff485da2755d"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="4d878689-15c0-46cc-acc8-3c524463db5c"/>
+      <column name="SCORE" valueNumeric="10.00"/>
+      <column name="SORT" valueNumeric="20"/>
+      <column name="TITLE" value="medium"/>
+    </insert>
+    <insert tableName="CLASSIFICATIONSCORE">
+      <column name="CLASSIFICATIONSCOREID" value="5be4d454-1f3e-4a3d-b8a4-3eb49ce1bc35"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="4d878689-15c0-46cc-acc8-3c524463db5c"/>
+      <column name="SCORE" valueNumeric="20.00"/>
+      <column name="SORT" valueNumeric="10"/>
+      <column name="TITLE" value="high"/>
+    </insert>
+    <insert tableName="CLASSIFICATIONSCORE">
+      <column name="CLASSIFICATIONSCOREID" value="29134094-66f2-4331-9f14-fc6a27ab111e"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="f581dcb9-db6f-4a82-995c-695d0a7393d3"/>
+      <column name="SCORE" valueNumeric="0.00"/>
+      <column name="SORT" valueNumeric="10"/>
+      <column name="TITLE" value="0-49 T€"/>
+    </insert>
+    <insert tableName="CLASSIFICATIONSCORE">
+      <column name="CLASSIFICATIONSCOREID" value="07f21cf8-c369-45f3-88fe-40ca586ed11b"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="f581dcb9-db6f-4a82-995c-695d0a7393d3"/>
+      <column name="SCORE" valueNumeric="10.00"/>
+      <column name="SORT" valueNumeric="30"/>
+      <column name="TITLE" value="100-199 T€"/>
+    </insert>
+    <insert tableName="CLASSIFICATIONSCORE">
+      <column name="CLASSIFICATIONSCOREID" value="733323d6-ff3d-4ccb-b179-ad1fea05dfe8"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="f581dcb9-db6f-4a82-995c-695d0a7393d3"/>
+      <column name="SCORE" valueNumeric="15.00"/>
+      <column name="SORT" valueNumeric="40"/>
+      <column name="TITLE" value="200-349 T€"/>
+    </insert>
+    <insert tableName="CLASSIFICATIONSCORE">
+      <column name="CLASSIFICATIONSCOREID" value="839cd672-5981-4207-8a82-caddd00107e4"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="f581dcb9-db6f-4a82-995c-695d0a7393d3"/>
+      <column name="SCORE" valueNumeric="5.00"/>
+      <column name="SORT" valueNumeric="20"/>
+      <column name="TITLE" value="50-99 T€"/>
+    </insert>
+    <insert tableName="CLASSIFICATIONSCORE">
+      <column name="CLASSIFICATIONSCOREID" value="f02cfd28-5a09-42ca-b805-07b7b38e3363"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="f581dcb9-db6f-4a82-995c-695d0a7393d3"/>
+      <column name="SCORE" valueNumeric="20.00"/>
+      <column name="SORT" valueNumeric="50"/>
+      <column name="TITLE" value="ab 350 T€"/>
+    </insert>
+    <insert tableName="CLASSIFICATIONSCORE">
+      <column name="CLASSIFICATIONSCOREID" value="4982ab85-0961-4d85-8fee-2b55887add96"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="be76dab1-c6ab-4b1e-8322-8b052ccda4d9"/>
+      <column name="SCORE" valueNumeric="5.00"/>
+      <column name="SORT" valueNumeric="10"/>
+      <column name="TITLE" value="high"/>
+    </insert>
+    <insert tableName="CLASSIFICATIONSCORE">
+      <column name="CLASSIFICATIONSCOREID" value="08764209-9b5e-4893-96d0-e2a347bccf60"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="be76dab1-c6ab-4b1e-8322-8b052ccda4d9"/>
+      <column name="SCORE" valueNumeric="20.00"/>
+      <column name="SORT" valueNumeric="30"/>
+      <column name="TITLE" value="low"/>
+    </insert>
+    <insert tableName="CLASSIFICATIONSCORE">
+      <column name="CLASSIFICATIONSCOREID" value="6fe28489-2383-412b-9bbd-4f01a9421775"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="be76dab1-c6ab-4b1e-8322-8b052ccda4d9"/>
+      <column name="SCORE" valueNumeric="10.00"/>
+      <column name="SORT" valueNumeric="20"/>
+      <column name="TITLE" value="medium"/>
+    </insert>
+    <insert tableName="CLASSIFICATIONSCORE">
+      <column name="CLASSIFICATIONSCOREID" value="cddaf52d-37b7-426c-b858-c986e58544e6"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="95396ee7-f0e2-41b4-995e-bac5749709ec"/>
+      <column name="SCORE" valueNumeric="10.00"/>
+      <column name="SORT" valueNumeric="20"/>
+      <column name="TITLE" value="Stagnated"/>
+    </insert>
+    <insert tableName="CLASSIFICATIONSCORE">
+      <column name="CLASSIFICATIONSCOREID" value="4ed5e22f-222a-4a51-83d3-597fa035d2df"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="95396ee7-f0e2-41b4-995e-bac5749709ec"/>
+      <column name="SCORE" valueNumeric="0.00"/>
+      <column name="SORT" valueNumeric="30"/>
+      <column name="TITLE" value="Negative"/>
+    </insert>
+    <insert tableName="CLASSIFICATIONSCORE">
+      <column name="CLASSIFICATIONSCOREID" value="a60aaf2d-88aa-4c72-9606-0eb3ac9493cf"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="95396ee7-f0e2-41b4-995e-bac5749709ec"/>
+      <column name="SCORE" valueNumeric="25.00"/>
+      <column name="SORT" valueNumeric="10"/>
+      <column name="TITLE" value="Positive"/>
     </insert>
   </changeSet>
 </databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/_demoData/generatedData/classificationtype.xml b/.liquibase/Data_alias/basic/_demoData/generatedData/classificationtype.xml
index 88d262c0d8..9b58008a92 100644
--- a/.liquibase/Data_alias/basic/_demoData/generatedData/classificationtype.xml
+++ b/.liquibase/Data_alias/basic/_demoData/generatedData/classificationtype.xml
@@ -68,5 +68,61 @@
       <column name="CLASSIFICATIONTYPEID" value="f4d3791e-1717-4473-987b-0cd751805387"/>
       <column name="SCORETYPE" value="ScoreProjectStart"/>
     </insert>
+    
+    <insert tableName="CLASSIFICATIONTYPE">
+        <column name="CLASSIFICATIONGROUP" value="1. Target group"/>
+        <column name="CLASSIFICATIONTYPE" value="ORGANISATION"/>
+        <column name="CLASSIFICATIONTYPEID" value="4b72857e-863d-4254-accf-25281bb7bb64"/>
+        <column name="SCORETYPE" value="Number of employees"/>
+        </insert>
+        <insert tableName="CLASSIFICATIONTYPE">
+        <column name="CLASSIFICATIONGROUP" value="1. Target group"/>
+        <column name="CLASSIFICATIONTYPE" value="ORGANISATION"/>
+        <column name="CLASSIFICATIONTYPEID" value="970b251c-ca6e-43f4-9162-ebc5d1142a8b"/>
+        <column name="SCORETYPE" value="Product preference"/>
+        </insert>
+        <insert tableName="CLASSIFICATIONTYPE">
+        <column name="CLASSIFICATIONGROUP" value="1. Target group"/>
+        <column name="CLASSIFICATIONTYPE" value="ORGANISATION"/>
+        <column name="CLASSIFICATIONTYPEID" value="037a9de1-fa6d-4895-9db3-82f7769682ae"/>
+        <column name="SCORETYPE" value="Headquarters"/>
+        </insert>
+        <insert tableName="CLASSIFICATIONTYPE">
+        <column name="CLASSIFICATIONGROUP" value="1. Target group"/>
+        <column name="CLASSIFICATIONTYPE" value="ORGANISATION"/>
+        <column name="CLASSIFICATIONTYPEID" value="d67397c5-5e05-433b-b61d-12807906aa5a"/>
+        <column name="SCORETYPE" value="Industry"/>
+        </insert>
+        <insert tableName="CLASSIFICATIONTYPE">
+        <column name="CLASSIFICATIONGROUP" value="2. Customer value"/>
+        <column name="CLASSIFICATIONTYPE" value="ORGANISATION"/>
+        <column name="CLASSIFICATIONTYPEID" value="80c6ec8b-eb54-4d25-a4f5-0adaf4cdc84e"/>
+        <column name="SCORETYPE" value="Creditworthiness"/>
+        </insert>
+        <insert tableName="CLASSIFICATIONTYPE">
+        <column name="CLASSIFICATIONGROUP" value="2. Customer value"/>
+        <column name="CLASSIFICATIONTYPE" value="ORGANISATION"/>
+        <column name="CLASSIFICATIONTYPEID" value="4d878689-15c0-46cc-acc8-3c524463db5c"/>
+        <column name="SCORETYPE" value="Loyalty"/>
+        </insert>
+        <insert tableName="CLASSIFICATIONTYPE">
+        <column name="CLASSIFICATIONGROUP" value="2. Customer value"/>
+        <column name="CLASSIFICATIONTYPE" value="ORGANISATION"/>
+        <column name="CLASSIFICATIONTYPEID" value="f581dcb9-db6f-4a82-995c-695d0a7393d3"/>
+        <column name="SCORETYPE" value="Purchasing potential p. a."/>
+        </insert>
+        <insert tableName="CLASSIFICATIONTYPE">
+        <column name="CLASSIFICATIONGROUP" value="2. Customer value"/>
+        <column name="CLASSIFICATIONTYPE" value="ORGANISATION"/>
+        <column name="CLASSIFICATIONTYPEID" value="be76dab1-c6ab-4b1e-8322-8b052ccda4d9"/>
+        <column name="SCORETYPE" value="Current supply share"/>
+        </insert>
+        <insert tableName="CLASSIFICATIONTYPE">
+        <column name="CLASSIFICATIONGROUP" value="2. Customer value"/>
+        <column name="CLASSIFICATIONTYPE" value="ORGANISATION"/>
+        <column name="CLASSIFICATIONTYPEID" value="95396ee7-f0e2-41b4-995e-bac5749709ec"/>
+        <column name="SCORETYPE" value="Business development"/>
+        </insert>
+        
   </changeSet>
 </databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/changelog.xml b/.liquibase/Data_alias/changelog.xml
index b3fee691bd..db4017af8f 100644
--- a/.liquibase/Data_alias/changelog.xml
+++ b/.liquibase/Data_alias/changelog.xml
@@ -16,6 +16,8 @@
     <include relativeToChangelogFile="true" file="basic/2020.1.2/changelog.xml"/>
     <include relativeToChangelogFile="true" file="basic/2020.1.3/changelog.xml"/>
 
+    <include relativeToChangelogFile="true" file="basic/2020.2.0/changelog.xml"/>
+    
     <!--enable this only when you definetly want to overwrite the existing data with demo records:--> 
     <!--<include relativeToChangelogFile="true" file="basic/_demoData/changelog.xml" context="example"/>-->
 </databaseChangeLog>
\ No newline at end of file
diff --git a/aliasDefinition/Data_alias/Data_alias.aod b/aliasDefinition/Data_alias/Data_alias.aod
index b42801cfda..100725cc45 100644
--- a/aliasDefinition/Data_alias/Data_alias.aod
+++ b/aliasDefinition/Data_alias/Data_alias.aod
@@ -14975,6 +14975,82 @@
               </entityFieldDb>
             </entityFields>
           </entityDb>
+          <entityDb>
+            <name>CLASSIFICATIONGRADING</name>
+            <dbName></dbName>
+            <idColumn>CLASSIFICATIONGRADINGID</idColumn>
+            <idGeneratorType v="0" />
+            <idGeneratorInterval v="1" />
+            <documentation></documentation>
+            <title></title>
+            <description></description>
+            <auditSyncConfig>
+              <name>auditSyncConfig</name>
+              <auditMode v="0" />
+              <syncActive v="false" />
+              <syncComplete v="true" />
+              <syncDirection v="1" />
+              <syncIds></syncIds>
+            </auditSyncConfig>
+            <entityFields>
+              <entityFieldDb>
+                <name>CLASSIFICATIONGRADINGID</name>
+                <dbName></dbName>
+                <primaryKey v="true" />
+                <columnType v="1" />
+                <size v="36" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="true" />
+                <index v="true" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>CLASSIFICATIONTYPE_GROUP</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>GRADING</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="1" />
+                <size v="1" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>MAXGRADEFORSCORE</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="4" />
+                <size v="10" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+            </entityFields>
+          </entityDb>
         </entities>
       </entityGroup>
     </aliasDefDb>
diff --git a/entity/ClassificationAdmin_entity/ClassificationAdmin_entity.aod b/entity/ClassificationAdmin_entity/ClassificationAdmin_entity.aod
index 20d8afd447..f77ccf9048 100644
--- a/entity/ClassificationAdmin_entity/ClassificationAdmin_entity.aod
+++ b/entity/ClassificationAdmin_entity/ClassificationAdmin_entity.aod
@@ -44,6 +44,7 @@
       <dropDownProcess>%aditoprj%/entity/ClassificationAdmin_entity/entityfields/classificationgroup/dropDownProcess.js</dropDownProcess>
       <textInputAllowed v="true" />
       <titleProcess>%aditoprj%/entity/ClassificationAdmin_entity/entityfields/classificationgroup/titleProcess.js</titleProcess>
+      <valueProcess>%aditoprj%/entity/ClassificationAdmin_entity/entityfields/classificationgroup/valueProcess.js</valueProcess>
       <displayValueProcess>%aditoprj%/entity/ClassificationAdmin_entity/entityfields/classificationgroup/displayValueProcess.js</displayValueProcess>
       <onValidation>%aditoprj%/entity/ClassificationAdmin_entity/entityfields/classificationgroup/onValidation.js</onValidation>
     </entityField>
@@ -100,6 +101,24 @@
       <mandatory v="true" />
       <displayValueProcess>%aditoprj%/entity/ClassificationAdmin_entity/entityfields/scoretype/displayValueProcess.js</displayValueProcess>
     </entityField>
+    <entityConsumer>
+      <name>ClassificationGradings</name>
+      <dependency>
+        <name>dependency</name>
+        <entityName>ClassificationGrading_entity</entityName>
+        <fieldName>ClassificationGradings</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>ClassificationTypeId_param</name>
+          <valueProcess>%aditoprj%/entity/ClassificationAdmin_entity/entityfields/classificationgradings/children/classificationtypeid_param/valueProcess.js</valueProcess>
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityParameter>
+      <name>group_param</name>
+      <expose v="true" />
+    </entityParameter>
   </entityFields>
   <recordContainers>
     <dbRecordContainer>
diff --git a/entity/ClassificationAdmin_entity/entityfields/classificationgradings/children/classificationtypeid_param/valueProcess.js b/entity/ClassificationAdmin_entity/entityfields/classificationgradings/children/classificationtypeid_param/valueProcess.js
new file mode 100644
index 0000000000..199c2e918d
--- /dev/null
+++ b/entity/ClassificationAdmin_entity/entityfields/classificationgradings/children/classificationtypeid_param/valueProcess.js
@@ -0,0 +1,4 @@
+import("system.vars");
+import("system.result");
+
+result.string(vars.get("$field.CLASSIFICATIONGROUP"));
\ No newline at end of file
diff --git a/entity/ClassificationAdmin_entity/entityfields/classificationgroup/valueProcess.js b/entity/ClassificationAdmin_entity/entityfields/classificationgroup/valueProcess.js
new file mode 100644
index 0000000000..dbfd2f7ec7
--- /dev/null
+++ b/entity/ClassificationAdmin_entity/entityfields/classificationgroup/valueProcess.js
@@ -0,0 +1,5 @@
+import("system.vars");
+import("system.result");
+
+if(vars.get("$param.group_param"))
+    result.string(vars.get("$param.group_param"));
diff --git a/entity/ClassificationAdmin_entity/entityfields/classificationtype_id/valueProcess.js b/entity/ClassificationAdmin_entity/entityfields/classificationtype_id/valueProcess.js
deleted file mode 100644
index aaef9be6b3..0000000000
--- a/entity/ClassificationAdmin_entity/entityfields/classificationtype_id/valueProcess.js
+++ /dev/null
@@ -1,8 +0,0 @@
-import("system.result");
-import("system.neon");
-import("system.vars");
-
-if ((vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT || vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW) && vars.get("$this.value") == null)
-{
-    result.string(vars.get("$field.CLASSIFICATIONTYPEID"));
-}
\ No newline at end of file
diff --git a/entity/ClassificationAdmin_entity/entityfields/object_rowid/valueProcess.js b/entity/ClassificationAdmin_entity/entityfields/object_rowid/valueProcess.js
deleted file mode 100644
index 00c91dc0b7..0000000000
--- a/entity/ClassificationAdmin_entity/entityfields/object_rowid/valueProcess.js
+++ /dev/null
@@ -1,8 +0,0 @@
-import("system.result");
-import("system.neon");
-import("system.vars");
-
-if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT && vars.get("$this.value") == null)
-{
-    result.string(vars.get("$param.ObjectRowid_param"));
-}
\ No newline at end of file
diff --git a/entity/ClassificationAdmin_entity/entityfields/object_type/valueProcess.js b/entity/ClassificationAdmin_entity/entityfields/object_type/valueProcess.js
deleted file mode 100644
index 6a34068808..0000000000
--- a/entity/ClassificationAdmin_entity/entityfields/object_type/valueProcess.js
+++ /dev/null
@@ -1,8 +0,0 @@
-import("system.result");
-import("system.neon");
-import("system.vars");
-
-if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT && vars.get("$this.value") == null)
-{
-    result.string(vars.get("$param.ObjectType_param"));
-}
\ No newline at end of file
diff --git a/entity/ClassificationAdmin_entity/entityfields/uid/displayValueProcess.js b/entity/ClassificationAdmin_entity/entityfields/uid/displayValueProcess.js
deleted file mode 100644
index 62451165d8..0000000000
--- a/entity/ClassificationAdmin_entity/entityfields/uid/displayValueProcess.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import("system.result");
-import("system.vars");
-import("Keyword_lib");
-import("KeywordRegistry_basic");
-
-result.string(KeywordUtils.getViewValue($KeywordRegistry.classificationType(), vars.get("$field.UID")))
\ No newline at end of file
diff --git a/entity/ClassificationGrading_entity/ClassificationGrading_entity.aod b/entity/ClassificationGrading_entity/ClassificationGrading_entity.aod
new file mode 100644
index 0000000000..f53efcebd9
--- /dev/null
+++ b/entity/ClassificationGrading_entity/ClassificationGrading_entity.aod
@@ -0,0 +1,95 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
+  <name>ClassificationGrading_entity</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <documentation>%aditoprj%/entity/ClassificationGrading_entity/documentation.adoc</documentation>
+  <title>Grading</title>
+  <titlePlural>Gradings</titlePlural>
+  <recordContainer>db</recordContainer>
+  <entityFields>
+    <entityProvider>
+      <name>#PROVIDER</name>
+    </entityProvider>
+    <entityField>
+      <name>CLASSIFICATIONGRADINGID</name>
+      <valueProcess>%aditoprj%/entity/ClassificationGrading_entity/entityfields/classificationgradingid/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>GRADING</name>
+      <title>Scoretype</title>
+    </entityField>
+    <entityField>
+      <name>MAXGRADEFORSCORE</name>
+      <documentation>%aditoprj%/entity/ClassificationGrading_entity/entityfields/maxgradeforscore/documentation.adoc</documentation>
+      <title>Till Score</title>
+      <contentType>NUMBER</contentType>
+      <outputFormat>#####</outputFormat>
+      <inputFormat>#####</inputFormat>
+      <valueProcess>%aditoprj%/entity/ClassificationGrading_entity/entityfields/maxgradeforscore/valueProcess.js</valueProcess>
+      <onValidation>%aditoprj%/entity/ClassificationGrading_entity/entityfields/maxgradeforscore/onValidation.js</onValidation>
+    </entityField>
+    <entityField>
+      <name>CLASSIFICATIONTYPE_GROUP</name>
+      <title>Group</title>
+      <valueProcess>%aditoprj%/entity/ClassificationGrading_entity/entityfields/classificationtype_group/valueProcess.js</valueProcess>
+    </entityField>
+    <entityParameter>
+      <name>ClassificationTypeId_param</name>
+      <expose v="true" />
+    </entityParameter>
+    <entityProvider>
+      <name>ClassificationGradings</name>
+      <documentation>%aditoprj%/entity/ClassificationGrading_entity/entityfields/classificationgradings/documentation.adoc</documentation>
+      <dependencies>
+        <entityDependency>
+          <name>31a0ee6d-b6e3-4a7c-82a7-598c9a12c4aa</name>
+          <entityName>ClassificationAdmin_entity</entityName>
+          <fieldName>ClassificationGradings</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+      </dependencies>
+      <children>
+        <entityParameter>
+          <name>ClassificationTypeId_param</name>
+          <valueProcess>%aditoprj%/entity/ClassificationGrading_entity/entityfields/classificationgradings/children/classificationtypeid_param/valueProcess.js</valueProcess>
+          <expose v="true" />
+        </entityParameter>
+      </children>
+    </entityProvider>
+  </entityFields>
+  <recordContainers>
+    <dbRecordContainer>
+      <name>db</name>
+      <alias>Data_alias</alias>
+      <conditionProcess>%aditoprj%/entity/ClassificationGrading_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
+      <orderClauseProcess>%aditoprj%/entity/ClassificationGrading_entity/recordcontainers/db/orderClauseProcess.js</orderClauseProcess>
+      <linkInformation>
+        <linkInformation>
+          <name>9a9482d5-005a-4dc5-8b58-e07c44420b64</name>
+          <tableName>CLASSIFICATIONGRADING</tableName>
+          <primaryKey>CLASSIFICATIONGRADINGID</primaryKey>
+          <isUIDTable v="true" />
+          <readonly v="false" />
+        </linkInformation>
+      </linkInformation>
+      <recordFieldMappings>
+        <dbRecordFieldMapping>
+          <name>CLASSIFICATIONTYPE_GROUP.value</name>
+          <recordfield>CLASSIFICATIONGRADING.CLASSIFICATIONTYPE_GROUP</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>MAXGRADEFORSCORE.value</name>
+          <recordfield>CLASSIFICATIONGRADING.MAXGRADEFORSCORE</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>CLASSIFICATIONGRADINGID.value</name>
+          <recordfield>CLASSIFICATIONGRADING.CLASSIFICATIONGRADINGID</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>GRADING.value</name>
+          <recordfield>CLASSIFICATIONGRADING.GRADING</recordfield>
+        </dbRecordFieldMapping>
+      </recordFieldMappings>
+    </dbRecordContainer>
+  </recordContainers>
+</entity>
diff --git a/entity/ClassificationGrading_entity/documentation.adoc b/entity/ClassificationGrading_entity/documentation.adoc
new file mode 100644
index 0000000000..f87c483ab8
--- /dev/null
+++ b/entity/ClassificationGrading_entity/documentation.adoc
@@ -0,0 +1,3 @@
+= ClassificationGrading_entity
+
+This entity is used for storing the classification grading and making it possible for the admin to change the grading of the classification scores.
\ No newline at end of file
diff --git a/entity/ClassificationGrading_entity/entityfields/classificationgradingid/valueProcess.js b/entity/ClassificationGrading_entity/entityfields/classificationgradingid/valueProcess.js
new file mode 100644
index 0000000000..6ff4a9c195
--- /dev/null
+++ b/entity/ClassificationGrading_entity/entityfields/classificationgradingid/valueProcess.js
@@ -0,0 +1,7 @@
+import("system.neon");
+import("system.result");
+import("system.util");
+import("system.vars");
+
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.get("$this.value") == null)
+    result.string(util.getNewUUID());
\ No newline at end of file
diff --git a/entity/ClassificationGrading_entity/entityfields/classificationgradings/children/classificationtypeid_param/valueProcess.js b/entity/ClassificationGrading_entity/entityfields/classificationgradings/children/classificationtypeid_param/valueProcess.js
new file mode 100644
index 0000000000..b11d099579
--- /dev/null
+++ b/entity/ClassificationGrading_entity/entityfields/classificationgradings/children/classificationtypeid_param/valueProcess.js
@@ -0,0 +1,4 @@
+import("system.vars");
+import("system.result");
+
+result.string(vars.get("$field.CLASSIFICATIONTYPEID"));
\ No newline at end of file
diff --git a/entity/ClassificationGrading_entity/entityfields/classificationgradings/documentation.adoc b/entity/ClassificationGrading_entity/entityfields/classificationgradings/documentation.adoc
new file mode 100644
index 0000000000..6a527bdbe7
--- /dev/null
+++ b/entity/ClassificationGrading_entity/entityfields/classificationgradings/documentation.adoc
@@ -0,0 +1,3 @@
+= ClassificationGradings;
+
+Provider for ClassificationAdmin using the ClassificationGrading.ClassificationTypeId_param, because the grading is linked to a classificationtype
\ No newline at end of file
diff --git a/entity/ClassificationGrading_entity/entityfields/classificationtype_group/valueProcess.js b/entity/ClassificationGrading_entity/entityfields/classificationtype_group/valueProcess.js
new file mode 100644
index 0000000000..ddf20047b1
--- /dev/null
+++ b/entity/ClassificationGrading_entity/entityfields/classificationtype_group/valueProcess.js
@@ -0,0 +1,9 @@
+import("system.result");
+import("system.neon");
+import("system.vars");
+
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
+{
+    if(vars.exists("$param.ClassificationTypeId_param") && vars.get("$param.ClassificationTypeId_param") != null)
+        result.string(vars.getString("$param.ClassificationTypeId_param"));    
+}
\ No newline at end of file
diff --git a/entity/ClassificationGrading_entity/entityfields/maxgradeforscore/documentation.adoc b/entity/ClassificationGrading_entity/entityfields/maxgradeforscore/documentation.adoc
new file mode 100644
index 0000000000..d42cd1657a
--- /dev/null
+++ b/entity/ClassificationGrading_entity/entityfields/maxgradeforscore/documentation.adoc
@@ -0,0 +1,17 @@
+== ClassificationGrading.MaxGradeForScore:
+
+Used to store the highest value for the Grade.
+
+Example: 
+A 100-75,
+B 74-50,
+C 49-25,
+D 24-0
+--> maxGradeForScore: A:100, B:74, C:49, D:24
+
+The maxGradeForScore of the best possible grading (In our Example A), should always be the highest possible value, 
+that's why it's set as the default value of the field.
+The maxGradeForScore should never be greater than the highest possible value, that's why this field has it's onValidationProcess.
+
+The highest possible value get's calculated by calculating the sum of all the classificationScores of the types under the group. 
+(ClassificationUtils.getMaxScore)
\ No newline at end of file
diff --git a/entity/ClassificationGrading_entity/entityfields/maxgradeforscore/onValidation.js b/entity/ClassificationGrading_entity/entityfields/maxgradeforscore/onValidation.js
new file mode 100644
index 0000000000..7d3a67af63
--- /dev/null
+++ b/entity/ClassificationGrading_entity/entityfields/maxgradeforscore/onValidation.js
@@ -0,0 +1,12 @@
+import("Classification_lib");
+import("Entity_lib");
+import("system.translate");
+import("system.result");
+import("system.vars");
+
+var classificationTypeGroup = vars.get("$field.CLASSIFICATIONTYPE_GROUP");
+var maxValue = ClassificationUtils.getMaxScore(classificationTypeGroup);
+if (maxValue == "")
+    maxValue = 100;
+        
+if (parseFloat(vars.get("local.value")) > maxValue)
\ No newline at end of file
diff --git a/entity/ClassificationGrading_entity/entityfields/maxgradeforscore/valueProcess.js b/entity/ClassificationGrading_entity/entityfields/maxgradeforscore/valueProcess.js
new file mode 100644
index 0000000000..6e8504b68f
--- /dev/null
+++ b/entity/ClassificationGrading_entity/entityfields/maxgradeforscore/valueProcess.js
@@ -0,0 +1,11 @@
+import("Classification_lib");
+import("system.neon");
+import("system.vars");
+import("system.result");
+    
+if(((vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW || vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT) && 
+    (vars.get("$this.value") == null || vars.get("$this.value") == undefined)))
+{
+    var group = vars.getString("$param.ClassificationTypeId_param")
+    result.string(ClassificationUtils.getMaxScore(group));
+}
\ No newline at end of file
diff --git a/entity/ClassificationGrading_entity/recordcontainers/db/conditionProcess.js b/entity/ClassificationGrading_entity/recordcontainers/db/conditionProcess.js
new file mode 100644
index 0000000000..8739d3dce8
--- /dev/null
+++ b/entity/ClassificationGrading_entity/recordcontainers/db/conditionProcess.js
@@ -0,0 +1,7 @@
+import("system.vars");
+import("system.result");
+import("Sql_lib");
+
+var cond = newWhereIfSet("CLASSIFICATIONGRADING.CLASSIFICATIONTYPE_GROUP", "$param.ClassificationTypeId_param");
+result.string(cond.toString());
+
diff --git a/entity/ClassificationGrading_entity/recordcontainers/db/orderClauseProcess.js b/entity/ClassificationGrading_entity/recordcontainers/db/orderClauseProcess.js
new file mode 100644
index 0000000000..7d2ce489ca
--- /dev/null
+++ b/entity/ClassificationGrading_entity/recordcontainers/db/orderClauseProcess.js
@@ -0,0 +1,6 @@
+import("system.result");
+import("system.db");
+
+result.object({
+    "CLASSIFICATIONGRADING.MAXGRADEFORSCORE": db.DESCENDING
+    });
\ No newline at end of file
diff --git a/entity/ClassificationGroupAnalyses_entity/ClassificationGroupAnalyses_entity.aod b/entity/ClassificationGroupAnalyses_entity/ClassificationGroupAnalyses_entity.aod
index fe7204329c..81219e0739 100644
--- a/entity/ClassificationGroupAnalyses_entity/ClassificationGroupAnalyses_entity.aod
+++ b/entity/ClassificationGroupAnalyses_entity/ClassificationGroupAnalyses_entity.aod
@@ -46,6 +46,12 @@
           <fieldName>ClassificationGroups</fieldName>
           <isConsumer v="false" />
         </entityDependency>
+        <entityDependency>
+          <name>ccd9d58a-6175-4f67-a80a-88aeac1cad3a</name>
+          <entityName>Organisation_entity</entityName>
+          <fieldName>ClassificationGroups</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
       </dependencies>
     </entityProvider>
     <entityField>
diff --git a/entity/ClassificationGroupAnalyses_entity/recordcontainers/jdito/contentProcess.js b/entity/ClassificationGroupAnalyses_entity/recordcontainers/jdito/contentProcess.js
index 142d69350b..160dc5a4c4 100644
--- a/entity/ClassificationGroupAnalyses_entity/recordcontainers/jdito/contentProcess.js
+++ b/entity/ClassificationGroupAnalyses_entity/recordcontainers/jdito/contentProcess.js
@@ -6,10 +6,8 @@ import("Classification_lib");
 var scores = ClassificationUtils.getScore(vars.get("$param.ClassificationType_param"), vars.get("$param.ObjectType_param"), vars.get("$param.ObjectRowid_param"));
 var data = [];
 
-for (group in scores)
-{
-    
-    data.push([group, group, translate.text(group), scores[group]]);
+for (var i = 0; i < scores.length; i++) {
+    data.push([scores[i][1], scores[i][1], translate.text(scores[i][1]), scores[i][0]]);
 }
 
 result.object(data);
\ No newline at end of file
diff --git a/entity/ClassificationScore_entity/ClassificationScore_entity.aod b/entity/ClassificationScore_entity/ClassificationScore_entity.aod
index 2c0285db54..79b3abfd9a 100644
--- a/entity/ClassificationScore_entity/ClassificationScore_entity.aod
+++ b/entity/ClassificationScore_entity/ClassificationScore_entity.aod
@@ -38,7 +38,6 @@
       <outputFormat>#,##0.00</outputFormat>
       <inputFormat>#,##0.00</inputFormat>
       <mandatory v="true" />
-      <onValidation>%aditoprj%/entity/ClassificationScore_entity/entityfields/score/onValidation.js</onValidation>
     </entityField>
     <entityProvider>
       <name>ClassificationScores</name>
@@ -87,6 +86,8 @@
       <alias>Data_alias</alias>
       <conditionProcess>%aditoprj%/entity/ClassificationScore_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
       <orderClauseProcess>%aditoprj%/entity/ClassificationScore_entity/recordcontainers/db/orderClauseProcess.js</orderClauseProcess>
+      <onDBInsert>%aditoprj%/entity/ClassificationScore_entity/recordcontainers/db/onDBInsert.js</onDBInsert>
+      <onDBUpdate>%aditoprj%/entity/ClassificationScore_entity/recordcontainers/db/onDBUpdate.js</onDBUpdate>
       <onDBDelete>%aditoprj%/entity/ClassificationScore_entity/recordcontainers/db/onDBDelete.js</onDBDelete>
       <linkInformation>
         <linkInformation>
diff --git a/entity/ClassificationScore_entity/entityfields/score/onValidation.js b/entity/ClassificationScore_entity/entityfields/score/onValidation.js
deleted file mode 100644
index 83ad4d951b..0000000000
--- a/entity/ClassificationScore_entity/entityfields/score/onValidation.js
+++ /dev/null
@@ -1,8 +0,0 @@
-import("Entity_lib");
-import("system.translate");
-import("system.result");
-import("system.vars");
-
-var max = parseFloat(vars.getString("$field.MaxValue"));
-if (parseFloat(vars.get("local.value")) > max)
-    result.string(translate.withArguments("${HIGHER_THAN_MAX} max: %0", [max]));
\ No newline at end of file
diff --git a/entity/ClassificationScore_entity/recordcontainers/db/onDBDelete.js b/entity/ClassificationScore_entity/recordcontainers/db/onDBDelete.js
index 4ff706b929..6f34bda69d 100644
--- a/entity/ClassificationScore_entity/recordcontainers/db/onDBDelete.js
+++ b/entity/ClassificationScore_entity/recordcontainers/db/onDBDelete.js
@@ -1,3 +1,29 @@
 import("Sql_lib");
+import("system.db");
+import("system.vars");
+import("Classification_lib");
+import("system.eMath");
 
-newWhere("CLASSIFICATION.CLASSIFICATIONSCORE_ID", "$field.CLASSIFICATIONSCOREID").deleteData();
\ No newline at end of file
+newWhere("CLASSIFICATION.CLASSIFICATIONSCORE_ID", "$field.CLASSIFICATIONSCOREID").deleteData();
+
+var classificationScoreId = vars.get("$field.CLASSIFICATIONSCOREID");
+
+var gradingTable = ClassificationUtils.getGradingTableByScoreId(classificationScoreId);
+var classificationGroup = ClassificationUtils.getClassificationGroup(classificationScoreId);
+var maxScore = ClassificationUtils.getMaxScore(classificationGroup);
+
+//checks if the maxscore has to be updated after the data has been deleted
+if(gradingTable[0][1] != maxScore)
+{
+    var column = ["MAXGRADEFORSCORE"];
+    var table = ["CLASSIFICATIONGRADING"];
+    var multiplier = maxScore/gradingTable[0][1];
+    var update = newWhere("CLASSIFICATIONGRADING.CLASSIFICATIONGRADINGID", gradingTable[0][0])
+                            .updateData(true, table, column,  db.getColumnTypes("CLASSIFICATIONGRADING", column, db.getCurrentAlias()), [maxScore]);
+                        
+    for (var i = 1; i < gradingTable.length; i++) 
+    {
+        update = newWhere("CLASSIFICATIONGRADING.CLASSIFICATIONGRADINGID", gradingTable[i][0])
+                        .updateData(true, table, column,  db.getColumnTypes("CLASSIFICATIONGRADING", column, db.getCurrentAlias()), [parseInt(gradingTable[i][1] * multiplier)]);
+    }
+}
\ No newline at end of file
diff --git a/entity/ClassificationScore_entity/recordcontainers/db/onDBInsert.js b/entity/ClassificationScore_entity/recordcontainers/db/onDBInsert.js
new file mode 100644
index 0000000000..eddf0f09ff
--- /dev/null
+++ b/entity/ClassificationScore_entity/recordcontainers/db/onDBInsert.js
@@ -0,0 +1,30 @@
+import("system.db");
+import("Sql_lib");
+import("system.vars");
+import("Classification_lib");
+import("system.eMath");
+
+var classificationScoreId = vars.get("$field.CLASSIFICATIONSCOREID");
+
+var gradingTable = ClassificationUtils.getGradingTableByScoreId(classificationScoreId);
+var classificationGroup = ClassificationUtils.getClassificationGroup(classificationScoreId);
+var maxScore = ClassificationUtils.getMaxScore(classificationGroup);
+
+//checks if the maxscore has to be updated after inserting data
+if(gradingTable.length > 0 && gradingTable != undefined && gradingTable != null)
+{
+    if(gradingTable[0][1] != maxScore)
+    {
+        var column = ["MAXGRADEFORSCORE"];
+        var table = ["CLASSIFICATIONGRADING"];
+        var multiplier = maxScore/gradingTable[0][1];
+        var update = newWhere("CLASSIFICATIONGRADING.CLASSIFICATIONGRADINGID", gradingTable[0][0])
+                                .updateData(true, table, column,  db.getColumnTypes("CLASSIFICATIONGRADING", column, db.getCurrentAlias()), [maxScore]);
+
+        for (var i = 1; i < gradingTable.length; i++) 
+        {
+            update = newWhere("CLASSIFICATIONGRADING.CLASSIFICATIONGRADINGID", gradingTable[i][0])
+                            .updateData(true, table, column,  db.getColumnTypes("CLASSIFICATIONGRADING", column, db.getCurrentAlias()), [parseInt(gradengTable[i][1] * multiplier)]);
+        }
+    }
+}
\ No newline at end of file
diff --git a/entity/ClassificationScore_entity/recordcontainers/db/onDBUpdate.js b/entity/ClassificationScore_entity/recordcontainers/db/onDBUpdate.js
new file mode 100644
index 0000000000..fb8657adbc
--- /dev/null
+++ b/entity/ClassificationScore_entity/recordcontainers/db/onDBUpdate.js
@@ -0,0 +1,27 @@
+import("system.db");
+import("Sql_lib");
+import("system.vars");
+import("Classification_lib");
+import("system.eMath");
+
+var classificationScoreId = vars.get("$field.CLASSIFICATIONSCOREID");
+
+var gradingTable = ClassificationUtils.getGradingTableByScoreId(classificationScoreId);
+var classificationGroup = ClassificationUtils.getClassificationGroup(classificationScoreId);
+var maxScore = ClassificationUtils.getMaxScore(classificationGroup);
+
+//checks if the maxscore has to be updated after updating data
+if(gradingTable[0][1] != maxScore)
+{
+    var column = ["MAXGRADEFORSCORE"];
+    var table = ["CLASSIFICATIONGRADING"];
+    var multiplier = maxScore/gradingTable[0][1];
+    var update = newWhere("CLASSIFICATIONGRADING.CLASSIFICATIONGRADINGID", gradingTable[0][0])
+                            .updateData(true, table, column,  db.getColumnTypes("CLASSIFICATIONGRADING", column, db.getCurrentAlias()), [maxScore]);
+                        
+    for (var i = 1; i < gradingTable.length; i++) 
+    {
+        update = newWhere("CLASSIFICATIONGRADING.CLASSIFICATIONGRADINGID", gradingTable[i][0])
+                        .updateData(true, table, column,  db.getColumnTypes("CLASSIFICATIONGRADING", column, db.getCurrentAlias()), [parseInt(gradingTable[i][1] * multiplier)]);
+    }
+}
\ No newline at end of file
diff --git a/entity/ClassificationType_entity/ClassificationType_entity.aod b/entity/ClassificationType_entity/ClassificationType_entity.aod
index 71e9814dfa..c7a88ccec2 100644
--- a/entity/ClassificationType_entity/ClassificationType_entity.aod
+++ b/entity/ClassificationType_entity/ClassificationType_entity.aod
@@ -3,6 +3,7 @@
   <name>ClassificationType_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/ClassificationType_entity/documentation.adoc</documentation>
+  <recordContainer>db</recordContainer>
   <entityFields>
     <entityProvider>
       <name>#PROVIDER</name>
@@ -16,6 +17,10 @@
     <entityField>
       <name>CLASS</name>
     </entityField>
+    <entityParameter>
+      <name>ClassificationTypeIds_param</name>
+      <expose v="true" />
+    </entityParameter>
   </entityFields>
   <recordContainers>
     <dbRecordContainer>
diff --git a/entity/ClassificationType_entity/entityfields/classificationtypeids/children/classificationtypeids_param/valueProcess.js b/entity/ClassificationType_entity/entityfields/classificationtypeids/children/classificationtypeids_param/valueProcess.js
new file mode 100644
index 0000000000..b11d099579
--- /dev/null
+++ b/entity/ClassificationType_entity/entityfields/classificationtypeids/children/classificationtypeids_param/valueProcess.js
@@ -0,0 +1,4 @@
+import("system.vars");
+import("system.result");
+
+result.string(vars.get("$field.CLASSIFICATIONTYPEID"));
\ No newline at end of file
diff --git a/entity/Classification_entity/Classification_entity.aod b/entity/Classification_entity/Classification_entity.aod
index 2a9be22684..3378487b57 100644
--- a/entity/Classification_entity/Classification_entity.aod
+++ b/entity/Classification_entity/Classification_entity.aod
@@ -50,6 +50,12 @@
           <fieldName>Classifications</fieldName>
           <isConsumer v="false" />
         </entityDependency>
+        <entityDependency>
+          <name>c1521dc3-ba97-4e00-8d9b-a6fa46bef42d</name>
+          <entityName>Organisation_entity</entityName>
+          <fieldName>Classifications</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
       </dependencies>
     </entityProvider>
     <entityField>
@@ -146,6 +152,9 @@
       <name>GroupScore</name>
       <valueProcess>%aditoprj%/entity/Classification_entity/entityfields/groupscore/valueProcess.js</valueProcess>
     </entityField>
+    <entityField>
+      <name>GRADINGVALUE</name>
+    </entityField>
   </entityFields>
   <recordContainers>
     <jDitoRecordContainer>
diff --git a/entity/Classification_entity/contentProcess.js b/entity/Classification_entity/contentProcess.js
deleted file mode 100644
index bb0a011684..0000000000
--- a/entity/Classification_entity/contentProcess.js
+++ /dev/null
@@ -1,19 +0,0 @@
-import("system.result");
-import("system.vars");
-import("Keyword_lib");
-
-var keyword = LegacyKeywordUtils.createKeyword("SALESPROJECT.CLASS");
-
-if (vars.exists("$local.idvalues") && vars.get("$local.idvalues")) {
-    var idValues = vars.get("$local.idvalues");
-    
-    if (idValues.length > 0) {
-        keyword.filter(function(id) {
-            return id == idValues[0];
-        });
-    }
-}
-result.object(keyword.toArray(["id", "name"]));
-
-
-//TODO correct db if kewords changed
diff --git a/entity/Classification_entity/entityfields/classificationgroup/displayValueProcess.js b/entity/Classification_entity/entityfields/classificationgroup/displayValueProcess.js
index 6f677fee2c..deb00e8d5e 100644
--- a/entity/Classification_entity/entityfields/classificationgroup/displayValueProcess.js
+++ b/entity/Classification_entity/entityfields/classificationgroup/displayValueProcess.js
@@ -6,6 +6,9 @@ import("system.vars");
 if (vars.getString("$field.CLASSIFICATIONGROUP"))
 {
     var score = vars.getString("$field.GroupScore");
-    result.string(translate.text(vars.get("$field.CLASSIFICATIONGROUP")) + ": " + score + " " + translate.text("points") + " = " + ClassificationUtils.mapToClass(score));
-
+    var group = vars.getString("$field.CLASSIFICATIONGROUP");
+    var maxScore = ClassificationUtils.getMaxScore(group);
+    var classifications = ClassificationUtils.getClassifications(score, group);
+    
+    result.string(translate.withArguments("%0: %1/%2points = %3", [group, score, maxScore, classifications]));
 }
diff --git a/entity/Classification_entity/entityfields/points/valueProcess.js b/entity/Classification_entity/entityfields/points/valueProcess.js
deleted file mode 100644
index 5b74382810..0000000000
--- a/entity/Classification_entity/entityfields/points/valueProcess.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import("system.result");
-
-// TODO: load from Entry. Currently this is not possible.
-result.object(50); // return dummy value
\ No newline at end of file
diff --git a/entity/Classification_entity/entityfields/salesprojectclassificationentries/children/salesprojectid_param/valueProcess.js b/entity/Classification_entity/entityfields/salesprojectclassificationentries/children/salesprojectid_param/valueProcess.js
deleted file mode 100644
index 098d87cfa5..0000000000
--- a/entity/Classification_entity/entityfields/salesprojectclassificationentries/children/salesprojectid_param/valueProcess.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import("system.result");
-import("system.vars");
-
-result.string(vars.getString("$param.SalesprojectId_param"));
\ No newline at end of file
diff --git a/entity/Classification_entity/recordcontainers/jdito/contentProcess.js b/entity/Classification_entity/recordcontainers/jdito/contentProcess.js
index 0060716a7d..3c8b450298 100644
--- a/entity/Classification_entity/recordcontainers/jdito/contentProcess.js
+++ b/entity/Classification_entity/recordcontainers/jdito/contentProcess.js
@@ -5,7 +5,7 @@ import("Sql_lib");
 import("system.db");
 import("system.result");
 
-var scores = JSON.stringify(ClassificationUtils.getScore(vars.get("$param.ClassificationType_param"), vars.get("$param.ObjectType_param"), vars.get("$param.ObjectRowid_param")));
+var scores = JSON.stringify(ClassificationUtils.getScoreAsObject(vars.get("$param.ClassificationType_param"), vars.get("$param.ObjectType_param"), vars.get("$param.ObjectRowid_param")));
 
 var classificationId = null;
 var classificationTypeId = null;
diff --git a/entity/Organisation_entity/Organisation_entity.aod b/entity/Organisation_entity/Organisation_entity.aod
index 9fe5066d15..1f828eee9c 100644
--- a/entity/Organisation_entity/Organisation_entity.aod
+++ b/entity/Organisation_entity/Organisation_entity.aod
@@ -1104,6 +1104,56 @@
       <onActionProcess>%aditoprj%/entity/Organisation_entity/entityfields/openlocation/onActionProcess.js</onActionProcess>
       <iconId>NEON:TACKED</iconId>
     </entityActionField>
+    <entityConsumer>
+      <name>Classifications</name>
+      <dependency>
+        <name>dependency</name>
+        <entityName>Classification_entity</entityName>
+        <fieldName>Classifications</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>ClassificationType_param</name>
+          <valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/classifications/children/classificationtype_param/valueProcess.js</valueProcess>
+          <expose v="true" />
+        </entityParameter>
+        <entityParameter>
+          <name>ObjectRowid_param</name>
+          <valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/classifications/children/objectrowid_param/valueProcess.js</valueProcess>
+          <expose v="true" />
+        </entityParameter>
+        <entityParameter>
+          <name>ObjectType_param</name>
+          <valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/classifications/children/objecttype_param/valueProcess.js</valueProcess>
+          <expose v="true" />
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityConsumer>
+      <name>ClassificationGroups</name>
+      <dependency>
+        <name>dependency</name>
+        <entityName>ClassificationGroupAnalyses_entity</entityName>
+        <fieldName>GroupAnalyses</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>ClassificationType_param</name>
+          <valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/classificationgroups/children/classificationtype_param/valueProcess.js</valueProcess>
+          <expose v="true" />
+        </entityParameter>
+        <entityParameter>
+          <name>ObjectRowid_param</name>
+          <valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/classificationgroups/children/objectrowid_param/valueProcess.js</valueProcess>
+          <expose v="true" />
+        </entityParameter>
+        <entityParameter>
+          <name>ObjectType_param</name>
+          <valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/classificationgroups/children/objecttype_param/valueProcess.js</valueProcess>
+          <expose v="true" />
+        </entityParameter>
+      </children>
+    </entityConsumer>
     <entityField>
       <name>COUNT</name>
       <title>Count</title>
diff --git a/entity/Organisation_entity/entityfields/classificationgroups/children/classificationtype_param/valueProcess.js b/entity/Organisation_entity/entityfields/classificationgroups/children/classificationtype_param/valueProcess.js
new file mode 100644
index 0000000000..051bc0a827
--- /dev/null
+++ b/entity/Organisation_entity/entityfields/classificationgroups/children/classificationtype_param/valueProcess.js
@@ -0,0 +1,4 @@
+import("KeywordRegistry_basic");
+import("system.result");
+
+result.string($KeywordRegistry.classificationType$organisation());
\ No newline at end of file
diff --git a/entity/Classification_entity/entityfields/salesprojectclassificationentries/children/classid_param/valueProcess.js b/entity/Organisation_entity/entityfields/classificationgroups/children/objectrowid_param/valueProcess.js
similarity index 52%
rename from entity/Classification_entity/entityfields/salesprojectclassificationentries/children/classid_param/valueProcess.js
rename to entity/Organisation_entity/entityfields/classificationgroups/children/objectrowid_param/valueProcess.js
index a5632992f1..533f8ec837 100644
--- a/entity/Classification_entity/entityfields/salesprojectclassificationentries/children/classid_param/valueProcess.js
+++ b/entity/Organisation_entity/entityfields/classificationgroups/children/objectrowid_param/valueProcess.js
@@ -1,4 +1,4 @@
-import("system.result");
 import("system.vars");
+import("system.result");
 
-result.string(vars.getString("$field.UID"));
\ No newline at end of file
+result.string(vars.get("$sys.uid"));
\ No newline at end of file
diff --git a/entity/Organisation_entity/entityfields/classificationgroups/children/objecttype_param/valueProcess.js b/entity/Organisation_entity/entityfields/classificationgroups/children/objecttype_param/valueProcess.js
new file mode 100644
index 0000000000..008915f61d
--- /dev/null
+++ b/entity/Organisation_entity/entityfields/classificationgroups/children/objecttype_param/valueProcess.js
@@ -0,0 +1,4 @@
+import("system.result");
+import("Context_lib");
+
+result.string(ContextUtils.getCurrentContextId());
\ No newline at end of file
diff --git a/entity/Organisation_entity/entityfields/classifications/children/classificationtype_param/valueProcess.js b/entity/Organisation_entity/entityfields/classifications/children/classificationtype_param/valueProcess.js
new file mode 100644
index 0000000000..051bc0a827
--- /dev/null
+++ b/entity/Organisation_entity/entityfields/classifications/children/classificationtype_param/valueProcess.js
@@ -0,0 +1,4 @@
+import("KeywordRegistry_basic");
+import("system.result");
+
+result.string($KeywordRegistry.classificationType$organisation());
\ No newline at end of file
diff --git a/entity/Organisation_entity/entityfields/classifications/children/objectrowid_param/valueProcess.js b/entity/Organisation_entity/entityfields/classifications/children/objectrowid_param/valueProcess.js
new file mode 100644
index 0000000000..533f8ec837
--- /dev/null
+++ b/entity/Organisation_entity/entityfields/classifications/children/objectrowid_param/valueProcess.js
@@ -0,0 +1,4 @@
+import("system.vars");
+import("system.result");
+
+result.string(vars.get("$sys.uid"));
\ No newline at end of file
diff --git a/entity/Organisation_entity/entityfields/classifications/children/objecttype_param/valueProcess.js b/entity/Organisation_entity/entityfields/classifications/children/objecttype_param/valueProcess.js
new file mode 100644
index 0000000000..008915f61d
--- /dev/null
+++ b/entity/Organisation_entity/entityfields/classifications/children/objecttype_param/valueProcess.js
@@ -0,0 +1,4 @@
+import("system.result");
+import("Context_lib");
+
+result.string(ContextUtils.getCurrentContextId());
\ No newline at end of file
diff --git a/entity/Salesproject_entity/recordcontainers/db/filterextensions/classificationsummary_filter/filterConditionProcess.js b/entity/Salesproject_entity/recordcontainers/db/filterextensions/classificationsummary_filter/filterConditionProcess.js
index ffad1bd95e..2f086c699f 100644
--- a/entity/Salesproject_entity/recordcontainers/db/filterextensions/classificationsummary_filter/filterConditionProcess.js
+++ b/entity/Salesproject_entity/recordcontainers/db/filterextensions/classificationsummary_filter/filterConditionProcess.js
@@ -1,43 +1,49 @@
-import("Sql_lib");
-import("Classification_lib");
-import("system.logging");
-import("AttributeFilter_lib");
-import("Entity_lib");
-import("Context_lib");
-import("system.vars");
-import("system.result");
-
-
-var operator = vars.get("$local.operator");
-var rawvalue = vars.get("$local.rawvalue");
-var columnPlaceholder = vars.get("$local.columnPlaceholder");
-var filterCond = vars.get("$local.condition");
-var classificationTypeID = AttributeSearchNameCoder.decode(vars.getString("$local.name")).id;
-var sqlCond;
-
-//[["A","A"],["B","B"],["C","C"],["D","D"]]
-var scoreValue = ClassificationUtils.mapClassLetter(rawvalue);
-var havingCase;
-if(scoreValue[0] == 0)
-    havingCase = "sum(SCORE) >= " + scoreValue[0];
-else
-    havingCase = "sum(SCORE) > " + scoreValue[0];
-            
-var having = havingCase + " and sum(SCORE) <= " + scoreValue[1];  
-
-
-var subSqlCond = newSelect("OBJECT_ROWID").from("classification").join("classificationscore", "classiFICATIONSCOREID = CLASSIFICATIONSCORE_ID")
-    .where("classificationscore.CLASSIFICATIONTYPE_ID", newSelect("classificationtypeId").from("classificationtype")
-    .where("classificationtype.CLASSIFICATIONGROUP", classificationTypeID), SqlBuilder.IN()).groupBy("classification.OBJECT_ROWID");
-
-if (operator == "1")//equal
-    sqlCond = newWhere("SALESPROJECT.SALESPROJECTID", subSqlCond.having(having), SqlBuilder.IN()).toString();
-else if (operator == "2")//not equal
-    sqlCond = newWhere("SALESPROJECT.SALESPROJECTID", subSqlCond.having(having), SqlBuilder.NOT_IN()).toString();
-else if (operator == "11")//is not empty
-    sqlCond = newWhere("SALESPROJECT.SALESPROJECTID", subSqlCond, SqlBuilder.IN()).toString();
-else if (operator == "12")//is empty
-    sqlCond = newWhere("SALESPROJECT.SALESPROJECTID", subSqlCond, SqlBuilder.NOT_IN()).or("SALESPROJECT.SALESPROJECTID", newSelect("OBJECT_ROWID").from("classification"), SqlBuilder.NOT_IN()).toString();
-else sqlCond = "1=1";
-
-result.string(sqlCond);
+//
+//
+////ToDo: This FilterProcess used to work with the old classification system, it's useless now. 
+//It's gonna get updated soon (#1061442)
+//
+//
+////import("Sql_lib");
+//import("Classification_lib");
+//import("system.logging");
+//import("AttributeFilter_lib");
+//import("Entity_lib");
+//import("Context_lib");
+//import("system.vars");
+//import("system.result");
+//
+//
+//var operator = vars.get("$local.operator");
+//var rawvalue = vars.get("$local.rawvalue");
+//var columnPlaceholder = vars.get("$local.columnPlaceholder");
+//var filterCond = vars.get("$local.condition");
+//var classificationTypeID = AttributeSearchNameCoder.decode(vars.getString("$local.name")).id;
+//var sqlCond;
+//
+////[["A","A"],["B","B"],["C","C"],["D","D"]]
+//var scoreValue = ClassificationUtils.mapClassLetter(rawvalue);
+//var havingCase;
+//if(scoreValue[0] == 0)
+//    havingCase = "sum(SCORE) >= " + scoreValue[0];
+//else
+//    havingCase = "sum(SCORE) > " + scoreValue[0];
+//            
+//var having = havingCase + " and sum(SCORE) <= " + scoreValue[1];  
+//
+//
+//var subSqlCond = newSelect("OBJECT_ROWID").from("classification").join("classificationscore", "classiFICATIONSCOREID = CLASSIFICATIONSCORE_ID")
+//    .where("classificationscore.CLASSIFICATIONTYPE_ID", newSelect("classificationtypeId").from("classificationtype")
+//    .where("classificationtype.CLASSIFICATIONGROUP", classificationTypeID), SqlBuilder.IN()).groupBy("classification.OBJECT_ROWID");
+//
+//if (operator == "1")//equal
+//    sqlCond = newWhere("SALESPROJECT.SALESPROJECTID", subSqlCond.having(having), SqlBuilder.IN()).toString();
+//else if (operator == "2")//not equal
+//    sqlCond = newWhere("SALESPROJECT.SALESPROJECTID", subSqlCond.having(having), SqlBuilder.NOT_IN()).toString();
+//else if (operator == "11")//is not empty
+//    sqlCond = newWhere("SALESPROJECT.SALESPROJECTID", subSqlCond, SqlBuilder.IN()).toString();
+//else if (operator == "12")//is empty
+//    sqlCond = newWhere("SALESPROJECT.SALESPROJECTID", subSqlCond, SqlBuilder.NOT_IN()).or("SALESPROJECT.SALESPROJECTID", newSelect("OBJECT_ROWID").from("classification"), SqlBuilder.NOT_IN()).toString();
+//else sqlCond = "1=1";
+//
+//result.string(sqlCond);
diff --git a/entity/Salesproject_entity/recordcontainers/db/filterextensions/classificationsummary_filter/filterFieldsProcess.js b/entity/Salesproject_entity/recordcontainers/db/filterextensions/classificationsummary_filter/filterFieldsProcess.js
index 9121b18d61..2ea352cf1d 100644
--- a/entity/Salesproject_entity/recordcontainers/db/filterextensions/classificationsummary_filter/filterFieldsProcess.js
+++ b/entity/Salesproject_entity/recordcontainers/db/filterextensions/classificationsummary_filter/filterFieldsProcess.js
@@ -1,29 +1,34 @@
-import("Sql_lib");
-import("system.translate");
-import("system.logging");
-import("system.util");
-import("KeywordRegistry_basic");
-import("system.entities");
-import("Attribute_lib");
-import("AttributeFilter_lib");
-import("system.result");
-
-var res = [];
-
-var data = newSelect("distinct CLASSIFICATIONGROUP, CLASSIFICATIONGROUP") 
-          .from("classificationtype") 
-          .orderBy("CLASSIFICATIONGROUP").table();
-
-
-data.forEach(function(row){
-    var name = AttributeSearchNameCoder.encode(row[0], row[1]);
-    res.push({
-        name: name,
-        title: translate.text(row[1]),
-        contentType: "TEXT",
-        hasDropDownValues: true 
-    });
-})
-
-res = JSON.stringify(res);
-result.string(res);
\ No newline at end of file
+//
+//
+////ToDo: This FilterProcess used to work with the old classification system, it's useless now. 
+//It's gonna get updated soon (#1061442)
+//
+////import("Sql_lib");
+//import("system.translate");
+//import("system.logging");
+//import("system.util");
+//import("KeywordRegistry_basic");
+//import("system.entities");
+//import("Attribute_lib");
+//import("AttributeFilter_lib");
+//import("system.result");
+//
+//var res = [];
+//
+//var data = newSelect("distinct CLASSIFICATIONGROUP, CLASSIFICATIONGROUP") 
+//          .from("classificationtype") 
+//          .orderBy("CLASSIFICATIONGROUP").table();
+//
+//
+//data.forEach(function(row){
+//    var name = AttributeSearchNameCoder.encode(row[0], row[1]);
+//    res.push({
+//        name: name,
+//        title: translate.text(row[1]),
+//        contentType: "TEXT",
+//        hasDropDownValues: true 
+//    });
+//})
+//
+//res = JSON.stringify(res);
+//result.string(res);
\ No newline at end of file
diff --git a/entity/Salesproject_entity/recordcontainers/db/filterextensions/classificationsummary_filter/filterValuesProcess.js b/entity/Salesproject_entity/recordcontainers/db/filterextensions/classificationsummary_filter/filterValuesProcess.js
index 8a572bd109..f4b34eb8c3 100644
--- a/entity/Salesproject_entity/recordcontainers/db/filterextensions/classificationsummary_filter/filterValuesProcess.js
+++ b/entity/Salesproject_entity/recordcontainers/db/filterextensions/classificationsummary_filter/filterValuesProcess.js
@@ -1,2 +1,6 @@
-import("system.result");
-result.object([["A","A"],["B","B"],["C","C"],["D","D"]]);
\ No newline at end of file
+////ToDo: This FilterProcess used to work with the old classification system, it's useless now. 
+//It's gonna get updated soon (#1061442)
+//
+//
+////import("system.result");
+//result.object([["A","A"],["B","B"],["C","C"],["D","D"]]);
\ No newline at end of file
diff --git a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
index a0eb30f64c..7596a044fe 100644
--- a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
+++ b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
@@ -6782,21 +6782,96 @@
     <entry>
       <key>Offerrequest</key>
     </entry>
+    <entry>
+      <key>Number of employees</key>
+    </entry>
+    <entry>
+      <key>2. Customer value</key>
+    </entry>
+    <entry>
+      <key>Product preference</key>
+    </entry>
+    <entry>
+      <key>Business development</key>
+    </entry>
+    <entry>
+      <key>Headquarters</key>
+    </entry>
+    <entry>
+      <key>Current supply share</key>
+    </entry>
+    <entry>
+      <key>Purchasing potential p. a.</key>
+    </entry>
+    <entry>
+      <key>ScoreTargetGgroup</key>
+    </entry>
+    <entry>
+      <key>Stagnated</key>
+    </entry>
+    <entry>
+      <key>Negative</key>
+    </entry>
+    <entry>
+      <key>1. Target group</key>
+    </entry>
+    <entry>
+      <key>Positive</key>
+    </entry>
+    <entry>
+      <key>0-50</key>
+    </entry>
+    <entry>
+      <key>Till Score</key>
+    </entry>
+    <entry>
+      <key>251-1000</key>
+    </entry>
+    <entry>
+      <key>ab 1000</key>
+    </entry>
     <entry>
       <key>Full Permissions</key>
     </entry>
+    <entry>
+      <key>200-349 T€</key>
+    </entry>
+    <entry>
+      <key>100-199 T€</key>
+    </entry>
     <entry>
       <key>Full permissions already assigned</key>
     </entry>
+    <entry>
+      <key>51-100</key>
+    </entry>
     <entry>
       <key>Import Daten</key>
     </entry>
+    <entry>
+      <key>ab 350 T€</key>
+    </entry>
+    <entry>
+      <key>0-49 T€</key>
+    </entry>
+    <entry>
+      <key>Grading</key>
+    </entry>
     <entry>
       <key>Import Logs</key>
     </entry>
     <entry>
       <key>Transferdaten</key>
     </entry>
+    <entry>
+      <key>50-99 T€</key>
+    </entry>
+    <entry>
+      <key>101-250</key>
+    </entry>
+    <entry>
+      <key>Gradings</key>
+    </entry>
     <entry>
       <key>Valid from (as </key>
     </entry>
diff --git a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
index 1bd6d2f245..97fc54774c 100644
--- a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
+++ b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
@@ -1758,6 +1758,7 @@
     </entry>
     <entry>
       <key>Other</key>
+      <value>Andere</value>
     </entry>
     <entry>
       <key>Show all sent offers</key>
@@ -5571,6 +5572,10 @@
       <key>Target group</key>
       <value>Zielgruppe</value>
     </entry>
+    <entry>
+      <key>ScoreTargetGgroup</key>
+      <value>Zielgruppe</value>
+    </entry>
     <entry>
       <key>Interested person</key>
       <value>Interessent</value>
@@ -7721,6 +7726,7 @@ Bitte Datumseingabe prüfen</value>
     </entry>
     <entry>
       <key>low</key>
+      <value>niedrig</value>
     </entry>
     <entry>
       <key>Show only own</key>
@@ -8712,21 +8718,107 @@ Bitte Datumseingabe prüfen</value>
       <key>Offerrequest</key>
       <value>Angebotsanfrage</value>
     </entry>
+    <entry>
+      <key>Number of employees</key>
+      <value>Anzahl Mitarbeiter</value>
+    </entry>
+    <entry>
+      <key>2. Customer value</key>
+      <value>2. Kundenwert</value>
+    </entry>
+    <entry>
+      <key>Product preference</key>
+      <value>Produktpräferenz</value>
+    </entry>
+    <entry>
+      <key>Business development</key>
+      <value>Wirtschaftliche Entwicklung</value>
+    </entry>
+    <entry>
+      <key>Headquarters</key>
+      <value>Hauptsitz</value>
+    </entry>
+    <entry>
+      <key>Current supply share</key>
+      <value>Aktueller Lieferanteil</value>
+    </entry>
+    <entry>
+      <key>Purchasing potential p. a.</key>
+      <value>Einkaufspotential p. a.</value>
+    </entry>
+    <entry>
+      <key>Stagnated</key>
+      <value>Stagniert </value>
+    </entry>
+    <entry>
+      <key>Negative</key>
+    </entry>
+    <entry>
+      <key>1. Target group</key>
+      <value>1. Zielgruppe</value>
+    </entry>
+    <entry>
+      <key>Positive</key>
+    </entry>
+    <entry>
+      <key>0-50</key>
+    </entry>
+    <entry>
+      <key>Till Score</key>
+    </entry>
+    <entry>
+      <key>251-1000</key>
+    </entry>
+    <entry>
+      <key>asdf</key>
+    </entry>
+    <entry>
+      <key>ab 1000</key>
+    </entry>
+    <entry>
+      <key>Gradings</key>
+      <value>Bewertungen</value>
+    </entry>
     <entry>
       <key>Full Permissions</key>
     </entry>
+    <entry>
+      <key>200-349 T€</key>
+    </entry>
+    <entry>
+      <key>100-199 T€</key>
+    </entry>
     <entry>
       <key>Full permissions already assigned</key>
     </entry>
+    <entry>
+      <key>51-100</key>
+    </entry>
     <entry>
       <key>Import Daten</key>
     </entry>
+    <entry>
+      <key>ab 350 T€</key>
+    </entry>
+    <entry>
+      <key>0-49 T€</key>
+    </entry>
+    <entry>
+      <key>Grading</key>
+      <value>Bewertung</value>
+    </entry>
     <entry>
       <key>Import Logs</key>
     </entry>
     <entry>
       <key>Transferdaten</key>
     </entry>
+    <entry>
+      <key>50-99 T€</key>
+    </entry>
+    <entry>
+      <key>101-250</key>
+    </entry>
     <entry>
       <key>Valid from (as </key>
       <value>gültig ab (in </value>
diff --git a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
index f3a747b0f3..30b98ba6dd 100644
--- a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
+++ b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
@@ -6854,21 +6854,96 @@
     <entry>
       <key>Offerrequest</key>
     </entry>
+    <entry>
+      <key>Number of employees</key>
+    </entry>
+    <entry>
+      <key>2. Customer value</key>
+    </entry>
+    <entry>
+      <key>Product preference</key>
+    </entry>
+    <entry>
+      <key>Business development</key>
+    </entry>
+    <entry>
+      <key>Headquarters</key>
+    </entry>
+    <entry>
+      <key>Current supply share</key>
+    </entry>
+    <entry>
+      <key>Purchasing potential p. a.</key>
+    </entry>
+    <entry>
+      <key>ScoreTargetGgroup</key>
+    </entry>
+    <entry>
+      <key>Stagnated</key>
+    </entry>
+    <entry>
+      <key>Negative</key>
+    </entry>
+    <entry>
+      <key>1. Target group</key>
+    </entry>
+    <entry>
+      <key>Positive</key>
+    </entry>
+    <entry>
+      <key>0-50</key>
+    </entry>
+    <entry>
+      <key>Till Score</key>
+    </entry>
+    <entry>
+      <key>251-1000</key>
+    </entry>
+    <entry>
+      <key>ab 1000</key>
+    </entry>
     <entry>
       <key>Full Permissions</key>
     </entry>
+    <entry>
+      <key>200-349 T€</key>
+    </entry>
+    <entry>
+      <key>100-199 T€</key>
+    </entry>
     <entry>
       <key>Full permissions already assigned</key>
     </entry>
+    <entry>
+      <key>51-100</key>
+    </entry>
     <entry>
       <key>Import Daten</key>
     </entry>
+    <entry>
+      <key>ab 350 T€</key>
+    </entry>
+    <entry>
+      <key>0-49 T€</key>
+    </entry>
+    <entry>
+      <key>Grading</key>
+    </entry>
     <entry>
       <key>Import Logs</key>
     </entry>
     <entry>
       <key>Transferdaten</key>
     </entry>
+    <entry>
+      <key>50-99 T€</key>
+    </entry>
+    <entry>
+      <key>101-250</key>
+    </entry>
+    <entry>
+      <key>Gradings</key>
+    </entry>
     <entry>
       <key>Valid from (as </key>
     </entry>
diff --git a/neonContext/ClassificationAdmin/ClassificationAdmin.aod b/neonContext/ClassificationAdmin/ClassificationAdmin.aod
index 22a7232b63..dc900dcb04 100644
--- a/neonContext/ClassificationAdmin/ClassificationAdmin.aod
+++ b/neonContext/ClassificationAdmin/ClassificationAdmin.aod
@@ -21,5 +21,9 @@
       <name>2c6e2b30-0fd1-4f12-bf9f-d4bbcfbed8aa</name>
       <view>ClassificationAdminEdit_view</view>
     </neonViewReference>
+    <neonViewReference>
+      <name>8c79aba8-f87b-4ac6-b59b-1bbc65df2cee</name>
+      <view>ClassificationAdminGrading</view>
+    </neonViewReference>
   </references>
 </neonContext>
diff --git a/neonContext/ClassificationGrading/ClassificationGrading.aod b/neonContext/ClassificationGrading/ClassificationGrading.aod
new file mode 100644
index 0000000000..8f4192c31d
--- /dev/null
+++ b/neonContext/ClassificationGrading/ClassificationGrading.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.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonContext/1.1.1">
+  <name>ClassificationGrading</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <entity>ClassificationGrading_entity</entity>
+  <references>
+    <neonViewReference>
+      <name>9209d983-8388-4a72-96a8-905cdc8fd454</name>
+      <view>ClassificationGradingMultiplePreview_view</view>
+    </neonViewReference>
+  </references>
+</neonContext>
diff --git a/neonContext/Organisation/Organisation.aod b/neonContext/Organisation/Organisation.aod
index 956f247c22..90a9c418df 100644
--- a/neonContext/Organisation/Organisation.aod
+++ b/neonContext/Organisation/Organisation.aod
@@ -59,5 +59,13 @@
       <name>ade0ed85-260d-4da5-bf4c-f838cfdcc693</name>
       <view>OrganisationReport_view</view>
     </neonViewReference>
+    <neonViewReference>
+      <name>d27a8b2d-2fcf-4626-843c-e709c2ed71b0</name>
+      <view>OrganisationtClassificationAndChart_view</view>
+    </neonViewReference>
+    <neonViewReference>
+      <name>1efa420b-42f4-4d4d-8c23-aba7e6824f4b</name>
+      <view>OrganisationClassificationDrawer_view</view>
+    </neonViewReference>
   </references>
 </neonContext>
diff --git a/neonView/ClassificationAdminEdit_view/ClassificationAdminEdit_view.aod b/neonView/ClassificationAdminEdit_view/ClassificationAdminEdit_view.aod
index fde3568e95..8fdb484409 100644
--- a/neonView/ClassificationAdminEdit_view/ClassificationAdminEdit_view.aod
+++ b/neonView/ClassificationAdminEdit_view/ClassificationAdminEdit_view.aod
@@ -5,9 +5,10 @@
   <size>SMALL</size>
   <overlayOrientation>PORTRAIT</overlayOrientation>
   <layout>
-    <noneLayout>
+    <headerFooterLayout>
       <name>layout</name>
-    </noneLayout>
+      <header>classification</header>
+    </headerFooterLayout>
   </layout>
   <children>
     <genericViewTemplate>
diff --git a/neonView/ClassificationAdminGrading/ClassificationAdminGrading.aod b/neonView/ClassificationAdminGrading/ClassificationAdminGrading.aod
new file mode 100644
index 0000000000..7ca55318be
--- /dev/null
+++ b/neonView/ClassificationAdminGrading/ClassificationAdminGrading.aod
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.6">
+  <name>ClassificationAdminGrading</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <layout>
+    <noneLayout>
+      <name>layout</name>
+    </noneLayout>
+  </layout>
+  <children>
+    <genericViewTemplate>
+      <name>generic</name>
+      <entityField>#ENTITY</entityField>
+      <title>Classification</title>
+      <fields>
+        <entityFieldLink>
+          <name>ea58623d-4950-40cc-9027-5e2277703353</name>
+          <entityField>CLASSIFICATIONTYPE</entityField>
+        </entityFieldLink>
+        <entityFieldLink>
+          <name>27c5198d-9330-4617-addf-c7aabac6fa7b</name>
+          <entityField>CLASSIFICATIONGROUP</entityField>
+        </entityFieldLink>
+      </fields>
+    </genericViewTemplate>
+    <genericMultipleViewTemplate>
+      <name>genericMultiple</name>
+      <entityField>#ENTITY</entityField>
+      <title>Grading</title>
+      <columns>
+        <neonGenericMultipleTableColumn>
+          <name>cd98ae70-e37f-42f3-bbab-03ba67b65f49</name>
+          <entityField>SCORETYPE</entityField>
+        </neonGenericMultipleTableColumn>
+        <neonGenericMultipleTableColumn>
+          <name>d861661c-c1d2-4240-9a31-ab4e2ad0cb97</name>
+          <entityField>GRADINGVALUE</entityField>
+        </neonGenericMultipleTableColumn>
+      </columns>
+    </genericMultipleViewTemplate>
+  </children>
+</neonView>
diff --git a/neonView/ClassificationGradingMultiplePreview_view/ClassificationGradingMultiplePreview_view.aod b/neonView/ClassificationGradingMultiplePreview_view/ClassificationGradingMultiplePreview_view.aod
new file mode 100644
index 0000000000..a1e792129a
--- /dev/null
+++ b/neonView/ClassificationGradingMultiplePreview_view/ClassificationGradingMultiplePreview_view.aod
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.6">
+  <name>ClassificationGradingMultiplePreview_view</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <size>SMALL</size>
+  <layout>
+    <headerFooterLayout>
+      <name>layout</name>
+    </headerFooterLayout>
+  </layout>
+  <children>
+    <titledListViewTemplate>
+      <name>titledList</name>
+      <titleField>GRADING</titleField>
+      <fixedDrawer v="false" />
+      <entityField>#ENTITY</entityField>
+      <columns>
+        <neonTitledListTableColumn>
+          <name>9fffb1ac-b842-4c1c-9f81-85a17d78f649</name>
+          <entityField>MAXGRADEFORSCORE</entityField>
+        </neonTitledListTableColumn>
+      </columns>
+    </titledListViewTemplate>
+  </children>
+</neonView>
diff --git a/neonView/ClassificatonAdminPreview_view/ClassificatonAdminPreview_view.aod b/neonView/ClassificatonAdminPreview_view/ClassificatonAdminPreview_view.aod
index 2d8fc5a44b..1a9bbcdc8b 100644
--- a/neonView/ClassificatonAdminPreview_view/ClassificatonAdminPreview_view.aod
+++ b/neonView/ClassificatonAdminPreview_view/ClassificatonAdminPreview_view.aod
@@ -31,6 +31,11 @@
         </entityFieldLink>
       </fields>
     </genericViewTemplate>
+    <neonViewReference>
+      <name>97143b3d-9b13-4ad9-8f17-c134821d7a80</name>
+      <entityField>ClassificationGradings</entityField>
+      <view>ClassificationGradingMultiplePreview_view</view>
+    </neonViewReference>
     <neonViewReference>
       <name>214fbe22-378d-404e-99f8-f175e037f196</name>
       <entityField>ClassificationScores</entityField>
diff --git a/neonView/OrganisationClassificationDrawer_view/OrganisationClassificationDrawer_view.aod b/neonView/OrganisationClassificationDrawer_view/OrganisationClassificationDrawer_view.aod
new file mode 100644
index 0000000000..23aaa04349
--- /dev/null
+++ b/neonView/OrganisationClassificationDrawer_view/OrganisationClassificationDrawer_view.aod
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.6">
+  <name>OrganisationClassificationDrawer_view</name>
+  <title>Classifications</title>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <layout>
+    <drawerLayout>
+      <name>layout</name>
+      <layoutCaption>Classification</layoutCaption>
+      <fixedDrawer v="true" />
+    </drawerLayout>
+  </layout>
+  <children>
+    <neonViewReference>
+      <name>b49a0291-89cc-4962-8706-5044aa2f9e21</name>
+      <entityField>#ENTITY</entityField>
+      <view>OrganisationtClassificationAndChart_view</view>
+    </neonViewReference>
+  </children>
+</neonView>
diff --git a/neonView/OrganisationMain_view/OrganisationMain_view.aod b/neonView/OrganisationMain_view/OrganisationMain_view.aod
index 0ca88f9126..7c31d30da5 100644
--- a/neonView/OrganisationMain_view/OrganisationMain_view.aod
+++ b/neonView/OrganisationMain_view/OrganisationMain_view.aod
@@ -50,6 +50,11 @@
       <entityField>#ENTITY</entityField>
       <view>OrganisationAttributeRestriction_view</view>
     </neonViewReference>
+    <neonViewReference>
+      <name>cdd8e4b8-b3aa-445f-affc-e1fc5b0c03cd</name>
+      <entityField>#ENTITY</entityField>
+      <view>OrganisationClassificationDrawer_view</view>
+    </neonViewReference>
     <neonViewReference>
       <name>eba90ed2-5e55-4cdb-9e0b-5a09feeb7536</name>
       <entityField>Documents</entityField>
diff --git a/neonView/OrganisationtClassificationAndChart_view/OrganisationtClassificationAndChart_view.aod b/neonView/OrganisationtClassificationAndChart_view/OrganisationtClassificationAndChart_view.aod
new file mode 100644
index 0000000000..5af287813a
--- /dev/null
+++ b/neonView/OrganisationtClassificationAndChart_view/OrganisationtClassificationAndChart_view.aod
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.6">
+  <name>OrganisationtClassificationAndChart_view</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <layout>
+    <boxLayout>
+      <name>layout</name>
+      <direction>HORIZONTAL</direction>
+      <maxDirectionElements v="2" />
+    </boxLayout>
+  </layout>
+  <children>
+    <neonViewReference>
+      <name>b2ef616c-7605-429a-bace-868b52ce9b06</name>
+      <entityField>Classifications</entityField>
+      <view>ClassificationTree_view</view>
+    </neonViewReference>
+    <neonViewReference>
+      <name>427a8f25-63e5-44fd-98b9-49553f02e38d</name>
+      <entityField>Classifications</entityField>
+      <view>ClassificationChart_view</view>
+    </neonViewReference>
+  </children>
+</neonView>
diff --git a/process/Classification_lib/process.js b/process/Classification_lib/process.js
index 150dc27f19..3b85135681 100644
--- a/process/Classification_lib/process.js
+++ b/process/Classification_lib/process.js
@@ -1,3 +1,4 @@
+import("system.eMath");
 import("system.util");
 import("system.vars");
 import("system.db");
@@ -29,7 +30,7 @@ function ClassificationUtils() {}
  *                                                              Returns all scores as object-map.<br>
  *                                                              (e.g. {"scoreGroup1": 0, "scoreGroup2": 20})
  */
-ClassificationUtils.getScore = function(pClassificationType, pObjectType, pObjectRowid, pClassificationGroup)
+ClassificationUtils.getScoreAsObject = function(pClassificationType, pObjectType, pObjectRowid, pClassificationGroup)
 {
     var score = newSelect("CLASSIFICATIONTYPE.CLASSIFICATIONGROUP, case when sum(score) is not null then sum(score) else 0 end")
         .from("CLASSIFICATIONTYPE")
@@ -51,6 +52,48 @@ ClassificationUtils.getScore = function(pClassificationType, pObjectType, pObjec
     return scores;
 }
 
+/**
+ * Get the score of the classification. You can get all groups at once or only the score for one group.
+ * 
+ * @param {String} pClassificationType                          <p>
+ *                                                              The classification-type (usage) e.g. the key id<br>
+ *                                                              from keyword 'ClassificationType'.<br>
+ * @param {String} pObjectType                                  <p>
+ *                                                              The object type.<br>
+ * @param {String} pObjectRowid                                 <p>
+ *                                                              The row id. (UUID of the object, e.g: OrganisationId of Organisation)<br>
+ * @param {String} pClassificationGroup=undefined (optional)    <p>
+ *                                                              The classification group. If it is undefined,<br>
+ *                                                              the classification for all groups are returned <br>
+ *                                                              as Object(-map)<br>
+ * @return {Array}                                             <p>
+ *                                                              Returns all scores in a Array.<br>
+ *                                                              (e.g. ["10,"30","70"] <br>
+ *                                                              0 gets returned for null values)
+ */
+ClassificationUtils.getScore = function(pClassificationType, pObjectType, pObjectRowid, pClassificationGroup)
+{
+    var score = newSelect("sum(score), CLASSIFICATIONTYPE.CLASSIFICATIONGROUP")
+        .from("CLASSIFICATIONTYPE")
+        .leftJoin("CLASSIFICATION", newWhere("CLASSIFICATIONTYPEID = CLASSIFICATIONTYPE_ID")
+            .and("CLASSIFICATION.OBJECT_TYPE", pObjectType)
+            .and("CLASSIFICATION.OBJECT_ROWID", pObjectRowid))
+        .leftJoin("CLASSIFICATIONSCORE", "CLASSIFICATIONSCORE_ID = CLASSIFICATIONSCOREID")
+        .where("CLASSIFICATIONTYPE.CLASSIFICATIONTYPE", pClassificationType)
+        .andIfSet("CLASSIFICATIONTYPE.CLASSIFICATIONGROUP", pClassificationGroup)
+        .groupBy("CLASSIFICATIONGROUP")
+        .orderBy("CLASSIFICATIONGROUP")
+        .table();
+        
+    for (i = 0; i < score.length; i++)
+    {
+        if(score[i][0] == "")
+            score[i][0] = 0;
+    }
+        
+    return score;
+}
+
 /**
  * Get all classifications for one dataset as String.<br>
  * Each char represents one classification.<br>
@@ -67,81 +110,89 @@ ClassificationUtils.getScore = function(pClassificationType, pObjectType, pObjec
  */
 ClassificationUtils.getClass = function(pClassificationType, pObjectType, pObjectRowid)
 {
+    var classificationGrade = [];
+
     var score = ClassificationUtils.getScore(pClassificationType, pObjectType, pObjectRowid);
-    return Object.keys(score).map(function(classNum)
-        {
-            return ClassificationUtils.mapToClass(score[classNum]);
-        }).join("");
+    for (var i = 0; i < score.length; i++)
+            classificationGrade[i] = ClassificationUtils.getClassifications(score[i][0], score[i][1]);
+        
+    return classificationGrade.join("")
 }
 
 /**
- * Get the classification for a score.<br>
- * The classes are hardcoded like this:<br>
+ * Get the classification relative to the max score.<br>
+ * The classes calculated in percent of the max score like this:<br>
  * 
  * @param {String} pScore           <p>
- *                                  The score:<br>
- *                                  <ul>
- *                                  <li>>=0 to 25:    D</li>
- *                                  <li>> 25 to 50:   C</li>
- *                                  <li>> 50 to 75:   B</li>
- *                                  <li>> 75 to 100:  A</li>
- *                                  <li>< 0 || > 100: _</li>
- *                                  </ul>
+ *                                  The archieved score (e.g. 42)
+ * @param {String} pClassificationGroup  <p>     
+ *                                  The Name of the Classification Group
  * @return {String}                 <p>
  *                                  Returns the corresponding classification.<br>
  */
-ClassificationUtils.mapToClass = function(pScore) 
+ClassificationUtils.getClassifications = function(pScore, pClassificationGroup) 
 {
-    if(pScore >= 0 && pScore <= 25) 
-        return "D";
-    if(pScore > 25 && pScore <= 50) 
-        return "C";
-    if(pScore > 50 && pScore <= 75) 
-        return "B";
-    if(pScore > 75 && pScore <= 100) 
-        return "A";
-    
-    return "_";
+    var score = pScore;
+    var classificationGroup = pClassificationGroup;
+    var gradingTable = ClassificationUtils.getClassificationGrading(classificationGroup);
+    var grade = "-";
+
+        
+    for(var i = 0; i < gradingTable.length; i++)
+    {
+            if(Number(score) <= Number(gradingTable[i][0]) && score !=0 && grade == "-")
+            {
+                grade = gradingTable[i][1];
+                break;
+            }
+    }
+    return grade;
+}
+/**
+ * Gets the classification table <br>
+ * 
+ * @param {String} pClassificationGroup  <p>     
+ *                                  The Classification Group              
+ * @return {String}                 <p>
+ *                                  Returns the corresponding classification table, ordered by the maxscore ascending.<br>
+ */
+ClassificationUtils.getClassificationGrading = function(pClassificationGroup) 
+{
+    var gradingTable = newSelect("CLASSIFICATIONGRADING.MAXGRADEFORSCORE, CLASSIFICATIONGRADING.GRADING")
+                                    .from("CLASSIFICATIONGRADING")
+                                    .where("CLASSIFICATIONGRADING.CLASSIFICATIONTYPE_GROUP", pClassificationGroup)
+                                    .orderBy("MAXGRADEFORSCORE asc")
+                                    .table();
+    return gradingTable;
 }
 
 
 /**
- * Get the lowest score for a letter.<br>
- * The classes are hardcoded like this:<br>
- * <ul>
- * <li>>=0 to 25:    D</li>
- * <li>> 25 to 50:   C</li>
- * <li>> 50 to 75:   B</li>
- * <li>> 75 to 100:  A</li>
- * </ul>
- * @param {String} pLetter                  <p>
- *                                          The letter which stands for the classification.<br>
- * @return {Array}                          <p>
- *                                          Points the Letter is between (min, max).<br>
+ * Gets the maximum score for one group depending on the pClassificationGroup param.
+ * 
+ * @param {String} pClassificationGroup (optional)              <p>
+ *                                                              The classification groupname.<br>
+ * @return {String}                                             <p>
+ *                                                              Returns the maximum possible score of the chosen group.<br>
+ *                                                              
  */
-ClassificationUtils.mapClassLetter = function(pLetter) 
+ClassificationUtils.getMaxScore = function(pClassificationGroup)
 {
-    var res;
-    switch (pLetter) {
-        case 'A':
-            res = [75,100]
-            break;
-        case 'B':
-            res = [50, 75];
-            break;
-        case 'C':
-            res = [25, 50];
-            break;
-        case 'D':
-            res = [0, 25];
-            break;
-    }
-    if(!res)
-        res = false;
-    return res;
+    var classificationGroup = pClassificationGroup;
+    var maxScore = 0;
+    scores = newSelect("max(CLASSIFICATIONSCORE.SCORE)")
+                            .from("CLASSIFICATIONTYPE")
+                            .join("CLASSIFICATIONSCORE", "CLASSIFICATIONSCORE.CLASSIFICATIONTYPE_ID = CLASSIFICATIONTYPE.CLASSIFICATIONTYPEID")
+                            .where("CLASSIFICATIONTYPE.CLASSIFICATIONGROUP", pClassificationGroup)
+                            .groupBy("CLASSIFICATIONTYPE.CLASSIFICATIONTYPEID")
+                            .arrayColumn();
+                            
+    for (i = 0; i < scores.length; i++)
+        maxScore = eMath.addInt(maxScore, parseInt(scores[i]));
+    
+    return maxScore;
 }
 
-
 /**
  * Get all possible groupnames for a classificationtype.<br>
  * Either as [["group", "group"]] (for the possible items process).
@@ -195,7 +246,7 @@ ClassificationUtils.getGroupFromDb = function(pClassificationtypeId)
  */
 ClassificationUtils.changeGroupName = function(pOldName, pNewName, pClassificationType)
 {
-    var groups = ClassificationUtils.getAllGroups(pClassificationType, false)
+    var groups = ClassificationUtils.getAllGroups(pClassificationType, false);
                 
     if (groups.indexOf(pNewName, 0) == -1)
     {
@@ -205,7 +256,7 @@ ClassificationUtils.changeGroupName = function(pOldName, pNewName, pClassificati
 }
 
 /**
- * Get the classificationType for the current classification (either vom parameter or selection-variable)
+ * Get the classificationType for the current classification (either from parameter or selection-variable)
  * 
  * @param {String} pParamField                      <p>
  *                                                  The parameter field name. (e.g.: "$param.ClassificationType_param")<br>
@@ -263,3 +314,54 @@ ClassificationUtils.setClassificationValue = function(pObjectType, pObjectId, pC
         pClassificationScoreId,
     ]);
 }
+
+
+/**
+ * Get all classifications for one dataset as String.<br>
+ * Each char represents one classification.<br>
+ * 
+ * @param {String} pScoreId                                 <p>
+ *                                                          The classification score id you want the grading table for <br>
+ *                                                          
+* @return {String}                                          <p>
+*                                                           The resulting classification grading table. (e.g. "ACB")<br>
+ */
+ClassificationUtils.getGradingTableByScoreId = function(pScoreId)
+{
+
+    var scoreId = pScoreId;
+
+    var gradingTable = newSelect("CLASSIFICATIONGRADING.CLASSIFICATIONGRADINGID, CLASSIFICATIONGRADING.MAXGRADEFORSCORE, CLASSIFICATIONGRADING.GRADING")
+                            .from("CLASSIFICATIONGRADING")
+                            .where("CLASSIFICATIONGRADING.CLASSIFICATIONTYPE_GROUP", newSelect("CLASSIFICATIONTYPE.CLASSIFICATIONGROUP")
+                                                                                        .from("CLASSIFICATIONTYPE")
+                                                                                        .where("CLASSIFICATIONTYPE.CLASSIFICATIONTYPEID", newSelect("CLASSIFICATIONSCORE.CLASSIFICATIONTYPE_ID")
+                                                                                                                                                .from("CLASSIFICATIONSCORE")
+                                                                                                                                                .where("CLASSIFICATIONSCORE.CLASSIFICATIONSCOREID", scoreId).cell())
+                                                                                        .groupBy("CLASSIFICATIONGROUP").cell())
+                            .orderBy("MAXGRADEFORSCORE desc")
+                            .table();
+    return gradingTable;
+}
+
+/**
+ * Gets the classificationgroup from a classification score id as String.<br>
+ * 
+ * @param {String} pClassificationScoreId                   <p>
+ *                                                          The classification score id 
+ *                                                          
+* @return {String}                                          <p>
+*                                                           The classificationgroup of the chosen classificationtype<br>
+ */
+ClassificationUtils.getClassificationGroup = function(pClassificationScoreId)
+{
+    var classificationGroup = newSelect("CLASSIFICATIONTYPE.CLASSIFICATIONGROUP")
+                                        .from("CLASSIFICATIONTYPE")
+                                        .where("CLASSIFICATIONTYPE.CLASSIFICATIONTYPEID", newSelect("CLASSIFICATIONSCORE.CLASSIFICATIONTYPE_ID")
+                                                                                            .from("CLASSIFICATIONSCORE")
+                                                                                            .where("CLASSIFICATIONSCORE.CLASSIFICATIONSCOREID", pClassificationScoreId)
+                                                                                            .cell())
+                                        .groupBy("CLASSIFICATIONGROUP")
+                                        .cell();
+    return classificationGroup;                                        
+}
\ No newline at end of file
diff --git a/process/KeywordRegistry_basic/process.js b/process/KeywordRegistry_basic/process.js
index 76562cebe0..eca66d022d 100644
--- a/process/KeywordRegistry_basic/process.js
+++ b/process/KeywordRegistry_basic/process.js
@@ -173,6 +173,7 @@ $KeywordRegistry.documentTemplateTypeCategory$htmlTemplate = function(){return "
 
 $KeywordRegistry.classificationType = function(){return "ClassificationType";};
 $KeywordRegistry.classificationType$salesproject = function(){return "SALESPROJ";};
+$KeywordRegistry.classificationType$organisation = function(){return "ORGANISATION";};
 
 $KeywordRegistry.personGender = function(){return "PersonGender";};
 $KeywordRegistry.personGender$other = function(){return "o";};
-- 
GitLab


From adad6c0c5a9ee5ac1f295ed221a674dd051b7a02 Mon Sep 17 00:00:00 2001
From: "j.goderbauer" <j.goderbauer@adito.de>
Date: Wed, 12 Aug 2020 12:42:38 +0200
Subject: [PATCH 141/309] updated Data_alias

---
 .liquibase/Data_alias/changelog.xml       |  1 -
 aliasDefinition/Data_alias/Data_alias.aod | 71 ++++++-----------------
 2 files changed, 18 insertions(+), 54 deletions(-)

diff --git a/.liquibase/Data_alias/changelog.xml b/.liquibase/Data_alias/changelog.xml
index db4017af8f..ae8736c63f 100644
--- a/.liquibase/Data_alias/changelog.xml
+++ b/.liquibase/Data_alias/changelog.xml
@@ -15,7 +15,6 @@
     <include relativeToChangelogFile="true" file="basic/2020.1.1/changelog.xml"/>
     <include relativeToChangelogFile="true" file="basic/2020.1.2/changelog.xml"/>
     <include relativeToChangelogFile="true" file="basic/2020.1.3/changelog.xml"/>
-
     <include relativeToChangelogFile="true" file="basic/2020.2.0/changelog.xml"/>
     
     <!--enable this only when you definetly want to overwrite the existing data with demo records:--> 
diff --git a/aliasDefinition/Data_alias/Data_alias.aod b/aliasDefinition/Data_alias/Data_alias.aod
index 100725cc45..79e9d29ef9 100644
--- a/aliasDefinition/Data_alias/Data_alias.aod
+++ b/aliasDefinition/Data_alias/Data_alias.aod
@@ -4220,27 +4220,6 @@
                   </customStringProperty>
                 </customProperties>
               </entityFieldDb>
-              <entityFieldDb>
-                <name>VERSNR</name>
-                <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="4" />
-                <size v="10" />
-                <scale v="0" />
-                <notNull v="false" />
-                <isUnique v="false" />
-                <index v="false" />
-                <documentation></documentation>
-                <title>Vers. no.</title>
-                <description></description>
-                <customProperties>
-                  <customBooleanProperty>
-                    <name>log</name>
-                    <global v="false" />
-                    <property v="true" />
-                  </customBooleanProperty>
-                </customProperties>
-              </entityFieldDb>
               <entityFieldDb>
                 <name>VAT</name>
                 <dbName></dbName>
@@ -4625,20 +4604,6 @@
                   </customBooleanProperty>
                 </customProperties>
               </entityFieldDb>
-              <entityFieldDb>
-                <name>UNPAID</name>
-                <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="3" />
-                <size v="14" />
-                <scale v="2" />
-                <notNull v="false" />
-                <isUnique v="false" />
-                <index v="false" />
-                <documentation></documentation>
-                <title></title>
-                <description></description>
-              </entityFieldDb>
               <entityFieldDb>
                 <name>DUNNINGLEVEL</name>
                 <dbName></dbName>
@@ -8410,13 +8375,13 @@
               <entityFieldDb>
                 <name>DOCUMENTTEMPLATEID</name>
                 <dbName></dbName>
-                <primaryKey v="false" />
+                <primaryKey v="true" />
                 <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
-                <notNull v="false" />
-                <isUnique v="false" />
-                <index v="false" />
+                <notNull v="true" />
+                <isUnique v="true" />
+                <index v="true" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
@@ -14903,20 +14868,6 @@
                 <title></title>
                 <description></description>
               </entityFieldDb>
-              <entityFieldDb>
-                <name>ORGANISATION_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>VISITPLANENTRYID</name>
                 <dbName></dbName>
@@ -14973,6 +14924,20 @@
                 <title></title>
                 <description></description>
               </entityFieldDb>
+              <entityFieldDb>
+                <name>ORGANISATION_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>
             </entityFields>
           </entityDb>
           <entityDb>
-- 
GitLab


From 84c86f35df600eba6a3854eb751e8a5b40ad68d7 Mon Sep 17 00:00:00 2001
From: "j.goderbauer" <j.goderbauer@adito.de>
Date: Wed, 12 Aug 2020 12:48:07 +0200
Subject: [PATCH 142/309] reorganized salesproject filter columns

---
 .../SalesprojectFilter_view.aod                | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/neonView/SalesprojectFilter_view/SalesprojectFilter_view.aod b/neonView/SalesprojectFilter_view/SalesprojectFilter_view.aod
index de645d22f0..d0ac5d4dec 100644
--- a/neonView/SalesprojectFilter_view/SalesprojectFilter_view.aod
+++ b/neonView/SalesprojectFilter_view/SalesprojectFilter_view.aod
@@ -57,6 +57,7 @@
       <descriptionField>CONTACT_ID</descriptionField>
       <entityField>#ENTITY</entityField>
       <linkedColumns>
+        <element>PROJECTCODE</element>
         <element>PROJECTTITLE</element>
       </linkedColumns>
       <title></title>
@@ -69,14 +70,14 @@
           <name>59001269-3ca3-4e13-9b8a-d62e2e602e29</name>
           <entityField>PROJECTCODE</entityField>
         </neonTableColumn>
-        <neonTableColumn>
-          <name>6702bb75-1c57-42a7-9cf0-acd7cd8515f5</name>
-          <entityField>CONTACT_ID</entityField>
-        </neonTableColumn>
         <neonTableColumn>
           <name>9f6b967e-5140-420f-84ca-2273920221bd</name>
           <entityField>PROJECTTITLE</entityField>
         </neonTableColumn>
+        <neonTableColumn>
+          <name>6702bb75-1c57-42a7-9cf0-acd7cd8515f5</name>
+          <entityField>CONTACT_ID</entityField>
+        </neonTableColumn>
         <neonTableColumn>
           <name>20f132ef-161e-4b84-b6ae-1f4daf016d16</name>
           <entityField>PROBABILITY_AI</entityField>
@@ -103,6 +104,7 @@
       <name>Treetable</name>
       <entityField>#ENTITY</entityField>
       <linkedColumns>
+        <element>PROJECTCODE</element>
         <element>PROJECTTITLE</element>
       </linkedColumns>
       <columns>
@@ -114,14 +116,14 @@
           <name>90e4ddd7-1e1c-48da-a347-adadf075d9f0</name>
           <entityField>PROJECTCODE</entityField>
         </neonTreeTableColumn>
-        <neonTreeTableColumn>
-          <name>9b7b8a15-4a8d-41cb-bb46-3b1ed573dc6e</name>
-          <entityField>CONTACT_ID</entityField>
-        </neonTreeTableColumn>
         <neonTreeTableColumn>
           <name>392b25fe-e7ce-463e-ae92-af426d523c2a</name>
           <entityField>PROJECTTITLE</entityField>
         </neonTreeTableColumn>
+        <neonTreeTableColumn>
+          <name>9b7b8a15-4a8d-41cb-bb46-3b1ed573dc6e</name>
+          <entityField>CONTACT_ID</entityField>
+        </neonTreeTableColumn>
         <neonTreeTableColumn>
           <name>745d6192-4817-49e6-8cb2-8470c9c25f4d</name>
           <entityField>STARTDATE</entityField>
-- 
GitLab


From 292c099176249a9408bea37aa196e107db10602d Mon Sep 17 00:00:00 2001
From: "j.goderbauer" <j.goderbauer@adito.de>
Date: Wed, 12 Aug 2020 12:57:12 +0200
Subject: [PATCH 143/309] removed unnecessary file

---
 .aditoprj/UUIDNameMap.txt | 102 --------------------------------------
 1 file changed, 102 deletions(-)
 delete mode 100644 .aditoprj/UUIDNameMap.txt

diff --git a/.aditoprj/UUIDNameMap.txt b/.aditoprj/UUIDNameMap.txt
deleted file mode 100644
index b8c3112dea..0000000000
--- a/.aditoprj/UUIDNameMap.txt
+++ /dev/null
@@ -1,102 +0,0 @@
-*************************************************
-*                                               *
-* This is a generated file, please do not edit! *
-*                                               *
-*************************************************
- 5
- 6
- 7
- 8
- 9
- 10
- 11
- 12
- 13
- 14
- 15
- 16
- 17
- 18
- 19
- 20
- 21
- 22
- 23
- 24
- 25
- 26
- 27
- 28
- 29
- 30
- 31
- 32
- 33
- 34
- 35
- 36
- 37
- 38
- 39
- 40
- 41
-1.0.0
-1597227709184
-#ENTITY
-#ENTITY
-#PROVIDER_FIELD
-#PROVIDER_FIELD
-#CONTENTTITLE
-#CONTENTTITLE
-#TITLE
-#TITLE
-#INDEX_GROUP
-#INDEX_GROUP
-#TARGETCONTEXT
-#TARGETCONTEXT
-INTERNAL_ADMINISTRATOR
-INTERNAL_ADMINISTRATOR
-INTERNAL_WEBSERVICE
-INTERNAL_WEBSERVICE
-#DESCRIPTION
-#DESCRIPTION
-INTERNAL_GROUPWARE
-INTERNAL_GROUPWARE
-INTERNAL_TECHNICAL
-INTERNAL_TECHNICAL
-#MAPPING
-#MAPPING
-#LOCATION
-#LOCATION
-#PROVIDER
-#PROVIDER
-INTERNAL_DESIGNER
-INTERNAL_DESIGNER
-#USERHELP
-#USERHELP
-#NONE
-#NONE
-#TARGETID
-#TARGETID
-#CONTENTDESCRIPTION
-#CONTENTDESCRIPTION
-#SORTING
-#SORTING
-#LOOKUPID
-#LOOKUPID
-#GROUPING
-#GROUPING
-#ICON
-#ICON
-INTERNAL_DASHBOARDSTOREADMIN
-INTERNAL_DASHBOARDSTOREADMIN
-#IMAGE
-#IMAGE
-#UID
-#UID
-INTERNAL_SNMP
-INTERNAL_SNMP
-#TARGETCONSUMER
-#TARGETCONSUMER
-INTERNAL_EVERYONE
-INTERNAL_EVERYONE
\ No newline at end of file
-- 
GitLab


From 658a9fccb59b6a4120d3a8571e1e34d187d880ab Mon Sep 17 00:00:00 2001
From: "j.goderbauer" <j.goderbauer@adito.de>
Date: Wed, 12 Aug 2020 12:57:31 +0200
Subject: [PATCH 144/309] Notification center: scanservice error

---
 entity/Notification_entity/Notification_entity.aod | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/entity/Notification_entity/Notification_entity.aod b/entity/Notification_entity/Notification_entity.aod
index 9cb2eaa374..359ef2c4c9 100644
--- a/entity/Notification_entity/Notification_entity.aod
+++ b/entity/Notification_entity/Notification_entity.aod
@@ -203,11 +203,6 @@
           <name>CONTENTID.value</name>
           <recordfield>ASYS_NOTIFICATIONCONTENTS.CONTENTID</recordfield>
         </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>CREATIONDATE.value</name>
-          <isFilterable v="true" />
-          <isLookupFilter v="true" />
-        </dbRecordFieldMapping>
         <dbRecordFieldMapping>
           <name>DESCRIPTION.value</name>
           <recordfield>ASYS_NOTIFICATIONCONTENTS.DESCRIPTION</recordfield>
@@ -267,6 +262,8 @@
         <dbRecordFieldMapping>
           <name>CREATEDATE.value</name>
           <recordfield>ASYS_NOTIFICATIONCONTENTS.CREATEDATE</recordfield>
+          <isFilterable v="true" />
+          <isLookupFilter v="false" />
         </dbRecordFieldMapping>
         <dbRecordFieldMapping>
           <name>DELETEDATE.value</name>
-- 
GitLab


From a4b4a485d0d8033aef9e83cc16d70573a9c72035 Mon Sep 17 00:00:00 2001
From: Tom Lutzenberger <t.lutzenberger@adito.de>
Date: Wed, 12 Aug 2020 13:22:38 +0200
Subject: [PATCH 145/309] #1058862: Translations wieder entfernen (wird
 serverseitig gemacht)

---
 entity/Employee_entity/entityfields/password/onValidation.js   | 3 +--
 .../Usersettings_entity/entityfields/jpassword/onValidation.js | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/entity/Employee_entity/entityfields/password/onValidation.js b/entity/Employee_entity/entityfields/password/onValidation.js
index 594e4ab704..09a1493246 100644
--- a/entity/Employee_entity/entityfields/password/onValidation.js
+++ b/entity/Employee_entity/entityfields/password/onValidation.js
@@ -1,6 +1,5 @@
 import("system.neon");
 import("system.result");
-import("system.translate");
 import("system.tools");
 import("system.vars");
 
@@ -15,7 +14,7 @@ if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW) {
     if(newPassword) {
         if(Object.keys(policyMessages).length > 0) {
             for(let msg in policyMessages) {
-                messages.push(translate.withArguments(msg, policyMessages[msg]));
+                messages.push(policyMessages[msg]);
             }
             result.string(messages.join("\n", messages));
         }
diff --git a/entity/Usersettings_entity/entityfields/jpassword/onValidation.js b/entity/Usersettings_entity/entityfields/jpassword/onValidation.js
index 8186278630..8afe8f4de4 100644
--- a/entity/Usersettings_entity/entityfields/jpassword/onValidation.js
+++ b/entity/Usersettings_entity/entityfields/jpassword/onValidation.js
@@ -16,7 +16,7 @@ if(newPassword) {
     
     if(Object.keys(policyMessages).length > 0) {
         for(let msg in policyMessages) {
-            messages.push(translate.withArguments(msg, policyMessages[msg]));
+            messages.push(policyMessages[msg]);
         }
         result.string(messages.join("\n", messages));
     }
-- 
GitLab


From 0cba1dbb73cae6cc71f025d3be856e8745fa4333 Mon Sep 17 00:00:00 2001
From: "j.goderbauer" <j.goderbauer@adito.de>
Date: Wed, 12 Aug 2020 13:43:59 +0200
Subject: [PATCH 146/309] ScanServices - warnings

---
 entity/Activity_entity/Activity_entity.aod    |   4 -
 .../isunlinked/filterValuesProcess.js         |   1 +
 .../CampaignAddParticipants_entity.aod        |   1 -
 .../recordcontainers/jdito/onInsert.js        |   0
 .../valueProcess.js                           |   4 -
 .../CommRestriction_Entity.aod                |   1 +
 .../valueProcess.js                           |   4 -
 .../commrestrictions/documentation.adoc       |   1 +
 .../Communication_entity.aod                  |   4 +
 .../allcommunications/documentation.adoc      |   1 +
 .../entityfields/commid/valueProcess.js       |   8 --
 .../children/commcategory_param/code.js       |   3 -
 .../emailcommunications/documentation.adoc    |   1 +
 .../containername_param/valueProcess.js       |   5 -
 .../children/commcategory_param/code.js       |   3 -
 .../phonecommunications/documentation.adoc    |   1 +
 .../documentation.adoc                        |   1 +
 .../recordcontainers/groupextension/query.js  |  14 ---
 .../entityfields/date_edit/valueProcess.js    |   6 -
 .../entityfields/date_new/valueProcess.js     |   6 -
 .../containername_param/valueProcess.js       |   5 -
 .../containername_param/valueProcess.js       |   5 -
 .../containername_param/valueProcess.js       |   5 -
 .../containername_param/valueProcess.js       |   5 -
 .../containername_param/valueProcess.js       |   6 -
 .../organisationtype_param/valueProcess.js    |   4 -
 .../entityfields/user_edit/valueProcess.js    |   6 -
 .../entityfields/user_new/valueProcess.js     |   6 -
 .../invertblacklist_param/valueProcess.js     |   3 -
 .../entityfields/dummyyy/valueProcess.js      |   2 -
 entity/Contract_entity/Contract_entity.aod    |   1 -
 entity/Contract_entity/conditionProcess.js    |   9 --
 .../entityfields/contact_id/fieldIdProcess.js |   4 -
 .../entityfields/date_edit/valueProcess.js    |   6 -
 .../entityfields/date_new/valueProcess.js     |   6 -
 .../entityfields/user_edit/valueProcess.js    |   6 -
 .../entityfields/user_new/valueProcess.js     |   6 -
 .../children/key_param/valueProcess.js        |   2 -
 .../children/value_param/valueProcess.js      |   2 -
 .../iso2_name2/children/key_param/code.js     |   2 -
 .../iso2_name2/children/value_param/code.js   |   2 -
 .../iso2_names/children/key_param/code.js     |   2 -
 .../iso2_names/children/value_param/code.js   |   2 -
 .../children/key_param/valueProcess.js        |   2 -
 .../children/value_param/valueProcess.js      |   2 -
 entity/DSGVOInfo_entity/DSGVOInfo_entity.aod  |   2 -
 .../recordcontainers/db/onDBInsert.js         |   0
 .../recordcontainers/db/onDBUpdate.js         |   0
 .../titleProcess.js                           |   5 -
 .../DocumentTemplate_entity/titleProcess.js   |   5 -
 entity/Document_entity/contentProcess.js      |  29 -----
 .../downloadfilesaction/onActionProcess.js    |   2 -
 entity/Document_entity/onDelete.js            |   2 -
 entity/Document_entity/onInsert.js            |  17 ---
 entity/Document_entity/onUpdate.js            |  22 ----
 entity/Forecast_entity/conditionProcess.js    |   8 --
 .../entityfields/date_edit/valueProcess.js    |   6 -
 .../entityfields/date_new/valueProcess.js     |   6 -
 .../salesprojectforecastdatestart/code.js     |   2 -
 .../entityfields/user_edit/valueProcess.js    |   6 -
 .../entityfields/user_new/valueProcess.js     |   6 -
 entity/Gender_keyword/contentProcess.js       |   7 --
 .../containername_param/valueProcess.js       |   5 -
 .../containername_param/valueProcess.js       |   5 -
 .../entityfields/date_edit/valueProcess.js    |   6 -
 .../entityfields/date_new/valueProcess.js     |   6 -
 .../pers_full_name/fieldIdProcess.js          |   4 -
 .../entityfields/user_edit/valueProcess.js    |   6 -
 .../entityfields/user_new/valueProcess.js     |   6 -
 .../Notification_entity.aod                   |   1 -
 entity/Offer_entity/Offer_entity.aod          |   2 -
 entity/Offer_entity/conditionProcess.js       |   8 --
 .../valueProcess.js                           |   2 -
 .../valueProcess.js                           |   2 -
 .../containername_param/valueProcess.js       |   5 -
 .../children/contactid_param/valueProcess.js  |   4 -
 .../entityfields/status/onValueChange.js      |   8 --
 entity/Offer_entity/onDBDelete.js             |   3 -
 .../entityfields/date_edit/valueProcess.js    |   6 -
 .../entityfields/date_new/valueProcess.js     |   6 -
 .../entityfields/user_edit/valueProcess.js    |   6 -
 .../entityfields/user_new/valueProcess.js     |   6 -
 .../price_aggregate.value/expression.js       |   3 -
 entity/Order_entity/Order_entity.aod          |   2 -
 .../entityfields/attributes/stateProcess.js   |   9 --
 .../entityfields/date_edit/valueProcess.js    |   6 -
 .../entityfields/date_new/valueProcess.js     |   6 -
 .../children/contactid_param/valueProcess.js  |   4 -
 .../orderlanguage_param/valueProcess.js       |   8 --
 .../entityfields/user_edit/valueProcess.js    |   6 -
 .../entityfields/user_new/valueProcess.js     |   6 -
 .../filterConditionProcess.js                 |   5 -
 .../attribute_filter/filterFieldsProcess.js   |   5 -
 .../attribute_filter/filterValuesProcess.js   |   5 -
 .../activities/filterConditionProcess.js      |   6 -
 .../entityfields/date_edit/valueProcess.js    |   6 -
 .../entityfields/date_new/valueProcess.js     |   6 -
 .../entityfields/user_edit/valueProcess.js    |   6 -
 .../entityfields/user_new/valueProcess.js     |   6 -
 .../Organisation_entity.aod                   |   1 -
 .../children/contactid_param/valueProcess.js  |   1 -
 .../children/orgid_param/valueProcess.js      |   4 -
 .../children/contactid_param/valueProcess.js  |   4 -
 .../containername_param/valueProcess.js       |   5 -
 .../containername_param/valueProcess.js       |   5 -
 .../containername_param/valueProcess.js       |   5 -
 .../org_date_edit/valueProcess.js             |   6 -
 .../entityfields/org_date_new/valueProcess.js |   7 --
 .../org_user_edit/valueProcess.js             |   6 -
 .../entityfields/org_user_new/valueProcess.js |   6 -
 .../organisation_objecttype/valueProcess.js   |   3 -
 .../rel_date_edit/valueProcess.js             |   6 -
 .../entityfields/rel_date_new/valueProcess.js |   6 -
 .../rel_user_edit/valueProcess.js             |   6 -
 .../entityfields/rel_user_new/valueProcess.js |   6 -
 .../Organisation_entity/fromClauseProcess.js  |   4 -
 entity/Person_entity/Person_entity.aod        |   1 -
 entity/Person_entity/conditionProcess.js      |  10 --
 .../addtobulkmailfromtable/stateProcess.js    |   9 --
 .../addtocampaignfromtable/stateProcess.js    |  14 ---
 .../addtoserialletter/stateProcess.js         |   9 --
 .../children/contactid_param/valueProcess.js  |   4 -
 .../entityfields/newtask/stateProcess.js      |   7 --
 .../person_objecttype/valueProcess.js         |   3 -
 entity/Person_entity/fromClauseProcess.js     |   6 -
 entity/Prod2prod_entity/contentProcess.js     |  14 ---
 .../entityfields/date_edit/valueProcess.js    |   6 -
 .../entityfields/date_new/valueProcess.js     |   7 --
 .../entityfields/user_edit/valueProcess.js    |   6 -
 .../entityfields/user_new/valueProcess.js     |   6 -
 entity/Prod2prod_entity/externalOpenAction.js |   4 -
 entity/Prod2prod_entity/onDelete.js           |   3 -
 entity/Prod2prod_entity/onInsert.js           |  19 ----
 entity/Prod2prod_entity/onUpdate.js           |  17 ---
 entity/Product_entity/Product_entity.aod      |   1 -
 .../children/productid_param/valueProcess.js  |   4 -
 .../children/productid_param/valueProcess.js  |   4 -
 entity/Product_entity/onDBDelete.js           |  13 ---
 .../Productprice_entity/conditionProcess.js   |  11 --
 .../displaysimplename_param/valueProcess.js   |   2 -
 .../filteredattributes_param/valueProcess.js  |   3 -
 .../entityfields/date_edit/valueProcess.js    |   6 -
 .../entityfields/date_new/valueProcess.js     |   6 -
 .../entityfields/product_id/fieldIdProcess.js |   4 -
 .../entityfields/user_edit/valueProcess.js    |   6 -
 .../entityfields/user_new/valueProcess.js     |   6 -
 .../Productprice_entity/orderClauseProcess.js |   3 -
 .../pricelist.displayvalue/expression.js      |   6 -
 .../QuickEntry_entity/QuickEntry_entity.aod   |   2 -
 entity/Role_entity/Role_entity.aod            |   1 -
 .../children/roletitle_param/valueProcess.js  |   4 -
 .../conditionProcess.js                       |   7 --
 .../entityfields/date_edit/valueProcess.js    |   6 -
 .../entityfields/date_new/valueProcess.js     |   6 -
 .../entityfields/user_edit/valueProcess.js    |   6 -
 .../entityfields/user_new/valueProcess.js     |   6 -
 .../conditionProcess.js                       |   7 --
 .../entityfields/date_edit/valueProcess.js    |   6 -
 .../entityfields/date_new/valueProcess.js     |   6 -
 .../entityfields/user_edit/valueProcess.js    |   6 -
 .../entityfields/user_new/valueProcess.js     |   6 -
 .../Salesproject_entity.aod                   |   1 -
 .../children/state_param/valueProcess.js      |   4 -
 .../entityfields/date_edit/valueProcess.js    |   6 -
 .../entityfields/date_new/valueProcess.js     |   6 -
 .../containername_param/valueProcess.js       |   5 -
 .../containername_param/valueProcess.js       |   5 -
 .../children/containername_param/code.js      |   5 -
 .../children/forecastid_param/valueProcess.js |   4 -
 .../children/state_param/valueProcess.js      |   5 -
 .../entityfields/user_edit/valueProcess.js    |   6 -
 .../entityfields/user_new/valueProcess.js     |   6 -
 .../entityfields/volume/onValidation.js       |  15 ---
 entity/Social_entity/contentProcess.js        |   2 -
 entity/Stock_entity/conditionProcess.js       |   7 --
 .../entityfields/date_edit/valueProcess.js    |   6 -
 .../entityfields/date_new/valueProcess.js     |   6 -
 .../entityfields/user_edit/valueProcess.js    |   6 -
 .../entityfields/user_new/valueProcess.js     |   6 -
 entity/Stock_entity/orderClauseProcess.js     |   3 -
 .../SupportTicket_entity.aod                  |   1 -
 .../expression.js                             |   6 -
 .../priority.displayvalue/expression.js       |   6 -
 .../progress.displayvalue/expression.js       |   6 -
 .../expression.js                             |   6 -
 .../status.displayvalue/expression.js         |   2 -
 entity/Task_entity/Task_entity.aod            |   1 -
 .../entityfields/date_edit/valueProcess.js    |   6 -
 .../entityfields/date_new/valueProcess.js     |   7 --
 .../containername_param/valueProcess.js       |   5 -
 .../children/containername_param/code.js      |   5 -
 .../links/children/taskid_param/code.js       |   4 -
 .../children/contextname/valueProcess.js      |   3 -
 .../moduletrees/children/id/valueProcess.js   |   4 -
 .../entityfields/user_edit/valueProcess.js    |   6 -
 .../entityfields/user_new/valueProcess.js     |   6 -
 .../entityfields/date_edit/valueProcess.js    |   6 -
 .../entityfields/date_new/valueProcess.js     |   6 -
 .../entityfields/user_edit/valueProcess.js    |   6 -
 .../entityfields/user_new/valueProcess.js     |   6 -
 .../downloadmail_action/onActionProcess.js    |   8 --
 .../WorkflowDefinition_entity.aod             |   1 -
 .../_____LANGUAGE_EXTRA.aod                   |  21 ++++
 .../_____LANGUAGE_de/_____LANGUAGE_de.aod     | 105 ++++++++++++++++++
 .../_____LANGUAGE_en/_____LANGUAGE_en.aod     |  24 ++++
 205 files changed, 161 insertions(+), 1057 deletions(-)
 delete mode 100644 entity/CampaignAddParticipants_entity/recordcontainers/jdito/onInsert.js
 delete mode 100644 entity/ClassificationType_entity/entityfields/classificationtypeids/children/classificationtypeids_param/valueProcess.js
 delete mode 100644 entity/CommRestriction_Entity/entityfields/commrestrictionmedium_param/valueProcess.js
 create mode 100644 entity/CommRestriction_Entity/entityfields/commrestrictions/documentation.adoc
 create mode 100644 entity/Communication_entity/entityfields/allcommunications/documentation.adoc
 delete mode 100644 entity/Communication_entity/entityfields/commid/valueProcess.js
 delete mode 100644 entity/Communication_entity/entityfields/emailcommunication/children/commcategory_param/code.js
 create mode 100644 entity/Communication_entity/entityfields/emailcommunications/documentation.adoc
 delete mode 100644 entity/Communication_entity/entityfields/keywordmedium/children/containername_param/valueProcess.js
 delete mode 100644 entity/Communication_entity/entityfields/phonecommunication/children/commcategory_param/code.js
 create mode 100644 entity/Communication_entity/entityfields/phonecommunications/documentation.adoc
 create mode 100644 entity/Communication_entity/entityfields/quickentrycommunications/documentation.adoc
 delete mode 100644 entity/Communication_entity/recordcontainers/groupextension/query.js
 delete mode 100644 entity/Competition_entity/entityfields/date_edit/valueProcess.js
 delete mode 100644 entity/Competition_entity/entityfields/date_new/valueProcess.js
 delete mode 100644 entity/Competition_entity/entityfields/keywordphase/children/containername_param/valueProcess.js
 delete mode 100644 entity/Competition_entity/entityfields/keywordprice_politics/children/containername_param/valueProcess.js
 delete mode 100644 entity/Competition_entity/entityfields/keywordstate/children/containername_param/valueProcess.js
 delete mode 100644 entity/Competition_entity/entityfields/keywordstrenght/children/containername_param/valueProcess.js
 delete mode 100644 entity/Competition_entity/entityfields/keywordweakness/children/containername_param/valueProcess.js
 delete mode 100644 entity/Competition_entity/entityfields/organisations/children/organisationtype_param/valueProcess.js
 delete mode 100644 entity/Competition_entity/entityfields/user_edit/valueProcess.js
 delete mode 100644 entity/Competition_entity/entityfields/user_new/valueProcess.js
 delete mode 100644 entity/Context_entity/entityfields/contextdocumenttemplateplaceofuse/children/invertblacklist_param/valueProcess.js
 delete mode 100644 entity/Context_entity/entityfields/dummyyy/valueProcess.js
 delete mode 100644 entity/Contract_entity/conditionProcess.js
 delete mode 100644 entity/Contract_entity/entityfields/contact_id/fieldIdProcess.js
 delete mode 100644 entity/Contract_entity/entityfields/date_edit/valueProcess.js
 delete mode 100644 entity/Contract_entity/entityfields/date_new/valueProcess.js
 delete mode 100644 entity/Contract_entity/entityfields/user_edit/valueProcess.js
 delete mode 100644 entity/Contract_entity/entityfields/user_new/valueProcess.js
 delete mode 100644 entity/Countries_Entity/entityfields/iso2_name/children/key_param/valueProcess.js
 delete mode 100644 entity/Countries_Entity/entityfields/iso2_name/children/value_param/valueProcess.js
 delete mode 100644 entity/Countries_Entity/entityfields/iso2_name2/children/key_param/code.js
 delete mode 100644 entity/Countries_Entity/entityfields/iso2_name2/children/value_param/code.js
 delete mode 100644 entity/Countries_Entity/entityfields/iso2_names/children/key_param/code.js
 delete mode 100644 entity/Countries_Entity/entityfields/iso2_names/children/value_param/code.js
 delete mode 100644 entity/Countries_Entity/entityfields/iso2names/children/key_param/valueProcess.js
 delete mode 100644 entity/Countries_Entity/entityfields/iso2names/children/value_param/valueProcess.js
 delete mode 100644 entity/DSGVOInfo_entity/recordcontainers/db/onDBInsert.js
 delete mode 100644 entity/DSGVOInfo_entity/recordcontainers/db/onDBUpdate.js
 delete mode 100644 entity/DocumentTemplateTypeCategory_entity/titleProcess.js
 delete mode 100644 entity/DocumentTemplate_entity/titleProcess.js
 delete mode 100644 entity/Document_entity/contentProcess.js
 delete mode 100644 entity/Document_entity/entityfields/downloadfilesaction/onActionProcess.js
 delete mode 100644 entity/Document_entity/onDelete.js
 delete mode 100644 entity/Document_entity/onInsert.js
 delete mode 100644 entity/Document_entity/onUpdate.js
 delete mode 100644 entity/Forecast_entity/conditionProcess.js
 delete mode 100644 entity/Forecast_entity/entityfields/date_edit/valueProcess.js
 delete mode 100644 entity/Forecast_entity/entityfields/date_new/valueProcess.js
 delete mode 100644 entity/Forecast_entity/entityfields/salesprojectforecastdatestart/code.js
 delete mode 100644 entity/Forecast_entity/entityfields/user_edit/valueProcess.js
 delete mode 100644 entity/Forecast_entity/entityfields/user_new/valueProcess.js
 delete mode 100644 entity/Gender_keyword/contentProcess.js
 delete mode 100644 entity/KeywordAttribute_entity/entityfields/keywordattributetype/children/containername_param/valueProcess.js
 delete mode 100644 entity/KeywordAttribute_entity/entityfields/keywordkeywordattributetypes/children/containername_param/valueProcess.js
 delete mode 100644 entity/Member_entity/entityfields/date_edit/valueProcess.js
 delete mode 100644 entity/Member_entity/entityfields/date_new/valueProcess.js
 delete mode 100644 entity/Member_entity/entityfields/pers_full_name/fieldIdProcess.js
 delete mode 100644 entity/Member_entity/entityfields/user_edit/valueProcess.js
 delete mode 100644 entity/Member_entity/entityfields/user_new/valueProcess.js
 delete mode 100644 entity/Offer_entity/conditionProcess.js
 delete mode 100644 entity/Offer_entity/entityfields/documenttemplatetext/children/documenttemplatetype_param/valueProcess.js
 delete mode 100644 entity/Offer_entity/entityfields/documenttemplatetext/children/documenttemplatetypeclassification_param/valueProcess.js
 delete mode 100644 entity/Offer_entity/entityfields/keywordprobability/children/containername_param/valueProcess.js
 delete mode 100644 entity/Offer_entity/entityfields/offeritems/children/contactid_param/valueProcess.js
 delete mode 100644 entity/Offer_entity/entityfields/status/onValueChange.js
 delete mode 100644 entity/Offer_entity/onDBDelete.js
 delete mode 100644 entity/Offeritem_entity/entityfields/date_edit/valueProcess.js
 delete mode 100644 entity/Offeritem_entity/entityfields/date_new/valueProcess.js
 delete mode 100644 entity/Offeritem_entity/entityfields/user_edit/valueProcess.js
 delete mode 100644 entity/Offeritem_entity/entityfields/user_new/valueProcess.js
 delete mode 100644 entity/Offeritem_entity/recordcontainers/db/recordfieldmappings/price_aggregate.value/expression.js
 delete mode 100644 entity/Order_entity/entityfields/attributes/stateProcess.js
 delete mode 100644 entity/Order_entity/entityfields/date_edit/valueProcess.js
 delete mode 100644 entity/Order_entity/entityfields/date_new/valueProcess.js
 delete mode 100644 entity/Order_entity/entityfields/orderitems/children/contactid_param/valueProcess.js
 delete mode 100644 entity/Order_entity/entityfields/orderlanguage_param/valueProcess.js
 delete mode 100644 entity/Order_entity/entityfields/user_edit/valueProcess.js
 delete mode 100644 entity/Order_entity/entityfields/user_new/valueProcess.js
 delete mode 100644 entity/Order_entity/recordcontainers/db/filterextensions/attribute_filter/filterConditionProcess.js
 delete mode 100644 entity/Order_entity/recordcontainers/db/filterextensions/attribute_filter/filterFieldsProcess.js
 delete mode 100644 entity/Order_entity/recordcontainers/db/filterextensions/attribute_filter/filterValuesProcess.js
 delete mode 100644 entity/Order_entity/recordcontainers/db/recordfieldmappings/activities/filterConditionProcess.js
 delete mode 100644 entity/Orderitem_entity/entityfields/date_edit/valueProcess.js
 delete mode 100644 entity/Orderitem_entity/entityfields/date_new/valueProcess.js
 delete mode 100644 entity/Orderitem_entity/entityfields/user_edit/valueProcess.js
 delete mode 100644 entity/Orderitem_entity/entityfields/user_new/valueProcess.js
 delete mode 100644 entity/Organisation_entity/entityfields/contacts/children/contactid_param/valueProcess.js
 delete mode 100644 entity/Organisation_entity/entityfields/contacts/children/orgid_param/valueProcess.js
 delete mode 100644 entity/Organisation_entity/entityfields/contract/children/contactid_param/valueProcess.js
 delete mode 100644 entity/Organisation_entity/entityfields/keywordprice_politics/children/containername_param/valueProcess.js
 delete mode 100644 entity/Organisation_entity/entityfields/keywordstrenght/children/containername_param/valueProcess.js
 delete mode 100644 entity/Organisation_entity/entityfields/keywordweakness/children/containername_param/valueProcess.js
 delete mode 100644 entity/Organisation_entity/entityfields/org_date_edit/valueProcess.js
 delete mode 100644 entity/Organisation_entity/entityfields/org_date_new/valueProcess.js
 delete mode 100644 entity/Organisation_entity/entityfields/org_user_edit/valueProcess.js
 delete mode 100644 entity/Organisation_entity/entityfields/org_user_new/valueProcess.js
 delete mode 100644 entity/Organisation_entity/entityfields/organisation_objecttype/valueProcess.js
 delete mode 100644 entity/Organisation_entity/entityfields/rel_date_edit/valueProcess.js
 delete mode 100644 entity/Organisation_entity/entityfields/rel_date_new/valueProcess.js
 delete mode 100644 entity/Organisation_entity/entityfields/rel_user_edit/valueProcess.js
 delete mode 100644 entity/Organisation_entity/entityfields/rel_user_new/valueProcess.js
 delete mode 100644 entity/Organisation_entity/fromClauseProcess.js
 delete mode 100644 entity/Person_entity/conditionProcess.js
 delete mode 100644 entity/Person_entity/entityfields/campaignactiongroup/children/addtobulkmailfromtable/stateProcess.js
 delete mode 100644 entity/Person_entity/entityfields/campaignactiongroup/children/addtocampaignfromtable/stateProcess.js
 delete mode 100644 entity/Person_entity/entityfields/campaignactiongroup/children/addtoserialletter/stateProcess.js
 delete mode 100644 entity/Person_entity/entityfields/contract/children/contactid_param/valueProcess.js
 delete mode 100644 entity/Person_entity/entityfields/newtask/stateProcess.js
 delete mode 100644 entity/Person_entity/entityfields/person_objecttype/valueProcess.js
 delete mode 100644 entity/Person_entity/fromClauseProcess.js
 delete mode 100644 entity/Prod2prod_entity/contentProcess.js
 delete mode 100644 entity/Prod2prod_entity/entityfields/date_edit/valueProcess.js
 delete mode 100644 entity/Prod2prod_entity/entityfields/date_new/valueProcess.js
 delete mode 100644 entity/Prod2prod_entity/entityfields/user_edit/valueProcess.js
 delete mode 100644 entity/Prod2prod_entity/entityfields/user_new/valueProcess.js
 delete mode 100644 entity/Prod2prod_entity/externalOpenAction.js
 delete mode 100644 entity/Prod2prod_entity/onDelete.js
 delete mode 100644 entity/Prod2prod_entity/onInsert.js
 delete mode 100644 entity/Prod2prod_entity/onUpdate.js
 delete mode 100644 entity/Product_entity/entityfields/stock/children/productid_param/valueProcess.js
 delete mode 100644 entity/Product_entity/entityfields/stockcount/children/productid_param/valueProcess.js
 delete mode 100644 entity/Product_entity/onDBDelete.js
 delete mode 100644 entity/Productprice_entity/conditionProcess.js
 delete mode 100644 entity/Productprice_entity/entityfields/attributes/children/displaysimplename_param/valueProcess.js
 delete mode 100644 entity/Productprice_entity/entityfields/attributes/children/filteredattributes_param/valueProcess.js
 delete mode 100644 entity/Productprice_entity/entityfields/date_edit/valueProcess.js
 delete mode 100644 entity/Productprice_entity/entityfields/date_new/valueProcess.js
 delete mode 100644 entity/Productprice_entity/entityfields/product_id/fieldIdProcess.js
 delete mode 100644 entity/Productprice_entity/entityfields/user_edit/valueProcess.js
 delete mode 100644 entity/Productprice_entity/entityfields/user_new/valueProcess.js
 delete mode 100644 entity/Productprice_entity/orderClauseProcess.js
 delete mode 100644 entity/Productprice_entity/recordcontainers/db/recordfieldmappings/pricelist.displayvalue/expression.js
 delete mode 100644 entity/Role_entity/entityfields/permissions/children/roletitle_param/valueProcess.js
 delete mode 100644 entity/SalesprojectMilestone_entity/conditionProcess.js
 delete mode 100644 entity/SalesprojectMilestone_entity/entityfields/date_edit/valueProcess.js
 delete mode 100644 entity/SalesprojectMilestone_entity/entityfields/date_new/valueProcess.js
 delete mode 100644 entity/SalesprojectMilestone_entity/entityfields/user_edit/valueProcess.js
 delete mode 100644 entity/SalesprojectMilestone_entity/entityfields/user_new/valueProcess.js
 delete mode 100644 entity/SalesprojectSource_entity/conditionProcess.js
 delete mode 100644 entity/SalesprojectSource_entity/entityfields/date_edit/valueProcess.js
 delete mode 100644 entity/SalesprojectSource_entity/entityfields/date_new/valueProcess.js
 delete mode 100644 entity/SalesprojectSource_entity/entityfields/user_edit/valueProcess.js
 delete mode 100644 entity/SalesprojectSource_entity/entityfields/user_new/valueProcess.js
 delete mode 100644 entity/Salesproject_entity/entityfields/2pensalesprojects/children/state_param/valueProcess.js
 delete mode 100644 entity/Salesproject_entity/entityfields/date_edit/valueProcess.js
 delete mode 100644 entity/Salesproject_entity/entityfields/date_new/valueProcess.js
 delete mode 100644 entity/Salesproject_entity/entityfields/keywordphase/children/containername_param/valueProcess.js
 delete mode 100644 entity/Salesproject_entity/entityfields/keywordstate/children/containername_param/valueProcess.js
 delete mode 100644 entity/Salesproject_entity/entityfields/keywordwonlost/children/containername_param/code.js
 delete mode 100644 entity/Salesproject_entity/entityfields/salesprojectforecasts/children/forecastid_param/valueProcess.js
 delete mode 100644 entity/Salesproject_entity/entityfields/salesprojectsopen/children/state_param/valueProcess.js
 delete mode 100644 entity/Salesproject_entity/entityfields/user_edit/valueProcess.js
 delete mode 100644 entity/Salesproject_entity/entityfields/user_new/valueProcess.js
 delete mode 100644 entity/Salesproject_entity/entityfields/volume/onValidation.js
 delete mode 100644 entity/Social_entity/contentProcess.js
 delete mode 100644 entity/Stock_entity/conditionProcess.js
 delete mode 100644 entity/Stock_entity/entityfields/date_edit/valueProcess.js
 delete mode 100644 entity/Stock_entity/entityfields/date_new/valueProcess.js
 delete mode 100644 entity/Stock_entity/entityfields/user_edit/valueProcess.js
 delete mode 100644 entity/Stock_entity/entityfields/user_new/valueProcess.js
 delete mode 100644 entity/Stock_entity/orderClauseProcess.js
 delete mode 100644 entity/SupportTicket_entity/recordcontainers/db/recordfieldmappings/editor_contact_id.displayvalue/expression.js
 delete mode 100644 entity/SupportTicket_entity/recordcontainers/db/recordfieldmappings/priority.displayvalue/expression.js
 delete mode 100644 entity/SupportTicket_entity/recordcontainers/db/recordfieldmappings/progress.displayvalue/expression.js
 delete mode 100644 entity/SupportTicket_entity/recordcontainers/db/recordfieldmappings/requestor_contact_id.displayvalue/expression.js
 delete mode 100644 entity/SupportTicket_entity/recordcontainers/db/recordfieldmappings/status.displayvalue/expression.js
 delete mode 100644 entity/Task_entity/entityfields/date_edit/valueProcess.js
 delete mode 100644 entity/Task_entity/entityfields/date_new/valueProcess.js
 delete mode 100644 entity/Task_entity/entityfields/keywordpriority/children/containername_param/valueProcess.js
 delete mode 100644 entity/Task_entity/entityfields/keywordprogress/children/containername_param/code.js
 delete mode 100644 entity/Task_entity/entityfields/links/children/taskid_param/code.js
 delete mode 100644 entity/Task_entity/entityfields/moduletrees/children/contextname/valueProcess.js
 delete mode 100644 entity/Task_entity/entityfields/moduletrees/children/id/valueProcess.js
 delete mode 100644 entity/Task_entity/entityfields/user_edit/valueProcess.js
 delete mode 100644 entity/Task_entity/entityfields/user_new/valueProcess.js
 delete mode 100644 entity/Timetracking_entity/entityfields/date_edit/valueProcess.js
 delete mode 100644 entity/Timetracking_entity/entityfields/date_new/valueProcess.js
 delete mode 100644 entity/Timetracking_entity/entityfields/user_edit/valueProcess.js
 delete mode 100644 entity/Timetracking_entity/entityfields/user_new/valueProcess.js
 delete mode 100644 entity/UnlinkedMail_entity/entityfields/downloadmail_actiongroup/children/downloadmail_actiongroup/children/downloadmail_action/onActionProcess.js

diff --git a/entity/Activity_entity/Activity_entity.aod b/entity/Activity_entity/Activity_entity.aod
index 0dc1eae96a..23119b4b9e 100644
--- a/entity/Activity_entity/Activity_entity.aod
+++ b/entity/Activity_entity/Activity_entity.aod
@@ -730,10 +730,6 @@
           <recordfield>ACTIVITY.ACTIVITYID</recordfield>
           <aggregateType>COUNT</aggregateType>
         </aggregateFieldDbMapping>
-        <dbRecordFieldMapping>
-          <name>COUNT.value</name>
-          <expression>%aditoprj%/entity/Activity_entity/recordcontainers/db/recordfieldmappings/count.value/expression.js</expression>
-        </dbRecordFieldMapping>
       </recordFieldMappings>
       <filterExtensions>
         <filterExtensionSet>
diff --git a/entity/Activity_entity/recordcontainers/db/filterextensions/isunlinked/filterValuesProcess.js b/entity/Activity_entity/recordcontainers/db/filterextensions/isunlinked/filterValuesProcess.js
index 056eacc69d..4462144da5 100644
--- a/entity/Activity_entity/recordcontainers/db/filterextensions/isunlinked/filterValuesProcess.js
+++ b/entity/Activity_entity/recordcontainers/db/filterextensions/isunlinked/filterValuesProcess.js
@@ -1,3 +1,4 @@
+import("system.translate");
 import("system.result");
 
 result.object([["true", translate.text("Yes")], ["false", translate.text("No")]]);
\ No newline at end of file
diff --git a/entity/CampaignAddParticipants_entity/CampaignAddParticipants_entity.aod b/entity/CampaignAddParticipants_entity/CampaignAddParticipants_entity.aod
index 427c1e2626..72b8d3952b 100644
--- a/entity/CampaignAddParticipants_entity/CampaignAddParticipants_entity.aod
+++ b/entity/CampaignAddParticipants_entity/CampaignAddParticipants_entity.aod
@@ -144,7 +144,6 @@
       <name>jdito</name>
       <jDitoRecordAlias>Data_alias</jDitoRecordAlias>
       <contentProcess>%aditoprj%/entity/CampaignAddParticipants_entity/recordcontainers/jdito/contentProcess.js</contentProcess>
-      <onInsert>%aditoprj%/entity/CampaignAddParticipants_entity/recordcontainers/jdito/onInsert.js</onInsert>
       <recordFieldMappings>
         <jDitoRecordFieldMapping>
           <name>UID.value</name>
diff --git a/entity/CampaignAddParticipants_entity/recordcontainers/jdito/onInsert.js b/entity/CampaignAddParticipants_entity/recordcontainers/jdito/onInsert.js
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/entity/ClassificationType_entity/entityfields/classificationtypeids/children/classificationtypeids_param/valueProcess.js b/entity/ClassificationType_entity/entityfields/classificationtypeids/children/classificationtypeids_param/valueProcess.js
deleted file mode 100644
index b11d099579..0000000000
--- a/entity/ClassificationType_entity/entityfields/classificationtypeids/children/classificationtypeids_param/valueProcess.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import("system.vars");
-import("system.result");
-
-result.string(vars.get("$field.CLASSIFICATIONTYPEID"));
\ No newline at end of file
diff --git a/entity/CommRestriction_Entity/CommRestriction_Entity.aod b/entity/CommRestriction_Entity/CommRestriction_Entity.aod
index 3da4230788..44a8c93600 100644
--- a/entity/CommRestriction_Entity/CommRestriction_Entity.aod
+++ b/entity/CommRestriction_Entity/CommRestriction_Entity.aod
@@ -74,6 +74,7 @@
     </entityConsumer>
     <entityProvider>
       <name>CommRestrictions</name>
+      <documentation>%aditoprj%/entity/CommRestriction_Entity/entityfields/commrestrictions/documentation.adoc</documentation>
       <dependencies>
         <entityDependency>
           <name>b50e33cd-e20f-4bdf-b0ee-2ecdab921ffd</name>
diff --git a/entity/CommRestriction_Entity/entityfields/commrestrictionmedium_param/valueProcess.js b/entity/CommRestriction_Entity/entityfields/commrestrictionmedium_param/valueProcess.js
deleted file mode 100644
index 945de9c5f7..0000000000
--- a/entity/CommRestriction_Entity/entityfields/commrestrictionmedium_param/valueProcess.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import("system.vars");
-import("system.result");
-
-result.string(vars.get("$field.MEDIUM"));
\ No newline at end of file
diff --git a/entity/CommRestriction_Entity/entityfields/commrestrictions/documentation.adoc b/entity/CommRestriction_Entity/entityfields/commrestrictions/documentation.adoc
new file mode 100644
index 0000000000..c912348a6c
--- /dev/null
+++ b/entity/CommRestriction_Entity/entityfields/commrestrictions/documentation.adoc
@@ -0,0 +1 @@
+Basic provider for communication restrictions (advertising bans) for one contact. Therefor the ContactId is a mandatory parameter.
\ No newline at end of file
diff --git a/entity/Communication_entity/Communication_entity.aod b/entity/Communication_entity/Communication_entity.aod
index dd820facad..c9b220e519 100644
--- a/entity/Communication_entity/Communication_entity.aod
+++ b/entity/Communication_entity/Communication_entity.aod
@@ -60,6 +60,7 @@ Usually this is used for filtering COMMUNICATION-entries by a specified contact
     </entityParameter>
     <entityProvider>
       <name>AllCommunications</name>
+      <documentation>%aditoprj%/entity/Communication_entity/entityfields/allcommunications/documentation.adoc</documentation>
       <recordContainer>db</recordContainer>
       <dependencies>
         <entityDependency>
@@ -111,6 +112,7 @@ Usually this is used for filtering COMMUNICATION-entries by a specified contact
     </entityProvider>
     <entityProvider>
       <name>PhoneCommunications</name>
+      <documentation>%aditoprj%/entity/Communication_entity/entityfields/phonecommunications/documentation.adoc</documentation>
       <recordContainer>db</recordContainer>
       <dependencies>
         <entityDependency>
@@ -152,6 +154,7 @@ Usually this is used for filtering COMMUNICATION-entries by a specified contact
     </entityProvider>
     <entityProvider>
       <name>EmailCommunications</name>
+      <documentation>%aditoprj%/entity/Communication_entity/entityfields/emailcommunications/documentation.adoc</documentation>
       <recordContainer>db</recordContainer>
       <dependencies>
         <entityDependency>
@@ -259,6 +262,7 @@ Usually this is used for filtering COMMUNICATION-entries by a specified contact
     </entityField>
     <entityProvider>
       <name>QuickEntryCommunications</name>
+      <documentation>%aditoprj%/entity/Communication_entity/entityfields/quickentrycommunications/documentation.adoc</documentation>
       <dependencies>
         <entityDependency>
           <name>85bc11c4-7226-4b3e-82cb-947dfb05a972</name>
diff --git a/entity/Communication_entity/entityfields/allcommunications/documentation.adoc b/entity/Communication_entity/entityfields/allcommunications/documentation.adoc
new file mode 100644
index 0000000000..79b0805cc2
--- /dev/null
+++ b/entity/Communication_entity/entityfields/allcommunications/documentation.adoc
@@ -0,0 +1 @@
+Provides all communication entries for a single contact, regardless of the communication type.
\ No newline at end of file
diff --git a/entity/Communication_entity/entityfields/commid/valueProcess.js b/entity/Communication_entity/entityfields/commid/valueProcess.js
deleted file mode 100644
index 9cf79dfccb..0000000000
--- a/entity/Communication_entity/entityfields/commid/valueProcess.js
+++ /dev/null
@@ -1,8 +0,0 @@
-import("system.util");
-import("system.result");
-import("system.neon");
-import("system.vars");
-
-//do not check if own value is null or empty because the own value is currently not set correctly when you've got several COMMUNICATION entries (e.g. in a list edit)
-if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
-    result.string(util.getNewUUID());
\ No newline at end of file
diff --git a/entity/Communication_entity/entityfields/emailcommunication/children/commcategory_param/code.js b/entity/Communication_entity/entityfields/emailcommunication/children/commcategory_param/code.js
deleted file mode 100644
index 3612519c44..0000000000
--- a/entity/Communication_entity/entityfields/emailcommunication/children/commcategory_param/code.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import("system.result");
-
-result.string("EMAIL")
\ No newline at end of file
diff --git a/entity/Communication_entity/entityfields/emailcommunications/documentation.adoc b/entity/Communication_entity/entityfields/emailcommunications/documentation.adoc
new file mode 100644
index 0000000000..de362bf3fc
--- /dev/null
+++ b/entity/Communication_entity/entityfields/emailcommunications/documentation.adoc
@@ -0,0 +1 @@
+Provides all communication entries of the type "email". For example, this can be used to provide a list of choose able standard email addresses for a contact.
\ No newline at end of file
diff --git a/entity/Communication_entity/entityfields/keywordmedium/children/containername_param/valueProcess.js b/entity/Communication_entity/entityfields/keywordmedium/children/containername_param/valueProcess.js
deleted file mode 100644
index 8f3681332b..0000000000
--- a/entity/Communication_entity/entityfields/keywordmedium/children/containername_param/valueProcess.js
+++ /dev/null
@@ -1,5 +0,0 @@
-import("system.result");
-import("Keyword_lib");
-import("KeywordRegistry_basic");
-
-result.string($KeywordRegistry.communicationMedium());
\ No newline at end of file
diff --git a/entity/Communication_entity/entityfields/phonecommunication/children/commcategory_param/code.js b/entity/Communication_entity/entityfields/phonecommunication/children/commcategory_param/code.js
deleted file mode 100644
index a809f839e8..0000000000
--- a/entity/Communication_entity/entityfields/phonecommunication/children/commcategory_param/code.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import("system.result");
-
-result.string("PHONE")
\ No newline at end of file
diff --git a/entity/Communication_entity/entityfields/phonecommunications/documentation.adoc b/entity/Communication_entity/entityfields/phonecommunications/documentation.adoc
new file mode 100644
index 0000000000..2d3c2d405c
--- /dev/null
+++ b/entity/Communication_entity/entityfields/phonecommunications/documentation.adoc
@@ -0,0 +1 @@
+Provides all communication entries of the type "phone". For example, this can be used to provide a list of choose able standard phone addresses for a contact.
\ No newline at end of file
diff --git a/entity/Communication_entity/entityfields/quickentrycommunications/documentation.adoc b/entity/Communication_entity/entityfields/quickentrycommunications/documentation.adoc
new file mode 100644
index 0000000000..428c1736ae
--- /dev/null
+++ b/entity/Communication_entity/entityfields/quickentrycommunications/documentation.adoc
@@ -0,0 +1 @@
+Provider specialized for the use in the QuickEntry_entity since the QuickEntry_entity needs some special handling of data.
\ No newline at end of file
diff --git a/entity/Communication_entity/recordcontainers/groupextension/query.js b/entity/Communication_entity/recordcontainers/groupextension/query.js
deleted file mode 100644
index 973ba257b3..0000000000
--- a/entity/Communication_entity/recordcontainers/groupextension/query.js
+++ /dev/null
@@ -1,14 +0,0 @@
-import("Sql_lib");
-import("system.result");
-import("system.vars");
-import("system.db");
-
-var querySelect = newSelect('COMMUNICATION.COMMUNICATIONID, COMMUNICATION.COMMUNICATIONID as "_uid_", COMMUNICATION.ADDR')
-                        .from("COMMUNICATION")
-                        .orderBy("COMMUNICATION.COMMUNICATIONID");
-
-if (vars.exists("$local.idvalue") && vars.get("$local.idvalue") && vars.get("$local.idvalue").length > 0) {
-    querySelect.where("COMMUNICATION.COMMUNICATIONID", vars.get("$local.idvalue"), SqlBuilder.IN());
-}
-
-result.string(querySelect.toString());
\ No newline at end of file
diff --git a/entity/Competition_entity/entityfields/date_edit/valueProcess.js b/entity/Competition_entity/entityfields/date_edit/valueProcess.js
deleted file mode 100644
index 710ac8a06a..0000000000
--- a/entity/Competition_entity/entityfields/date_edit/valueProcess.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import("system.vars");
-import("system.result");
-import("system.neon");
-
-if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT)
-    result.string(vars.getString("$sys.date"));
\ No newline at end of file
diff --git a/entity/Competition_entity/entityfields/date_new/valueProcess.js b/entity/Competition_entity/entityfields/date_new/valueProcess.js
deleted file mode 100644
index 3a0d59096c..0000000000
--- a/entity/Competition_entity/entityfields/date_new/valueProcess.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import("system.vars");
-import("system.result");
-import("system.neon");
-
-if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
-    result.string(vars.getString("$sys.date"));
\ No newline at end of file
diff --git a/entity/Competition_entity/entityfields/keywordphase/children/containername_param/valueProcess.js b/entity/Competition_entity/entityfields/keywordphase/children/containername_param/valueProcess.js
deleted file mode 100644
index 0fda06efff..0000000000
--- a/entity/Competition_entity/entityfields/keywordphase/children/containername_param/valueProcess.js
+++ /dev/null
@@ -1,5 +0,0 @@
-import("system.result");
-import("Keyword_lib");
-import("KeywordRegistry_basic");
-
-result.string($KeywordRegistry.salesprojectPhase());
\ No newline at end of file
diff --git a/entity/Competition_entity/entityfields/keywordprice_politics/children/containername_param/valueProcess.js b/entity/Competition_entity/entityfields/keywordprice_politics/children/containername_param/valueProcess.js
deleted file mode 100644
index a76a727534..0000000000
--- a/entity/Competition_entity/entityfields/keywordprice_politics/children/containername_param/valueProcess.js
+++ /dev/null
@@ -1,5 +0,0 @@
-import("system.result");
-import("Keyword_lib");
-import("KeywordRegistry_basic");
-
-result.string($KeywordRegistry.salesprojectPricePolitics());
\ No newline at end of file
diff --git a/entity/Competition_entity/entityfields/keywordstate/children/containername_param/valueProcess.js b/entity/Competition_entity/entityfields/keywordstate/children/containername_param/valueProcess.js
deleted file mode 100644
index 8c5b3ca3c9..0000000000
--- a/entity/Competition_entity/entityfields/keywordstate/children/containername_param/valueProcess.js
+++ /dev/null
@@ -1,5 +0,0 @@
-import("system.result");
-import("Keyword_lib");
-import("KeywordRegistry_basic");
-
-result.string($KeywordRegistry.competitionState());
\ No newline at end of file
diff --git a/entity/Competition_entity/entityfields/keywordstrenght/children/containername_param/valueProcess.js b/entity/Competition_entity/entityfields/keywordstrenght/children/containername_param/valueProcess.js
deleted file mode 100644
index cae1ead387..0000000000
--- a/entity/Competition_entity/entityfields/keywordstrenght/children/containername_param/valueProcess.js
+++ /dev/null
@@ -1,5 +0,0 @@
-import("system.result");
-import("Keyword_lib");
-import("KeywordRegistry_basic");
-
-result.string($KeywordRegistry.salesprojectStrenght());
\ No newline at end of file
diff --git a/entity/Competition_entity/entityfields/keywordweakness/children/containername_param/valueProcess.js b/entity/Competition_entity/entityfields/keywordweakness/children/containername_param/valueProcess.js
deleted file mode 100644
index 1f3ec844e7..0000000000
--- a/entity/Competition_entity/entityfields/keywordweakness/children/containername_param/valueProcess.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import("system.result");
-import("Keyword_lib");
-import("KeywordRegistry_basic");
-
-var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.salesprojectWeakness(), "ORGANISATION.WEAKNESS");
-result.string(sql);
\ No newline at end of file
diff --git a/entity/Competition_entity/entityfields/organisations/children/organisationtype_param/valueProcess.js b/entity/Competition_entity/entityfields/organisations/children/organisationtype_param/valueProcess.js
deleted file mode 100644
index 407c679050..0000000000
--- a/entity/Competition_entity/entityfields/organisations/children/organisationtype_param/valueProcess.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import("system.result");
-import("KeywordRegistry_basic");
-
-result.string($KeywordRegistry.organisationType$competitor());
\ No newline at end of file
diff --git a/entity/Competition_entity/entityfields/user_edit/valueProcess.js b/entity/Competition_entity/entityfields/user_edit/valueProcess.js
deleted file mode 100644
index 1581e18d97..0000000000
--- a/entity/Competition_entity/entityfields/user_edit/valueProcess.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import("system.vars");
-import("system.result");
-import("system.neon");
-
-if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT)
-    result.string(vars.getString("$sys.user"));
\ No newline at end of file
diff --git a/entity/Competition_entity/entityfields/user_new/valueProcess.js b/entity/Competition_entity/entityfields/user_new/valueProcess.js
deleted file mode 100644
index 7c566863b4..0000000000
--- a/entity/Competition_entity/entityfields/user_new/valueProcess.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import("system.vars");
-import("system.result");
-import("system.neon");
-
-if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
-    result.string(vars.getString("$sys.user"));
\ No newline at end of file
diff --git a/entity/Context_entity/entityfields/contextdocumenttemplateplaceofuse/children/invertblacklist_param/valueProcess.js b/entity/Context_entity/entityfields/contextdocumenttemplateplaceofuse/children/invertblacklist_param/valueProcess.js
deleted file mode 100644
index 9e45ce3b6c..0000000000
--- a/entity/Context_entity/entityfields/contextdocumenttemplateplaceofuse/children/invertblacklist_param/valueProcess.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import("system.result");
-
-result.object(["Person", "Organisation"]);
\ No newline at end of file
diff --git a/entity/Context_entity/entityfields/dummyyy/valueProcess.js b/entity/Context_entity/entityfields/dummyyy/valueProcess.js
deleted file mode 100644
index 9c705ff529..0000000000
--- a/entity/Context_entity/entityfields/dummyyy/valueProcess.js
+++ /dev/null
@@ -1,2 +0,0 @@
-import("system.result");
-result.string("asdf")
\ No newline at end of file
diff --git a/entity/Contract_entity/Contract_entity.aod b/entity/Contract_entity/Contract_entity.aod
index 8a6ccfd90c..bc87ed2f2c 100644
--- a/entity/Contract_entity/Contract_entity.aod
+++ b/entity/Contract_entity/Contract_entity.aod
@@ -536,7 +536,6 @@
         </consumerMapping>
         <dbRecordFieldMapping>
           <name>COUNT.value</name>
-          <expression>%aditoprj%/entity/Contract_entity/recordcontainers/db/recordfieldmappings/count.value/expression.js</expression>
         </dbRecordFieldMapping>
         <aggregateFieldDbMapping>
           <name>COUNT_aggregate.value</name>
diff --git a/entity/Contract_entity/conditionProcess.js b/entity/Contract_entity/conditionProcess.js
deleted file mode 100644
index b40df37b5c..0000000000
--- a/entity/Contract_entity/conditionProcess.js
+++ /dev/null
@@ -1,9 +0,0 @@
-import("Sql_lib");
-import("system.result");
-import("system.vars");
-
-var condition = newWhere();
-if (vars.exists("$param.ContactId_param"))
-    condition.andIfSet("CONTRACT.CONTACT_ID", "$param.ContactId_param");
-
-result.string(condition.toString("1=1"));
\ No newline at end of file
diff --git a/entity/Contract_entity/entityfields/contact_id/fieldIdProcess.js b/entity/Contract_entity/entityfields/contact_id/fieldIdProcess.js
deleted file mode 100644
index 6cd3c4544e..0000000000
--- a/entity/Contract_entity/entityfields/contact_id/fieldIdProcess.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import("system.vars");
-import("system.result");
-
-result.string(vars.get("$this.value"));
\ No newline at end of file
diff --git a/entity/Contract_entity/entityfields/date_edit/valueProcess.js b/entity/Contract_entity/entityfields/date_edit/valueProcess.js
deleted file mode 100644
index 710ac8a06a..0000000000
--- a/entity/Contract_entity/entityfields/date_edit/valueProcess.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import("system.vars");
-import("system.result");
-import("system.neon");
-
-if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT)
-    result.string(vars.getString("$sys.date"));
\ No newline at end of file
diff --git a/entity/Contract_entity/entityfields/date_new/valueProcess.js b/entity/Contract_entity/entityfields/date_new/valueProcess.js
deleted file mode 100644
index 3a0d59096c..0000000000
--- a/entity/Contract_entity/entityfields/date_new/valueProcess.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import("system.vars");
-import("system.result");
-import("system.neon");
-
-if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
-    result.string(vars.getString("$sys.date"));
\ No newline at end of file
diff --git a/entity/Contract_entity/entityfields/user_edit/valueProcess.js b/entity/Contract_entity/entityfields/user_edit/valueProcess.js
deleted file mode 100644
index 1581e18d97..0000000000
--- a/entity/Contract_entity/entityfields/user_edit/valueProcess.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import("system.vars");
-import("system.result");
-import("system.neon");
-
-if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT)
-    result.string(vars.getString("$sys.user"));
\ No newline at end of file
diff --git a/entity/Contract_entity/entityfields/user_new/valueProcess.js b/entity/Contract_entity/entityfields/user_new/valueProcess.js
deleted file mode 100644
index 7c566863b4..0000000000
--- a/entity/Contract_entity/entityfields/user_new/valueProcess.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import("system.vars");
-import("system.result");
-import("system.neon");
-
-if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
-    result.string(vars.getString("$sys.user"));
\ No newline at end of file
diff --git a/entity/Countries_Entity/entityfields/iso2_name/children/key_param/valueProcess.js b/entity/Countries_Entity/entityfields/iso2_name/children/key_param/valueProcess.js
deleted file mode 100644
index ce35888708..0000000000
--- a/entity/Countries_Entity/entityfields/iso2_name/children/key_param/valueProcess.js
+++ /dev/null
@@ -1,2 +0,0 @@
-import("system.result");
-result.string("ISO2");
\ No newline at end of file
diff --git a/entity/Countries_Entity/entityfields/iso2_name/children/value_param/valueProcess.js b/entity/Countries_Entity/entityfields/iso2_name/children/value_param/valueProcess.js
deleted file mode 100644
index 02118b5079..0000000000
--- a/entity/Countries_Entity/entityfields/iso2_name/children/value_param/valueProcess.js
+++ /dev/null
@@ -1,2 +0,0 @@
-import("system.result");
-result.string("NAME");
\ No newline at end of file
diff --git a/entity/Countries_Entity/entityfields/iso2_name2/children/key_param/code.js b/entity/Countries_Entity/entityfields/iso2_name2/children/key_param/code.js
deleted file mode 100644
index ce35888708..0000000000
--- a/entity/Countries_Entity/entityfields/iso2_name2/children/key_param/code.js
+++ /dev/null
@@ -1,2 +0,0 @@
-import("system.result");
-result.string("ISO2");
\ No newline at end of file
diff --git a/entity/Countries_Entity/entityfields/iso2_name2/children/value_param/code.js b/entity/Countries_Entity/entityfields/iso2_name2/children/value_param/code.js
deleted file mode 100644
index 02118b5079..0000000000
--- a/entity/Countries_Entity/entityfields/iso2_name2/children/value_param/code.js
+++ /dev/null
@@ -1,2 +0,0 @@
-import("system.result");
-result.string("NAME");
\ No newline at end of file
diff --git a/entity/Countries_Entity/entityfields/iso2_names/children/key_param/code.js b/entity/Countries_Entity/entityfields/iso2_names/children/key_param/code.js
deleted file mode 100644
index ce35888708..0000000000
--- a/entity/Countries_Entity/entityfields/iso2_names/children/key_param/code.js
+++ /dev/null
@@ -1,2 +0,0 @@
-import("system.result");
-result.string("ISO2");
\ No newline at end of file
diff --git a/entity/Countries_Entity/entityfields/iso2_names/children/value_param/code.js b/entity/Countries_Entity/entityfields/iso2_names/children/value_param/code.js
deleted file mode 100644
index 02118b5079..0000000000
--- a/entity/Countries_Entity/entityfields/iso2_names/children/value_param/code.js
+++ /dev/null
@@ -1,2 +0,0 @@
-import("system.result");
-result.string("NAME");
\ No newline at end of file
diff --git a/entity/Countries_Entity/entityfields/iso2names/children/key_param/valueProcess.js b/entity/Countries_Entity/entityfields/iso2names/children/key_param/valueProcess.js
deleted file mode 100644
index ce35888708..0000000000
--- a/entity/Countries_Entity/entityfields/iso2names/children/key_param/valueProcess.js
+++ /dev/null
@@ -1,2 +0,0 @@
-import("system.result");
-result.string("ISO2");
\ No newline at end of file
diff --git a/entity/Countries_Entity/entityfields/iso2names/children/value_param/valueProcess.js b/entity/Countries_Entity/entityfields/iso2names/children/value_param/valueProcess.js
deleted file mode 100644
index 02118b5079..0000000000
--- a/entity/Countries_Entity/entityfields/iso2names/children/value_param/valueProcess.js
+++ /dev/null
@@ -1,2 +0,0 @@
-import("system.result");
-result.string("NAME");
\ No newline at end of file
diff --git a/entity/DSGVOInfo_entity/DSGVOInfo_entity.aod b/entity/DSGVOInfo_entity/DSGVOInfo_entity.aod
index 1dfd409f91..193f2a36e4 100644
--- a/entity/DSGVOInfo_entity/DSGVOInfo_entity.aod
+++ b/entity/DSGVOInfo_entity/DSGVOInfo_entity.aod
@@ -163,8 +163,6 @@
       <name>db</name>
       <alias>Data_alias</alias>
       <conditionProcess>%aditoprj%/entity/DSGVOInfo_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
-      <onDBInsert>%aditoprj%/entity/DSGVOInfo_entity/recordcontainers/db/onDBInsert.js</onDBInsert>
-      <onDBUpdate>%aditoprj%/entity/DSGVOInfo_entity/recordcontainers/db/onDBUpdate.js</onDBUpdate>
       <linkInformation>
         <linkInformation>
           <name>23dd4eb2-0ac4-406e-92e3-031f1342bd05</name>
diff --git a/entity/DSGVOInfo_entity/recordcontainers/db/onDBInsert.js b/entity/DSGVOInfo_entity/recordcontainers/db/onDBInsert.js
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/entity/DSGVOInfo_entity/recordcontainers/db/onDBUpdate.js b/entity/DSGVOInfo_entity/recordcontainers/db/onDBUpdate.js
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/entity/DocumentTemplateTypeCategory_entity/titleProcess.js b/entity/DocumentTemplateTypeCategory_entity/titleProcess.js
deleted file mode 100644
index 4c4e2663bd..0000000000
--- a/entity/DocumentTemplateTypeCategory_entity/titleProcess.js
+++ /dev/null
@@ -1,5 +0,0 @@
-import("system.vars");
-import("system.translate");
-import("system.result");
-
-result.string(translate.text(vars.get("$field.TITLE")));
\ No newline at end of file
diff --git a/entity/DocumentTemplate_entity/titleProcess.js b/entity/DocumentTemplate_entity/titleProcess.js
deleted file mode 100644
index e7185d9810..0000000000
--- a/entity/DocumentTemplate_entity/titleProcess.js
+++ /dev/null
@@ -1,5 +0,0 @@
-import("system.vars");
-import("system.translate");
-import("system.result");
-
-result.string(translate.text(vars.get("$field.NAME")));
diff --git a/entity/Document_entity/contentProcess.js b/entity/Document_entity/contentProcess.js
deleted file mode 100644
index c676dbd27c..0000000000
--- a/entity/Document_entity/contentProcess.js
+++ /dev/null
@@ -1,29 +0,0 @@
-import("system.vars");
-import("system.result");
-import("system.db");
-
-// Check if assignment parameters are present
-if(vars.exists("$param.AssignmentTable_param") &&
-    vars.exists("$param.AssignmentName_param") &&
-    vars.exists("$param.AssignmentRowId_param")) {
-    var assignmentTable = vars.get("$param.AssignmentTable_param");
-    var assignmentName = vars.get("$param.AssignmentName_param");
-    var assignmentRowId = vars.get("$param.AssignmentRowId_param");
-    var alias = db.getCurrentAlias();
-    var documents = [];
-    
-    // Check if multiple Documents are selected
-    if(vars.exists("$local.idvalues") && vars.get("$local.idvalues") != '')
-        metadata = db.getBinaryMetadataForIds(vars.get("$local.idvalues"), true, alias)
-    else
-        metadata = db.getBinaryMetadata(assignmentTable, assignmentName, assignmentRowId, false, alias);    
-
-    // Iterate through found binary data and populate result array    
-    for( var i = 0; i < metadata.length; i++) {
-        documents.push( [metadata[i].id, metadata[i].filename, metadata[i].size, 
-            metadata[i].edit, metadata[i].preview, metadata[i].mimetype, 
-            metadata[i].description, metadata[i].keyword]);
-    }
-
-    result.object(documents);
-}
diff --git a/entity/Document_entity/entityfields/downloadfilesaction/onActionProcess.js b/entity/Document_entity/entityfields/downloadfilesaction/onActionProcess.js
deleted file mode 100644
index cb680339a3..0000000000
--- a/entity/Document_entity/entityfields/downloadfilesaction/onActionProcess.js
+++ /dev/null
@@ -1,2 +0,0 @@
-import("Document_lib");
-DocumentUtil.downloadSelectedDocuments();
diff --git a/entity/Document_entity/onDelete.js b/entity/Document_entity/onDelete.js
deleted file mode 100644
index 74fe702632..0000000000
--- a/entity/Document_entity/onDelete.js
+++ /dev/null
@@ -1,2 +0,0 @@
-import("Document_lib");
-DocumentUtil.deleteCurrentDocument();
diff --git a/entity/Document_entity/onInsert.js b/entity/Document_entity/onInsert.js
deleted file mode 100644
index 6ca4ff7fcd..0000000000
--- a/entity/Document_entity/onInsert.js
+++ /dev/null
@@ -1,17 +0,0 @@
-import("system.db");
-import("system.vars");
-import("Document_lib");
-
-var assignmentTable = vars.get("$param.AssignmentTable_param");
-var assignmentName = vars.get("$param.AssignmentName_param");
-var assignmentRowId = vars.get("$param.AssignmentRowId_param");
-var bindata = DocumentUtil.getBindataFromUpload(vars.get("$field.BINDATA_UPLOAD"));
-var filename = vars.get("$field.NAME");
-var description = vars.get("$field.DESCRIPTION");
-var alias = db.getCurrentAlias();
-var keyword = vars.get("$field.KEYWORD");
-
-if(bindata != '' && filename != ''){
-    db.insertBinary(assignmentTable, assignmentName, assignmentRowId, "", 
-        bindata, filename, description, keyword, alias);
-}
diff --git a/entity/Document_entity/onUpdate.js b/entity/Document_entity/onUpdate.js
deleted file mode 100644
index 9a1c27e56d..0000000000
--- a/entity/Document_entity/onUpdate.js
+++ /dev/null
@@ -1,22 +0,0 @@
-import("system.vars");
-import("system.db");
-import("Document_lib");
-
-var id = vars.get("$field.ID");
-var parentId = "";
-var fileName = vars.get("$field.NAME");
-var description = vars.get("$field.DESCRIPTION");
-var keyword = vars.get("$field.KEYWORD");
-var alias = db.getCurrentAlias();
-
-var bindata = DocumentUtil.getBindataFromUpload(vars.get("$field.BINDATA_UPLOAD"));
-
-if (bindata == ''){
-    bindata = vars.get("$field.BINDATA_UPLOAD")
-}
-
-// Check if bindata is present and execute the corresponding update method
-if(bindata != '')
-    db.updateBinary(id, parentId, bindata, fileName, description, keyword, alias);
-else
-    db.updateBinaryMetadata(id, parentId, fileName, description, keyword, alias);
\ No newline at end of file
diff --git a/entity/Forecast_entity/conditionProcess.js b/entity/Forecast_entity/conditionProcess.js
deleted file mode 100644
index 3f88d5b798..0000000000
--- a/entity/Forecast_entity/conditionProcess.js
+++ /dev/null
@@ -1,8 +0,0 @@
-import("system.db");
-import("system.result");
-import("Sql_lib");
-
-var cond = newWhereIfSet("FORECAST.OBJECT_ROWID", "$param.ForecastId_param");
-
-//TODO: use a preparedCondition (.build instead of .toString) when available #1030812 #1034026
-result.string(cond.toString());
\ No newline at end of file
diff --git a/entity/Forecast_entity/entityfields/date_edit/valueProcess.js b/entity/Forecast_entity/entityfields/date_edit/valueProcess.js
deleted file mode 100644
index 710ac8a06a..0000000000
--- a/entity/Forecast_entity/entityfields/date_edit/valueProcess.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import("system.vars");
-import("system.result");
-import("system.neon");
-
-if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT)
-    result.string(vars.getString("$sys.date"));
\ No newline at end of file
diff --git a/entity/Forecast_entity/entityfields/date_new/valueProcess.js b/entity/Forecast_entity/entityfields/date_new/valueProcess.js
deleted file mode 100644
index 3a0d59096c..0000000000
--- a/entity/Forecast_entity/entityfields/date_new/valueProcess.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import("system.vars");
-import("system.result");
-import("system.neon");
-
-if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
-    result.string(vars.getString("$sys.date"));
\ No newline at end of file
diff --git a/entity/Forecast_entity/entityfields/salesprojectforecastdatestart/code.js b/entity/Forecast_entity/entityfields/salesprojectforecastdatestart/code.js
deleted file mode 100644
index 66ce3a4676..0000000000
--- a/entity/Forecast_entity/entityfields/salesprojectforecastdatestart/code.js
+++ /dev/null
@@ -1,2 +0,0 @@
-import("system.result")
-result.string("DATE_START");
\ No newline at end of file
diff --git a/entity/Forecast_entity/entityfields/user_edit/valueProcess.js b/entity/Forecast_entity/entityfields/user_edit/valueProcess.js
deleted file mode 100644
index 1581e18d97..0000000000
--- a/entity/Forecast_entity/entityfields/user_edit/valueProcess.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import("system.vars");
-import("system.result");
-import("system.neon");
-
-if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT)
-    result.string(vars.getString("$sys.user"));
\ No newline at end of file
diff --git a/entity/Forecast_entity/entityfields/user_new/valueProcess.js b/entity/Forecast_entity/entityfields/user_new/valueProcess.js
deleted file mode 100644
index 7c566863b4..0000000000
--- a/entity/Forecast_entity/entityfields/user_new/valueProcess.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import("system.vars");
-import("system.result");
-import("system.neon");
-
-if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
-    result.string(vars.getString("$sys.user"));
\ No newline at end of file
diff --git a/entity/Gender_keyword/contentProcess.js b/entity/Gender_keyword/contentProcess.js
deleted file mode 100644
index b744f12ef0..0000000000
--- a/entity/Gender_keyword/contentProcess.js
+++ /dev/null
@@ -1,7 +0,0 @@
-import("system.translate");
-import("system.result");
-
-result.object([
-    ['f', translate.text("Female")], 
-    ['m', translate.text("Male")]
-]);
\ No newline at end of file
diff --git a/entity/KeywordAttribute_entity/entityfields/keywordattributetype/children/containername_param/valueProcess.js b/entity/KeywordAttribute_entity/entityfields/keywordattributetype/children/containername_param/valueProcess.js
deleted file mode 100644
index 286c720daa..0000000000
--- a/entity/KeywordAttribute_entity/entityfields/keywordattributetype/children/containername_param/valueProcess.js
+++ /dev/null
@@ -1,5 +0,0 @@
-import("system.result");
-import("Keyword_lib");
-import("KeywordRegistry_basic");
-
-result.string($KeywordRegistry.keywordAttributeType());
diff --git a/entity/KeywordAttribute_entity/entityfields/keywordkeywordattributetypes/children/containername_param/valueProcess.js b/entity/KeywordAttribute_entity/entityfields/keywordkeywordattributetypes/children/containername_param/valueProcess.js
deleted file mode 100644
index e52675c31d..0000000000
--- a/entity/KeywordAttribute_entity/entityfields/keywordkeywordattributetypes/children/containername_param/valueProcess.js
+++ /dev/null
@@ -1,5 +0,0 @@
-import("system.result");
-import("Keyword_lib");
-import("KeywordRegistry_basic");
-
-result.string($KeywordRegistry.keywordAttributeType());
\ No newline at end of file
diff --git a/entity/Member_entity/entityfields/date_edit/valueProcess.js b/entity/Member_entity/entityfields/date_edit/valueProcess.js
deleted file mode 100644
index 710ac8a06a..0000000000
--- a/entity/Member_entity/entityfields/date_edit/valueProcess.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import("system.vars");
-import("system.result");
-import("system.neon");
-
-if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT)
-    result.string(vars.getString("$sys.date"));
\ No newline at end of file
diff --git a/entity/Member_entity/entityfields/date_new/valueProcess.js b/entity/Member_entity/entityfields/date_new/valueProcess.js
deleted file mode 100644
index 3a0d59096c..0000000000
--- a/entity/Member_entity/entityfields/date_new/valueProcess.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import("system.vars");
-import("system.result");
-import("system.neon");
-
-if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
-    result.string(vars.getString("$sys.date"));
\ No newline at end of file
diff --git a/entity/Member_entity/entityfields/pers_full_name/fieldIdProcess.js b/entity/Member_entity/entityfields/pers_full_name/fieldIdProcess.js
deleted file mode 100644
index d8ff22328f..0000000000
--- a/entity/Member_entity/entityfields/pers_full_name/fieldIdProcess.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import("system.vars");
-import("system.result");
-
-result.string(vars.getString("$field.CONTACT_ID"));
\ No newline at end of file
diff --git a/entity/Member_entity/entityfields/user_edit/valueProcess.js b/entity/Member_entity/entityfields/user_edit/valueProcess.js
deleted file mode 100644
index 1581e18d97..0000000000
--- a/entity/Member_entity/entityfields/user_edit/valueProcess.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import("system.vars");
-import("system.result");
-import("system.neon");
-
-if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT)
-    result.string(vars.getString("$sys.user"));
\ No newline at end of file
diff --git a/entity/Member_entity/entityfields/user_new/valueProcess.js b/entity/Member_entity/entityfields/user_new/valueProcess.js
deleted file mode 100644
index 7c566863b4..0000000000
--- a/entity/Member_entity/entityfields/user_new/valueProcess.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import("system.vars");
-import("system.result");
-import("system.neon");
-
-if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
-    result.string(vars.getString("$sys.user"));
\ No newline at end of file
diff --git a/entity/Notification_entity/Notification_entity.aod b/entity/Notification_entity/Notification_entity.aod
index 359ef2c4c9..d1f13073d9 100644
--- a/entity/Notification_entity/Notification_entity.aod
+++ b/entity/Notification_entity/Notification_entity.aod
@@ -122,7 +122,6 @@
         </entityActionField>
         <entityActionField>
           <name>getNotification</name>
-          <onActionProcess>%aditoprj%/entity/Notification_entity/entityfields/setnotificationstate/children/getnotification/onActionProcess.js</onActionProcess>
         </entityActionField>
       </children>
     </entityActionGroup>
diff --git a/entity/Offer_entity/Offer_entity.aod b/entity/Offer_entity/Offer_entity.aod
index 8d82f2247f..fbd5d50403 100644
--- a/entity/Offer_entity/Offer_entity.aod
+++ b/entity/Offer_entity/Offer_entity.aod
@@ -134,7 +134,6 @@
         </entityParameter>
         <entityParameter>
           <name>ContactId_param</name>
-          <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/offeritems/children/ContactId_param/valueProcess.js</valueProcess>
           <expose v="true" />
           <mandatory v="true" />
         </entityParameter>
@@ -1288,7 +1287,6 @@
         </aggregateFieldDbMapping>
         <dbRecordFieldMapping>
           <name>COUNT.value</name>
-          <expression>%aditoprj%/entity/Offer_entity/recordcontainers/db/recordfieldmappings/count.value/expression.js</expression>
         </dbRecordFieldMapping>
         <aggregateFieldDbMapping>
           <name>COUNT_aggregate.value</name>
diff --git a/entity/Offer_entity/conditionProcess.js b/entity/Offer_entity/conditionProcess.js
deleted file mode 100644
index 1fb5c50e9a..0000000000
--- a/entity/Offer_entity/conditionProcess.js
+++ /dev/null
@@ -1,8 +0,0 @@
-import("system.db");
-import("system.result");
-import("Sql_lib");
-
-var cond = newWhereIfSet("OFFER.OBJECT_ROWID", "$param.ObjectRowId_param");
-
-//TODO: use a preparedCondition (.build instead of .toString) when available #1030812 #1034026
-result.string(cond.toString());
\ No newline at end of file
diff --git a/entity/Offer_entity/entityfields/documenttemplatetext/children/documenttemplatetype_param/valueProcess.js b/entity/Offer_entity/entityfields/documenttemplatetext/children/documenttemplatetype_param/valueProcess.js
deleted file mode 100644
index 361c9a2190..0000000000
--- a/entity/Offer_entity/entityfields/documenttemplatetext/children/documenttemplatetype_param/valueProcess.js
+++ /dev/null
@@ -1,2 +0,0 @@
-import("system.result");
-result.string("TEX");
\ No newline at end of file
diff --git a/entity/Offer_entity/entityfields/documenttemplatetext/children/documenttemplatetypeclassification_param/valueProcess.js b/entity/Offer_entity/entityfields/documenttemplatetext/children/documenttemplatetypeclassification_param/valueProcess.js
deleted file mode 100644
index a46ac9a337..0000000000
--- a/entity/Offer_entity/entityfields/documenttemplatetext/children/documenttemplatetypeclassification_param/valueProcess.js
+++ /dev/null
@@ -1,2 +0,0 @@
-import("system.result");
-result.string("3");
\ No newline at end of file
diff --git a/entity/Offer_entity/entityfields/keywordprobability/children/containername_param/valueProcess.js b/entity/Offer_entity/entityfields/keywordprobability/children/containername_param/valueProcess.js
deleted file mode 100644
index b5612781a1..0000000000
--- a/entity/Offer_entity/entityfields/keywordprobability/children/containername_param/valueProcess.js
+++ /dev/null
@@ -1,5 +0,0 @@
-import("system.result");
-import("Keyword_lib");
-import("KeywordRegistry_basic");
-
-result.string($KeywordRegistry.offerProbability());
\ No newline at end of file
diff --git a/entity/Offer_entity/entityfields/offeritems/children/contactid_param/valueProcess.js b/entity/Offer_entity/entityfields/offeritems/children/contactid_param/valueProcess.js
deleted file mode 100644
index ef0d5bcac5..0000000000
--- a/entity/Offer_entity/entityfields/offeritems/children/contactid_param/valueProcess.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import("system.vars");
-import("system.result");
-
-result.string(vars.get("$field.CONTACT_ID"));
\ No newline at end of file
diff --git a/entity/Offer_entity/entityfields/status/onValueChange.js b/entity/Offer_entity/entityfields/status/onValueChange.js
deleted file mode 100644
index d06a9e01b5..0000000000
--- a/entity/Offer_entity/entityfields/status/onValueChange.js
+++ /dev/null
@@ -1,8 +0,0 @@
-import("system.vars");
-import("Offer_lib");
-
-var offerId = vars.getString("$field.OFFERID");
-if (offerId && vars.get("local.value") == 2 || vars.get("local.value") == 3 || vars.get("local.value") == 4)
-{
-    OfferUtils.setSent(offerId);
-}
\ No newline at end of file
diff --git a/entity/Offer_entity/onDBDelete.js b/entity/Offer_entity/onDBDelete.js
deleted file mode 100644
index 0090a9df8b..0000000000
--- a/entity/Offer_entity/onDBDelete.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import("Sql_lib");
-
-newWhere("OFFERITEM.OFFER_ID", "$field.OFFERID").deleteData();
\ No newline at end of file
diff --git a/entity/Offeritem_entity/entityfields/date_edit/valueProcess.js b/entity/Offeritem_entity/entityfields/date_edit/valueProcess.js
deleted file mode 100644
index 710ac8a06a..0000000000
--- a/entity/Offeritem_entity/entityfields/date_edit/valueProcess.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import("system.vars");
-import("system.result");
-import("system.neon");
-
-if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT)
-    result.string(vars.getString("$sys.date"));
\ No newline at end of file
diff --git a/entity/Offeritem_entity/entityfields/date_new/valueProcess.js b/entity/Offeritem_entity/entityfields/date_new/valueProcess.js
deleted file mode 100644
index 3a0d59096c..0000000000
--- a/entity/Offeritem_entity/entityfields/date_new/valueProcess.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import("system.vars");
-import("system.result");
-import("system.neon");
-
-if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
-    result.string(vars.getString("$sys.date"));
\ No newline at end of file
diff --git a/entity/Offeritem_entity/entityfields/user_edit/valueProcess.js b/entity/Offeritem_entity/entityfields/user_edit/valueProcess.js
deleted file mode 100644
index 1581e18d97..0000000000
--- a/entity/Offeritem_entity/entityfields/user_edit/valueProcess.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import("system.vars");
-import("system.result");
-import("system.neon");
-
-if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT)
-    result.string(vars.getString("$sys.user"));
\ No newline at end of file
diff --git a/entity/Offeritem_entity/entityfields/user_new/valueProcess.js b/entity/Offeritem_entity/entityfields/user_new/valueProcess.js
deleted file mode 100644
index 7c566863b4..0000000000
--- a/entity/Offeritem_entity/entityfields/user_new/valueProcess.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import("system.vars");
-import("system.result");
-import("system.neon");
-
-if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
-    result.string(vars.getString("$sys.user"));
\ No newline at end of file
diff --git a/entity/Offeritem_entity/recordcontainers/db/recordfieldmappings/price_aggregate.value/expression.js b/entity/Offeritem_entity/recordcontainers/db/recordfieldmappings/price_aggregate.value/expression.js
deleted file mode 100644
index 6a3e3167e6..0000000000
--- a/entity/Offeritem_entity/recordcontainers/db/recordfieldmappings/price_aggregate.value/expression.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import("system.result");
-
-result.string("OFFERITEM.PRICE * OFFERITEM.QUANTITY * ((100 - OFFERITEM.DISCOUNT) / 100)");
\ No newline at end of file
diff --git a/entity/Order_entity/Order_entity.aod b/entity/Order_entity/Order_entity.aod
index 3353e6aa31..1829735c0a 100644
--- a/entity/Order_entity/Order_entity.aod
+++ b/entity/Order_entity/Order_entity.aod
@@ -120,7 +120,6 @@
         </entityParameter>
         <entityParameter>
           <name>ContactId_param</name>
-          <valueProcess>%aditoprj%/entity/Order_entity/entityfields/orderitems/children/ContactId_param/valueProcess.js</valueProcess>
           <expose v="true" />
           <mandatory v="true" />
         </entityParameter>
@@ -1105,7 +1104,6 @@
         </dbRecordFieldMapping>
         <dbRecordFieldMapping>
           <name>COUNT.value</name>
-          <expression>%aditoprj%/entity/Order_entity/recordcontainers/db/recordfieldmappings/count.value/expression.js</expression>
         </dbRecordFieldMapping>
         <aggregateFieldDbMapping>
           <name>COUNT_aggregate.value</name>
diff --git a/entity/Order_entity/entityfields/attributes/stateProcess.js b/entity/Order_entity/entityfields/attributes/stateProcess.js
deleted file mode 100644
index 9cffc2b804..0000000000
--- a/entity/Order_entity/entityfields/attributes/stateProcess.js
+++ /dev/null
@@ -1,9 +0,0 @@
-import("system.neon");
-import("system.result");
-import("Context_lib");
-import("Attribute_lib");
-
-if (AttributeUtil.hasAttributes(ContextUtils.getCurrentContextId()))
-    result.string(neon.COMPONENTSTATE_EDITABLE);
-else
-    result.string(neon.COMPONENTSTATE_INVISIBLE);
\ No newline at end of file
diff --git a/entity/Order_entity/entityfields/date_edit/valueProcess.js b/entity/Order_entity/entityfields/date_edit/valueProcess.js
deleted file mode 100644
index 710ac8a06a..0000000000
--- a/entity/Order_entity/entityfields/date_edit/valueProcess.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import("system.vars");
-import("system.result");
-import("system.neon");
-
-if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT)
-    result.string(vars.getString("$sys.date"));
\ No newline at end of file
diff --git a/entity/Order_entity/entityfields/date_new/valueProcess.js b/entity/Order_entity/entityfields/date_new/valueProcess.js
deleted file mode 100644
index 3a0d59096c..0000000000
--- a/entity/Order_entity/entityfields/date_new/valueProcess.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import("system.vars");
-import("system.result");
-import("system.neon");
-
-if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
-    result.string(vars.getString("$sys.date"));
\ No newline at end of file
diff --git a/entity/Order_entity/entityfields/orderitems/children/contactid_param/valueProcess.js b/entity/Order_entity/entityfields/orderitems/children/contactid_param/valueProcess.js
deleted file mode 100644
index ef0d5bcac5..0000000000
--- a/entity/Order_entity/entityfields/orderitems/children/contactid_param/valueProcess.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import("system.vars");
-import("system.result");
-
-result.string(vars.get("$field.CONTACT_ID"));
\ No newline at end of file
diff --git a/entity/Order_entity/entityfields/orderlanguage_param/valueProcess.js b/entity/Order_entity/entityfields/orderlanguage_param/valueProcess.js
deleted file mode 100644
index 1da341d92c..0000000000
--- a/entity/Order_entity/entityfields/orderlanguage_param/valueProcess.js
+++ /dev/null
@@ -1,8 +0,0 @@
-import("Sql_lib");
-import("system.result");
-
-var language = newSelect("ISOLANGUAGE")
-    .from("SALESORDER")
-    .whereIfSet("SALESORDER.SALESORDERID", "$field.SALESORDERID")
-    .cell(true);
-result.string(language);
\ No newline at end of file
diff --git a/entity/Order_entity/entityfields/user_edit/valueProcess.js b/entity/Order_entity/entityfields/user_edit/valueProcess.js
deleted file mode 100644
index 1581e18d97..0000000000
--- a/entity/Order_entity/entityfields/user_edit/valueProcess.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import("system.vars");
-import("system.result");
-import("system.neon");
-
-if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT)
-    result.string(vars.getString("$sys.user"));
\ No newline at end of file
diff --git a/entity/Order_entity/entityfields/user_new/valueProcess.js b/entity/Order_entity/entityfields/user_new/valueProcess.js
deleted file mode 100644
index 7c566863b4..0000000000
--- a/entity/Order_entity/entityfields/user_new/valueProcess.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import("system.vars");
-import("system.result");
-import("system.neon");
-
-if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
-    result.string(vars.getString("$sys.user"));
\ No newline at end of file
diff --git a/entity/Order_entity/recordcontainers/db/filterextensions/attribute_filter/filterConditionProcess.js b/entity/Order_entity/recordcontainers/db/filterextensions/attribute_filter/filterConditionProcess.js
deleted file mode 100644
index 65d6b67c6e..0000000000
--- a/entity/Order_entity/recordcontainers/db/filterextensions/attribute_filter/filterConditionProcess.js
+++ /dev/null
@@ -1,5 +0,0 @@
-import("system.result");
-import("AttributeFilter_lib");
-
-var sqlCond = AttributeFilterExtensionMaker.makeFilterConditionSql();
-result.string(sqlCond);
\ No newline at end of file
diff --git a/entity/Order_entity/recordcontainers/db/filterextensions/attribute_filter/filterFieldsProcess.js b/entity/Order_entity/recordcontainers/db/filterextensions/attribute_filter/filterFieldsProcess.js
deleted file mode 100644
index 209ddd39ef..0000000000
--- a/entity/Order_entity/recordcontainers/db/filterextensions/attribute_filter/filterFieldsProcess.js
+++ /dev/null
@@ -1,5 +0,0 @@
-import("system.result");
-import("AttributeFilter_lib");
-
-var fields = AttributeFilterExtensionMaker.makeFilterFields();
-result.string(fields);
\ No newline at end of file
diff --git a/entity/Order_entity/recordcontainers/db/filterextensions/attribute_filter/filterValuesProcess.js b/entity/Order_entity/recordcontainers/db/filterextensions/attribute_filter/filterValuesProcess.js
deleted file mode 100644
index 942b0a0495..0000000000
--- a/entity/Order_entity/recordcontainers/db/filterextensions/attribute_filter/filterValuesProcess.js
+++ /dev/null
@@ -1,5 +0,0 @@
-import("system.result");
-import("AttributeFilter_lib");
-
-var values = AttributeFilterExtensionMaker.makeFilterValues();
-result.object(values);
\ No newline at end of file
diff --git a/entity/Order_entity/recordcontainers/db/recordfieldmappings/activities/filterConditionProcess.js b/entity/Order_entity/recordcontainers/db/recordfieldmappings/activities/filterConditionProcess.js
deleted file mode 100644
index 33c36a352b..0000000000
--- a/entity/Order_entity/recordcontainers/db/recordfieldmappings/activities/filterConditionProcess.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import("system.vars");
-import("system.result");
-
-var from = "ACTIVITYLINK join ACTIVITY on ACTIVITY.ACTIVITYID = ACTIVITYLINK.ACTIVITY_ID and ACTIVITYLINK.OBJECT_TYPE = 'Order'";
-
-result.string("SALESORDERID in (select ACTIVITYLINK.OBJECT_ROWID from " + from + " where " + vars.get("$local.condition")+ ")");
\ No newline at end of file
diff --git a/entity/Orderitem_entity/entityfields/date_edit/valueProcess.js b/entity/Orderitem_entity/entityfields/date_edit/valueProcess.js
deleted file mode 100644
index 710ac8a06a..0000000000
--- a/entity/Orderitem_entity/entityfields/date_edit/valueProcess.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import("system.vars");
-import("system.result");
-import("system.neon");
-
-if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT)
-    result.string(vars.getString("$sys.date"));
\ No newline at end of file
diff --git a/entity/Orderitem_entity/entityfields/date_new/valueProcess.js b/entity/Orderitem_entity/entityfields/date_new/valueProcess.js
deleted file mode 100644
index f0ba30f6e1..0000000000
--- a/entity/Orderitem_entity/entityfields/date_new/valueProcess.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import("system.vars");
-import("system.result");
-import("system.neon");
-
-if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.get("$this.value") == null)
-    result.string(vars.getString("$sys.date"));
\ No newline at end of file
diff --git a/entity/Orderitem_entity/entityfields/user_edit/valueProcess.js b/entity/Orderitem_entity/entityfields/user_edit/valueProcess.js
deleted file mode 100644
index 1581e18d97..0000000000
--- a/entity/Orderitem_entity/entityfields/user_edit/valueProcess.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import("system.vars");
-import("system.result");
-import("system.neon");
-
-if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT)
-    result.string(vars.getString("$sys.user"));
\ No newline at end of file
diff --git a/entity/Orderitem_entity/entityfields/user_new/valueProcess.js b/entity/Orderitem_entity/entityfields/user_new/valueProcess.js
deleted file mode 100644
index 71110834d7..0000000000
--- a/entity/Orderitem_entity/entityfields/user_new/valueProcess.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import("system.vars");
-import("system.result");
-import("system.neon");
-
-if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.get("$this.value") == null)
-    result.string(vars.getString("$sys.user"));
\ No newline at end of file
diff --git a/entity/Organisation_entity/Organisation_entity.aod b/entity/Organisation_entity/Organisation_entity.aod
index 1f828eee9c..2f958bb71b 100644
--- a/entity/Organisation_entity/Organisation_entity.aod
+++ b/entity/Organisation_entity/Organisation_entity.aod
@@ -1381,7 +1381,6 @@
         </aggregateFieldDbMapping>
         <dbRecordFieldMapping>
           <name>COUNT.value</name>
-          <expression>%aditoprj%/entity/Organisation_entity/recordcontainers/db/recordfieldmappings/count.value/expression.js</expression>
         </dbRecordFieldMapping>
       </recordFieldMappings>
       <filterExtensions>
diff --git a/entity/Organisation_entity/entityfields/contacts/children/contactid_param/valueProcess.js b/entity/Organisation_entity/entityfields/contacts/children/contactid_param/valueProcess.js
deleted file mode 100644
index 0519ecba6e..0000000000
--- a/entity/Organisation_entity/entityfields/contacts/children/contactid_param/valueProcess.js
+++ /dev/null
@@ -1 +0,0 @@
- 
\ No newline at end of file
diff --git a/entity/Organisation_entity/entityfields/contacts/children/orgid_param/valueProcess.js b/entity/Organisation_entity/entityfields/contacts/children/orgid_param/valueProcess.js
deleted file mode 100644
index ff5cde1a52..0000000000
--- a/entity/Organisation_entity/entityfields/contacts/children/orgid_param/valueProcess.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import("system.result");
-import("system.vars");
-
-result.string(vars.get("$field.ORGANISATIONID"));
\ No newline at end of file
diff --git a/entity/Organisation_entity/entityfields/contract/children/contactid_param/valueProcess.js b/entity/Organisation_entity/entityfields/contract/children/contactid_param/valueProcess.js
deleted file mode 100644
index 70a1c0fcc1..0000000000
--- a/entity/Organisation_entity/entityfields/contract/children/contactid_param/valueProcess.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import("system.result");
-import("system.vars");
-
-result.string(vars.get("$field.CONTACTID"));
\ No newline at end of file
diff --git a/entity/Organisation_entity/entityfields/keywordprice_politics/children/containername_param/valueProcess.js b/entity/Organisation_entity/entityfields/keywordprice_politics/children/containername_param/valueProcess.js
deleted file mode 100644
index a76a727534..0000000000
--- a/entity/Organisation_entity/entityfields/keywordprice_politics/children/containername_param/valueProcess.js
+++ /dev/null
@@ -1,5 +0,0 @@
-import("system.result");
-import("Keyword_lib");
-import("KeywordRegistry_basic");
-
-result.string($KeywordRegistry.salesprojectPricePolitics());
\ No newline at end of file
diff --git a/entity/Organisation_entity/entityfields/keywordstrenght/children/containername_param/valueProcess.js b/entity/Organisation_entity/entityfields/keywordstrenght/children/containername_param/valueProcess.js
deleted file mode 100644
index cae1ead387..0000000000
--- a/entity/Organisation_entity/entityfields/keywordstrenght/children/containername_param/valueProcess.js
+++ /dev/null
@@ -1,5 +0,0 @@
-import("system.result");
-import("Keyword_lib");
-import("KeywordRegistry_basic");
-
-result.string($KeywordRegistry.salesprojectStrenght());
\ No newline at end of file
diff --git a/entity/Organisation_entity/entityfields/keywordweakness/children/containername_param/valueProcess.js b/entity/Organisation_entity/entityfields/keywordweakness/children/containername_param/valueProcess.js
deleted file mode 100644
index 9973fed72b..0000000000
--- a/entity/Organisation_entity/entityfields/keywordweakness/children/containername_param/valueProcess.js
+++ /dev/null
@@ -1,5 +0,0 @@
-import("system.result");
-import("Keyword_lib");
-import("KeywordRegistry_basic");
-
-result.string($KeywordRegistry.salesprojectWeakness());
\ No newline at end of file
diff --git a/entity/Organisation_entity/entityfields/org_date_edit/valueProcess.js b/entity/Organisation_entity/entityfields/org_date_edit/valueProcess.js
deleted file mode 100644
index 710ac8a06a..0000000000
--- a/entity/Organisation_entity/entityfields/org_date_edit/valueProcess.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import("system.vars");
-import("system.result");
-import("system.neon");
-
-if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT)
-    result.string(vars.getString("$sys.date"));
\ No newline at end of file
diff --git a/entity/Organisation_entity/entityfields/org_date_new/valueProcess.js b/entity/Organisation_entity/entityfields/org_date_new/valueProcess.js
deleted file mode 100644
index 408c498a4c..0000000000
--- a/entity/Organisation_entity/entityfields/org_date_new/valueProcess.js
+++ /dev/null
@@ -1,7 +0,0 @@
-import("system.vars");
-import("system.result");
-import("system.neon");
-
-if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
-    result.string(vars.getString("$sys.date"));
-
diff --git a/entity/Organisation_entity/entityfields/org_user_edit/valueProcess.js b/entity/Organisation_entity/entityfields/org_user_edit/valueProcess.js
deleted file mode 100644
index 1581e18d97..0000000000
--- a/entity/Organisation_entity/entityfields/org_user_edit/valueProcess.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import("system.vars");
-import("system.result");
-import("system.neon");
-
-if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT)
-    result.string(vars.getString("$sys.user"));
\ No newline at end of file
diff --git a/entity/Organisation_entity/entityfields/org_user_new/valueProcess.js b/entity/Organisation_entity/entityfields/org_user_new/valueProcess.js
deleted file mode 100644
index 7c566863b4..0000000000
--- a/entity/Organisation_entity/entityfields/org_user_new/valueProcess.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import("system.vars");
-import("system.result");
-import("system.neon");
-
-if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
-    result.string(vars.getString("$sys.user"));
\ No newline at end of file
diff --git a/entity/Organisation_entity/entityfields/organisation_objecttype/valueProcess.js b/entity/Organisation_entity/entityfields/organisation_objecttype/valueProcess.js
deleted file mode 100644
index 9e359dfbd0..0000000000
--- a/entity/Organisation_entity/entityfields/organisation_objecttype/valueProcess.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import("system.result");
-
-result.string("Organisation");
\ No newline at end of file
diff --git a/entity/Organisation_entity/entityfields/rel_date_edit/valueProcess.js b/entity/Organisation_entity/entityfields/rel_date_edit/valueProcess.js
deleted file mode 100644
index 710ac8a06a..0000000000
--- a/entity/Organisation_entity/entityfields/rel_date_edit/valueProcess.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import("system.vars");
-import("system.result");
-import("system.neon");
-
-if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT)
-    result.string(vars.getString("$sys.date"));
\ No newline at end of file
diff --git a/entity/Organisation_entity/entityfields/rel_date_new/valueProcess.js b/entity/Organisation_entity/entityfields/rel_date_new/valueProcess.js
deleted file mode 100644
index 3a0d59096c..0000000000
--- a/entity/Organisation_entity/entityfields/rel_date_new/valueProcess.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import("system.vars");
-import("system.result");
-import("system.neon");
-
-if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
-    result.string(vars.getString("$sys.date"));
\ No newline at end of file
diff --git a/entity/Organisation_entity/entityfields/rel_user_edit/valueProcess.js b/entity/Organisation_entity/entityfields/rel_user_edit/valueProcess.js
deleted file mode 100644
index 1581e18d97..0000000000
--- a/entity/Organisation_entity/entityfields/rel_user_edit/valueProcess.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import("system.vars");
-import("system.result");
-import("system.neon");
-
-if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT)
-    result.string(vars.getString("$sys.user"));
\ No newline at end of file
diff --git a/entity/Organisation_entity/entityfields/rel_user_new/valueProcess.js b/entity/Organisation_entity/entityfields/rel_user_new/valueProcess.js
deleted file mode 100644
index 7c566863b4..0000000000
--- a/entity/Organisation_entity/entityfields/rel_user_new/valueProcess.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import("system.vars");
-import("system.result");
-import("system.neon");
-
-if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
-    result.string(vars.getString("$sys.user"));
\ No newline at end of file
diff --git a/entity/Organisation_entity/fromClauseProcess.js b/entity/Organisation_entity/fromClauseProcess.js
deleted file mode 100644
index 866a616c6a..0000000000
--- a/entity/Organisation_entity/fromClauseProcess.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import("system.result");
-
-result.string("ORGANISATION \n\
-    join CONTACT on (ORGANISATION.ORGANISATIONID = CONTACT.ORGANISATION_ID and CONTACT.PERSON_ID is null)");
\ No newline at end of file
diff --git a/entity/Person_entity/Person_entity.aod b/entity/Person_entity/Person_entity.aod
index a9282ecbdf..c7a3668a87 100644
--- a/entity/Person_entity/Person_entity.aod
+++ b/entity/Person_entity/Person_entity.aod
@@ -1573,7 +1573,6 @@
         </aggregateFieldDbMapping>
         <dbRecordFieldMapping>
           <name>COUNT.value</name>
-          <expression>%aditoprj%/entity/Person_entity/recordcontainers/db/recordfieldmappings/count.value/expression.js</expression>
         </dbRecordFieldMapping>
       </recordFieldMappings>
       <filterExtensions>
diff --git a/entity/Person_entity/conditionProcess.js b/entity/Person_entity/conditionProcess.js
deleted file mode 100644
index 788e9d5681..0000000000
--- a/entity/Person_entity/conditionProcess.js
+++ /dev/null
@@ -1,10 +0,0 @@
-import("system.result");
-import("Sql_lib");
-
-var cond = newWhere()
-            .andIfSet("CONTACT.ORGANISATION_ID", "$param.OrgId_param")
-            .andIfSet("PERSON.CONTACT_ID", "$param.ContactId_param");
-
-//TODO; add OBJECT_ID (probably another param)
-//TODO: use a preparedCondition (.build instead of .toString) when available #1030812 #1034026
-result.string(cond.toString());
\ No newline at end of file
diff --git a/entity/Person_entity/entityfields/campaignactiongroup/children/addtobulkmailfromtable/stateProcess.js b/entity/Person_entity/entityfields/campaignactiongroup/children/addtobulkmailfromtable/stateProcess.js
deleted file mode 100644
index 97f11bcc36..0000000000
--- a/entity/Person_entity/entityfields/campaignactiongroup/children/addtobulkmailfromtable/stateProcess.js
+++ /dev/null
@@ -1,9 +0,0 @@
-import("system.result");
-import("system.neon");
-import("system.vars");
-import("KeywordRegistry_basic");
-
-var isInactive = vars.get("$field.STATUS") == $KeywordRegistry.contactStatus$inactive() ? true : false;
-
-if (isInactive) 
-    result.string(neon.COMPONENTSTATE_DISABLED);
\ No newline at end of file
diff --git a/entity/Person_entity/entityfields/campaignactiongroup/children/addtocampaignfromtable/stateProcess.js b/entity/Person_entity/entityfields/campaignactiongroup/children/addtocampaignfromtable/stateProcess.js
deleted file mode 100644
index de48bf8c67..0000000000
--- a/entity/Person_entity/entityfields/campaignactiongroup/children/addtocampaignfromtable/stateProcess.js
+++ /dev/null
@@ -1,14 +0,0 @@
-import("system.db");
-import("system.vars");
-import("system.neon");
-import("system.result");
-import("KeywordRegistry_basic");
-
-
-var contactCount = vars.get("$sys.datarowcount")
-var isInactive = vars.get("$field.STATUS") == $KeywordRegistry.contactStatus$inactive() ? true : false;
-
-if (contactCount <= 0 || isInactive)
-    result.string(neon.COMPONENTSTATE_DISABLED);
-else
-    result.string(neon.COMPONENTSTATE_EDITABLE);
diff --git a/entity/Person_entity/entityfields/campaignactiongroup/children/addtoserialletter/stateProcess.js b/entity/Person_entity/entityfields/campaignactiongroup/children/addtoserialletter/stateProcess.js
deleted file mode 100644
index 97f11bcc36..0000000000
--- a/entity/Person_entity/entityfields/campaignactiongroup/children/addtoserialletter/stateProcess.js
+++ /dev/null
@@ -1,9 +0,0 @@
-import("system.result");
-import("system.neon");
-import("system.vars");
-import("KeywordRegistry_basic");
-
-var isInactive = vars.get("$field.STATUS") == $KeywordRegistry.contactStatus$inactive() ? true : false;
-
-if (isInactive) 
-    result.string(neon.COMPONENTSTATE_DISABLED);
\ No newline at end of file
diff --git a/entity/Person_entity/entityfields/contract/children/contactid_param/valueProcess.js b/entity/Person_entity/entityfields/contract/children/contactid_param/valueProcess.js
deleted file mode 100644
index 70a1c0fcc1..0000000000
--- a/entity/Person_entity/entityfields/contract/children/contactid_param/valueProcess.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import("system.result");
-import("system.vars");
-
-result.string(vars.get("$field.CONTACTID"));
\ No newline at end of file
diff --git a/entity/Person_entity/entityfields/newtask/stateProcess.js b/entity/Person_entity/entityfields/newtask/stateProcess.js
deleted file mode 100644
index aefbc6e8f7..0000000000
--- a/entity/Person_entity/entityfields/newtask/stateProcess.js
+++ /dev/null
@@ -1,7 +0,0 @@
-import("system.result");
-import("system.neon");
-import("system.vars");
-import("KeywordRegistry_basic");
-
-if (vars.get("$field.STATUS") == $KeywordRegistry.contactStatus$inactive())
-    result.string(neon.COMPONENTSTATE_DISABLED);
\ No newline at end of file
diff --git a/entity/Person_entity/entityfields/person_objecttype/valueProcess.js b/entity/Person_entity/entityfields/person_objecttype/valueProcess.js
deleted file mode 100644
index a1a6271987..0000000000
--- a/entity/Person_entity/entityfields/person_objecttype/valueProcess.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import("system.result")
-
-result.string("Person");
\ No newline at end of file
diff --git a/entity/Person_entity/fromClauseProcess.js b/entity/Person_entity/fromClauseProcess.js
deleted file mode 100644
index bea9bd3897..0000000000
--- a/entity/Person_entity/fromClauseProcess.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import("system.vars");
-import("system.result");
-
-result.string("PERSON \n\
-    join CONTACT on (CONTACT.PERSON_ID = PERSON.PERSONID) \n\
-    join ORGANISATION on (ORGANISATION.ORGANISATIONID = CONTACT.ORGANISATION_ID) ");
\ No newline at end of file
diff --git a/entity/Prod2prod_entity/contentProcess.js b/entity/Prod2prod_entity/contentProcess.js
deleted file mode 100644
index 912ab1f560..0000000000
--- a/entity/Prod2prod_entity/contentProcess.js
+++ /dev/null
@@ -1,14 +0,0 @@
-import("system.result");
-import("system.vars");
-import("system.db");
-import("system.util");
-import("Product_lib");
-
-var prodid = vars.exists("$param.ProductId_param") 
-             && vars.get("$param.ProductId_param") != null ? vars.get("$param.ProductId_param") : "";
-
-if(prodid != "")
-{
-    var p2pUtils = new Prod2ProdUtils(prodid);
-    result.object(p2pUtils.getPartsListForRecordContainer());
-}
\ No newline at end of file
diff --git a/entity/Prod2prod_entity/entityfields/date_edit/valueProcess.js b/entity/Prod2prod_entity/entityfields/date_edit/valueProcess.js
deleted file mode 100644
index 710ac8a06a..0000000000
--- a/entity/Prod2prod_entity/entityfields/date_edit/valueProcess.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import("system.vars");
-import("system.result");
-import("system.neon");
-
-if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT)
-    result.string(vars.getString("$sys.date"));
\ No newline at end of file
diff --git a/entity/Prod2prod_entity/entityfields/date_new/valueProcess.js b/entity/Prod2prod_entity/entityfields/date_new/valueProcess.js
deleted file mode 100644
index 408c498a4c..0000000000
--- a/entity/Prod2prod_entity/entityfields/date_new/valueProcess.js
+++ /dev/null
@@ -1,7 +0,0 @@
-import("system.vars");
-import("system.result");
-import("system.neon");
-
-if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
-    result.string(vars.getString("$sys.date"));
-
diff --git a/entity/Prod2prod_entity/entityfields/user_edit/valueProcess.js b/entity/Prod2prod_entity/entityfields/user_edit/valueProcess.js
deleted file mode 100644
index 1581e18d97..0000000000
--- a/entity/Prod2prod_entity/entityfields/user_edit/valueProcess.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import("system.vars");
-import("system.result");
-import("system.neon");
-
-if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT)
-    result.string(vars.getString("$sys.user"));
\ No newline at end of file
diff --git a/entity/Prod2prod_entity/entityfields/user_new/valueProcess.js b/entity/Prod2prod_entity/entityfields/user_new/valueProcess.js
deleted file mode 100644
index 7c566863b4..0000000000
--- a/entity/Prod2prod_entity/entityfields/user_new/valueProcess.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import("system.vars");
-import("system.result");
-import("system.neon");
-
-if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
-    result.string(vars.getString("$sys.user"));
\ No newline at end of file
diff --git a/entity/Prod2prod_entity/externalOpenAction.js b/entity/Prod2prod_entity/externalOpenAction.js
deleted file mode 100644
index ebe4247e95..0000000000
--- a/entity/Prod2prod_entity/externalOpenAction.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import("system.vars");
-import("system.neon");
-
-neon.openContext("Product", null, [vars.get("$field.SOURCE_ID")], neon.OPERATINGSTATE_VIEW, null);
\ No newline at end of file
diff --git a/entity/Prod2prod_entity/onDelete.js b/entity/Prod2prod_entity/onDelete.js
deleted file mode 100644
index 0ad9fcce71..0000000000
--- a/entity/Prod2prod_entity/onDelete.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import("Sql_lib");
-
-newWhere("PROD2PROD.PROD2PRODID", "$field.UID").deleteData();
\ No newline at end of file
diff --git a/entity/Prod2prod_entity/onInsert.js b/entity/Prod2prod_entity/onInsert.js
deleted file mode 100644
index d11203f624..0000000000
--- a/entity/Prod2prod_entity/onInsert.js
+++ /dev/null
@@ -1,19 +0,0 @@
-import("system.datetime");
-import("system.vars");
-import("system.db");
-
-var cols = [ "PROD2PRODID"
-           , "DEST_ID"
-           , "SOURCE_ID"
-           , "QUANTITY"
-           , "OPTIONAL"
-           , "TAKEPRICE" ];
-
-var vals = [ vars.get("$field.UID")
-           , vars.get("$field.DEST_ID")
-           , vars.get("$field.SOURCE_ID")
-           , vars.get("$field.QUANTITY")
-           , vars.get("$field.OPTIONAL")
-           , vars.get("$field.TAKEPRICE") ];
-
-db.insertData("PROD2PROD", cols, null, vals);
\ No newline at end of file
diff --git a/entity/Prod2prod_entity/onUpdate.js b/entity/Prod2prod_entity/onUpdate.js
deleted file mode 100644
index a2834dd3ef..0000000000
--- a/entity/Prod2prod_entity/onUpdate.js
+++ /dev/null
@@ -1,17 +0,0 @@
-import("Sql_lib");
-import("system.vars");
-
-var cols = [ "DEST_ID"
-           , "SOURCE_ID"
-           , "QUANTITY"
-           , "OPTIONAL"
-           , "TAKEPRICE" ];
-
-var vals = [ vars.get("$field.DEST_ID")
-           , vars.get("$field.SOURCE_ID")
-           , vars.get("$field.QUANTITY")
-           , vars.get("$field.OPTIONAL")
-           , vars.get("$field.TAKEPRICE") ];
-
-newWhere("PROD2PROD.PROD2PRODID", "$field.UID")
-    .updateData(true, "PROD2PROD", cols, null, vals);
\ No newline at end of file
diff --git a/entity/Product_entity/Product_entity.aod b/entity/Product_entity/Product_entity.aod
index 6c336478ef..6213090a38 100644
--- a/entity/Product_entity/Product_entity.aod
+++ b/entity/Product_entity/Product_entity.aod
@@ -598,7 +598,6 @@
         </consumerMapping>
         <dbRecordFieldMapping>
           <name>COUNT.value</name>
-          <expression>%aditoprj%/entity/Product_entity/recordcontainers/db/recordfieldmappings/count.value/expression.js</expression>
         </dbRecordFieldMapping>
         <aggregateFieldDbMapping>
           <name>COUNT_aggregate.value</name>
diff --git a/entity/Product_entity/entityfields/stock/children/productid_param/valueProcess.js b/entity/Product_entity/entityfields/stock/children/productid_param/valueProcess.js
deleted file mode 100644
index 24f19f3778..0000000000
--- a/entity/Product_entity/entityfields/stock/children/productid_param/valueProcess.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import("system.vars");
-import("system.result");
-
-result.string(vars.get("$field.PRODUCTID"));
\ No newline at end of file
diff --git a/entity/Product_entity/entityfields/stockcount/children/productid_param/valueProcess.js b/entity/Product_entity/entityfields/stockcount/children/productid_param/valueProcess.js
deleted file mode 100644
index 24f19f3778..0000000000
--- a/entity/Product_entity/entityfields/stockcount/children/productid_param/valueProcess.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import("system.vars");
-import("system.result");
-
-result.string(vars.get("$field.PRODUCTID"));
\ No newline at end of file
diff --git a/entity/Product_entity/onDBDelete.js b/entity/Product_entity/onDBDelete.js
deleted file mode 100644
index 9fe9dbd247..0000000000
--- a/entity/Product_entity/onDBDelete.js
+++ /dev/null
@@ -1,13 +0,0 @@
-import("Sql_lib");
-
-newWhereIfSet("PROD2PROD.DEST_ID", "$field.PRODUCTID")
-    .deleteData();
-    
-newWhereIfSet("PROD2PROD.SOURCE_ID", "$field.PRODUCTID")
-    .deleteData();
-    
-newWhereIfSet("PRODUCTPRICE.PRODUCT_ID", "$field.PRODUCTID")
-    .deleteData();
-    
-newWhereIfSet("STOCK.PRODUCT_ID", "$field.PRODUCTID")
-    .deleteData();
\ No newline at end of file
diff --git a/entity/Productprice_entity/conditionProcess.js b/entity/Productprice_entity/conditionProcess.js
deleted file mode 100644
index 90e180d441..0000000000
--- a/entity/Productprice_entity/conditionProcess.js
+++ /dev/null
@@ -1,11 +0,0 @@
-import("Sql_lib");
-import("system.result");
-import("system.vars");
-                    
-
-if(vars.get("$param.ProductId_param") != "")
-    result.string(newWhere("PRODUCTPRICE.PRODUCT_ID", "$param.ProductId_param").toString());  
-else if(vars.exists("$param.ContactId_param") && vars.get("$param.ContactId_param") != "")
-    result.string(newWhere("PRODUCTPRICE.CONTACT_ID", "$param.ContactId_param").toString());  
-else
-    result.string("1 = 2");
\ No newline at end of file
diff --git a/entity/Productprice_entity/entityfields/attributes/children/displaysimplename_param/valueProcess.js b/entity/Productprice_entity/entityfields/attributes/children/displaysimplename_param/valueProcess.js
deleted file mode 100644
index ed8bbd1082..0000000000
--- a/entity/Productprice_entity/entityfields/attributes/children/displaysimplename_param/valueProcess.js
+++ /dev/null
@@ -1,2 +0,0 @@
-import("system.result");
-result.string(1);
\ No newline at end of file
diff --git a/entity/Productprice_entity/entityfields/attributes/children/filteredattributes_param/valueProcess.js b/entity/Productprice_entity/entityfields/attributes/children/filteredattributes_param/valueProcess.js
deleted file mode 100644
index 69acbaabde..0000000000
--- a/entity/Productprice_entity/entityfields/attributes/children/filteredattributes_param/valueProcess.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import("system.db");
-import("system.result");
-result.object(db.array(db.ROW, "select AB_ATTRIBUTEID from AB_ATTRIBUTE where ATTRIBUTE_PARENT_ID = 'ab545654-1fce-4993-b763-0ec469781302'"));
diff --git a/entity/Productprice_entity/entityfields/date_edit/valueProcess.js b/entity/Productprice_entity/entityfields/date_edit/valueProcess.js
deleted file mode 100644
index 710ac8a06a..0000000000
--- a/entity/Productprice_entity/entityfields/date_edit/valueProcess.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import("system.vars");
-import("system.result");
-import("system.neon");
-
-if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT)
-    result.string(vars.getString("$sys.date"));
\ No newline at end of file
diff --git a/entity/Productprice_entity/entityfields/date_new/valueProcess.js b/entity/Productprice_entity/entityfields/date_new/valueProcess.js
deleted file mode 100644
index 3a0d59096c..0000000000
--- a/entity/Productprice_entity/entityfields/date_new/valueProcess.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import("system.vars");
-import("system.result");
-import("system.neon");
-
-if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
-    result.string(vars.getString("$sys.date"));
\ No newline at end of file
diff --git a/entity/Productprice_entity/entityfields/product_id/fieldIdProcess.js b/entity/Productprice_entity/entityfields/product_id/fieldIdProcess.js
deleted file mode 100644
index 6cd3c4544e..0000000000
--- a/entity/Productprice_entity/entityfields/product_id/fieldIdProcess.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import("system.vars");
-import("system.result");
-
-result.string(vars.get("$this.value"));
\ No newline at end of file
diff --git a/entity/Productprice_entity/entityfields/user_edit/valueProcess.js b/entity/Productprice_entity/entityfields/user_edit/valueProcess.js
deleted file mode 100644
index 1581e18d97..0000000000
--- a/entity/Productprice_entity/entityfields/user_edit/valueProcess.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import("system.vars");
-import("system.result");
-import("system.neon");
-
-if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT)
-    result.string(vars.getString("$sys.user"));
\ No newline at end of file
diff --git a/entity/Productprice_entity/entityfields/user_new/valueProcess.js b/entity/Productprice_entity/entityfields/user_new/valueProcess.js
deleted file mode 100644
index 7c566863b4..0000000000
--- a/entity/Productprice_entity/entityfields/user_new/valueProcess.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import("system.vars");
-import("system.result");
-import("system.neon");
-
-if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
-    result.string(vars.getString("$sys.user"));
\ No newline at end of file
diff --git a/entity/Productprice_entity/orderClauseProcess.js b/entity/Productprice_entity/orderClauseProcess.js
deleted file mode 100644
index 9fd0aad5a4..0000000000
--- a/entity/Productprice_entity/orderClauseProcess.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import("system.result");
-
-result.object({"PRODUCTPRICE.VALID_FROM": "down"});
\ No newline at end of file
diff --git a/entity/Productprice_entity/recordcontainers/db/recordfieldmappings/pricelist.displayvalue/expression.js b/entity/Productprice_entity/recordcontainers/db/recordfieldmappings/pricelist.displayvalue/expression.js
deleted file mode 100644
index e83ab1dfc8..0000000000
--- a/entity/Productprice_entity/recordcontainers/db/recordfieldmappings/pricelist.displayvalue/expression.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import("system.result");
-import("Keyword_lib");
-import("KeywordRegistry_basic");
-
-var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.productPricelist(), "PRODUCTPRICE.PRICELIST");
-result.string(sql);
diff --git a/entity/QuickEntry_entity/QuickEntry_entity.aod b/entity/QuickEntry_entity/QuickEntry_entity.aod
index ac7e1e7e1b..4885bf9a0d 100644
--- a/entity/QuickEntry_entity/QuickEntry_entity.aod
+++ b/entity/QuickEntry_entity/QuickEntry_entity.aod
@@ -67,13 +67,11 @@
     <entityField>
       <name>FIRSTNAME</name>
       <title>Firstname</title>
-      <mandatoryProcess>%aditoprj%/entity/QuickEntry_entity/entityfields/firstname/mandatoryProcess.js</mandatoryProcess>
     </entityField>
     <entityField>
       <name>LASTNAME</name>
       <title>Lastname</title>
       <mandatoryProcess>%aditoprj%/entity/QuickEntry_entity/entityfields/lastname/mandatoryProcess.js</mandatoryProcess>
-      <valueProcess>%aditoprj%/entity/QuickEntry_entity/entityfields/lastname/valueProcess.js</valueProcess>
     </entityField>
     <entityField>
       <name>PERSON_TITLE</name>
diff --git a/entity/Role_entity/Role_entity.aod b/entity/Role_entity/Role_entity.aod
index a591a19e52..9ad193b1ba 100644
--- a/entity/Role_entity/Role_entity.aod
+++ b/entity/Role_entity/Role_entity.aod
@@ -49,7 +49,6 @@
       <children>
         <entityParameter>
           <name>RoleTitle_param</name>
-          <valueProcess>%aditoprj%/entity/Role_entity/entityfields/permissions/children/roletitle_param/valueProcess.js</valueProcess>
         </entityParameter>
       </children>
     </entityConsumer>
diff --git a/entity/Role_entity/entityfields/permissions/children/roletitle_param/valueProcess.js b/entity/Role_entity/entityfields/permissions/children/roletitle_param/valueProcess.js
deleted file mode 100644
index c4fc6bffb9..0000000000
--- a/entity/Role_entity/entityfields/permissions/children/roletitle_param/valueProcess.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import("system.vars");
-import("system.result");
-
-result.string(vars.get("$field.ROLENAME"));
\ No newline at end of file
diff --git a/entity/SalesprojectMilestone_entity/conditionProcess.js b/entity/SalesprojectMilestone_entity/conditionProcess.js
deleted file mode 100644
index 300b91638b..0000000000
--- a/entity/SalesprojectMilestone_entity/conditionProcess.js
+++ /dev/null
@@ -1,7 +0,0 @@
-import("system.result");
-import("Sql_lib");
-
-var cond = newWhereIfSet("SALESPROJECT_MILESTONE.SALESPROJECT_ID", "$param.SalesprojectId_param")
-
-//TODO: use a preparedCondition (.build instead of .toString) when available #1030812 #1034026
-result.string(cond.toString());
\ No newline at end of file
diff --git a/entity/SalesprojectMilestone_entity/entityfields/date_edit/valueProcess.js b/entity/SalesprojectMilestone_entity/entityfields/date_edit/valueProcess.js
deleted file mode 100644
index 710ac8a06a..0000000000
--- a/entity/SalesprojectMilestone_entity/entityfields/date_edit/valueProcess.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import("system.vars");
-import("system.result");
-import("system.neon");
-
-if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT)
-    result.string(vars.getString("$sys.date"));
\ No newline at end of file
diff --git a/entity/SalesprojectMilestone_entity/entityfields/date_new/valueProcess.js b/entity/SalesprojectMilestone_entity/entityfields/date_new/valueProcess.js
deleted file mode 100644
index 3a0d59096c..0000000000
--- a/entity/SalesprojectMilestone_entity/entityfields/date_new/valueProcess.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import("system.vars");
-import("system.result");
-import("system.neon");
-
-if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
-    result.string(vars.getString("$sys.date"));
\ No newline at end of file
diff --git a/entity/SalesprojectMilestone_entity/entityfields/user_edit/valueProcess.js b/entity/SalesprojectMilestone_entity/entityfields/user_edit/valueProcess.js
deleted file mode 100644
index 1581e18d97..0000000000
--- a/entity/SalesprojectMilestone_entity/entityfields/user_edit/valueProcess.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import("system.vars");
-import("system.result");
-import("system.neon");
-
-if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT)
-    result.string(vars.getString("$sys.user"));
\ No newline at end of file
diff --git a/entity/SalesprojectMilestone_entity/entityfields/user_new/valueProcess.js b/entity/SalesprojectMilestone_entity/entityfields/user_new/valueProcess.js
deleted file mode 100644
index 7c566863b4..0000000000
--- a/entity/SalesprojectMilestone_entity/entityfields/user_new/valueProcess.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import("system.vars");
-import("system.result");
-import("system.neon");
-
-if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
-    result.string(vars.getString("$sys.user"));
\ No newline at end of file
diff --git a/entity/SalesprojectSource_entity/conditionProcess.js b/entity/SalesprojectSource_entity/conditionProcess.js
deleted file mode 100644
index 679d08965b..0000000000
--- a/entity/SalesprojectSource_entity/conditionProcess.js
+++ /dev/null
@@ -1,7 +0,0 @@
-import("system.result");
-import("Sql_lib");
-
-var cond = newWhereIfSet("SALESPROJECT_TOUCHPOINT.SALESPROJECT_ID", "$param.SalesprojectId_param");
-
-//TODO: use a preparedCondition (.build instead of .toString) when available #1030812 #1034026
-result.string(cond.toString());
\ No newline at end of file
diff --git a/entity/SalesprojectSource_entity/entityfields/date_edit/valueProcess.js b/entity/SalesprojectSource_entity/entityfields/date_edit/valueProcess.js
deleted file mode 100644
index 710ac8a06a..0000000000
--- a/entity/SalesprojectSource_entity/entityfields/date_edit/valueProcess.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import("system.vars");
-import("system.result");
-import("system.neon");
-
-if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT)
-    result.string(vars.getString("$sys.date"));
\ No newline at end of file
diff --git a/entity/SalesprojectSource_entity/entityfields/date_new/valueProcess.js b/entity/SalesprojectSource_entity/entityfields/date_new/valueProcess.js
deleted file mode 100644
index 3a0d59096c..0000000000
--- a/entity/SalesprojectSource_entity/entityfields/date_new/valueProcess.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import("system.vars");
-import("system.result");
-import("system.neon");
-
-if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
-    result.string(vars.getString("$sys.date"));
\ No newline at end of file
diff --git a/entity/SalesprojectSource_entity/entityfields/user_edit/valueProcess.js b/entity/SalesprojectSource_entity/entityfields/user_edit/valueProcess.js
deleted file mode 100644
index 1581e18d97..0000000000
--- a/entity/SalesprojectSource_entity/entityfields/user_edit/valueProcess.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import("system.vars");
-import("system.result");
-import("system.neon");
-
-if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT)
-    result.string(vars.getString("$sys.user"));
\ No newline at end of file
diff --git a/entity/SalesprojectSource_entity/entityfields/user_new/valueProcess.js b/entity/SalesprojectSource_entity/entityfields/user_new/valueProcess.js
deleted file mode 100644
index 7c566863b4..0000000000
--- a/entity/SalesprojectSource_entity/entityfields/user_new/valueProcess.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import("system.vars");
-import("system.result");
-import("system.neon");
-
-if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
-    result.string(vars.getString("$sys.user"));
\ No newline at end of file
diff --git a/entity/Salesproject_entity/Salesproject_entity.aod b/entity/Salesproject_entity/Salesproject_entity.aod
index 5aee7c6855..fd09bf8076 100644
--- a/entity/Salesproject_entity/Salesproject_entity.aod
+++ b/entity/Salesproject_entity/Salesproject_entity.aod
@@ -900,7 +900,6 @@
         </dbRecordFieldMapping>
         <dbRecordFieldMapping>
           <name>COUNT.value</name>
-          <expression>%aditoprj%/entity/Salesproject_entity/recordcontainers/db/recordfieldmappings/count.value/expression.js</expression>
         </dbRecordFieldMapping>
         <aggregateFieldDbMapping>
           <name>COUNT_aggregate.value</name>
diff --git a/entity/Salesproject_entity/entityfields/2pensalesprojects/children/state_param/valueProcess.js b/entity/Salesproject_entity/entityfields/2pensalesprojects/children/state_param/valueProcess.js
deleted file mode 100644
index 2a82320164..0000000000
--- a/entity/Salesproject_entity/entityfields/2pensalesprojects/children/state_param/valueProcess.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import("system.result");
-import("KeywordRegistry_basic");
-
-result.string($KeywordRegistry.salesprojectState$open());
\ No newline at end of file
diff --git a/entity/Salesproject_entity/entityfields/date_edit/valueProcess.js b/entity/Salesproject_entity/entityfields/date_edit/valueProcess.js
deleted file mode 100644
index 710ac8a06a..0000000000
--- a/entity/Salesproject_entity/entityfields/date_edit/valueProcess.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import("system.vars");
-import("system.result");
-import("system.neon");
-
-if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT)
-    result.string(vars.getString("$sys.date"));
\ No newline at end of file
diff --git a/entity/Salesproject_entity/entityfields/date_new/valueProcess.js b/entity/Salesproject_entity/entityfields/date_new/valueProcess.js
deleted file mode 100644
index 3a0d59096c..0000000000
--- a/entity/Salesproject_entity/entityfields/date_new/valueProcess.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import("system.vars");
-import("system.result");
-import("system.neon");
-
-if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
-    result.string(vars.getString("$sys.date"));
\ No newline at end of file
diff --git a/entity/Salesproject_entity/entityfields/keywordphase/children/containername_param/valueProcess.js b/entity/Salesproject_entity/entityfields/keywordphase/children/containername_param/valueProcess.js
deleted file mode 100644
index 0fda06efff..0000000000
--- a/entity/Salesproject_entity/entityfields/keywordphase/children/containername_param/valueProcess.js
+++ /dev/null
@@ -1,5 +0,0 @@
-import("system.result");
-import("Keyword_lib");
-import("KeywordRegistry_basic");
-
-result.string($KeywordRegistry.salesprojectPhase());
\ No newline at end of file
diff --git a/entity/Salesproject_entity/entityfields/keywordstate/children/containername_param/valueProcess.js b/entity/Salesproject_entity/entityfields/keywordstate/children/containername_param/valueProcess.js
deleted file mode 100644
index 9604353462..0000000000
--- a/entity/Salesproject_entity/entityfields/keywordstate/children/containername_param/valueProcess.js
+++ /dev/null
@@ -1,5 +0,0 @@
-import("system.result");
-import("Keyword_lib");
-import("KeywordRegistry_basic");
-
-result.string($KeywordRegistry.salesprojectState());
\ No newline at end of file
diff --git a/entity/Salesproject_entity/entityfields/keywordwonlost/children/containername_param/code.js b/entity/Salesproject_entity/entityfields/keywordwonlost/children/containername_param/code.js
deleted file mode 100644
index cbd1c68194..0000000000
--- a/entity/Salesproject_entity/entityfields/keywordwonlost/children/containername_param/code.js
+++ /dev/null
@@ -1,5 +0,0 @@
-import("system.result");
-import("Keyword_lib");
-import("KeywordRegistry_basic");
-
-result.string($KeywordRegistry.salesprojectWonLost());
\ No newline at end of file
diff --git a/entity/Salesproject_entity/entityfields/salesprojectforecasts/children/forecastid_param/valueProcess.js b/entity/Salesproject_entity/entityfields/salesprojectforecasts/children/forecastid_param/valueProcess.js
deleted file mode 100644
index b9a94c51a1..0000000000
--- a/entity/Salesproject_entity/entityfields/salesprojectforecasts/children/forecastid_param/valueProcess.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import("system.result");
-import("system.vars");
-
-result.string(vars.getString("$field.SALESPROJECTID"));
\ No newline at end of file
diff --git a/entity/Salesproject_entity/entityfields/salesprojectsopen/children/state_param/valueProcess.js b/entity/Salesproject_entity/entityfields/salesprojectsopen/children/state_param/valueProcess.js
deleted file mode 100644
index 52a7642475..0000000000
--- a/entity/Salesproject_entity/entityfields/salesprojectsopen/children/state_param/valueProcess.js
+++ /dev/null
@@ -1,5 +0,0 @@
-import("system.result");
-
-
-//KeywordId for CompetitionState OPEN
-result.string("25b0ac77-ef92-4809-802e-bb9d8782f865")
\ No newline at end of file
diff --git a/entity/Salesproject_entity/entityfields/user_edit/valueProcess.js b/entity/Salesproject_entity/entityfields/user_edit/valueProcess.js
deleted file mode 100644
index 1581e18d97..0000000000
--- a/entity/Salesproject_entity/entityfields/user_edit/valueProcess.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import("system.vars");
-import("system.result");
-import("system.neon");
-
-if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT)
-    result.string(vars.getString("$sys.user"));
\ No newline at end of file
diff --git a/entity/Salesproject_entity/entityfields/user_new/valueProcess.js b/entity/Salesproject_entity/entityfields/user_new/valueProcess.js
deleted file mode 100644
index 7c566863b4..0000000000
--- a/entity/Salesproject_entity/entityfields/user_new/valueProcess.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import("system.vars");
-import("system.result");
-import("system.neon");
-
-if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
-    result.string(vars.getString("$sys.user"));
\ No newline at end of file
diff --git a/entity/Salesproject_entity/entityfields/volume/onValidation.js b/entity/Salesproject_entity/entityfields/volume/onValidation.js
deleted file mode 100644
index 410b72014a..0000000000
--- a/entity/Salesproject_entity/entityfields/volume/onValidation.js
+++ /dev/null
@@ -1,15 +0,0 @@
-import("system.translate");
-import("system.result");
-import("system.vars");
-import("PostalAddress_lib");
-import("Entity_lib");
-
-// TODO: displayValue + contentType number crashes so we use TEXT and validate ourselve
-// Workaround for 1035861
-
-var volume =  vars.get("local.value");
-var message = "";
-if (!/^\d+\.?\d*$/.test(volume))
-    message = translate.text("Only numbers are allowed.");
-    
-result.string(message);
\ No newline at end of file
diff --git a/entity/Social_entity/contentProcess.js b/entity/Social_entity/contentProcess.js
deleted file mode 100644
index 9a4d854baa..0000000000
--- a/entity/Social_entity/contentProcess.js
+++ /dev/null
@@ -1,2 +0,0 @@
-import("system.result");
-result.object([["1"]]);
\ No newline at end of file
diff --git a/entity/Stock_entity/conditionProcess.js b/entity/Stock_entity/conditionProcess.js
deleted file mode 100644
index 06122e880d..0000000000
--- a/entity/Stock_entity/conditionProcess.js
+++ /dev/null
@@ -1,7 +0,0 @@
-import("system.result");
-import("system.vars");
-
-if(vars.exists("$param.ProductId_param") && vars.get("$param.ProductId_param") != "")
-    result.string(newWhere("STOCK.PRODUCT_ID", "$param.ProductId_param").toString());  
-else
-    result.string("1 = 2");  
\ No newline at end of file
diff --git a/entity/Stock_entity/entityfields/date_edit/valueProcess.js b/entity/Stock_entity/entityfields/date_edit/valueProcess.js
deleted file mode 100644
index 710ac8a06a..0000000000
--- a/entity/Stock_entity/entityfields/date_edit/valueProcess.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import("system.vars");
-import("system.result");
-import("system.neon");
-
-if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT)
-    result.string(vars.getString("$sys.date"));
\ No newline at end of file
diff --git a/entity/Stock_entity/entityfields/date_new/valueProcess.js b/entity/Stock_entity/entityfields/date_new/valueProcess.js
deleted file mode 100644
index 3a0d59096c..0000000000
--- a/entity/Stock_entity/entityfields/date_new/valueProcess.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import("system.vars");
-import("system.result");
-import("system.neon");
-
-if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
-    result.string(vars.getString("$sys.date"));
\ No newline at end of file
diff --git a/entity/Stock_entity/entityfields/user_edit/valueProcess.js b/entity/Stock_entity/entityfields/user_edit/valueProcess.js
deleted file mode 100644
index 1581e18d97..0000000000
--- a/entity/Stock_entity/entityfields/user_edit/valueProcess.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import("system.vars");
-import("system.result");
-import("system.neon");
-
-if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT)
-    result.string(vars.getString("$sys.user"));
\ No newline at end of file
diff --git a/entity/Stock_entity/entityfields/user_new/valueProcess.js b/entity/Stock_entity/entityfields/user_new/valueProcess.js
deleted file mode 100644
index 7c566863b4..0000000000
--- a/entity/Stock_entity/entityfields/user_new/valueProcess.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import("system.vars");
-import("system.result");
-import("system.neon");
-
-if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
-    result.string(vars.getString("$sys.user"));
\ No newline at end of file
diff --git a/entity/Stock_entity/orderClauseProcess.js b/entity/Stock_entity/orderClauseProcess.js
deleted file mode 100644
index ec31c7395e..0000000000
--- a/entity/Stock_entity/orderClauseProcess.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import("system.result");
-
-result.object( {"STOCK.ENTRYDATE": "down"} );
\ No newline at end of file
diff --git a/entity/SupportTicket_entity/SupportTicket_entity.aod b/entity/SupportTicket_entity/SupportTicket_entity.aod
index 095a43105b..81e357dd2a 100644
--- a/entity/SupportTicket_entity/SupportTicket_entity.aod
+++ b/entity/SupportTicket_entity/SupportTicket_entity.aod
@@ -544,7 +544,6 @@
         </dbRecordFieldMapping>
         <dbRecordFieldMapping>
           <name>COUNT.value</name>
-          <expression>%aditoprj%/entity/SupportTicket_entity/recordcontainers/db/recordfieldmappings/count.value/expression.js</expression>
         </dbRecordFieldMapping>
         <aggregateFieldDbMapping>
           <name>COUNT_aggregate.value</name>
diff --git a/entity/SupportTicket_entity/recordcontainers/db/recordfieldmappings/editor_contact_id.displayvalue/expression.js b/entity/SupportTicket_entity/recordcontainers/db/recordfieldmappings/editor_contact_id.displayvalue/expression.js
deleted file mode 100644
index e5961584dd..0000000000
--- a/entity/SupportTicket_entity/recordcontainers/db/recordfieldmappings/editor_contact_id.displayvalue/expression.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import("system.result");
-import("Person_lib");
-
-//TODO: try to find a better solution for this -> #TITLE-mechanic when available
-var subSql = PersUtils.getResolvingDisplaySubSql("TASK.EDITOR_CONTACT_ID");
-result.string(subSql);
\ No newline at end of file
diff --git a/entity/SupportTicket_entity/recordcontainers/db/recordfieldmappings/priority.displayvalue/expression.js b/entity/SupportTicket_entity/recordcontainers/db/recordfieldmappings/priority.displayvalue/expression.js
deleted file mode 100644
index 0b2c6568c3..0000000000
--- a/entity/SupportTicket_entity/recordcontainers/db/recordfieldmappings/priority.displayvalue/expression.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import("system.result");
-import("Keyword_lib");
-import("KeywordRegistry_basic");
-
-var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.taskPriority(), "TASK.PRIORITY");
-result.string(sql);
\ No newline at end of file
diff --git a/entity/SupportTicket_entity/recordcontainers/db/recordfieldmappings/progress.displayvalue/expression.js b/entity/SupportTicket_entity/recordcontainers/db/recordfieldmappings/progress.displayvalue/expression.js
deleted file mode 100644
index 4666f51439..0000000000
--- a/entity/SupportTicket_entity/recordcontainers/db/recordfieldmappings/progress.displayvalue/expression.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import("system.result");
-import("Keyword_lib");
-import("KeywordRegistry_basic");
-
-var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.taskProgress(), "TASK.PROGRESS");
-result.string(sql);
\ No newline at end of file
diff --git a/entity/SupportTicket_entity/recordcontainers/db/recordfieldmappings/requestor_contact_id.displayvalue/expression.js b/entity/SupportTicket_entity/recordcontainers/db/recordfieldmappings/requestor_contact_id.displayvalue/expression.js
deleted file mode 100644
index 6c6d6087a2..0000000000
--- a/entity/SupportTicket_entity/recordcontainers/db/recordfieldmappings/requestor_contact_id.displayvalue/expression.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import("system.result");
-import("Person_lib");
-
-//TODO: try to find a better solution for this -> #TITLE-mechanic when available
-var subSql = PersUtils.getResolvingDisplaySubSql("TASK.REQUESTOR_CONTACT_ID");
-result.string(subSql);
\ No newline at end of file
diff --git a/entity/SupportTicket_entity/recordcontainers/db/recordfieldmappings/status.displayvalue/expression.js b/entity/SupportTicket_entity/recordcontainers/db/recordfieldmappings/status.displayvalue/expression.js
deleted file mode 100644
index 7f15c2dfb2..0000000000
--- a/entity/SupportTicket_entity/recordcontainers/db/recordfieldmappings/status.displayvalue/expression.js
+++ /dev/null
@@ -1,2 +0,0 @@
-// do not use this, because TaskUtils.getTypeStatusKeyword(vars.get("$field.TASK_TYPE")) has to be called, which is not possible in a subselect.
-// --> only use display value process
\ No newline at end of file
diff --git a/entity/Task_entity/Task_entity.aod b/entity/Task_entity/Task_entity.aod
index 64f381e93f..483c8123f7 100644
--- a/entity/Task_entity/Task_entity.aod
+++ b/entity/Task_entity/Task_entity.aod
@@ -583,7 +583,6 @@
         </dbRecordFieldMapping>
         <dbRecordFieldMapping>
           <name>COUNT.value</name>
-          <expression>%aditoprj%/entity/Task_entity/recordcontainers/db/recordfieldmappings/count.value/expression.js</expression>
         </dbRecordFieldMapping>
         <aggregateFieldDbMapping>
           <name>COUNT_aggregate.value</name>
diff --git a/entity/Task_entity/entityfields/date_edit/valueProcess.js b/entity/Task_entity/entityfields/date_edit/valueProcess.js
deleted file mode 100644
index 710ac8a06a..0000000000
--- a/entity/Task_entity/entityfields/date_edit/valueProcess.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import("system.vars");
-import("system.result");
-import("system.neon");
-
-if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT)
-    result.string(vars.getString("$sys.date"));
\ No newline at end of file
diff --git a/entity/Task_entity/entityfields/date_new/valueProcess.js b/entity/Task_entity/entityfields/date_new/valueProcess.js
deleted file mode 100644
index 408c498a4c..0000000000
--- a/entity/Task_entity/entityfields/date_new/valueProcess.js
+++ /dev/null
@@ -1,7 +0,0 @@
-import("system.vars");
-import("system.result");
-import("system.neon");
-
-if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
-    result.string(vars.getString("$sys.date"));
-
diff --git a/entity/Task_entity/entityfields/keywordpriority/children/containername_param/valueProcess.js b/entity/Task_entity/entityfields/keywordpriority/children/containername_param/valueProcess.js
deleted file mode 100644
index 8a4cee1603..0000000000
--- a/entity/Task_entity/entityfields/keywordpriority/children/containername_param/valueProcess.js
+++ /dev/null
@@ -1,5 +0,0 @@
-import("system.result");
-import("Keyword_lib");
-import("KeywordRegistry_basic");
-
-result.string($KeywordRegistry.taskPriority());
\ No newline at end of file
diff --git a/entity/Task_entity/entityfields/keywordprogress/children/containername_param/code.js b/entity/Task_entity/entityfields/keywordprogress/children/containername_param/code.js
deleted file mode 100644
index b19308201a..0000000000
--- a/entity/Task_entity/entityfields/keywordprogress/children/containername_param/code.js
+++ /dev/null
@@ -1,5 +0,0 @@
-import("system.result");
-import("Keyword_lib");
-import("KeywordRegistry_basic");
-
-result.string($KeywordRegistry.taskProgress());
\ No newline at end of file
diff --git a/entity/Task_entity/entityfields/links/children/taskid_param/code.js b/entity/Task_entity/entityfields/links/children/taskid_param/code.js
deleted file mode 100644
index cf73f1e2a3..0000000000
--- a/entity/Task_entity/entityfields/links/children/taskid_param/code.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import("system.vars");
-import("system.result");
-
-result.string(vars.get("$field.TASKID"));
\ No newline at end of file
diff --git a/entity/Task_entity/entityfields/moduletrees/children/contextname/valueProcess.js b/entity/Task_entity/entityfields/moduletrees/children/contextname/valueProcess.js
deleted file mode 100644
index 86bf9bdfc9..0000000000
--- a/entity/Task_entity/entityfields/moduletrees/children/contextname/valueProcess.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import("system.result");
-
-result.string("Task");
\ No newline at end of file
diff --git a/entity/Task_entity/entityfields/moduletrees/children/id/valueProcess.js b/entity/Task_entity/entityfields/moduletrees/children/id/valueProcess.js
deleted file mode 100644
index 890f0a3405..0000000000
--- a/entity/Task_entity/entityfields/moduletrees/children/id/valueProcess.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import("system.result");
-import("system.vars");
-
-result.string(vars.get("$field.TASKID"));
\ No newline at end of file
diff --git a/entity/Task_entity/entityfields/user_edit/valueProcess.js b/entity/Task_entity/entityfields/user_edit/valueProcess.js
deleted file mode 100644
index 1581e18d97..0000000000
--- a/entity/Task_entity/entityfields/user_edit/valueProcess.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import("system.vars");
-import("system.result");
-import("system.neon");
-
-if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT)
-    result.string(vars.getString("$sys.user"));
\ No newline at end of file
diff --git a/entity/Task_entity/entityfields/user_new/valueProcess.js b/entity/Task_entity/entityfields/user_new/valueProcess.js
deleted file mode 100644
index 7c566863b4..0000000000
--- a/entity/Task_entity/entityfields/user_new/valueProcess.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import("system.vars");
-import("system.result");
-import("system.neon");
-
-if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
-    result.string(vars.getString("$sys.user"));
\ No newline at end of file
diff --git a/entity/Timetracking_entity/entityfields/date_edit/valueProcess.js b/entity/Timetracking_entity/entityfields/date_edit/valueProcess.js
deleted file mode 100644
index 710ac8a06a..0000000000
--- a/entity/Timetracking_entity/entityfields/date_edit/valueProcess.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import("system.vars");
-import("system.result");
-import("system.neon");
-
-if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT)
-    result.string(vars.getString("$sys.date"));
\ No newline at end of file
diff --git a/entity/Timetracking_entity/entityfields/date_new/valueProcess.js b/entity/Timetracking_entity/entityfields/date_new/valueProcess.js
deleted file mode 100644
index 3a0d59096c..0000000000
--- a/entity/Timetracking_entity/entityfields/date_new/valueProcess.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import("system.vars");
-import("system.result");
-import("system.neon");
-
-if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
-    result.string(vars.getString("$sys.date"));
\ No newline at end of file
diff --git a/entity/Timetracking_entity/entityfields/user_edit/valueProcess.js b/entity/Timetracking_entity/entityfields/user_edit/valueProcess.js
deleted file mode 100644
index 1581e18d97..0000000000
--- a/entity/Timetracking_entity/entityfields/user_edit/valueProcess.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import("system.vars");
-import("system.result");
-import("system.neon");
-
-if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT)
-    result.string(vars.getString("$sys.user"));
\ No newline at end of file
diff --git a/entity/Timetracking_entity/entityfields/user_new/valueProcess.js b/entity/Timetracking_entity/entityfields/user_new/valueProcess.js
deleted file mode 100644
index 7c566863b4..0000000000
--- a/entity/Timetracking_entity/entityfields/user_new/valueProcess.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import("system.vars");
-import("system.result");
-import("system.neon");
-
-if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
-    result.string(vars.getString("$sys.user"));
\ No newline at end of file
diff --git a/entity/UnlinkedMail_entity/entityfields/downloadmail_actiongroup/children/downloadmail_actiongroup/children/downloadmail_action/onActionProcess.js b/entity/UnlinkedMail_entity/entityfields/downloadmail_actiongroup/children/downloadmail_actiongroup/children/downloadmail_action/onActionProcess.js
deleted file mode 100644
index 62b2cac763..0000000000
--- a/entity/UnlinkedMail_entity/entityfields/downloadmail_actiongroup/children/downloadmail_actiongroup/children/downloadmail_action/onActionProcess.js
+++ /dev/null
@@ -1,8 +0,0 @@
-import("system.util");
-import("system.vars");
-import("system.mail");
-import("system.neon");
-
-var email = vars.get("$field.MAIL");
-var fileName = "Mail.eml";//if you want to use the subject here, remember to sanitize it first
-neon.download(util.encodeBase64String(email), fileName);
\ No newline at end of file
diff --git a/entity/WorkflowDefinition_entity/WorkflowDefinition_entity.aod b/entity/WorkflowDefinition_entity/WorkflowDefinition_entity.aod
index 4bfb7356f1..a8f87b3549 100644
--- a/entity/WorkflowDefinition_entity/WorkflowDefinition_entity.aod
+++ b/entity/WorkflowDefinition_entity/WorkflowDefinition_entity.aod
@@ -247,7 +247,6 @@
       <contentProcess>%aditoprj%/entity/WorkflowDefinition_entity/recordcontainers/jdito/contentProcess.js</contentProcess>
       <onInsert>%aditoprj%/entity/WorkflowDefinition_entity/recordcontainers/jdito/onInsert.js</onInsert>
       <onUpdate>%aditoprj%/entity/WorkflowDefinition_entity/recordcontainers/jdito/onUpdate.js</onUpdate>
-      <onDelete>%aditoprj%/entity/WorkflowDefinition_entity/recordcontainers/jdito/onDelete.js</onDelete>
       <recordFieldMappings>
         <jDitoRecordFieldMapping>
           <name>UID.value</name>
diff --git a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
index 7596a044fe..0bc0d24b6c 100644
--- a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
+++ b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
@@ -7004,6 +7004,27 @@
     <entry>
       <key>Archived</key>
     </entry>
+    <entry>
+      <key>asdf</key>
+    </entry>
+    <entry>
+      <key>Settings</key>
+    </entry>
+    <entry>
+      <key>favorites</key>
+    </entry>
+    <entry>
+      <key>Latitude</key>
+    </entry>
+    <entry>
+      <key>favorite</key>
+    </entry>
+    <entry>
+      <key>favorties</key>
+    </entry>
+    <entry>
+      <key>Longitude</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 97fc54774c..f025cec028 100644
--- a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
+++ b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
@@ -8854,6 +8854,111 @@ Bitte Datumseingabe prüfen</value>
     <entry>
       <key>Actionthriller</key>
     </entry>
+    <entry>
+      <key>and open modeler</key>
+    </entry>
+    <entry>
+      <key>export</key>
+    </entry>
+    <entry>
+      <key>Receive new Department Permission</key>
+    </entry>
+    <entry>
+      <key>No new recipients found that can be added to the serial letter.</key>
+    </entry>
+    <entry>
+      <key>New</key>
+    </entry>
+    <entry>
+      <key>Archived</key>
+    </entry>
+    <entry>
+      <key>Receive new User Permission</key>
+    </entry>
+    <entry>
+      <key>workflow notification</key>
+    </entry>
+    <entry>
+      <key>Permission received</key>
+    </entry>
+    <entry>
+      <key>leadimport notification</key>
+    </entry>
+    <entry>
+      <key>Workflow Model</key>
+    </entry>
+    <entry>
+      <key>No new recipients found that can be added to the bulk mail.</key>
+    </entry>
+    <entry>
+      <key>Total in euros</key>
+    </entry>
+    <entry>
+      <key>export using the selected  template</key>
+    </entry>
+    <entry>
+      <key>send mail</key>
+    </entry>
+    <entry>
+      <key>Download letter and create Activity</key>
+    </entry>
+    <entry>
+      <key>{SENT_MAIL}</key>
+    </entry>
+    <entry>
+      <key>The workflow could not be deployed</key>
+    </entry>
+    <entry>
+      <key>Add Participants</key>
+    </entry>
+    <entry>
+      <key>Workflow deploy failed</key>
+    </entry>
+    <entry>
+      <key>Create model</key>
+    </entry>
+    <entry>
+      <key>Release</key>
+    </entry>
+    <entry>
+      <key>granted permission</key>
+    </entry>
+    <entry>
+      <key>bulk mail sent</key>
+    </entry>
+    <entry>
+      <key>Edit workflow</key>
+    </entry>
+    <entry>
+      <key>and open Report</key>
+    </entry>
+    <entry>
+      <key>The Sales Project can only be filled when a company has been specified</key>
+    </entry>
+    <entry>
+      <key>Add Recipients</key>
+    </entry>
+    <entry>
+      <key>{SEND_MAIL}</key>
+    </entry>
+    <entry>
+      <key>download ready</key>
+    </entry>
+    <entry>
+      <key>favorites</key>
+    </entry>
+    <entry>
+      <key>Latitude</key>
+    </entry>
+    <entry>
+      <key>favorite</key>
+    </entry>
+    <entry>
+      <key>favorties</key>
+    </entry>
+    <entry>
+      <key>Longitude</key>
+    </entry>
   </keyValueMap>
   <font name="Dialog" style="0" size="11" />
 </language>
diff --git a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
index 30b98ba6dd..dc7c1be278 100644
--- a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
+++ b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
@@ -7068,6 +7068,30 @@
     <entry>
       <key>Archived</key>
     </entry>
+    <entry>
+      <key>asdf</key>
+    </entry>
+    <entry>
+      <key>{SENT_MAIL}</key>
+    </entry>
+    <entry>
+      <key>Settings</key>
+    </entry>
+    <entry>
+      <key>favorites</key>
+    </entry>
+    <entry>
+      <key>Latitude</key>
+    </entry>
+    <entry>
+      <key>favorite</key>
+    </entry>
+    <entry>
+      <key>favorties</key>
+    </entry>
+    <entry>
+      <key>Longitude</key>
+    </entry>
   </keyValueMap>
   <font name="Dialog" style="0" size="11" />
 </language>
-- 
GitLab


From c7423a1282b7f3cab9e5b40e58890151b452ef3d Mon Sep 17 00:00:00 2001
From: "j.goderbauer" <j.goderbauer@adito.de>
Date: Wed, 12 Aug 2020 14:42:10 +0200
Subject: [PATCH 147/309] ScanServices - warnings 2

---
 .aditoprj/ignoredScanServiceTasks.json           | 16 ++++++++++++++++
 entity/Activity_entity/Activity_entity.aod       | 15 +++++++++++++++
 .../entryday.value/expression.js                 |  5 +++++
 .../entrymonth.value/expression.js               |  5 +++++
 .../entryyear.value/expression.js                |  5 +++++
 .../Organisation_entity/Organisation_entity.aod  |  3 ---
 .../Salesproject_entity/Salesproject_entity.aod  |  4 ----
 7 files changed, 46 insertions(+), 7 deletions(-)
 create mode 100644 .aditoprj/ignoredScanServiceTasks.json
 create mode 100644 entity/Activity_entity/recordcontainers/db/recordfieldmappings/entryday.value/expression.js
 create mode 100644 entity/Activity_entity/recordcontainers/db/recordfieldmappings/entrymonth.value/expression.js
 create mode 100644 entity/Activity_entity/recordcontainers/db/recordfieldmappings/entryyear.value/expression.js

diff --git a/.aditoprj/ignoredScanServiceTasks.json b/.aditoprj/ignoredScanServiceTasks.json
new file mode 100644
index 0000000000..341e02b446
--- /dev/null
+++ b/.aditoprj/ignoredScanServiceTasks.json
@@ -0,0 +1,16 @@
+{
+  "entries": [
+    {
+      "target": "aliasDefinition/Data_alias/Data_alias.aod",
+      "line": -1,
+      "description": "The table \"DATABASECHANGELOG\" has no primary key [65]",
+      "groupName": "nb-tasklist-warning"
+    },
+    {
+      "target": "aliasDefinition/_____SYSTEMALIAS/_____SYSTEMALIAS.aod",
+      "line": -1,
+      "description": "The table \"DATABASECHANGELOG\" has no primary key [65]",
+      "groupName": "nb-tasklist-warning"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/entity/Activity_entity/Activity_entity.aod b/entity/Activity_entity/Activity_entity.aod
index 23119b4b9e..c0a781e0a9 100644
--- a/entity/Activity_entity/Activity_entity.aod
+++ b/entity/Activity_entity/Activity_entity.aod
@@ -730,6 +730,21 @@
           <recordfield>ACTIVITY.ACTIVITYID</recordfield>
           <aggregateType>COUNT</aggregateType>
         </aggregateFieldDbMapping>
+        <dbRecordFieldMapping>
+          <name>ENTRYDAY.value</name>
+          <expression>%aditoprj%/entity/Activity_entity/recordcontainers/db/recordfieldmappings/entryday.value/expression.js</expression>
+          <isFilterable v="true" />
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>ENTRYMONTH.value</name>
+          <expression>%aditoprj%/entity/Activity_entity/recordcontainers/db/recordfieldmappings/entrymonth.value/expression.js</expression>
+          <isFilterable v="true" />
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>ENTRYYEAR.value</name>
+          <expression>%aditoprj%/entity/Activity_entity/recordcontainers/db/recordfieldmappings/entryyear.value/expression.js</expression>
+          <isFilterable v="true" />
+        </dbRecordFieldMapping>
       </recordFieldMappings>
       <filterExtensions>
         <filterExtensionSet>
diff --git a/entity/Activity_entity/recordcontainers/db/recordfieldmappings/entryday.value/expression.js b/entity/Activity_entity/recordcontainers/db/recordfieldmappings/entryday.value/expression.js
new file mode 100644
index 0000000000..16e52cf56f
--- /dev/null
+++ b/entity/Activity_entity/recordcontainers/db/recordfieldmappings/entryday.value/expression.js
@@ -0,0 +1,5 @@
+import("system.result");
+import("Sql_lib");
+
+var helper = new SqlMaskingUtils();
+result.string(helper.dayFromDate("ACTIVITY.ENTRYDATE"));
\ No newline at end of file
diff --git a/entity/Activity_entity/recordcontainers/db/recordfieldmappings/entrymonth.value/expression.js b/entity/Activity_entity/recordcontainers/db/recordfieldmappings/entrymonth.value/expression.js
new file mode 100644
index 0000000000..b6df066c20
--- /dev/null
+++ b/entity/Activity_entity/recordcontainers/db/recordfieldmappings/entrymonth.value/expression.js
@@ -0,0 +1,5 @@
+import("system.result");
+import("Sql_lib");
+
+var helper = new SqlMaskingUtils();
+result.string(helper.monthFromDate("ACTIVITY.ENTRYDATE"));
\ No newline at end of file
diff --git a/entity/Activity_entity/recordcontainers/db/recordfieldmappings/entryyear.value/expression.js b/entity/Activity_entity/recordcontainers/db/recordfieldmappings/entryyear.value/expression.js
new file mode 100644
index 0000000000..a882e16947
--- /dev/null
+++ b/entity/Activity_entity/recordcontainers/db/recordfieldmappings/entryyear.value/expression.js
@@ -0,0 +1,5 @@
+import("system.result");
+import("Sql_lib");
+
+var helper = new SqlMaskingUtils();
+result.string(helper.yearFromDate("ACTIVITY.ENTRYDATE"));
\ No newline at end of file
diff --git a/entity/Organisation_entity/Organisation_entity.aod b/entity/Organisation_entity/Organisation_entity.aod
index 2f958bb71b..15ca75258c 100644
--- a/entity/Organisation_entity/Organisation_entity.aod
+++ b/entity/Organisation_entity/Organisation_entity.aod
@@ -1379,9 +1379,6 @@
           <recordfield>ORGANISATION.ORGANISATIONID</recordfield>
           <aggregateType>COUNT</aggregateType>
         </aggregateFieldDbMapping>
-        <dbRecordFieldMapping>
-          <name>COUNT.value</name>
-        </dbRecordFieldMapping>
       </recordFieldMappings>
       <filterExtensions>
         <filterExtensionSet>
diff --git a/entity/Salesproject_entity/Salesproject_entity.aod b/entity/Salesproject_entity/Salesproject_entity.aod
index fd09bf8076..fc6487cb3a 100644
--- a/entity/Salesproject_entity/Salesproject_entity.aod
+++ b/entity/Salesproject_entity/Salesproject_entity.aod
@@ -712,7 +712,6 @@
       <title>Project type</title>
       <description>own field for setting the project type attribute in the new mode, required for creating Salesprojects in QuickEntry</description>
       <consumer>ProjectTypeAttribute</consumer>
-      <groupable v="true" />
     </entityField>
     <entityConsumer>
       <name>ProjectTypeAttribute</name>
@@ -898,9 +897,6 @@
           <isFilterable v="true" />
           <isLookupFilter v="true" />
         </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>COUNT.value</name>
-        </dbRecordFieldMapping>
         <aggregateFieldDbMapping>
           <name>COUNT_aggregate.value</name>
           <recordfield>SALESPROJECT.SALESPROJECTID</recordfield>
-- 
GitLab


From 2a9f65a1ea7b51b47b93dbeb45d2d3056d18725e Mon Sep 17 00:00:00 2001
From: Tom Lutzenberger <t.lutzenberger@adito.de>
Date: Wed, 12 Aug 2020 14:53:06 +0200
Subject: [PATCH 148/309] #1058862: Entity Dokumentation

---
 .../Usersettings_entity.aod                   |  1 +
 entity/Usersettings_entity/documentation.adoc | 44 +++++++++++++++++++
 2 files changed, 45 insertions(+)
 create mode 100644 entity/Usersettings_entity/documentation.adoc

diff --git a/entity/Usersettings_entity/Usersettings_entity.aod b/entity/Usersettings_entity/Usersettings_entity.aod
index 969bd62d6e..50b2150922 100644
--- a/entity/Usersettings_entity/Usersettings_entity.aod
+++ b/entity/Usersettings_entity/Usersettings_entity.aod
@@ -2,6 +2,7 @@
 <entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
   <name>Usersettings_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
+  <documentation>%aditoprj%/entity/Usersettings_entity/documentation.adoc</documentation>
   <title>Settings</title>
   <grantDelete v="false" />
   <afterUiInit>%aditoprj%/entity/Usersettings_entity/afterUiInit.js</afterUiInit>
diff --git a/entity/Usersettings_entity/documentation.adoc b/entity/Usersettings_entity/documentation.adoc
new file mode 100644
index 0000000000..5eb27c8972
--- /dev/null
+++ b/entity/Usersettings_entity/documentation.adoc
@@ -0,0 +1,44 @@
+= Usersettings_entity
+
+
+== Overview
+
+=== Definition
+
+Entity to read, write and handle user settings.
+
+
+=== Purpose
+
+Enables users to edit their own settings and change their password.
+
+
+=== Particularities
+
+* The settings are stored in the table `ASYS_USERS` as key-value pairs and therefore direct access via DB container is not possible
+* The read/write logic is implemented in the `UserSettings_lib` and will be accessed in the jDito Container
+* The field `UID` exists to prevent errors but is not actually needed
+
+
+== Related entities
+
+-
+
+
+== Best Practice
+
+-
+
+
+== FAQ
+
+[qanda]
+How can I add more fields to the settings view?::
+    You need to do the following:
+
+    * Add a new field to this entity. The name must be the same as in the users data model/the settings table
+    * Add the field to `UsersettingsEdit_view`
+    * Add the name of the field to the arrays in `UserSettings_lib`. Most of them are located in the user objects `params` property => `paramSettings` 
+
+Which setting fields are possible?::
+    You can find out if you have a look at the return value of `tools.getCurrentUser()`
\ No newline at end of file
-- 
GitLab


From 41dd9779f576d0f2f19cc4b1f8eb0dbc7377fd0f Mon Sep 17 00:00:00 2001
From: Benjamin Ulrich <b.ulrich@adito.de>
Date: Wed, 12 Aug 2020 14:27:09 +0000
Subject: [PATCH 149/309] =?UTF-8?q?[Projekt:=20Entwicklung=20-=20Neon][Tic?=
 =?UTF-8?q?ketNr.:=201059218][Besuchsvorschlag=20kann=20in=20QS=20nicht=20?=
 =?UTF-8?q?gel=C3=B6scht=20werden]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../VisitPlanEmployeeWeek_entity.aod                   |  1 +
 .../VisitPlanEmployeeWeek_entity/grantDeleteProcess.js | 10 ++++++++++
 .../recordcontainers/jdito/onDelete.js                 | 10 ++++++++++
 .../VisitPlanEmployeeWeekPreview_view.aod              |  1 -
 4 files changed, 21 insertions(+), 1 deletion(-)
 create mode 100644 entity/VisitPlanEmployeeWeek_entity/grantDeleteProcess.js

diff --git a/entity/VisitPlanEmployeeWeek_entity/VisitPlanEmployeeWeek_entity.aod b/entity/VisitPlanEmployeeWeek_entity/VisitPlanEmployeeWeek_entity.aod
index 531c1918d2..07aec7a835 100644
--- a/entity/VisitPlanEmployeeWeek_entity/VisitPlanEmployeeWeek_entity.aod
+++ b/entity/VisitPlanEmployeeWeek_entity/VisitPlanEmployeeWeek_entity.aod
@@ -4,6 +4,7 @@
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/VisitPlanEmployeeWeek_entity/documentation.adoc</documentation>
   <title>Visitplan Weekly Overview</title>
+  <grantDeleteProcess>%aditoprj%/entity/VisitPlanEmployeeWeek_entity/grantDeleteProcess.js</grantDeleteProcess>
   <iconId>VAADIN:CAR</iconId>
   <image>VAADIN:CAR</image>
   <recordContainer>db</recordContainer>
diff --git a/entity/VisitPlanEmployeeWeek_entity/grantDeleteProcess.js b/entity/VisitPlanEmployeeWeek_entity/grantDeleteProcess.js
new file mode 100644
index 0000000000..c5a2db6695
--- /dev/null
+++ b/entity/VisitPlanEmployeeWeek_entity/grantDeleteProcess.js
@@ -0,0 +1,10 @@
+import("system.vars");
+import("system.result");
+import("Entity_lib");
+
+var id = vars.get("$field.VISITPLANEMPLOYEEWEEKID")
+var canDelete = new HasLinkedObjectTester()
+    .andNoEntityRows("VisitPlanEntry_entity", "Entries", {Entries_param : id})
+    .validate();
+    
+result.string(canDelete)
\ No newline at end of file
diff --git a/entity/VisitPlanEntry_entity/recordcontainers/jdito/onDelete.js b/entity/VisitPlanEntry_entity/recordcontainers/jdito/onDelete.js
index 053a7f39e0..a507271c67 100644
--- a/entity/VisitPlanEntry_entity/recordcontainers/jdito/onDelete.js
+++ b/entity/VisitPlanEntry_entity/recordcontainers/jdito/onDelete.js
@@ -1,6 +1,16 @@
+import("system.vars");
+import("Calendar_lib");
 import("system.neon");
 import("Sql_lib");
 import("system.db");
 
+var id = vars.get("$field.APPOINTMENT_ID") //deletes appointmententries (+ the linked Objects) if an appointment has been made
+
+new SqlBuilder(SqlUtils.getSystemAlias()).whereIfSet("ASYS_CALENDARBACKEND.ELEMENTUID", id)
+    .deleteData();
+    
+newWhereIfSet("AB_APPOINTMENTLINK.APPOINTMENT_ID", id)
+    .deleteData();
+
 newWhereIfSet("VISITPLANENTRY.VISITPLANENTRYID", "$field.UID")
     .deleteData();
\ No newline at end of file
diff --git a/neonView/VisitPlanEmployeeWeekPreview_view/VisitPlanEmployeeWeekPreview_view.aod b/neonView/VisitPlanEmployeeWeekPreview_view/VisitPlanEmployeeWeekPreview_view.aod
index 7c1d4abf3b..7e053c7391 100644
--- a/neonView/VisitPlanEmployeeWeekPreview_view/VisitPlanEmployeeWeekPreview_view.aod
+++ b/neonView/VisitPlanEmployeeWeekPreview_view/VisitPlanEmployeeWeekPreview_view.aod
@@ -4,7 +4,6 @@
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <size>SMALL</size>
   <isOverlay v="false" />
-  <overlayOrientation>PORTRAIT</overlayOrientation>
   <layout>
     <headerFooterLayout>
       <name>layout</name>
-- 
GitLab


From 8daf340a1c17ef26ff072567dbb6851ceef86dcf Mon Sep 17 00:00:00 2001
From: Benjamin Ulrich <b.ulrich@adito.de>
Date: Wed, 12 Aug 2020 14:28:12 +0000
Subject: [PATCH 150/309] [Projekt: Entwicklung - Neon][TicketNr.:
 1060551][Standardadresse bleibt bei Firmenwechsel gleich]

---
 .../recordcontainers/db/onDBUpdate.js         | 42 ++++++++++++++++++-
 1 file changed, 41 insertions(+), 1 deletion(-)

diff --git a/entity/Person_entity/recordcontainers/db/onDBUpdate.js b/entity/Person_entity/recordcontainers/db/onDBUpdate.js
index 4268b8a017..126fccba8c 100644
--- a/entity/Person_entity/recordcontainers/db/onDBUpdate.js
+++ b/entity/Person_entity/recordcontainers/db/onDBUpdate.js
@@ -1,12 +1,52 @@
+import("Sql_lib");
 import("Workflow_lib");
 import("DataPrivacy_lib");
 import("system.tools");
+import("system.neon");
 import("system.vars");
 import("Person_lib");
 import("Communication_lib");
 import("Entity_lib");
 import("StandardObject_lib");
 
+var localChanged = vars.get("$local.changed");
+var orgChanged = false;
+for (var i = 0; i < localChanged.length; i++) {
+    if(localChanged[i] == "CONTACT.ORGANISATION_ID")
+    {
+        orgChanged = true;
+        break;
+    }
+}
+
+if(orgChanged)
+{
+    var orgAddressId = newSelect("CONTACT.ADDRESS_ID")
+                                    .from("CONTACT")
+                                    .where("CONTACT.ORGANISATION_ID",  vars.get("$field.ORGANISATION_ID"))
+                                    .and("CONTACT.PERSON_ID is null")
+                                    .cell();
+
+    var addressId = vars.get("$field.ADDRESS_ID");
+
+    if(addressId != orgAddressId) //update standard address if the the organisation changed
+    {
+        var persAddress = newSelect("ADDRESS.ADDRESSID")
+                                .from("ADDRESS")
+                                .where("ADDRESS.CONTACT_ID", vars.get("$field.CONTACTID"))
+                                .and("ADDRESS.ADDRESSID", addressId)
+                                .cell();
+
+        if(!persAddress) // only when the standard address is from the organisation
+        {
+            var standardAddressId = new StandardObject("Address", null, "Person", vars.get("$field.PERSONID"))
+                    .onPersonValueChange(vars.get("$field.ORGANISATION_ID"));
+
+            neon.setFieldValue("$field.ADDRESS_ID", standardAddressId);
+        }
+    }
+}
+
 var rowdata =  vars.get("$local.rowdata");
 // TODO: this is a workaround for missing possibility to react on changes of fields not connected to record Contqainer #1030023
 var uid = rowdata["CONTACT.CONTACTID"];
@@ -24,7 +64,7 @@ new StandardObject("Address", rowdata["CONTACT.ADDRESS_ID"], "Person", uid)
 var updates = [];
     
 // update user object if name changed
-vars.get("$local.changed").forEach(function(fieldName) 
+localChanged.forEach(function(fieldName) 
 {
     var nameProp = tools.LASTNAME;
     switch (fieldName) {
-- 
GitLab


From 1a695493816b2624de5b8db6419c97403abcb749 Mon Sep 17 00:00:00 2001
From: "a.schindlbeck" <a.schindlbeck@adito.de>
Date: Thu, 13 Aug 2020 11:15:08 +0200
Subject: [PATCH 151/309] #1060652 Favorites: filterExtensions

---
 entity/Favorite_entity/Favorite_entity.aod    | 30 ++++++-
 .../group_title/displayValueProcess.js        |  8 ++
 .../jditorecordcontainer/contentProcess.js    | 80 ++++++++++++++++---
 .../filterValuesProcess.js                    | 23 ++++++
 .../filterValuesProcess.js                    | 19 +++++
 .../grouptypeextension/filterValuesProcess.js | 24 ++++++
 .../jditorecordcontainer/rowCountProcess.js   |  5 --
 .../FavoriteFilter_view.aod                   | 23 ++++++
 8 files changed, 196 insertions(+), 16 deletions(-)
 create mode 100644 entity/Favorite_entity/entityfields/group_title/displayValueProcess.js
 create mode 100644 entity/Favorite_entity/recordcontainers/jditorecordcontainer/filterextensions/groupgroupnameextension/filterValuesProcess.js
 create mode 100644 entity/Favorite_entity/recordcontainers/jditorecordcontainer/filterextensions/grouptitleextension/filterValuesProcess.js
 create mode 100644 entity/Favorite_entity/recordcontainers/jditorecordcontainer/filterextensions/grouptypeextension/filterValuesProcess.js
 delete mode 100644 entity/Favorite_entity/recordcontainers/jditorecordcontainer/rowCountProcess.js

diff --git a/entity/Favorite_entity/Favorite_entity.aod b/entity/Favorite_entity/Favorite_entity.aod
index 8c07dbcfa3..431adf82e4 100644
--- a/entity/Favorite_entity/Favorite_entity.aod
+++ b/entity/Favorite_entity/Favorite_entity.aod
@@ -7,6 +7,7 @@
   <grantCreate v="true" />
   <grantUpdate v="true" />
   <grantDelete v="true" />
+  <usePermissions v="false" />
   <titlePlural>Favorites</titlePlural>
   <recordContainer>jDitoRecordContainer</recordContainer>
   <entityFields>
@@ -36,6 +37,7 @@
     <entityField>
       <name>GROUP_TITLE</name>
       <titleProcess>%aditoprj%/entity/Favorite_entity/entityfields/group_title/titleProcess.js</titleProcess>
+      <displayValueProcess>%aditoprj%/entity/Favorite_entity/entityfields/group_title/displayValueProcess.js</displayValueProcess>
     </entityField>
     <entityField>
       <name>GROUP_TYPE</name>
@@ -55,11 +57,11 @@
   <recordContainers>
     <jDitoRecordContainer>
       <name>jDitoRecordContainer</name>
-      <jDitoRecordAlias>Data_alias</jDitoRecordAlias>
+      <jDitoRecordAlias>_____SYSTEMALIAS</jDitoRecordAlias>
       <isFilterable v="true" />
+      <isGroupable v="true" />
       <isSortable v="true" />
       <contentProcess>%aditoprj%/entity/Favorite_entity/recordcontainers/jditorecordcontainer/contentProcess.js</contentProcess>
-      <rowCountProcess>%aditoprj%/entity/Favorite_entity/recordcontainers/jditorecordcontainer/rowCountProcess.js</rowCountProcess>
       <onDelete>%aditoprj%/entity/Favorite_entity/recordcontainers/jditorecordcontainer/onDelete.js</onDelete>
       <recordFieldMappings>
         <jDitoRecordFieldMapping>
@@ -90,6 +92,30 @@
           <name>USER_ID.value</name>
         </jDitoRecordFieldMapping>
       </recordFieldMappings>
+      <filterExtensions>
+        <filterExtension>
+          <name>groupGroupNameExtension</name>
+          <title>Gruppenname</title>
+          <contentType>TEXT</contentType>
+          <filterValuesProcess>%aditoprj%/entity/Favorite_entity/recordcontainers/jditorecordcontainer/filterextensions/groupgroupnameextension/filterValuesProcess.js</filterValuesProcess>
+          <filtertype>BASIC</filtertype>
+        </filterExtension>
+        <filterExtension>
+          <name>groupTitleExtension</name>
+          <title>Titel</title>
+          <contentType>TEXT</contentType>
+          <filterValuesProcess>%aditoprj%/entity/Favorite_entity/recordcontainers/jditorecordcontainer/filterextensions/grouptitleextension/filterValuesProcess.js</filterValuesProcess>
+          <isLookupFilter v="false" />
+          <filtertype>BASIC</filtertype>
+        </filterExtension>
+        <filterExtension>
+          <name>groupTypeExtension</name>
+          <title>Typ</title>
+          <contentType>TEXT</contentType>
+          <filterValuesProcess>%aditoprj%/entity/Favorite_entity/recordcontainers/jditorecordcontainer/filterextensions/grouptypeextension/filterValuesProcess.js</filterValuesProcess>
+          <filtertype>BASIC</filtertype>
+        </filterExtension>
+      </filterExtensions>
     </jDitoRecordContainer>
   </recordContainers>
 </entity>
diff --git a/entity/Favorite_entity/entityfields/group_title/displayValueProcess.js b/entity/Favorite_entity/entityfields/group_title/displayValueProcess.js
new file mode 100644
index 0000000000..f0d364ec30
--- /dev/null
+++ b/entity/Favorite_entity/entityfields/group_title/displayValueProcess.js
@@ -0,0 +1,8 @@
+import("system.vars");
+import("system.result");
+import("system.translate");
+
+
+if(vars.get("$field.GROUP_TITLE").equals(""))
+//    result.string(translate.text("Standard"))
+    result.string("Standard");
\ No newline at end of file
diff --git a/entity/Favorite_entity/recordcontainers/jditorecordcontainer/contentProcess.js b/entity/Favorite_entity/recordcontainers/jditorecordcontainer/contentProcess.js
index 0e0c24c33e..f11203501b 100644
--- a/entity/Favorite_entity/recordcontainers/jditorecordcontainer/contentProcess.js
+++ b/entity/Favorite_entity/recordcontainers/jditorecordcontainer/contentProcess.js
@@ -5,15 +5,12 @@ import("system.favorite");
 import("system.tools");
 import("system.entities");
 
-var loadConfig;
-
-//$local.idvalues
 if(vars.get("$local.idvalues") && vars.get("$local.idvalues").length != 0)
 {
     var selected = vars.get("$local.idvalues");
     var selectedFavos = [];
     
-    for(i = 0; i < selected.length; i++)
+    for(let i = 0; i < selected.length; i++)
     {
         selectedFavos.push(buildFavorite(favorite.getFavoriteById(selected[i])));
     }
@@ -21,21 +18,86 @@ if(vars.get("$local.idvalues") && vars.get("$local.idvalues").length != 0)
 }
 else
 {
-    var allFavorites = favorite.getAllFavorites(tools.getCurrentUser()["name"]);
+    var filters = vars.get("$local.filter");
+    var activeFilters = [];
+    if(filters["filter"] != null)
+        filters["filter"]["childs"].forEach(child => activeFilters.push(child));
+    
+    
     var finishedFavoritesForDisplay = [];
+    var filteredFavorites = [];
+    var allFavorites = favorite.getAllFavorites(tools.getCurrentUser()["name"]);
     
-    for(i = 0; i < allFavorites.length; i++)
+    for(let i = 0; i < allFavorites.length; i++)
     {
         var favo = allFavorites[i];
-        finishedFavoritesForDisplay.push(buildFavorite(favo));
+        var builtFavo = buildFavorite(favo);
+        if(isFiltered(activeFilters, builtFavo))
+            finishedFavoritesForDisplay.push(builtFavo);
     }
     
     result.object(finishedFavoritesForDisplay);
 }
 
-function buildFavorite(favo)
+function isFiltered(filters, fav)
+{
+    var favoObjectType = fav[3];
+    var favoGroupName = fav[1];
+    var favoRowId = fav[5];
+    var favoTitle = fav[6];
+    
+    var isFiltered = true;
+    
+    for(let i = 0; i < filters.length; i++)
+    {
+        if(filters[i]["name"].includes("groupTypeExtension"))
+        {
+            if(!isValid(favoObjectType, filters[i]))
+            {
+                isFiltered = false;
+                break;
+            }
+        }
+        if(filters[i]["name"].includes("groupTitleExtension"))
+        {
+            if(!isValid(favoTitle, filters[i]))
+            {
+                isFiltered = false;
+                break;
+            }
+        }
+        if(filters[i]["name"].includes("groupGroupNameExtension"))
+        {
+            if(!isValid(favoObjectType, filters[i]))
+            {
+                isFiltered = false;
+                break;
+            }
+        }
+    }
+        
+    return isFiltered;
+}
+
+function isValid(value, filter)
 {
-    loadConfig = entities.createConfigForLoadingRows();
+    var operator = filter["operator"];
+    var filterValue = filter["key"];
+    
+    switch(operator)
+    {
+        case "EQUAL":
+            return value.equals(filterValue);
+        case "CONTAINS":
+            return value.includes(filterValue);
+    }
+    
+    return false;
+}
+
+function buildFavorite(favo)
+{    
+    var loadConfig = entities.createConfigForLoadingRows();
     loadConfig.entity(ContextUtils.getEntity(favo["objecttype"]));
     loadConfig.uid(favo["rowid"]);
     loadConfig.fields(["#CONTENTTITLE", "#IMAGE"]);
diff --git a/entity/Favorite_entity/recordcontainers/jditorecordcontainer/filterextensions/groupgroupnameextension/filterValuesProcess.js b/entity/Favorite_entity/recordcontainers/jditorecordcontainer/filterextensions/groupgroupnameextension/filterValuesProcess.js
new file mode 100644
index 0000000000..9d02b256cd
--- /dev/null
+++ b/entity/Favorite_entity/recordcontainers/jditorecordcontainer/filterextensions/groupgroupnameextension/filterValuesProcess.js
@@ -0,0 +1,23 @@
+import("system.favorite");
+import("system.tools");
+import("system.result");
+import("Sql_lib");
+import("system.logging");
+
+logging.log("groupNameExtensionValuesProcess");
+
+var allTypes = [];
+
+var filterCond = newWhere("ASYS_RECORDGROUP.USER_ID", tools.getCurrentUser()["name"]);
+var groupNames = (new SqlBuilder()).selectDistinct("ASYS_RECORDGROUP.TITLE")
+                        .from("ASYS_RECORDGROUP")
+                        .where(filterCond)
+                        .arrayColumn();
+                        
+groupNames.forEach(element => {
+   allTypes.push([element, element]); 
+});
+
+result.object(Array.from(allTypes));
+
+
diff --git a/entity/Favorite_entity/recordcontainers/jditorecordcontainer/filterextensions/grouptitleextension/filterValuesProcess.js b/entity/Favorite_entity/recordcontainers/jditorecordcontainer/filterextensions/grouptitleextension/filterValuesProcess.js
new file mode 100644
index 0000000000..f853dbb441
--- /dev/null
+++ b/entity/Favorite_entity/recordcontainers/jditorecordcontainer/filterextensions/grouptitleextension/filterValuesProcess.js
@@ -0,0 +1,19 @@
+import("system.favorite");
+import("system.tools");
+import("system.result");
+import("Sql_lib");
+import("system.logging");
+
+var allTitles = [];
+
+var filterCond = newWhere("ASYS_RECORDGROUP.USER_ID", tools.getCurrentUser()["name"]);
+var groupNames = (new SqlBuilder()).selectDistinct("ASYS_RECORDGROUP.TITLE")
+                        .from("ASYS_RECORDGROUP")
+                        .where(filterCond)
+                        .arrayColumn();
+                        
+groupNames.forEach(element => {
+   allTypes.push([element, element]); 
+});
+
+result.object(Array.from(allTypes));
\ No newline at end of file
diff --git a/entity/Favorite_entity/recordcontainers/jditorecordcontainer/filterextensions/grouptypeextension/filterValuesProcess.js b/entity/Favorite_entity/recordcontainers/jditorecordcontainer/filterextensions/grouptypeextension/filterValuesProcess.js
new file mode 100644
index 0000000000..a93adae204
--- /dev/null
+++ b/entity/Favorite_entity/recordcontainers/jditorecordcontainer/filterextensions/grouptypeextension/filterValuesProcess.js
@@ -0,0 +1,24 @@
+import("system.translate");
+import("system.result");
+import("system.project");
+import("system.tools");
+import("system.logging");
+import("Context_lib");
+
+
+var allContexts = project.getDataModels(project.DATAMODEL_KIND_CONTEXT);
+var permittedContexts = [];
+
+for(i = 0; i < allContexts.length; i++) 
+{
+    var isFavoEnabled = false;
+    var entityname = ContextUtils.getEntity(allContexts[i][0]);
+    var entity = null;
+    if(entityname)
+        entity = project.getDataModel(project.DATAMODEL_KIND_ENTITY,entityname);
+        
+    if(entity && entity[7].equals("true")) //favoritesEnabled
+        permittedContexts.push([allContexts[i][0], translate.text(allContexts[i][0])]);
+}
+    
+result.object(permittedContexts);
diff --git a/entity/Favorite_entity/recordcontainers/jditorecordcontainer/rowCountProcess.js b/entity/Favorite_entity/recordcontainers/jditorecordcontainer/rowCountProcess.js
deleted file mode 100644
index cfea6a5728..0000000000
--- a/entity/Favorite_entity/recordcontainers/jditorecordcontainer/rowCountProcess.js
+++ /dev/null
@@ -1,5 +0,0 @@
-import("system.tools");
-import("system.result");
-import("system.favorite");
-
-result.string(favorite.getAllFavorites(tools.getCurrentUser()["name"]).length);
\ No newline at end of file
diff --git a/neonView/FavoriteFilter_view/FavoriteFilter_view.aod b/neonView/FavoriteFilter_view/FavoriteFilter_view.aod
index f24dbfa624..dc33a0e2aa 100644
--- a/neonView/FavoriteFilter_view/FavoriteFilter_view.aod
+++ b/neonView/FavoriteFilter_view/FavoriteFilter_view.aod
@@ -44,5 +44,28 @@
         </neonTableColumn>
       </columns>
     </tableViewTemplate>
+    <treeTableViewTemplate>
+      <name>FavoriteTree</name>
+      <parentField>TITLE</parentField>
+      <entityField>#ENTITY</entityField>
+      <columns>
+        <neonTreeTableColumn>
+          <name>3f35104a-7ccc-44aa-8b9a-9de31d410f81</name>
+          <entityField>PICTURE</entityField>
+        </neonTreeTableColumn>
+        <neonTreeTableColumn>
+          <name>b7660bdb-7ae4-46c5-a0a6-5127244bfcf8</name>
+          <entityField>OBJECT_TYPE</entityField>
+        </neonTreeTableColumn>
+        <neonTreeTableColumn>
+          <name>d68cc010-2d84-43d1-a333-39f9fdd3a23a</name>
+          <entityField>TITLE</entityField>
+        </neonTreeTableColumn>
+        <neonTreeTableColumn>
+          <name>d6e9557d-1368-4bc3-8638-fa01e24fcbf3</name>
+          <entityField>GROUP_TITLE</entityField>
+        </neonTreeTableColumn>
+      </columns>
+    </treeTableViewTemplate>
   </children>
 </neonView>
-- 
GitLab


From 774d0d0293404569a5a63c55be83bd759ae2586a Mon Sep 17 00:00:00 2001
From: "a.schindlbeck" <a.schindlbeck@adito.de>
Date: Thu, 13 Aug 2020 11:34:06 +0200
Subject: [PATCH 152/309] #1060652 Favorites: filterExtensions fixes

---
 entity/Favorite_entity/Favorite_entity.aod             |  1 -
 .../jditorecordcontainer/contentProcess.js             | 10 +++++++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/entity/Favorite_entity/Favorite_entity.aod b/entity/Favorite_entity/Favorite_entity.aod
index 431adf82e4..58fde656e8 100644
--- a/entity/Favorite_entity/Favorite_entity.aod
+++ b/entity/Favorite_entity/Favorite_entity.aod
@@ -105,7 +105,6 @@
           <title>Titel</title>
           <contentType>TEXT</contentType>
           <filterValuesProcess>%aditoprj%/entity/Favorite_entity/recordcontainers/jditorecordcontainer/filterextensions/grouptitleextension/filterValuesProcess.js</filterValuesProcess>
-          <isLookupFilter v="false" />
           <filtertype>BASIC</filtertype>
         </filterExtension>
         <filterExtension>
diff --git a/entity/Favorite_entity/recordcontainers/jditorecordcontainer/contentProcess.js b/entity/Favorite_entity/recordcontainers/jditorecordcontainer/contentProcess.js
index f11203501b..183c191aca 100644
--- a/entity/Favorite_entity/recordcontainers/jditorecordcontainer/contentProcess.js
+++ b/entity/Favorite_entity/recordcontainers/jditorecordcontainer/contentProcess.js
@@ -68,7 +68,7 @@ function isFiltered(filters, fav)
         }
         if(filters[i]["name"].includes("groupGroupNameExtension"))
         {
-            if(!isValid(favoObjectType, filters[i]))
+            if(!isValid(favoGroupName, filters[i]))
             {
                 isFiltered = false;
                 break;
@@ -88,8 +88,16 @@ function isValid(value, filter)
     {
         case "EQUAL":
             return value.equals(filterValue);
+        case "NOT_EQUAL":
+            return !value.equals(filterValue);
         case "CONTAINS":
             return value.includes(filterValue);
+        case "NOT_CONTAINS":
+            return !value.includes(filterValue);
+        case "ISNULL":
+            return value == null;
+        case "ISNOTNULL":
+            return value != null;
     }
     
     return false;
-- 
GitLab


From c5cf678cd0a7e42cf5e9849434d354370e43cf37 Mon Sep 17 00:00:00 2001
From: Tom Lutzenberger <t.lutzenberger@adito.de>
Date: Thu, 13 Aug 2020 13:12:56 +0200
Subject: [PATCH 153/309] #1058862: Adjust password validation to tools-API

---
 entity/Employee_entity/entityfields/password/onValidation.js  | 4 ++--
 .../entityfields/jpassword/onValidation.js                    | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/entity/Employee_entity/entityfields/password/onValidation.js b/entity/Employee_entity/entityfields/password/onValidation.js
index 09a1493246..c633cac88f 100644
--- a/entity/Employee_entity/entityfields/password/onValidation.js
+++ b/entity/Employee_entity/entityfields/password/onValidation.js
@@ -8,11 +8,11 @@ import("system.vars");
 if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW) {
     
     let newPassword = vars.get("$local.value");
-    let policyMessages = tools.validatePasswordPolicies(newPassword);
+    let policyMessages = tools.validatePasswordPolicies(newPassword, "");
     let messages = [];
 
     if(newPassword) {
-        if(Object.keys(policyMessages).length > 0) {
+        if(policyMessages.length > 0) {
             for(let msg in policyMessages) {
                 messages.push(policyMessages[msg]);
             }
diff --git a/entity/Usersettings_entity/entityfields/jpassword/onValidation.js b/entity/Usersettings_entity/entityfields/jpassword/onValidation.js
index 8afe8f4de4..ee0296a725 100644
--- a/entity/Usersettings_entity/entityfields/jpassword/onValidation.js
+++ b/entity/Usersettings_entity/entityfields/jpassword/onValidation.js
@@ -6,7 +6,7 @@ import("system.vars");
 
 let newPassword = vars.get("$local.value");
 let currentPassword = vars.get("$field.currentPassword");
-let policyMessages = tools.validatePasswordPolicies(newPassword);
+let policyMessages = tools.validatePasswordPolicies(newPassword, vars.get("$sys.user"));
 let messages = [];
 
 if(newPassword) {
@@ -14,7 +14,7 @@ if(newPassword) {
         result.string(translate.text("New password must not be the same as the current password"));
     }
     
-    if(Object.keys(policyMessages).length > 0) {
+    if(policyMessages.length > 0) {
         for(let msg in policyMessages) {
             messages.push(policyMessages[msg]);
         }
-- 
GitLab


From dca01e244419556549b89724ae43cca69c9b971c Mon Sep 17 00:00:00 2001
From: "j.goderbauer" <j.goderbauer@adito.de>
Date: Fri, 14 Aug 2020 09:32:57 +0200
Subject: [PATCH 154/309] [Projekt: Entwicklung - Neon][TicketNr.:
 1063776][autostart wirft Fehler wenn keinerlei Kalenderberechtigungen gesetzt
 sind]

---
 process/PermissionCalendar_lib/process.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/process/PermissionCalendar_lib/process.js b/process/PermissionCalendar_lib/process.js
index 453eced128..070309c80f 100644
--- a/process/PermissionCalendar_lib/process.js
+++ b/process/PermissionCalendar_lib/process.js
@@ -259,8 +259,9 @@ PermissionCalendar.getTree = function(pCurrentUser)
     let user = PermissionCalendar._getUser();
     
     let root = PermissionCalendar._getDepartment($AttributeRegistry.departments(), permissions, resultArr);
-    // Rekursion aufrufen
-    PermissionCalendar._getDataRecursive(root[0], pCurrentUser, permissions, user, resultArr);    
+    // is empty if no entry exists in the permission calendar table
+    if (root.length > 0)
+        PermissionCalendar._getDataRecursive(root[0], pCurrentUser, permissions, user, resultArr);    
     
     return resultArr;
     resultArr = [];
-- 
GitLab


From ecc5ed89a796fa1b7b265d67e800576f0d2b7857 Mon Sep 17 00:00:00 2001
From: "a.schindlbeck" <a.schindlbeck@adito.de>
Date: Thu, 13 Aug 2020 11:34:06 +0200
Subject: [PATCH 155/309] #1060652 Favorites: filterExtensions fixes #2

---
 .../filterValuesProcess.js                    | 19 -------------------
 1 file changed, 19 deletions(-)
 delete mode 100644 entity/Favorite_entity/recordcontainers/jditorecordcontainer/filterextensions/grouptitleextension/filterValuesProcess.js

diff --git a/entity/Favorite_entity/recordcontainers/jditorecordcontainer/filterextensions/grouptitleextension/filterValuesProcess.js b/entity/Favorite_entity/recordcontainers/jditorecordcontainer/filterextensions/grouptitleextension/filterValuesProcess.js
deleted file mode 100644
index f853dbb441..0000000000
--- a/entity/Favorite_entity/recordcontainers/jditorecordcontainer/filterextensions/grouptitleextension/filterValuesProcess.js
+++ /dev/null
@@ -1,19 +0,0 @@
-import("system.favorite");
-import("system.tools");
-import("system.result");
-import("Sql_lib");
-import("system.logging");
-
-var allTitles = [];
-
-var filterCond = newWhere("ASYS_RECORDGROUP.USER_ID", tools.getCurrentUser()["name"]);
-var groupNames = (new SqlBuilder()).selectDistinct("ASYS_RECORDGROUP.TITLE")
-                        .from("ASYS_RECORDGROUP")
-                        .where(filterCond)
-                        .arrayColumn();
-                        
-groupNames.forEach(element => {
-   allTypes.push([element, element]); 
-});
-
-result.object(Array.from(allTypes));
\ No newline at end of file
-- 
GitLab


From 041b6ef3ab30cb84fcf836af6783eddd7c2724bb Mon Sep 17 00:00:00 2001
From: "a.schindlbeck" <a.schindlbeck@adito.de>
Date: Thu, 13 Aug 2020 14:32:03 +0200
Subject: [PATCH 156/309] #1055989 Favorites: optimizations

---
 entity/Employee_entity/Employee_entity.aod                | 6 +-----
 .../entityfields/employee_objecttype/valueProcess.js      | 3 ---
 entity/ExportTemplate_entity/ExportTemplate_entity.aod    | 1 +
 entity/ExportTemplate_entity/contentTitleProcess.js       | 5 +++++
 entity/Favorite_entity/Favorite_entity.aod                | 1 -
 .../entityfields/group_title/displayValueProcess.js       | 8 --------
 entity/Favorite_entity/entityfields/title/titleProcess.js | 2 +-
 .../jditorecordcontainer/contentProcess.js                | 4 ++--
 .../groupgroupnameextension/filterValuesProcess.js        | 2 +-
 entity/Productprice_entity/Productprice_entity.aod        | 6 +-----
 .../entityfields/productprice_objecttype/valueProcess.js  | 3 ---
 neonView/EmployeePreview_view/EmployeePreview_view.aod    | 7 -------
 .../ProductpricePreview_view/ProductpricePreview_view.aod | 7 -------
 13 files changed, 12 insertions(+), 43 deletions(-)
 delete mode 100644 entity/Employee_entity/entityfields/employee_objecttype/valueProcess.js
 create mode 100644 entity/ExportTemplate_entity/contentTitleProcess.js
 delete mode 100644 entity/Favorite_entity/entityfields/group_title/displayValueProcess.js
 delete mode 100644 entity/Productprice_entity/entityfields/productprice_objecttype/valueProcess.js

diff --git a/entity/Employee_entity/Employee_entity.aod b/entity/Employee_entity/Employee_entity.aod
index 7017e5bde0..df90cbca0c 100644
--- a/entity/Employee_entity/Employee_entity.aod
+++ b/entity/Employee_entity/Employee_entity.aod
@@ -8,7 +8,7 @@
   <contentTitleProcess>%aditoprj%/entity/Employee_entity/contentTitleProcess.js</contentTitleProcess>
   <afterUiInit>%aditoprj%/entity/Employee_entity/afterUiInit.js</afterUiInit>
   <onValidation>%aditoprj%/entity/Employee_entity/onValidation.js</onValidation>
-  <useFavorites v="true" />
+  <useFavorites v="false" />
   <iconId>VAADIN:USER</iconId>
   <titlePlural>Employees</titlePlural>
   <recordContainer>jdito</recordContainer>
@@ -379,10 +379,6 @@
         <element>MASK</element>
       </onValueChangeTypes>
     </entityField>
-    <entityField>
-      <name>EMPLOYEE_OBJECTTYPE</name>
-      <valueProcess>%aditoprj%/entity/Employee_entity/entityfields/employee_objecttype/valueProcess.js</valueProcess>
-    </entityField>
   </entityFields>
   <recordContainers>
     <jDitoRecordContainer>
diff --git a/entity/Employee_entity/entityfields/employee_objecttype/valueProcess.js b/entity/Employee_entity/entityfields/employee_objecttype/valueProcess.js
deleted file mode 100644
index a78f6195ba..0000000000
--- a/entity/Employee_entity/entityfields/employee_objecttype/valueProcess.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import("system.result");
-
-result.string("Employee");
\ No newline at end of file
diff --git a/entity/ExportTemplate_entity/ExportTemplate_entity.aod b/entity/ExportTemplate_entity/ExportTemplate_entity.aod
index b6614896d8..70951a03db 100644
--- a/entity/ExportTemplate_entity/ExportTemplate_entity.aod
+++ b/entity/ExportTemplate_entity/ExportTemplate_entity.aod
@@ -7,6 +7,7 @@
   <grantCreate v="true" />
   <grantUpdate v="true" />
   <grantDelete v="true" />
+  <contentTitleProcess>%aditoprj%/entity/ExportTemplate_entity/contentTitleProcess.js</contentTitleProcess>
   <useFavorites v="true" />
   <iconId>NEON:EXPORT</iconId>
   <titlePlural>Export Templates</titlePlural>
diff --git a/entity/ExportTemplate_entity/contentTitleProcess.js b/entity/ExportTemplate_entity/contentTitleProcess.js
new file mode 100644
index 0000000000..8c4a6496bf
--- /dev/null
+++ b/entity/ExportTemplate_entity/contentTitleProcess.js
@@ -0,0 +1,5 @@
+import("system.vars");
+import("system.result");
+
+
+result.string(vars.get("$field.TITLE"));
\ No newline at end of file
diff --git a/entity/Favorite_entity/Favorite_entity.aod b/entity/Favorite_entity/Favorite_entity.aod
index 58fde656e8..4b7853fc57 100644
--- a/entity/Favorite_entity/Favorite_entity.aod
+++ b/entity/Favorite_entity/Favorite_entity.aod
@@ -37,7 +37,6 @@
     <entityField>
       <name>GROUP_TITLE</name>
       <titleProcess>%aditoprj%/entity/Favorite_entity/entityfields/group_title/titleProcess.js</titleProcess>
-      <displayValueProcess>%aditoprj%/entity/Favorite_entity/entityfields/group_title/displayValueProcess.js</displayValueProcess>
     </entityField>
     <entityField>
       <name>GROUP_TYPE</name>
diff --git a/entity/Favorite_entity/entityfields/group_title/displayValueProcess.js b/entity/Favorite_entity/entityfields/group_title/displayValueProcess.js
deleted file mode 100644
index f0d364ec30..0000000000
--- a/entity/Favorite_entity/entityfields/group_title/displayValueProcess.js
+++ /dev/null
@@ -1,8 +0,0 @@
-import("system.vars");
-import("system.result");
-import("system.translate");
-
-
-if(vars.get("$field.GROUP_TITLE").equals(""))
-//    result.string(translate.text("Standard"))
-    result.string("Standard");
\ No newline at end of file
diff --git a/entity/Favorite_entity/entityfields/title/titleProcess.js b/entity/Favorite_entity/entityfields/title/titleProcess.js
index 2beec1320b..9a8ab89ba0 100644
--- a/entity/Favorite_entity/entityfields/title/titleProcess.js
+++ b/entity/Favorite_entity/entityfields/title/titleProcess.js
@@ -1,4 +1,4 @@
 import("system.result");
 import("system.translate");
 
-result.string(translate.text("Name"));
\ No newline at end of file
+result.string(translate.text("Title"));
\ No newline at end of file
diff --git a/entity/Favorite_entity/recordcontainers/jditorecordcontainer/contentProcess.js b/entity/Favorite_entity/recordcontainers/jditorecordcontainer/contentProcess.js
index 183c191aca..bc9d655212 100644
--- a/entity/Favorite_entity/recordcontainers/jditorecordcontainer/contentProcess.js
+++ b/entity/Favorite_entity/recordcontainers/jditorecordcontainer/contentProcess.js
@@ -95,9 +95,9 @@ function isValid(value, filter)
         case "NOT_CONTAINS":
             return !value.includes(filterValue);
         case "ISNULL":
-            return value == null;
+            return value == null || value === "";
         case "ISNOTNULL":
-            return value != null;
+            return value != null && value !== "";
     }
     
     return false;
diff --git a/entity/Favorite_entity/recordcontainers/jditorecordcontainer/filterextensions/groupgroupnameextension/filterValuesProcess.js b/entity/Favorite_entity/recordcontainers/jditorecordcontainer/filterextensions/groupgroupnameextension/filterValuesProcess.js
index 9d02b256cd..5c92d12cfb 100644
--- a/entity/Favorite_entity/recordcontainers/jditorecordcontainer/filterextensions/groupgroupnameextension/filterValuesProcess.js
+++ b/entity/Favorite_entity/recordcontainers/jditorecordcontainer/filterextensions/groupgroupnameextension/filterValuesProcess.js
@@ -15,7 +15,7 @@ var groupNames = (new SqlBuilder()).selectDistinct("ASYS_RECORDGROUP.TITLE")
                         .arrayColumn();
                         
 groupNames.forEach(element => {
-   allTypes.push([element, element]); 
+       allTypes.push([element, element]); 
 });
 
 result.object(Array.from(allTypes));
diff --git a/entity/Productprice_entity/Productprice_entity.aod b/entity/Productprice_entity/Productprice_entity.aod
index ea43f8afdd..aa0b3db458 100644
--- a/entity/Productprice_entity/Productprice_entity.aod
+++ b/entity/Productprice_entity/Productprice_entity.aod
@@ -9,7 +9,7 @@
     <element>Product_entity</element>
   </siblings>
   <onValidation>%aditoprj%/entity/Productprice_entity/onValidation.js</onValidation>
-  <useFavorites v="true" />
+  <useFavorites v="false" />
   <titlePlural>Prices</titlePlural>
   <recordContainer>db</recordContainer>
   <entityFields>
@@ -230,10 +230,6 @@
         <fieldName>#PROVIDER</fieldName>
       </dependency>
     </entityConsumer>
-    <entityField>
-      <name>PRODUCTPRICE_OBJECTTYPE</name>
-      <valueProcess>%aditoprj%/entity/Productprice_entity/entityfields/productprice_objecttype/valueProcess.js</valueProcess>
-    </entityField>
   </entityFields>
   <recordContainers>
     <dbRecordContainer>
diff --git a/entity/Productprice_entity/entityfields/productprice_objecttype/valueProcess.js b/entity/Productprice_entity/entityfields/productprice_objecttype/valueProcess.js
deleted file mode 100644
index 4296d2e68b..0000000000
--- a/entity/Productprice_entity/entityfields/productprice_objecttype/valueProcess.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import("system.result");
-
-result.string("Productprice");
\ No newline at end of file
diff --git a/neonView/EmployeePreview_view/EmployeePreview_view.aod b/neonView/EmployeePreview_view/EmployeePreview_view.aod
index ce68cd2619..576e510759 100644
--- a/neonView/EmployeePreview_view/EmployeePreview_view.aod
+++ b/neonView/EmployeePreview_view/EmployeePreview_view.aod
@@ -16,13 +16,6 @@
       <subtitleField>TITLE</subtitleField>
       <entityField>#ENTITY</entityField>
     </cardViewTemplate>
-    <favoriteViewTemplate>
-      <name>Favorite</name>
-      <objectType>EMPLOYEE_OBJECTTYPE</objectType>
-      <rowId>SHORT_UID</rowId>
-      <entityField>#ENTITY</entityField>
-      <title>favorite</title>
-    </favoriteViewTemplate>
     <genericViewTemplate>
       <name>Info</name>
       <showDrawer v="true" />
diff --git a/neonView/ProductpricePreview_view/ProductpricePreview_view.aod b/neonView/ProductpricePreview_view/ProductpricePreview_view.aod
index 78fe704e10..bf1fad13d5 100644
--- a/neonView/ProductpricePreview_view/ProductpricePreview_view.aod
+++ b/neonView/ProductpricePreview_view/ProductpricePreview_view.aod
@@ -16,13 +16,6 @@
       <subtitleField>PRODUCT_ID</subtitleField>
       <entityField>#ENTITY</entityField>
     </cardViewTemplate>
-    <favoriteViewTemplate>
-      <name>Favorites</name>
-      <objectType>PRODUCTPRICE_OBJECTTYPE</objectType>
-      <rowId>#UID</rowId>
-      <entityField>#ENTITY</entityField>
-      <title>favorites</title>
-    </favoriteViewTemplate>
     <genericViewTemplate>
       <name>PriceInfo</name>
       <showDrawer v="true" />
-- 
GitLab


From aa2f7c8c56cf1dbe6c99ea4e7ef477edc8fe8b3c Mon Sep 17 00:00:00 2001
From: "a.schindlbeck" <a.schindlbeck@adito.de>
Date: Fri, 14 Aug 2020 15:54:12 +0200
Subject: [PATCH 157/309] #1060652 Favorites: last tweaks regarding user
 experience

---
 entity/Contract_entity/Contract_entity.aod    |  1 +
 entity/Contract_entity/imageProcess.js        |  4 ++
 .../DocumentTemplate_entity.aod               |  1 +
 .../DocumentTemplate_entity/imageProcess.js   |  4 ++
 entity/Favorite_entity/Favorite_entity.aod    | 10 ++-
 .../entityfields/group_title/titleProcess.js  |  4 --
 .../entityfields/object_type/titleProcess.js  |  4 --
 .../entityfields/picture/titleProcess.js      |  4 --
 entity/Offer_entity/Offer_entity.aod          |  1 +
 entity/Offer_entity/imageProcess.js           |  5 ++
 .../Salesproject_entity.aod                   |  1 +
 entity/Salesproject_entity/imageProcess.js    |  4 ++
 .../FavoriteFilter_view.aod                   | 62 +++++++------------
 13 files changed, 52 insertions(+), 53 deletions(-)
 create mode 100644 entity/Contract_entity/imageProcess.js
 create mode 100644 entity/DocumentTemplate_entity/imageProcess.js
 delete mode 100644 entity/Favorite_entity/entityfields/group_title/titleProcess.js
 delete mode 100644 entity/Favorite_entity/entityfields/object_type/titleProcess.js
 delete mode 100644 entity/Favorite_entity/entityfields/picture/titleProcess.js
 create mode 100644 entity/Offer_entity/imageProcess.js
 create mode 100644 entity/Salesproject_entity/imageProcess.js

diff --git a/entity/Contract_entity/Contract_entity.aod b/entity/Contract_entity/Contract_entity.aod
index 8a6ccfd90c..f9e87649e0 100644
--- a/entity/Contract_entity/Contract_entity.aod
+++ b/entity/Contract_entity/Contract_entity.aod
@@ -10,6 +10,7 @@
   <onValidation>%aditoprj%/entity/Contract_entity/onValidation.js</onValidation>
   <useFavorites v="true" />
   <iconId>VAADIN:FILE_TEXT</iconId>
+  <imageProcess>%aditoprj%/entity/Contract_entity/imageProcess.js</imageProcess>
   <titlePlural>Contracts</titlePlural>
   <recordContainer>db</recordContainer>
   <entityFields>
diff --git a/entity/Contract_entity/imageProcess.js b/entity/Contract_entity/imageProcess.js
new file mode 100644
index 0000000000..9a2de54348
--- /dev/null
+++ b/entity/Contract_entity/imageProcess.js
@@ -0,0 +1,4 @@
+import("system.vars");
+import("system.result");
+
+result.string("TEXT:" + vars.getString("$field.#CONTENTTITLE"));
\ No newline at end of file
diff --git a/entity/DocumentTemplate_entity/DocumentTemplate_entity.aod b/entity/DocumentTemplate_entity/DocumentTemplate_entity.aod
index 2536bd7173..f24ed1ecb4 100644
--- a/entity/DocumentTemplate_entity/DocumentTemplate_entity.aod
+++ b/entity/DocumentTemplate_entity/DocumentTemplate_entity.aod
@@ -10,6 +10,7 @@
   <onValidation>%aditoprj%/entity/DocumentTemplate_entity/onValidation.js</onValidation>
   <useFavorites v="true" />
   <iconId>VAADIN:FILE_FONT</iconId>
+  <imageProcess>%aditoprj%/entity/DocumentTemplate_entity/imageProcess.js</imageProcess>
   <titlePlural>Document templates</titlePlural>
   <recordContainer>db</recordContainer>
   <entityFields>
diff --git a/entity/DocumentTemplate_entity/imageProcess.js b/entity/DocumentTemplate_entity/imageProcess.js
new file mode 100644
index 0000000000..9a2de54348
--- /dev/null
+++ b/entity/DocumentTemplate_entity/imageProcess.js
@@ -0,0 +1,4 @@
+import("system.vars");
+import("system.result");
+
+result.string("TEXT:" + vars.getString("$field.#CONTENTTITLE"));
\ No newline at end of file
diff --git a/entity/Favorite_entity/Favorite_entity.aod b/entity/Favorite_entity/Favorite_entity.aod
index 4b7853fc57..a09195213b 100644
--- a/entity/Favorite_entity/Favorite_entity.aod
+++ b/entity/Favorite_entity/Favorite_entity.aod
@@ -4,6 +4,9 @@
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <icon>VAADIN:STAR</icon>
   <title>Favorite</title>
+  <siblings>
+    <element>Organisation_entity</element>
+  </siblings>
   <grantCreate v="true" />
   <grantUpdate v="true" />
   <grantDelete v="true" />
@@ -28,7 +31,8 @@
     </entityField>
     <entityField>
       <name>OBJECT_TYPE</name>
-      <titleProcess>%aditoprj%/entity/Favorite_entity/entityfields/object_type/titleProcess.js</titleProcess>
+      <title>Object type</title>
+      <groupable v="true" />
       <displayValueProcess>%aditoprj%/entity/Favorite_entity/entityfields/object_type/displayValueProcess.js</displayValueProcess>
     </entityField>
     <entityField>
@@ -36,7 +40,8 @@
     </entityField>
     <entityField>
       <name>GROUP_TITLE</name>
-      <titleProcess>%aditoprj%/entity/Favorite_entity/entityfields/group_title/titleProcess.js</titleProcess>
+      <title>Group name</title>
+      <groupable v="true" />
     </entityField>
     <entityField>
       <name>GROUP_TYPE</name>
@@ -50,7 +55,6 @@
     <entityField>
       <name>PICTURE</name>
       <contentType>IMAGE</contentType>
-      <titleProcess>%aditoprj%/entity/Favorite_entity/entityfields/picture/titleProcess.js</titleProcess>
     </entityField>
   </entityFields>
   <recordContainers>
diff --git a/entity/Favorite_entity/entityfields/group_title/titleProcess.js b/entity/Favorite_entity/entityfields/group_title/titleProcess.js
deleted file mode 100644
index 3e8ef82777..0000000000
--- a/entity/Favorite_entity/entityfields/group_title/titleProcess.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import("system.result");
-import("system.translate");
-
-result.string(translate.text("Group name"));
\ No newline at end of file
diff --git a/entity/Favorite_entity/entityfields/object_type/titleProcess.js b/entity/Favorite_entity/entityfields/object_type/titleProcess.js
deleted file mode 100644
index e3c4a0c310..0000000000
--- a/entity/Favorite_entity/entityfields/object_type/titleProcess.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import("system.result");
-import("system.translate");
-
-result.string(translate.text("Object type"));
\ No newline at end of file
diff --git a/entity/Favorite_entity/entityfields/picture/titleProcess.js b/entity/Favorite_entity/entityfields/picture/titleProcess.js
deleted file mode 100644
index 0eb9d89690..0000000000
--- a/entity/Favorite_entity/entityfields/picture/titleProcess.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import("system.result");
-import("system.translate");
-
-result.string(translate.text("Picture"));
\ No newline at end of file
diff --git a/entity/Offer_entity/Offer_entity.aod b/entity/Offer_entity/Offer_entity.aod
index 8d82f2247f..e2817e9ffc 100644
--- a/entity/Offer_entity/Offer_entity.aod
+++ b/entity/Offer_entity/Offer_entity.aod
@@ -14,6 +14,7 @@
   <afterOperatingState>%aditoprj%/entity/Offer_entity/afterOperatingState.js</afterOperatingState>
   <useFavorites v="true" />
   <iconId>VAADIN:CART</iconId>
+  <imageProcess>%aditoprj%/entity/Offer_entity/imageProcess.js</imageProcess>
   <titlePlural>Offers</titlePlural>
   <recordContainer>db</recordContainer>
   <entityFields>
diff --git a/entity/Offer_entity/imageProcess.js b/entity/Offer_entity/imageProcess.js
new file mode 100644
index 0000000000..6cdd3b6896
--- /dev/null
+++ b/entity/Offer_entity/imageProcess.js
@@ -0,0 +1,5 @@
+import("system.translate");
+import("system.vars");
+import("system.result");
+
+result.string("TEXT:" + translate.text("Offer"));
\ No newline at end of file
diff --git a/entity/Salesproject_entity/Salesproject_entity.aod b/entity/Salesproject_entity/Salesproject_entity.aod
index 5aee7c6855..1378d8e50b 100644
--- a/entity/Salesproject_entity/Salesproject_entity.aod
+++ b/entity/Salesproject_entity/Salesproject_entity.aod
@@ -14,6 +14,7 @@
   <afterOperatingState>%aditoprj%/entity/Salesproject_entity/afterOperatingState.js</afterOperatingState>
   <useFavorites v="true" />
   <iconId>VAADIN:BOOK_DOLLAR</iconId>
+  <imageProcess>%aditoprj%/entity/Salesproject_entity/imageProcess.js</imageProcess>
   <titlePlural>Sales Projects</titlePlural>
   <recordContainer>db</recordContainer>
   <entityFields>
diff --git a/entity/Salesproject_entity/imageProcess.js b/entity/Salesproject_entity/imageProcess.js
new file mode 100644
index 0000000000..9a2de54348
--- /dev/null
+++ b/entity/Salesproject_entity/imageProcess.js
@@ -0,0 +1,4 @@
+import("system.vars");
+import("system.result");
+
+result.string("TEXT:" + vars.getString("$field.#CONTENTTITLE"));
\ No newline at end of file
diff --git a/neonView/FavoriteFilter_view/FavoriteFilter_view.aod b/neonView/FavoriteFilter_view/FavoriteFilter_view.aod
index dc33a0e2aa..5e74eef55d 100644
--- a/neonView/FavoriteFilter_view/FavoriteFilter_view.aod
+++ b/neonView/FavoriteFilter_view/FavoriteFilter_view.aod
@@ -4,55 +4,45 @@
   <title>FavoriteFilter_view</title>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <filterable v="true" />
+  <dashletConfigurations>
+    <neonDashletConfiguration>
+      <name>favoriteDashletConfiguration</name>
+      <title>favorites</title>
+      <description>Shows all favorites set by an specific user.</description>
+      <fragment>Favorite/filter?grouping=GROUP_TITLE</fragment>
+      <fragmentCustomizable v="true" />
+      <provider></provider>
+      <icon>VAADIN:STAR</icon>
+      <categories>
+        <neonDashletCategory>
+          <name>favorites</name>
+          <title>Favorites</title>
+        </neonDashletCategory>
+      </categories>
+    </neonDashletConfiguration>
+  </dashletConfigurations>
   <layout>
     <groupLayout>
       <name>layout</name>
     </groupLayout>
   </layout>
   <children>
-    <tableViewTemplate>
-      <name>FavoriteFilter</name>
-      <iconField>#IMAGE</iconField>
-      <titleField>TITLE</titleField>
-      <entityField>#ENTITY</entityField>
-      <linkedColumns>
-        <element>PICTURE</element>
-        <element>OBJECT_TYPE</element>
-        <element>TITLE</element>
-        <element>GROUP_TITLE</element>
-      </linkedColumns>
-      <fixedFilterFields />
-      <isCreatable v="false" />
-      <isEditable v="false" />
-      <title>favoriteFilter_view</title>
-      <columns>
-        <neonTableColumn>
-          <name>a87e6491-7d8a-4009-9da8-c72348c22b4a</name>
-          <entityField>PICTURE</entityField>
-        </neonTableColumn>
-        <neonTableColumn>
-          <name>b235f917-4c59-4b8a-be07-ea5371f69f3b</name>
-          <entityField>OBJECT_TYPE</entityField>
-        </neonTableColumn>
-        <neonTableColumn>
-          <name>075e4e29-515c-4d9e-b195-f481af367b42</name>
-          <entityField>TITLE</entityField>
-        </neonTableColumn>
-        <neonTableColumn>
-          <name>929170b5-b460-4558-9aa6-f7657f49098c</name>
-          <entityField>GROUP_TITLE</entityField>
-        </neonTableColumn>
-      </columns>
-    </tableViewTemplate>
     <treeTableViewTemplate>
       <name>FavoriteTree</name>
       <parentField>TITLE</parentField>
+      <defaultGroupFields>
+        <element>GROUP_TITLE</element>
+      </defaultGroupFields>
       <entityField>#ENTITY</entityField>
       <columns>
         <neonTreeTableColumn>
           <name>3f35104a-7ccc-44aa-8b9a-9de31d410f81</name>
           <entityField>PICTURE</entityField>
         </neonTreeTableColumn>
+        <neonTreeTableColumn>
+          <name>d6e9557d-1368-4bc3-8638-fa01e24fcbf3</name>
+          <entityField>GROUP_TITLE</entityField>
+        </neonTreeTableColumn>
         <neonTreeTableColumn>
           <name>b7660bdb-7ae4-46c5-a0a6-5127244bfcf8</name>
           <entityField>OBJECT_TYPE</entityField>
@@ -61,10 +51,6 @@
           <name>d68cc010-2d84-43d1-a333-39f9fdd3a23a</name>
           <entityField>TITLE</entityField>
         </neonTreeTableColumn>
-        <neonTreeTableColumn>
-          <name>d6e9557d-1368-4bc3-8638-fa01e24fcbf3</name>
-          <entityField>GROUP_TITLE</entityField>
-        </neonTreeTableColumn>
       </columns>
     </treeTableViewTemplate>
   </children>
-- 
GitLab


From 1d42fa14e4c273b645608da32709ea67fd202555 Mon Sep 17 00:00:00 2001
From: "a.schindlbeck" <a.schindlbeck@ASCHINDLBECK.aditosoftware.local>
Date: Mon, 17 Aug 2020 08:10:16 +0200
Subject: [PATCH 158/309] #1060652 Favorites: image Processes

---
 entity/ExportTemplate_entity/ExportTemplate_entity.aod | 1 +
 entity/ExportTemplate_entity/imageProcess.js           | 4 ++++
 entity/Order_entity/Order_entity.aod                   | 1 +
 entity/Order_entity/imageProcess.js                    | 4 ++++
 entity/SupportTicket_entity/SupportTicket_entity.aod   | 1 +
 entity/SupportTicket_entity/contentTitleProcess.js     | 2 +-
 entity/SupportTicket_entity/imageProcess.js            | 4 ++++
 7 files changed, 16 insertions(+), 1 deletion(-)
 create mode 100644 entity/ExportTemplate_entity/imageProcess.js
 create mode 100644 entity/Order_entity/imageProcess.js
 create mode 100644 entity/SupportTicket_entity/imageProcess.js

diff --git a/entity/ExportTemplate_entity/ExportTemplate_entity.aod b/entity/ExportTemplate_entity/ExportTemplate_entity.aod
index 70951a03db..e1b4d851dc 100644
--- a/entity/ExportTemplate_entity/ExportTemplate_entity.aod
+++ b/entity/ExportTemplate_entity/ExportTemplate_entity.aod
@@ -10,6 +10,7 @@
   <contentTitleProcess>%aditoprj%/entity/ExportTemplate_entity/contentTitleProcess.js</contentTitleProcess>
   <useFavorites v="true" />
   <iconId>NEON:EXPORT</iconId>
+  <imageProcess>%aditoprj%/entity/ExportTemplate_entity/imageProcess.js</imageProcess>
   <titlePlural>Export Templates</titlePlural>
   <recordContainer>db</recordContainer>
   <entityFields>
diff --git a/entity/ExportTemplate_entity/imageProcess.js b/entity/ExportTemplate_entity/imageProcess.js
new file mode 100644
index 0000000000..994135211b
--- /dev/null
+++ b/entity/ExportTemplate_entity/imageProcess.js
@@ -0,0 +1,4 @@
+import("system.vars");
+import("system.result");
+
+result.string("TEXT:"+vars.get("$field.TITLE"));
\ No newline at end of file
diff --git a/entity/Order_entity/Order_entity.aod b/entity/Order_entity/Order_entity.aod
index e040ec1ef9..cfcb234bc5 100644
--- a/entity/Order_entity/Order_entity.aod
+++ b/entity/Order_entity/Order_entity.aod
@@ -9,6 +9,7 @@
   <afterUiInit>%aditoprj%/entity/Order_entity/afterUiInit.js</afterUiInit>
   <useFavorites v="true" />
   <iconId>VAADIN:DOLLAR</iconId>
+  <imageProcess>%aditoprj%/entity/Order_entity/imageProcess.js</imageProcess>
   <titlePlural>Receipts</titlePlural>
   <recordContainer>db</recordContainer>
   <entityFields>
diff --git a/entity/Order_entity/imageProcess.js b/entity/Order_entity/imageProcess.js
new file mode 100644
index 0000000000..0895808ada
--- /dev/null
+++ b/entity/Order_entity/imageProcess.js
@@ -0,0 +1,4 @@
+import("system.vars");
+import("system.result");
+
+result.string("TEXT:"+vars.get("$field.FullOrderCode"));
\ No newline at end of file
diff --git a/entity/SupportTicket_entity/SupportTicket_entity.aod b/entity/SupportTicket_entity/SupportTicket_entity.aod
index 095a43105b..218470c687 100644
--- a/entity/SupportTicket_entity/SupportTicket_entity.aod
+++ b/entity/SupportTicket_entity/SupportTicket_entity.aod
@@ -9,6 +9,7 @@
   <onValidation>%aditoprj%/entity/SupportTicket_entity/onValidation.js</onValidation>
   <useFavorites v="true" />
   <iconId>VAADIN:CHAT</iconId>
+  <imageProcess>%aditoprj%/entity/SupportTicket_entity/imageProcess.js</imageProcess>
   <titlePlural>Support Tickets</titlePlural>
   <recordContainer>db</recordContainer>
   <entityFields>
diff --git a/entity/SupportTicket_entity/contentTitleProcess.js b/entity/SupportTicket_entity/contentTitleProcess.js
index d46871e044..aae1064b78 100644
--- a/entity/SupportTicket_entity/contentTitleProcess.js
+++ b/entity/SupportTicket_entity/contentTitleProcess.js
@@ -1,4 +1,4 @@
 import("system.vars");
 import("system.result");
 
-result.string(vars.get("$field.TICKETTYPE.displayValue"))
\ No newline at end of file
+result.string(vars.get("$field.TASK_SUBJECT"))
\ No newline at end of file
diff --git a/entity/SupportTicket_entity/imageProcess.js b/entity/SupportTicket_entity/imageProcess.js
new file mode 100644
index 0000000000..14bc9ba718
--- /dev/null
+++ b/entity/SupportTicket_entity/imageProcess.js
@@ -0,0 +1,4 @@
+import("system.vars");
+import("system.result");
+
+result.string("TEXT:"+vars.get("$field.TASK_SUBJECT"));
\ No newline at end of file
-- 
GitLab


From d68525c16fdbc490d19a6e6fccc1f9748ac46143 Mon Sep 17 00:00:00 2001
From: "a.schindlbeck" <a.schindlbeck@adito.de>
Date: Mon, 17 Aug 2020 10:08:58 +0200
Subject: [PATCH 159/309] #1060652 Favorites: image Processes Order fix

---
 entity/Order_entity/imageProcess.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/entity/Order_entity/imageProcess.js b/entity/Order_entity/imageProcess.js
index 0895808ada..1ba6b878be 100644
--- a/entity/Order_entity/imageProcess.js
+++ b/entity/Order_entity/imageProcess.js
@@ -1,4 +1,4 @@
 import("system.vars");
 import("system.result");
 
-result.string("TEXT:"+vars.get("$field.FullOrderCode"));
\ No newline at end of file
+result.string("TEXT:"+vars.get("$field.SALESORDERCODE"));
\ No newline at end of file
-- 
GitLab


From 684d76a73885ee8119f7ef611e2ff997c1cdbba0 Mon Sep 17 00:00:00 2001
From: Tom Lutzenberger <t.lutzenberger@adito.de>
Date: Mon, 17 Aug 2020 10:42:37 +0200
Subject: [PATCH 160/309] #1062069: Dokument-Preview in Tiles anzeigen

---
 entity/Document_entity/recordcontainers/jdito/contentProcess.js | 2 +-
 neonView/DocumentFilter_view/DocumentFilter_view.aod            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/entity/Document_entity/recordcontainers/jdito/contentProcess.js b/entity/Document_entity/recordcontainers/jdito/contentProcess.js
index ac587aa94d..6481d977a0 100644
--- a/entity/Document_entity/recordcontainers/jdito/contentProcess.js
+++ b/entity/Document_entity/recordcontainers/jdito/contentProcess.js
@@ -22,7 +22,7 @@ if(vars.exists("$param.AssignmentTable_param") &&
     if(vars.exists("$local.idvalues") && vars.get("$local.idvalues"))
         metadata = db.getBinaryMetadataForIds(vars.get("$local.idvalues"), true, alias)
     else
-        metadata = db.getBinaryMetadata(assignmentTable, assignmentName || "", assignmentRowId, false, alias, keyword);    
+        metadata = db.getBinaryMetadata(assignmentTable, assignmentName || "", assignmentRowId, true, alias, keyword);    
 
     // Iterate through found binary data and populate result array    
     for( var i = 0; i < metadata.length; i++) {
diff --git a/neonView/DocumentFilter_view/DocumentFilter_view.aod b/neonView/DocumentFilter_view/DocumentFilter_view.aod
index 3da41e270a..76cd35ba1d 100644
--- a/neonView/DocumentFilter_view/DocumentFilter_view.aod
+++ b/neonView/DocumentFilter_view/DocumentFilter_view.aod
@@ -11,7 +11,7 @@
   <children>
     <tilesViewTemplate>
       <name>Tiles</name>
-      <iconField>ICON</iconField>
+      <iconField>PREVIEW_IMAGE</iconField>
       <titleField>NAME</titleField>
       <subtitleField>TYPE</subtitleField>
       <descriptionField>SIZE</descriptionField>
-- 
GitLab


From c7514e97251f3d89290d7ccff54ec1602edcee43 Mon Sep 17 00:00:00 2001
From: "a.schindlbeck" <a.schindlbeck@adito.de>
Date: Mon, 17 Aug 2020 15:00:30 +0200
Subject: [PATCH 161/309] #1060652 Favorites: tanslations bugfixes

---
 .../organisation_objecttype/valueProcess.js   |  3 +++
 .../person_objecttype/valueProcess.js         |  4 ++++
 .../_____LANGUAGE_EXTRA.aod                   | 10 ++++-----
 .../_____LANGUAGE_de/_____LANGUAGE_de.aod     | 21 +++++++++++--------
 .../_____LANGUAGE_en/_____LANGUAGE_en.aod     | 10 ++++-----
 .../FavoriteFilter_view.aod                   |  4 ++--
 6 files changed, 31 insertions(+), 21 deletions(-)
 create mode 100644 entity/Organisation_entity/entityfields/organisation_objecttype/valueProcess.js
 create mode 100644 entity/Person_entity/entityfields/person_objecttype/valueProcess.js

diff --git a/entity/Organisation_entity/entityfields/organisation_objecttype/valueProcess.js b/entity/Organisation_entity/entityfields/organisation_objecttype/valueProcess.js
new file mode 100644
index 0000000000..9e359dfbd0
--- /dev/null
+++ b/entity/Organisation_entity/entityfields/organisation_objecttype/valueProcess.js
@@ -0,0 +1,3 @@
+import("system.result");
+
+result.string("Organisation");
\ No newline at end of file
diff --git a/entity/Person_entity/entityfields/person_objecttype/valueProcess.js b/entity/Person_entity/entityfields/person_objecttype/valueProcess.js
new file mode 100644
index 0000000000..2117b3614a
--- /dev/null
+++ b/entity/Person_entity/entityfields/person_objecttype/valueProcess.js
@@ -0,0 +1,4 @@
+import("system.result");
+
+
+result.string("Person");
\ No newline at end of file
diff --git a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
index 0bc0d24b6c..1f0cc08719 100644
--- a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
+++ b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
@@ -7011,19 +7011,19 @@
       <key>Settings</key>
     </entry>
     <entry>
-      <key>favorites</key>
+      <key>Latitude</key>
     </entry>
     <entry>
-      <key>Latitude</key>
+      <key>Longitude</key>
     </entry>
     <entry>
-      <key>favorite</key>
+      <key>Favorites</key>
     </entry>
     <entry>
-      <key>favorties</key>
+      <key>Favorite</key>
     </entry>
     <entry>
-      <key>Longitude</key>
+      <key>Show all Favorites</key>
     </entry>
   </keyValueMap>
   <font name="Dialog" style="0" size="11" />
diff --git a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
index f025cec028..0ebd6ea6b1 100644
--- a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
+++ b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
@@ -2434,6 +2434,10 @@
       <key>Mayotte</key>
       <value>Mayotte</value>
     </entry>
+    <entry>
+      <key>Favorite</key>
+      <value>Favorit</value>
+    </entry>
     <entry>
       <key>Israel</key>
       <value>Israel</value>
@@ -3288,6 +3292,10 @@
       <key>Anguilla</key>
       <value>Anguilla</value>
     </entry>
+    <entry>
+      <key>Favorites</key>
+      <value>Favoriten</value>
+    </entry>
     <entry>
       <key>Euro</key>
       <value>Euro</value>
@@ -3340,6 +3348,10 @@
       <key>Turkmenistan</key>
       <value>Turkmenistan</value>
     </entry>
+    <entry>
+      <key>Show all Favorites</key>
+      <value>Alle Favoriten anzeigen</value>
+    </entry>
     <entry>
       <key>Venezuela (Bolivarian Republic of)</key>
       <value>Venezuela (Bolivarische Republik)</value>
@@ -8944,18 +8956,9 @@ Bitte Datumseingabe prüfen</value>
     <entry>
       <key>download ready</key>
     </entry>
-    <entry>
-      <key>favorites</key>
-    </entry>
     <entry>
       <key>Latitude</key>
     </entry>
-    <entry>
-      <key>favorite</key>
-    </entry>
-    <entry>
-      <key>favorties</key>
-    </entry>
     <entry>
       <key>Longitude</key>
     </entry>
diff --git a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
index dc7c1be278..3c8df2ee9b 100644
--- a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
+++ b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
@@ -7078,19 +7078,19 @@
       <key>Settings</key>
     </entry>
     <entry>
-      <key>favorites</key>
+      <key>Latitude</key>
     </entry>
     <entry>
-      <key>Latitude</key>
+      <key>Longitude</key>
     </entry>
     <entry>
-      <key>favorite</key>
+      <key>Favorites</key>
     </entry>
     <entry>
-      <key>favorties</key>
+      <key>Favorite</key>
     </entry>
     <entry>
-      <key>Longitude</key>
+      <key>Show all Favorites</key>
     </entry>
   </keyValueMap>
   <font name="Dialog" style="0" size="11" />
diff --git a/neonView/FavoriteFilter_view/FavoriteFilter_view.aod b/neonView/FavoriteFilter_view/FavoriteFilter_view.aod
index 5e74eef55d..9e6f008225 100644
--- a/neonView/FavoriteFilter_view/FavoriteFilter_view.aod
+++ b/neonView/FavoriteFilter_view/FavoriteFilter_view.aod
@@ -7,8 +7,8 @@
   <dashletConfigurations>
     <neonDashletConfiguration>
       <name>favoriteDashletConfiguration</name>
-      <title>favorites</title>
-      <description>Shows all favorites set by an specific user.</description>
+      <title>Favorites</title>
+      <description>Show all Favorites</description>
       <fragment>Favorite/filter?grouping=GROUP_TITLE</fragment>
       <fragmentCustomizable v="true" />
       <provider></provider>
-- 
GitLab


From ecc8c5034c42d06e9459a388432fb290fc634b76 Mon Sep 17 00:00:00 2001
From: "a.schindlbeck" <a.schindlbeck@adito.de>
Date: Mon, 17 Aug 2020 15:00:30 +0200
Subject: [PATCH 162/309] #1060652 Favorites: tanslations bugfixes

---
 entity/Favorite_entity/Favorite_entity.aod                  | 1 +
 .../entityfields/group_title/displayValueProcess.js         | 6 ++++++
 .../groupgroupnameextension/filterValuesProcess.js          | 3 +++
 language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod        | 3 +++
 language/_____LANGUAGE_de/_____LANGUAGE_de.aod              | 4 ++++
 language/_____LANGUAGE_en/_____LANGUAGE_en.aod              | 3 +++
 6 files changed, 20 insertions(+)
 create mode 100644 entity/Favorite_entity/entityfields/group_title/displayValueProcess.js

diff --git a/entity/Favorite_entity/Favorite_entity.aod b/entity/Favorite_entity/Favorite_entity.aod
index a09195213b..1abaa9d435 100644
--- a/entity/Favorite_entity/Favorite_entity.aod
+++ b/entity/Favorite_entity/Favorite_entity.aod
@@ -42,6 +42,7 @@
       <name>GROUP_TITLE</name>
       <title>Group name</title>
       <groupable v="true" />
+      <displayValueProcess>%aditoprj%/entity/Favorite_entity/entityfields/group_title/displayValueProcess.js</displayValueProcess>
     </entityField>
     <entityField>
       <name>GROUP_TYPE</name>
diff --git a/entity/Favorite_entity/entityfields/group_title/displayValueProcess.js b/entity/Favorite_entity/entityfields/group_title/displayValueProcess.js
new file mode 100644
index 0000000000..7aed37bfce
--- /dev/null
+++ b/entity/Favorite_entity/entityfields/group_title/displayValueProcess.js
@@ -0,0 +1,6 @@
+import("system.vars");
+import("system.result");
+import("system.translate");
+
+
+result.string(translate.text(vars.get("$field.GROUP_TITLE")));
\ No newline at end of file
diff --git a/entity/Favorite_entity/recordcontainers/jditorecordcontainer/filterextensions/groupgroupnameextension/filterValuesProcess.js b/entity/Favorite_entity/recordcontainers/jditorecordcontainer/filterextensions/groupgroupnameextension/filterValuesProcess.js
index 5c92d12cfb..34c4eb2d23 100644
--- a/entity/Favorite_entity/recordcontainers/jditorecordcontainer/filterextensions/groupgroupnameextension/filterValuesProcess.js
+++ b/entity/Favorite_entity/recordcontainers/jditorecordcontainer/filterextensions/groupgroupnameextension/filterValuesProcess.js
@@ -15,6 +15,9 @@ var groupNames = (new SqlBuilder()).selectDistinct("ASYS_RECORDGROUP.TITLE")
                         .arrayColumn();
                         
 groupNames.forEach(element => {
+    if(element.equals("Default"))
+       allTypes.push([element, translate.text(element)]);
+    else
        allTypes.push([element, element]); 
 });
 
diff --git a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
index 1f0cc08719..057fb03cf8 100644
--- a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
+++ b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
@@ -7025,6 +7025,9 @@
     <entry>
       <key>Show all Favorites</key>
     </entry>
+    <entry>
+      <key>Default</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 0ebd6ea6b1..1fcd3a3b95 100644
--- a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
+++ b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
@@ -1032,6 +1032,10 @@
       <key>City</key>
       <value>Stadt</value>
     </entry>
+    <entry>
+      <key>Default</key>
+      <value>Standard</value>
+    </entry>
     <entry>
       <key>Region</key>
       <value>Gebiet</value>
diff --git a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
index 3c8df2ee9b..0e8d5a2949 100644
--- a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
+++ b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
@@ -7092,6 +7092,9 @@
     <entry>
       <key>Show all Favorites</key>
     </entry>
+    <entry>
+      <key>Default</key>
+    </entry>
   </keyValueMap>
   <font name="Dialog" style="0" size="11" />
 </language>
-- 
GitLab


From b385df69fd77c0071957c286fded8f33dac75eff Mon Sep 17 00:00:00 2001
From: "S.Listl" <s.listl@adito.de>
Date: Mon, 17 Aug 2020 16:24:27 +0200
Subject: [PATCH 163/309] Util_lib general Utils functions added

---
 process/Util_lib/process.js | 173 ++++++++++++++++++++++++++++++++++++
 1 file changed, 173 insertions(+)

diff --git a/process/Util_lib/process.js b/process/Util_lib/process.js
index 25765c5842..b005263bfa 100644
--- a/process/Util_lib/process.js
+++ b/process/Util_lib/process.js
@@ -15,6 +15,177 @@ import("system.datetime");
 import("Offer_lib");
 import("Date_lib");
 
+
+/**
+ * Provides static utility functions that work for more than a single data type.
+ * Don't instanciate it.
+ */
+function Utils () {}
+
+/**
+ * Checks if the given object, array or string is empty.
+ * 
+ * @param {Object|Array|String} pObject the object to check
+ * @return {Boolean} true if the object is empty
+ */
+Utils.isEmpty = function (pObject)
+{
+    if (Utils.isString(pObject) || Array.isArray(pObject))
+        return pObject.length === 0;
+    for (let key in pObject)
+    {
+        return false;
+    }
+    return true;
+}
+
+/**
+ * Checks if the given value is null, undefined or empty.
+ * 
+ * @param {Object|Array|String} pObject the object to check
+ * @return {Boolean} true if the object is null, undefined or empty
+ */
+Utils.isNullOrEmpty = function (pObject)
+{
+    return pObject === null || pObject === undefined || Utils.isEmpty(pObject);
+}
+
+/**
+ * Creates a deep copy of the given object. Also works with arrays.
+ * 
+ * @param {Object} pObject the object to create a copy of
+ * @return {Object} the cloned object
+ * @example
+ * 
+ * var original = new MyObject();
+ * original.name = "Jotaro";
+ * 
+ * var copy = ObjectUtils.clone(original);
+ * copy.name = "Josuke";
+ * 
+ * logging.log(original.name != copy.name);    //true
+ * logging.log(copy instanceof MyObject());    //true (prototypes are set correctly)
+ */
+Utils.clone = function (pObject)
+{
+    if (!Utils.isObject(pObject) || pObject === null)
+        return pObject; //Return the value if inObject is not an object
+    
+    var clonedObject = Array.isArray(pObject) 
+        ? [] 
+        : Object.create(Object.getPrototypeOf(pObject)); //set the prototype of the given object
+
+    for (let key in pObject) 
+    {
+        var value = pObject[key];
+        clonedObject[key] = Utils.clone(value); //Recursively (deep) copy for nested objects, including arrays
+    }
+
+    return clonedObject;
+}
+
+/**
+ * Checks two values or objects for deep equality. The following rules apply:
+ * <ul>
+ *      <li>primitive values are tested for strict equality (===)</li>
+ *      <li>NaN and NaN are treated as equal</li>
+ *      <li>objects are checked if they have exactly the same properties and values</li>
+ *      <li>arrays are checked if they are equal</li>
+ *      <li>an array is never equal to an object</li>
+ * </ul>
+ * 
+ * @param {Object} pFirstObject the first value
+ * @param {Object} pSecondObject the second value
+ * @return {Boolean} true, if both values are equal
+ */
+Utils.isEqual = function (pFirstObject, pSecondObject)
+{
+    var firstType = typeof pFirstObject;
+    var secondType = typeof pSecondObject;
+    if (firstType !== secondType)
+        return false;
+    if (firstType === "object" && pFirstObject !== null && pSecondObject !== null) //check for null because typeof null is also "object"
+    {
+        var isFirstArray = Array.isArray(pFirstObject);
+        var isSecondArray = Array.isArray(pSecondObject);
+        if (isFirstArray !== isSecondArray) //return false if only one object is an array
+            return false;
+        if (isFirstArray && pFirstObject.length !== pSecondObject.length)
+            return false;
+        
+        for (let key in pSecondObject)
+        {
+            if (!(key in pFirstObject))
+                return false;
+        }
+        for (let key in pFirstObject)
+        {
+            if (!(key in pSecondObject) || !Utils.isEqual(pFirstObject[key], pSecondObject[key]))
+                return false;
+        }
+        return true;
+    }
+    if (firstType === "number" && Number.isNaN(pFirstObject) && Number.isNaN(pSecondObject)) //NaN should be equal to NaN
+        return true;
+    
+    return pFirstObject === pSecondObject;
+}
+
+/**
+ * Checks if the given value is a function.
+ * 
+ * @param {Object} pObject the value to check
+ * @return {Boolean} true if the value is a function
+ */
+Utils.isFunction = function (pObject)
+{
+    return typeof pObject === "function";
+}
+
+/**
+ * Checks if the given value is a string.
+ * 
+ * @param {Object} pObject the value to check
+ * @return {Boolean} true if the value is a string
+ */
+Utils.isString = function (pObject)
+{
+    return typeof pObject === "string";
+}
+
+/**
+ * Checks if the given value is a number.
+ * 
+ * @param {Object} pObject the value to check
+ * @return {Boolean} true if the value is a number
+ */
+Utils.isNumber = function (pObject)
+{
+    return typeof pObject === "number";
+}
+
+/**
+ * Checks if the given value is an object. Be careful, null is also considered "object".
+ * 
+ * @param {Object} pObject the value to check
+ * @return {Boolean} true if the value is an object
+ */
+Utils.isObject = function (pObject)
+{
+    return typeof pObject === "object";
+}
+
+/**
+ * Checks if the given value is a boolean.
+ * 
+ * @param {Object} pObject the value to check
+ * @return {Boolean} true if the value is a boolean
+ */
+Utils.isBoolean = function (pObject)
+{
+    return typeof pObject === "boolean";
+}
+
 /**
  * Class containing static utility functions for regular expression objects (RegExp)
  * Do not create an instance of this
@@ -394,6 +565,8 @@ ArrayUtils.sortMulti = function(targetArray, sortOrder) {
 }
 
 /**
+* @deprecated just use Array.prototype.splice
+*
 * removes an specific element from an array
 *
 * @param {Array} targetArray Array from which the element should be removed
-- 
GitLab


From 8c8a08ba6a91fb0c4446a9eca25d5eb96c59d096 Mon Sep 17 00:00:00 2001
From: "S.Listl" <s.listl@adito.de>
Date: Mon, 17 Aug 2020 16:29:34 +0200
Subject: [PATCH 164/309] #1060558 LocationFinder object for searching address
 locations

---
 process/Address_lib/process.js              |  68 +++-
 process/Location_lib/process.js             |  95 ++++-
 process/WsValidation_lib/documentation.adoc |  66 +++-
 process/WsValidation_lib/process.js         | 405 +++++++++++---------
 4 files changed, 427 insertions(+), 207 deletions(-)

diff --git a/process/Address_lib/process.js b/process/Address_lib/process.js
index ecd34ddbbc..dbbe4e390c 100644
--- a/process/Address_lib/process.js
+++ b/process/Address_lib/process.js
@@ -1,4 +1,3 @@
-import("system.swing");
 import("system.text");
 import("system.db");
 import("system.logging");
@@ -11,6 +10,73 @@ import("Util_lib");
 import("DocumentTemplate_lib");
 
 
+function AddressObject (pAddress, pBuildingNo, pZipCode, pCity, pCountry, pState)
+{
+    this.address = pAddress;
+    this.buildingNo = pBuildingNo;
+    this.zipCode = pZipCode;
+    this.city = pCity;
+    this.country = pCountry;
+    this.state = pState;
+    this.addressAddition = null;
+    this.addressIdentifier = null;
+    this.district = null;
+    this.region = null;
+}
+
+function AddressParts () {}
+
+AddressParts.ADDRESS = function ()
+{
+    return "address";
+}
+
+AddressParts.BUILDINGNO = function ()
+{
+    return "buildingNo";
+}
+
+AddressParts.ZIPCODE = function ()
+{
+    return "zipCode";
+}
+
+AddressParts.CITY = function ()
+{
+    return "city";
+}
+
+AddressParts.COUNTRY = function ()
+{
+    return "country";
+}
+
+AddressParts.STATE = function ()
+{
+    return "state";
+}
+
+AddressParts.ADDRESSADDITION = function ()
+{
+    return "addressAddition";
+}
+
+AddressParts.ADDRESSIDENTIFIER = function ()
+{
+    return "addressIdentifier";
+}
+
+AddressParts.DISTRICT = function ()
+{
+    return "district";
+}
+
+AddressParts.REGION = function ()
+{
+    return "region";
+}
+
+
 // TODO: muss überarbeitet werden / evtl neu gemacht werden
 
 /*
diff --git a/process/Location_lib/process.js b/process/Location_lib/process.js
index 5c24f993ce..96a3360c74 100644
--- a/process/Location_lib/process.js
+++ b/process/Location_lib/process.js
@@ -1,5 +1,8 @@
+import("system.logging");
+import("Address_lib");
 import("Util_lib");
 import("system.eMath");
+import("WsValidation_lib");
 
 function GeoLocationUtils () {}
 
@@ -160,28 +163,90 @@ GeoLocationUtils.degreeToRadians = function (pAngle)
     return pAngle * Math.PI / 180;
 }
 
-function AreaSearchUtils () {}
+
+function LocationFinder ()
+{
+    this._minAccuracy = AddressParts.ZIPCODE();
+    this._accuracyOrder = [
+        AddressParts.BUILDINGNO(),
+        AddressParts.ADDRESS(),
+        AddressParts.ZIPCODE(),
+        AddressParts.CITY(),
+        AddressParts.STATE(),
+        AddressParts.COUNTRY()
+    ];
+    this._getLocationFn = LocationFinder._getLocationWithNominatim;
+    this._isServiceAvailable = WsValidationUtils.isWsEnabled("TYPE_FULLADDRESS_NOMINATIM");
+}
 
 /**
- * WIP
- * @ignore
+ * @param {AddressObject} pAddress
  */
-AreaSearchUtils.findOrganisationsInArea = function (pLatitude, pLongitude, pMaxDistance)
+LocationFinder._getLocationWithNominatim = function (pAddress)
 {
-    var locationData = [];
-    var locations = [];
-    
-    for (let i = 0, l = locationData.length; i < l; i++)
+    var parameters = {};
+    if (pAddress.address)
     {
-        let distance = GeoLocationUtils.distanceVincenty(pLatitude, pLongitude, locationData[i][0], locationData[i][1]);
-        if (distace <= pMaxDistance)
-            locations.push(locationData[i]);
+        if (pAddress.buildingNo)
+            parameters.street = pAddress.buildingNo + " " + pAddress.address;
+        else
+            parameters.street = pAddress.address;
     }
+    if (pAddress.city)
+        parameters.city = pAddress.city;
+    if (pAddress.zipCode)
+        parameters.postalcode = pAddress.zipCode;
+    if (pAddress.state)
+        parameters.state = pAddress.state;
+    if (pAddress.country)
+        parameters.country = pAddress.country;
+    
+    return WsValidationUtils.validate(null, "TYPE_FULLADDRESS_NOMINATIM", parameters);
+}
+
+LocationFinder.prototype.setLocationFindingFn = function (pLocationFn)
+{
+    if (typeof pLocationFn !== "function")
+        throw new TypeError(""); //TODO: error
+    this._getLocationFn = pLocationFn;
+    this._isServiceAvailable = true; //if a custom function is set, assume that it works
+    return this;
+}
+
+LocationFinder.prototype.setMinAccuracy = function (pAccuracy)
+{
+    this._minAccuracy = pAccuracy;
+    return this;
+}
+
+LocationFinder.prototype.getGeoLocation = function (pAddress)
+{
+    if (!this._isServiceAvailable)
+        return null;
     
-    return locations.sort(distanceSortFn);
+    //copy address, so the searchAddress can be modified without changing the given address
+    var searchAddress = Object.assign(new AddressObject(), pAddress);
     
-    function distanceSortFn (a, b) 
-    { 
-        return a[3] - b[3]; 
+    var minAccuracyIndex = this._minAccuracy ? this._accuracyOrder.indexOf(this._minAccuracy) : this._accuracyOrder.length - 1;
+    
+    for (let i = 0; i < this._accuracyOrder.length && i <= minAccuracyIndex; i++)
+    {
+        var mostAccurateField = this._accuracyOrder[i];
+        if (searchAddress[mostAccurateField])
+        {
+            var location = this._getLocationFn.call(this, searchAddress);
+            if (location === false)
+                return null;
+            if (location != null || !this._minAccuracy) //if no minAccuracy is set, only try once
+            {
+                return {
+                    lat: location.lat,
+                    lon: location.lon,
+                    accuracy: mostAccurateField
+                };
+            }
+        }
+        searchAddress[mostAccurateField] = null;
     }
+    return null;
 }
\ No newline at end of file
diff --git a/process/WsValidation_lib/documentation.adoc b/process/WsValidation_lib/documentation.adoc
index a47408f2ed..cebc9f7afd 100644
--- a/process/WsValidation_lib/documentation.adoc
+++ b/process/WsValidation_lib/documentation.adoc
@@ -1 +1,65 @@
-See beginning of Lib. (TODO: move here??)
\ No newline at end of file
+= WsValidation_lib
+
+To enable the nominatim webservice: go to Preferences -> _____PREFERENCES_PROJECT -> _____PREFERENCES_PROJECT
+and enable the nominatim.enable checkbox
+
+== How to add a new Webservice type
+
+- Scroll down to WsValidationType.get
+- add a new Type into the cache like the other ones
+- IMPORTANT: use the same name for the key as for the first parameter of the new WsValidationType!
+- the second param, pWebserviceName defines which webservice should be used. This name is used for the custom project preferences
+  e.g. nominatim webservice has the custom preference nominatim.enable which is checked by WsValidationUtils.isWsEnabled
+  all other project preferences can contain the url, useername, password, etc. and are used by the function you create in the next step:
+- WS-Request function: (pProcessRequestCallback)
+  This callback defines a function which is called if a Request is triggered.
+  the following params are available (if you need more you have to add them to WsValidationUtils.validate(...)
+  pValue, pCountry, pCity
+  
+  You can base your callback on the function _nominatimRequest(pValue, pCountry, pCity)
+
+  Your callback has to call the processResultCallback (created as next step) for example like this:
+    return this.processResultCallback.call(this, ret, pValue);
+  
+- WS-Result function: (pProcessResultCallback)
+  This callback defines a function which is called on receiving an answer from the webservice.
+  
+  Base it on function _processNominatimAddressLookup(pWsResult, pValue) below.
+
+- create a new provider, which presets the Type_param with the new Type (you should not expose the parameter on this provider):
+import("WsValidation_lib");
+import("system.result");
+
+result.string(WsValidationType.get().TYPE_ADDRESS_NOMINATIM.key);
+
+
+
+== How to add a new lookup using the webservice (like e.g. ZIP)
+
+Address_entity-specific! 
+
+In the following Text I use "main field" when referencing the field which is directly connected with the db and contains the actual data (e.g. $field.ZIP)
+The main field is only displayed if the webservice is disabled.
+In the following Text I use "ws field" when referencing the new field which is displayed when the webservice is enabled. It "uses" the data provided by the main field.
+
+- create new ws field:
+  e.g. Zip_ws
+- Set the following properties:
+  * textInputAllowed: true
+  * onValueChangeTypes: Mask (only)
+  * title
+- add the following processes by using the functions from WsValidationFieldUtils (see the already existing Zip_ws field for reference)
+  * valueProcess
+  * displayValueProcess
+  * onValueChange
+  * stateProcess
+  * mandatoryProcess
+- if your main field has a onValidationProcess, copy it from the main field and wrap it with a check for ENABLÖED webservice (see Zip_ws) 
+   and maybe modify it (note that the onValidationProcess may get the Request answer as value. You have to deal with it!
+  Also wrap the onValidationProcess of your main field with a check for DISABLED webservice (see ZIP field)
+- create a new Consumer (e.g. ZipValidation_entity) and point it to the AddressValidation_entity. 
+  Use the corresponding provider which is created for the type you need (see documentation 1. above)
+  You may have to fill the parameters. if they are needed by your webservice
+- You HAVE TO fill the param "currentValueParam" by the value of your main field.
+- set the consumer of your ws field to the newly created consumer
+- Add your new ws field to the views: AddressList_view and AddressMultiEdit_view (right above the mainField)See beginning of Lib. (TODO: move here??)
\ No newline at end of file
diff --git a/process/WsValidation_lib/process.js b/process/WsValidation_lib/process.js
index 53fd37c614..7e4347bc40 100644
--- a/process/WsValidation_lib/process.js
+++ b/process/WsValidation_lib/process.js
@@ -9,77 +9,7 @@ import("system.util");
 import("system.auth");
 import("DataCaching_lib");
 import("AddressEntity_lib");
-
-/******************************************************************************/
-/******************************************************************************/
-/********************************DOCUMENTATION*********************************/
-/******************************************************************************/
-/******************************************************************************/
-/*
-
-To enable the nominatim webservice: go to Preferences -> _____PREFERENCES_PROJECT -> _____PREFERENCES_PROJECT
-and enable the nominatim.enable checkbox
-
-1. How to add a new Webservice type
------------------------------------
-- Scroll down to WsValidationType.get
-- add a new Type into the cache like the other ones
-- IMPORTANT: use the same name for the key as for the first parameter of the new WsValidationType!
-- the second param, pWebserviceName defines which webservice should be used. This name is used for the custom project preferences
-  e.g. nominatim webservice has the custom preference nominatim.enable which is checked by WsValidationUtils.isWsEnabled
-  all other project preferences can contain the url, useername, password, etc. and are used by the function you create in the next step:
-- WS-Request function: (pProcessRequestCallback)
-  This callback defines a function which is called if a Request is triggered.
-  the following params are available (if you need more you have to add them to WsValidationUtils.validate(...)
-  pValue, pCountry, pCity
-  
-  You can base your callback on the function _nominatimRequest(pValue, pCountry, pCity)
-
-  Your callback has to call the processResultCallback (created as next step) for example like this:
-    return this.processResultCallback.call(this, ret, pValue);
-  
-- WS-Result function: (pProcessResultCallback)
-  This callback defines a function which is called on receiving an answer from the webservice.
-  
-  Base it on function _processNominatimAddressLookup(pWsResult, pValue) below.
-
-- create a new provider, which presets the Type_param with the new Type (you should not expose the parameter on this provider):
-import("WsValidation_lib");
-import("system.result");
-
-result.string(WsValidationType.get().TYPE_ADDRESS_NOMINATIM.key);
-
-
-2. Address_entity-specific! 
-How to add a new lookup using the webservice (like e.g. ZIP)
-------------------------------------------------------------
-
-In the following Text I use "main field" when referencing the field which is directly connected with the db and contains the actual data (e.g. $field.ZIP)
-The main field is only displayed if the webservice is disabled.
-In the following Text I use "ws field" when referencing the new field which is displayed when the webservice is enabled. It "uses" the data provided by the main field.
-
-- create new ws field:
-  e.g. Zip_ws
-- Set the following properties:
-  * textInputAllowed: true
-  * onValueChangeTypes: Mask (only)
-  * title
-- add the following processes by using the functions from WsValidationFieldUtils (see the already existing Zip_ws field for reference)
-  * valueProcess
-  * displayValueProcess
-  * onValueChange
-  * stateProcess
-  * mandatoryProcess
-- if your main field has a onValidationProcess, copy it from the main field and wrap it with a check for ENABLÖED webservice (see Zip_ws) 
-   and maybe modify it (note that the onValidationProcess may get the Request answer as value. You have to deal with it!
-  Also wrap the onValidationProcess of your main field with a check for DISABLED webservice (see ZIP field)
-- create a new Consumer (e.g. ZipValidation_entity) and point it to the AddressValidation_entity. 
-  Use the corresponding provider which is created for the type you need (see documentation 1. above)
-  You may have to fill the parameters. if they are needed by your webservice
-- You HAVE TO fill the param "currentValueParam" by the value of your main field.
-- set the consumer of your ws field to the newly created consumer
-- Add your new ws field to the views: AddressList_view and AddressMultiEdit_view (right above the mainField)
-*/
+import("Util_lib");
 
 /**
  * Class used for the webservice validation types.
@@ -112,10 +42,20 @@ WsValidationType.get = function(pKey)
     if (!this._cache)
         this._cache = {
             // Address lookups
-            TYPE_ADDRESS_NOMINATIM: new WsValidationType("TYPE_ADDRESS_NOMINATIM", "nominatim", _nominatimRequest, _processNominatimAddressLookup, "q"),
-            TYPE_ZIP_NOMINATIM: new WsValidationType("TYPE_ZIP_NOMINATIM", "nominatim", _nominatimRequest, _processNominatimAddressLookup, "postalcode"),
-            TYPE_CITY_NOMINATIM: new WsValidationType("TYPE_CITY_NOMINATIM", "nominatim", _nominatimRequest, _processNominatimAddressLookup, "city"),
-            TYPE_STREET_NOMINATIM: new WsValidationType("TYPE_STREET_NOMINATIM", "nominatim", _nominatimRequest, _processNominatimAddressLookup, "street"),
+            TYPE_ADDRESS_NOMINATIM: new WsValidationType("TYPE_ADDRESS_NOMINATIM", "nominatim", _nominatimRequest, _processNominatimAddressLookup, {
+                valueParameter: "q"
+            }),
+            TYPE_ZIP_NOMINATIM: new WsValidationType("TYPE_ZIP_NOMINATIM", "nominatim", _nominatimRequest, _processNominatimAddressLookup, {
+                valueParameter: "postalcode"
+            }),
+            TYPE_CITY_NOMINATIM: new WsValidationType("TYPE_CITY_NOMINATIM", "nominatim", _nominatimRequest, _processNominatimAddressLookup, {
+                valueParameter: "city"
+            }),
+            TYPE_STREET_NOMINATIM: new WsValidationType("TYPE_STREET_NOMINATIM", "nominatim", _nominatimRequest, _processNominatimAddressLookup, {
+                valueParameter: "street"
+            }),
+            
+            TYPE_FULLADDRESS_NOMINATIM: new WsValidationType("TYPE_FULLADDRESS_NOMINATIM", "nominatim", _nominatimLocationRequest, _processNominatimAddressLocation, {}),          
             
             // Communication validation (Not used anymore, as it's done via system functions now. Left here for reference.)
             TYPE_PHONE: new WsValidationType("TYPE_PHONE", "phoneValidation", _customRequest, _processCommunicationValidation, "Number")
@@ -140,52 +80,58 @@ WsValidationType.get = function(pKey)
     
     function _processNominatimAddressLookup(pWsResult, pValue)
     {
-        var resultAddresses = [];
-        
         if (pWsResult != null)
         {
-            pWsResult.forEach(function(pPlaceData) {
+            return pWsResult.map(function(pPlaceData) 
+            {
                 if (pPlaceData.address == undefined)
                     pPlaceData.address = {};
                 
-                var city = pPlaceData.address.town;
-                if (!city)
-                    city = pPlaceData.address.city;
-                if (!city)
-                    city = pPlaceData.address.village;
-                if (!city)
-                    city = pPlaceData.address.hamlet;
-                
-                var cityext = pPlaceData.address.suburb;
-                if (!cityext)
-                    cityext = pPlaceData.address.city_district;
+                var city = pPlaceData.address.town
+                    || pPlaceData.address.city
+                    || pPlaceData.address.village
+                    || pPlaceData.address.hamlet;
                 
-                var addrData = [
-                    pPlaceData.display_name,
-                    pPlaceData.address.postcode,
-                    city,
-                    cityext,
-                    pPlaceData.address.country_code.toUpperCase(),
-                    pPlaceData.address.district,
-                    pPlaceData.address.state_district,
-                    pPlaceData.address.state,
-                    pPlaceData.address.road,
-                    pPlaceData.address.house_number,
-                    pPlaceData.lon,
-                    pPlaceData.lat
-                ];
+                var cityext = pPlaceData.address.suburb
+                    || pPlaceData.address.city_district;
                 
-                resultAddresses.push([JSON.stringify(addrData.concat([pValue, pPlaceData.place_id]))].concat(addrData));
-            })
+                return {
+                    placeId: pPlaceData.place_id,
+                    value: pValue,
+                    displayName: pPlaceData.display_name,
+                    zipCode: pPlaceData.address.postcode,
+                    city: city,
+                    cityExt: cityext,
+                    country: pPlaceData.address.country_code.toUpperCase(), //4
+                    district: pPlaceData.address.district,
+                    region: pPlaceData.address.state_district,
+                    state: pPlaceData.address.state,
+                    road: pPlaceData.address.road, //8
+                    buildingNo: pPlaceData.address.house_number,
+                    lat: pPlaceData.lat,
+                    lon: pPlaceData.lon
+                };
+            });
         }
 
-        return resultAddresses;
+        return [];
+    }
+    
+    function _processNominatimAddressLocation (pWsResult)
+    {
+        if (pWsResult == null || pWsResult.length === 0)
+            return null;
+        
+        return {
+            lat: pWsResult[0].lat,
+            lon: pWsResult[0].lon
+        };
     }
     
     /**
      * request using a custom webservice
      */
-    function _customRequest(pValue, pCountry)
+    function _customRequest(pValue, pParameters)
     {
         if (WsValidationUtils.isWsEnabled(this))
         {
@@ -197,7 +143,7 @@ WsValidationType.get = function(pKey)
             
             if (!userName || !pw || !url || !countryParamName)
             {
-                throw new Error("if the webservice " + this.key + " is enabled, you have to provide also userName, pw, url and countryParamName")
+                throw new Error("if the webservice " + this.key + " is enabled, you have to provide also userName, pw, url and countryParamName");
             }
 
             var actionType = "GET";
@@ -206,9 +152,9 @@ WsValidationType.get = function(pKey)
             {
                 // fill params
                 var parameters = {};
-                if (pCountry)
+                if (pParameters && pParameters.country)
                 {
-                    parameters[countryParamName] = pCountry;
+                    parameters[countryParamName] = pParameters.country;
                 }
                 parameters[parameterName] = pValue;
 
@@ -229,100 +175,113 @@ WsValidationType.get = function(pKey)
         return this.processResultCallback.call(this, null, pValue);
     }
     
-    function _nominatimRequest(pValue, pCountry, pCity)
+    function _nominatimRequest(pValue, pParameters)
     {
+        if (!pParameters)
+            pParameters = {};
         var nominatimCache;
         if (WsValidationUtils.isWsEnabled(this))
         {
-            var parameterName = this.additionalInfo;
+            if (pValue && this.additionalInfo.valueParameter)
+                pParameters[this.additionalInfo.valueParameter] = pValue;
+            
+            var cacheKey = Object.keys(pParameters).sort().map(function (parameterName)
+            {
+                return parameterName + "=" + pParameters[parameterName];
+            }).join("&");
             
             if (!vars.exists("$context.nominatim"))
             {
                 nominatimCache = {
                     last: ""
-                }
+                };
             } 
             else 
             {
                 nominatimCache = JSON.parse(vars.getString("$context.nominatim"));
             }
             
-            if (nominatimCache.last == parameterName + pValue + (pCountry ? pCountry : "") +  (pCity ? pCity : "") )
+            if (nominatimCache.last == cacheKey)
             {
                 return nominatimCache.data;
             }
             else
             {
-                nominatimCache.last = parameterName + pValue + (pCountry ? pCountry : "") + (pCity ? pCity : "")
-
-                var url = project.getPreferenceValue("custom." + this.webserviceName + ".url");
-                var pw = project.getPreferenceValue("custom." + this.webserviceName + ".pw");
-                var user = project.getPreferenceValue("custom." + this.webserviceName + ".user");
-
+                nominatimCache.last = cacheKey;
+                
+                if (!this.additionalInfo.url)
+                    this.additionalInfo.url = project.getPreferenceValue("custom." + this.webserviceName + ".url");
+                if (!this.additionalInfo.user)
+                    this.additionalInfo.user = project.getPreferenceValue("custom." + this.webserviceName + ".user");
+                if (!this.additionalInfo.password)
+                    this.additionalInfo.password = project.getPreferenceValue("custom." + this.webserviceName + ".pw");
 
-                if (!url)
-                {
-                    throw new Error("if the webservice " + this.key + " is enabled, you have to provide also the url")
-                }
+                if (!this.additionalInfo.url)
+                    throw new Error("if the webservice '" + this.key + "' is enabled, you have to provide the url");
 
-                if (pValue)
+                if (!Utils.isEmpty(pParameters))
                 {
-                    var restConf = net.createConfigForRestWebserviceCall()
-                                    .url(url)
-                                    .actionType("GET")
-                                    .dataTypeAccept("application/json")
-                                    .dataTypeJDitoAccept(util.DATA_TEXT)
-                                    .dataTypeJDitoSend(util.DATA_TEXT)
-                                    .addQueryParameter("format", "json")
-                                    .addQueryParameter("addressdetails", "1");
-                    
-                    var authConf;
-                    if (user && pw)
-                    {
-                        authConf = auth.createConfigForBasicAuth()
-                                    .userName(user)
-                                    .password(pw);
-                    } 
-                    else
-                    {
-                        authConf = auth.createConfigForNoAuth()
-                    }
-
-                    // add user input params
-                    if (pCountry)
-                    {
-                        restConf.addQueryParameter("countrycodes", pCountry)
-                    }
-                    if (pCity)
-                    {
-                        restConf.addQueryParameter("city", pCity)
-                    }
-
-                    restConf.addQueryParameter(parameterName, pValue)
-
+                    var nominatimRequest = new NominatimRequest(this.additionalInfo.url)
+                        .includeAddressDetails()
+                        .setParameters(pParameters);
+                        
+                    if (this.additionalInfo.user && this.additionalInfo.password)
+                        nominatimRequest.setUser(this.additionalInfo.user, this.additionalInfo.password);
 
                     // call webservice
-                    var ret = JSON.parse(net.callRestWebservice(restConf, authConf));
+                    var ret = nominatimRequest.get();
 
                     // if error, log the error. But also process the result and let the callback generate the correct default value
                     if (ret == null)
                     {
-                        logging.log("error")
+                        logging.log("error");
                         logging.log(translate.withArguments("${WEBSERVICE_ERROR} url:%0 status:%1", [url, (ret.hasHttpSuccessStatusCode ? " StatusCode: " + ret.httpStatusCode : "")]));
                     }
 
                     // different handling of the result per type
                     nominatimCache.data = this.processResultCallback.call(this, ret, pValue);
-                    vars.set("$context.nominatim", JSON.stringify(nominatimCache))
+                    vars.set("$context.nominatim", JSON.stringify(nominatimCache));
                     return nominatimCache.data;
                 }
             }
         }
-        nominatimCache = {}
+        nominatimCache = {};
         nominatimCache.data = this.processResultCallback.call(this, null, pValue);
-        vars.set("$context.nominatim", JSON.stringify(nominatimCache)) 
+        vars.set("$context.nominatim", JSON.stringify(nominatimCache));
         return nominatimCache.data;
     }
+    
+    function _nominatimLocationRequest (pValue, pParameters)
+    {
+        if (!this.additionalInfo.url)
+            this.additionalInfo.url = project.getPreferenceValue("custom." + this.webserviceName + ".url");
+        if (!this.additionalInfo.user)
+            this.additionalInfo.user = project.getPreferenceValue("custom." + this.webserviceName + ".user");
+        if (!this.additionalInfo.password)
+            this.additionalInfo.password = project.getPreferenceValue("custom." + this.webserviceName + ".pw");
+        
+        var url = this.additionalInfo.url;
+        var user = this.additionalInfo.user;
+        var password = this.additionalInfo.password;
+        
+        if (!url)
+            throw new Error("if the webservice '" + this.key + "' is enabled, you have to provide the url");
+
+        if (Object.keys(pParameters).length > 0)
+        {
+            var nominatimRequest = new NominatimRequest(url)
+                .setResultLimit(1)
+                .setParameters(pParameters);
+
+            if (user && password)
+                nominatimRequest.setUser(user, password);
+
+            var ret = nominatimRequest.get();
+
+            return this.processResultCallback.call(this, ret);
+        }
+        return null;
+    }
 }
 
 /**
@@ -338,18 +297,17 @@ function WsValidationUtils() {}
  * validate the value with the webservice
  * @param {String} pValue to search for
  * @param {WsValidationType|String} pType type used for the search. Can be an WsValidationType or the key of the WsValidationType
- * @param {String} pCountry needed by some webservices e.g. "DE"
- * @param {String} pCity needed by some webservices e.g. "Landshut"
+ * @param {Object} pParameters extra parameters for the webservice, the possible parameters may differ depending on the WsValidationType
  * 
  * @return {object} this is different, based on which webservice-type is used
  */
-WsValidationUtils.validate = function(pValue, pType, pCountry, pCity)
+WsValidationUtils.validate = function(pValue, pType, pParameters)
 {
     // get WsValidationType-Object if it is only the key
     if (typeof pType == "string")
         pType = WsValidationType.get(pType);
     
-    return pType.processRequestCallback.call(pType, pValue, pCountry, pCity)
+    return pType.processRequestCallback.call(pType, pValue, pParameters);
 }
 
 /**
@@ -358,20 +316,20 @@ WsValidationUtils.validate = function(pValue, pType, pCountry, pCity)
  * 
  * @return {Array|null} the parsed data as array or null if it was no array
  */
-WsValidationUtils.parseJSONArray = function(pJSON) {
+WsValidationUtils.parseJSONArray = function(pJSON) 
+{
     try
     {
         var data = JSON.parse(pJSON);
-    } catch (ex) { 
-        // if no valid json, it is a direct user input and not a uuid.
-        // ignore error
-        return null
+    } 
+    catch (ex) 
+    { 
+        // if no valid json, it is a direct user input and not a uuid, ignore error
+        return null;
     }
-    var type = typeof data;
     
-    // Only an array can be returned by the ws.   V-- this check is slow -> check if not object before as its faster
-    if (type != "object" || Object.prototype.toString.call(data) !== '[object Array]')
-        return null
+    if (typeof data !== "object")
+        return null;
     
     return data;
 }
@@ -389,20 +347,22 @@ WsValidationUtils.setAddressFields = function(pJSON)
         return false;
 
     var toSet = { 
-        "$field.ZIP": data[1],
-        "$field.CITY": data[2],
-        "$field.COUNTRY": data[4],
-        //"$field.DISTRICT": data[5], not needed currently
-        "$field.REGION": data[6],
-        "$field.STATE": data[7],
-        "$field.ADDRESS": data[8]
+        "$field.ZIP": data.zipCode,
+        "$field.CITY": data.city,
+        "$field.COUNTRY": data.country,
+        //"$field.DISTRICT": data.district, not needed currently
+        "$field.REGION": data.region,
+        "$field.STATE": data.state,
+        "$field.ADDRESS": data.road,
+        "$field.LAT": data.lat,
+        "$field.LON": data.lon
     }
     
     for (field in toSet) 
     {
         let value = toSet[field];
         if (!value)
-        value = ""
+            value = "";
 
         neon.setFieldValue(field, value);
     }
@@ -420,9 +380,9 @@ WsValidationUtils.valueFromJSON = function(pJSON)
 {
     var data = WsValidationUtils.parseJSONArray(pJSON);
     if (data == null)
-        return null
+        return null;
 
-    return data[12];
+    return data.value;
 }
 /**
  * check if the Webservice is enabled in the project preferences
@@ -466,9 +426,9 @@ function WsValidationFieldUtils() {}
 WsValidationFieldUtils.mainFieldStateProcess = function(pWsType)
 {
     if (WsValidationUtils.isWsEnabled(pWsType))
-        return neon.COMPONENTSTATE_INVISIBLE
+        return neon.COMPONENTSTATE_INVISIBLE;
     else
-        return neon.COMPONENTSTATE_AUTO
+        return neon.COMPONENTSTATE_AUTO;
 }
 
 /**
@@ -478,9 +438,9 @@ WsValidationFieldUtils.mainFieldStateProcess = function(pWsType)
 WsValidationFieldUtils.wsFieldStateProcess = function(pWsType)
 {
     if (!WsValidationUtils.isWsEnabled(pWsType))
-        return neon.COMPONENTSTATE_INVISIBLE
+        return neon.COMPONENTSTATE_INVISIBLE;
     else
-        return neon.COMPONENTSTATE_AUTO
+        return neon.COMPONENTSTATE_AUTO;
 }
 
 /**
@@ -548,4 +508,69 @@ WsValidationFieldUtils.wsOnValueChangeProcess = function(pWsType, pMainField)
         if (!newCurrentValue)
             neon.setFieldValue(pMainField, vars.get("$local.value"));
     }
+}
+
+function NominatimRequest (pUrl)
+{
+    this.url = pUrl;
+    this.user = null;
+    this.password = null;
+    this.parameters = {
+        format: "json"
+    };
+}
+
+NominatimRequest.prototype.includeAddressDetails = function (pInclude)
+{
+    if (pInclude === false)
+        this.parameters.addressdetails = "0";
+    else
+        this.parameters.addressdetails = "1";
+    return this;
+}
+
+NominatimRequest.prototype.setUser = function (pUser, pPassword)
+{
+    this.user = pUser;
+    this.password = pPassword;
+    return this;
+}
+
+NominatimRequest.prototype.setParameters = function (pParameters)
+{
+    Object.assign(this.parameters, pParameters);
+    return this;
+}
+
+NominatimRequest.prototype.setResultLimit = function (pLimit)
+{
+    this.parameters.limit = pLimit.toString();
+    return this;
+}
+
+NominatimRequest.prototype.get = function ()
+{
+    var restConf = net.createConfigForRestWebserviceCall()
+        .url(this.url)
+        .actionType("GET")
+        .dataTypeAccept("application/json")
+        .dataTypeJDitoAccept(util.DATA_TEXT)
+        .dataTypeJDitoSend(util.DATA_TEXT);
+
+    var authConf;
+    if (this.user && this.password)
+    {
+        authConf = auth.createConfigForBasicAuth()
+            .userName(this.user)
+            .password(this.password);
+    } 
+    else
+        authConf = auth.createConfigForNoAuth();
+
+    for (let parameterName in this.parameters)
+    {
+        restConf.addQueryParameter(parameterName, this.parameters[parameterName]);
+    }
+
+    return JSON.parse(net.callRestWebservice(restConf, authConf));
 }
\ No newline at end of file
-- 
GitLab


From 981826311f598120202e428c092f00535ebd887a Mon Sep 17 00:00:00 2001
From: "S.Listl" <s.listl@adito.de>
Date: Mon, 17 Aug 2020 16:40:23 +0200
Subject: [PATCH 165/309] #1060558 load geo location data when saving addresses

---
 .../AddressValidation_entity.aod              |  4 +--
 .../recordcontainers/jdito/contentProcess.js  | 29 ++++++++++++++-----
 entity/Address_entity/Address_entity.aod      |  2 ++
 .../recordcontainers/db/onDBInsert.js         | 13 +++++++++
 .../recordcontainers/db/onDBUpdate.js         | 26 ++++++++++++++++-
 .../recordcontainers/index/query.js           |  2 +-
 .../recordcontainers/index/query.js           |  2 +-
 .../AddressList_view/AddressList_view.aod     |  8 +++++
 .../AddressOrgMultiEdit_view.aod              |  8 +++++
 .../AdressMultiEdit_view.aod                  |  8 +++++
 10 files changed, 90 insertions(+), 12 deletions(-)

diff --git a/entity/AddressValidation_entity/AddressValidation_entity.aod b/entity/AddressValidation_entity/AddressValidation_entity.aod
index d3842d9a8e..6a58a3dc69 100644
--- a/entity/AddressValidation_entity/AddressValidation_entity.aod
+++ b/entity/AddressValidation_entity/AddressValidation_entity.aod
@@ -198,10 +198,10 @@
           <name>BUILDINGNO.value</name>
         </jDitoRecordFieldMapping>
         <jDitoRecordFieldMapping>
-          <name>LON.value</name>
+          <name>LAT.value</name>
         </jDitoRecordFieldMapping>
         <jDitoRecordFieldMapping>
-          <name>LAT.value</name>
+          <name>LON.value</name>
         </jDitoRecordFieldMapping>
         <jDitoRecordFieldMapping>
           <name>VALUE.value</name>
diff --git a/entity/AddressValidation_entity/recordcontainers/jdito/contentProcess.js b/entity/AddressValidation_entity/recordcontainers/jdito/contentProcess.js
index 5e2e5870c7..2f5f62eea0 100644
--- a/entity/AddressValidation_entity/recordcontainers/jdito/contentProcess.js
+++ b/entity/AddressValidation_entity/recordcontainers/jdito/contentProcess.js
@@ -16,16 +16,15 @@ if (vars.get("$local.idvalues") != null)
 else
 {
     var type = "";
+    var params = {};
     if (vars.exists("$param.Type_param") && vars.get("$param.Type_param"))
         type = vars.get("$param.Type_param");
 
-    var country = "";
     if (vars.exists("$param.Country_param") && vars.get("$param.Country_param"))
-        country = vars.get("$param.Country_param");
+        params.country = vars.get("$param.Country_param");
 
-    var city = "";
     if (vars.exists("$param.City_param") && vars.get("$param.City_param"))
-        city = vars.get("$param.City_param");
+        params.city = vars.get("$param.City_param");
 
     // get the value typed by the user
     var filter = "";
@@ -38,9 +37,25 @@ else
     if (!filter && vars.exists("$param.CurrentValue_param") && vars.get("$param.CurrentValue_param"))
         filter = vars.get("$param.CurrentValue_param");
 
-    var foundAddresses = WsValidationUtils.validate(filter, type, country, city);
+    var foundAddresses = WsValidationUtils.validate(filter, type, params);
 
-    result.object(foundAddresses.map(function(row) {
-        return row.concat([filter])
+    result.object(foundAddresses.map(function(row) 
+    {
+        return [
+            JSON.stringify(row),
+            row.displayName,
+            row.zipCode,
+            row.city,
+            row.cityExt,
+            row.country,
+            row.district,
+            row.region,
+            row.state,
+            row.road,
+            row.buildingNo,
+            row.lat,
+            row.lon,
+            row.value
+        ];
     }));
 }
diff --git a/entity/Address_entity/Address_entity.aod b/entity/Address_entity/Address_entity.aod
index 659f2cb64d..9e5b31e8d1 100644
--- a/entity/Address_entity/Address_entity.aod
+++ b/entity/Address_entity/Address_entity.aod
@@ -474,12 +474,14 @@
       <documentation>%aditoprj%/entity/Address_entity/entityfields/lat/documentation.adoc</documentation>
       <title>Latitude</title>
       <contentType>NUMBER</contentType>
+      <state>INVISIBLE</state>
     </entityField>
     <entityField>
       <name>LON</name>
       <documentation>%aditoprj%/entity/Address_entity/entityfields/lon/documentation.adoc</documentation>
       <title>Longitude</title>
       <contentType>NUMBER</contentType>
+      <state>INVISIBLE</state>
     </entityField>
   </entityFields>
   <recordContainers>
diff --git a/entity/Address_entity/recordcontainers/db/onDBInsert.js b/entity/Address_entity/recordcontainers/db/onDBInsert.js
index bc66933dac..8d5c684b6c 100644
--- a/entity/Address_entity/recordcontainers/db/onDBInsert.js
+++ b/entity/Address_entity/recordcontainers/db/onDBInsert.js
@@ -5,6 +5,8 @@ import("DataPrivacy_lib");
 import("system.vars");
 import("StandardObject_lib");
 import("Keyword_lib");
+import("Location_lib");
+import("Address_lib");
 
 var rowdata = vars.get("$local.rowdata");
 var addrType = rowdata["ADDRESS.ADDR_TYPE"];
@@ -47,3 +49,14 @@ if(scopeType == "Organisation")
 }
 
 DataPrivacyUtils.notifyNeedDataPrivacyUpdate(rowdata["ADDRESS.CONTACT_ID"], vars.get("$param.ShowDsgvoMessage_param"));
+
+var address = new AddressObject(rowdata["ADDRESS.ADDRESS"], rowdata["ADDRESS.BUILDINGNO"], rowdata["ADDRESS.ZIP"], rowdata["ADDRESS.CITY"], rowdata["ADDRESS.COUNTRY"]);
+var addressLocation = new LocationFinder().getGeoLocation(address);
+if (addressLocation)
+{
+    newWhere("ADDRESS.ADDRESSID", "$local.uid")
+        .updateFields({
+            "LAT": addressLocation.lat,
+            "LON": addressLocation.lon
+        });
+}
\ No newline at end of file
diff --git a/entity/Address_entity/recordcontainers/db/onDBUpdate.js b/entity/Address_entity/recordcontainers/db/onDBUpdate.js
index 70056d7ef3..f92b7b77ce 100644
--- a/entity/Address_entity/recordcontainers/db/onDBUpdate.js
+++ b/entity/Address_entity/recordcontainers/db/onDBUpdate.js
@@ -1,6 +1,30 @@
+import("Sql_lib");
+import("Location_lib");
+import("Address_lib");
 import("system.vars");
 import("DataPrivacy_lib");
 
 var rowdata = vars.get("$local.rowdata");
 
-DataPrivacyUtils.notifyNeedDataPrivacyUpdate(rowdata["ADDRESS.CONTACT_ID"], vars.get("$param.ShowDsgvoMessage_param"));
\ No newline at end of file
+DataPrivacyUtils.notifyNeedDataPrivacyUpdate(rowdata["ADDRESS.CONTACT_ID"], vars.get("$param.ShowDsgvoMessage_param"));
+
+var changed = vars.get("$local.changed");
+var isAddressChanged = changed.includes("ADDRESS.ADDRESS")
+    || changed.includes("ADDRESS.BUILDINGNO")
+    || changed.includes("ADDRESS.ZIP")
+    || changed.includes("ADDRESS.CITY")
+    || changed.includes("ADDRESS.COUNTRY");
+
+if (isAddressChanged)
+{
+    var address = new AddressObject(rowdata["ADDRESS.ADDRESS"], rowdata["ADDRESS.BUILDINGNO"], rowdata["ADDRESS.ZIP"], rowdata["ADDRESS.CITY"], rowdata["ADDRESS.COUNTRY"]);
+    var addressLocation = new LocationFinder().getGeoLocation(address);
+    if (addressLocation)
+    {
+        newWhere("ADDRESS.ADDRESSID", "$local.uid")
+            .updateFields({
+                "LAT": addressLocation.lat,
+                "LON": addressLocation.lon
+            });
+    }
+}
\ No newline at end of file
diff --git a/entity/Organisation_entity/recordcontainers/index/query.js b/entity/Organisation_entity/recordcontainers/index/query.js
index 79b1326651..e5b5c756c9 100644
--- a/entity/Organisation_entity/recordcontainers/index/query.js
+++ b/entity/Organisation_entity/recordcontainers/index/query.js
@@ -46,6 +46,6 @@ var querySelect = newSelect([
         .and(["COMMUNICATION", "MEDIUM_ID", "phone"], commMediumPhoneIds, SqlBuilder.IN()), "phone");
 
 if (vars.exists("$local.idvalue") && vars.get("$local.idvalue") && vars.get("$local.idvalue").length > 0) 
-    querySelect.where("CONTACT.CONTACTID", "$local.idvalue", SqlBuilder.IN());
+    querySelect.where("CONTACT.CONTACTID", "$local.idvalue");
 
 result.string(querySelect.toString());
diff --git a/entity/Person_entity/recordcontainers/index/query.js b/entity/Person_entity/recordcontainers/index/query.js
index a21cc7b2e3..5d681cea1c 100644
--- a/entity/Person_entity/recordcontainers/index/query.js
+++ b/entity/Person_entity/recordcontainers/index/query.js
@@ -50,6 +50,6 @@ var querySelect = newSelect([
     .orderBy("CONTACT.CONTACTID");
 
 if (vars.exists("$local.idvalue"))
-    querySelect.whereIfSet("CONTACT.CONTACTID", "$local.idvalue", SqlBuilder.IN());
+    querySelect.whereIfSet("CONTACT.CONTACTID", "$local.idvalue");
 
 result.string(querySelect);
\ No newline at end of file
diff --git a/neonView/AddressList_view/AddressList_view.aod b/neonView/AddressList_view/AddressList_view.aod
index f98f7fde3b..bd5826a7da 100644
--- a/neonView/AddressList_view/AddressList_view.aod
+++ b/neonView/AddressList_view/AddressList_view.aod
@@ -74,6 +74,14 @@
           <name>6af52273-25bf-4286-83cc-217aea94ad09</name>
           <entityField>ADDRIDENTIFIER</entityField>
         </neonTitledListTableColumn>
+        <neonTitledListTableColumn>
+          <name>86444859-eb8c-4ee7-a400-eb10770c28b9</name>
+          <entityField>LAT</entityField>
+        </neonTitledListTableColumn>
+        <neonTitledListTableColumn>
+          <name>9c37669e-e577-44b9-b43f-3734b88de205</name>
+          <entityField>LON</entityField>
+        </neonTitledListTableColumn>
       </columns>
     </titledListViewTemplate>
   </children>
diff --git a/neonView/AddressOrgMultiEdit_view/AddressOrgMultiEdit_view.aod b/neonView/AddressOrgMultiEdit_view/AddressOrgMultiEdit_view.aod
index c9ff1b4175..dd7ee5507e 100644
--- a/neonView/AddressOrgMultiEdit_view/AddressOrgMultiEdit_view.aod
+++ b/neonView/AddressOrgMultiEdit_view/AddressOrgMultiEdit_view.aod
@@ -70,6 +70,14 @@
           <name>443b9d7d-dac2-40b2-bb2b-d5e0091877a9</name>
           <entityField>ADDRIDENTIFIER</entityField>
         </neonGenericMultipleTableColumn>
+        <neonGenericMultipleTableColumn>
+          <name>65ccb00c-c9b0-4a7b-a555-f54b494cbd62</name>
+          <entityField>LAT</entityField>
+        </neonGenericMultipleTableColumn>
+        <neonGenericMultipleTableColumn>
+          <name>5567205d-7c1d-4c87-b895-fb93a02f1c76</name>
+          <entityField>LON</entityField>
+        </neonGenericMultipleTableColumn>
       </columns>
     </genericMultipleViewTemplate>
   </children>
diff --git a/neonView/AdressMultiEdit_view/AdressMultiEdit_view.aod b/neonView/AdressMultiEdit_view/AdressMultiEdit_view.aod
index 9aa8cfe2a7..b4612adcf1 100644
--- a/neonView/AdressMultiEdit_view/AdressMultiEdit_view.aod
+++ b/neonView/AdressMultiEdit_view/AdressMultiEdit_view.aod
@@ -69,6 +69,14 @@
           <name>443b9d7d-dac2-40b2-bb2b-d5e0091877a9</name>
           <entityField>ADDRIDENTIFIER</entityField>
         </neonGenericMultipleTableColumn>
+        <neonGenericMultipleTableColumn>
+          <name>6554a8d1-9dbd-4690-89fd-9b467e859b1c</name>
+          <entityField>LAT</entityField>
+        </neonGenericMultipleTableColumn>
+        <neonGenericMultipleTableColumn>
+          <name>82dea925-d175-423d-843c-fbe194388ffc</name>
+          <entityField>LON</entityField>
+        </neonGenericMultipleTableColumn>
       </columns>
     </genericMultipleViewTemplate>
   </children>
-- 
GitLab


From 54cdd3c71b5672df274cbbc2ba4e0e983996fe2d Mon Sep 17 00:00:00 2001
From: Daniel Tran <d.tran@adito.de>
Date: Tue, 18 Aug 2020 11:19:30 +0000
Subject: [PATCH 166/309] #1052905: Added neon.setFilter to afterUiInit.js, to
 only see active contacts when PersonFilter_view is openend. #1052905: Added
 keywords "CONTACTSTATINACTIV", "CONTACTSTATREVIEW" to the
 KeywordRegistry_basic, to used it later in code.

---
 aliasDefinition/Data_alias/Data_alias.aod     |   2 +-
 .../AnyContact_entity/AnyContact_entity.aod   |  34 ++----
 entity/AnyContact_entity/afterUiInit.js       |   0
 entity/Contact_entity/Contact_entity.aod      |   1 +
 entity/Contact_entity/afterUiInit.js          |   0
 entity/Organisation_entity/afterUiInit.js     |   7 +-
 .../recordcontainers/db/onDBUpdate.js         |  15 +++
 .../recordcontainers/index/query.js           | 105 +++++++++---------
 entity/Person_entity/Person_entity.aod        |   2 +
 entity/Person_entity/afterUiInit.js           |  10 +-
 .../entityfields/newtask/iconIdProcess.js     |   0
 .../entityfields/opentaskview/stateProcess.js |   0
 .../recordcontainers/index/query.js           |  78 +++++++------
 13 files changed, 135 insertions(+), 119 deletions(-)
 create mode 100644 entity/AnyContact_entity/afterUiInit.js
 create mode 100644 entity/Contact_entity/afterUiInit.js
 create mode 100644 entity/Person_entity/entityfields/newtask/iconIdProcess.js
 create mode 100644 entity/Person_entity/entityfields/opentaskview/stateProcess.js

diff --git a/aliasDefinition/Data_alias/Data_alias.aod b/aliasDefinition/Data_alias/Data_alias.aod
index b42801cfda..36cca59634 100644
--- a/aliasDefinition/Data_alias/Data_alias.aod
+++ b/aliasDefinition/Data_alias/Data_alias.aod
@@ -6372,7 +6372,7 @@
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
-                <index v="true" />
+                <index v="false" />
                 <documentation></documentation>
                 <title>Activity Id</title>
                 <description></description>
diff --git a/entity/AnyContact_entity/AnyContact_entity.aod b/entity/AnyContact_entity/AnyContact_entity.aod
index c9855622f5..1fa8e83a7e 100644
--- a/entity/AnyContact_entity/AnyContact_entity.aod
+++ b/entity/AnyContact_entity/AnyContact_entity.aod
@@ -4,6 +4,7 @@
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/AnyContact_entity/documentation.adoc</documentation>
   <contentTitleProcess>%aditoprj%/entity/AnyContact_entity/contentTitleProcess.js</contentTitleProcess>
+  <afterUiInit>%aditoprj%/entity/AnyContact_entity/afterUiInit.js</afterUiInit>
   <initFilterProcess>%aditoprj%/entity/AnyContact_entity/initFilterProcess.js</initFilterProcess>
   <imageProcess>%aditoprj%/entity/AnyContact_entity/imageProcess.js</imageProcess>
   <recordContainer>db</recordContainer>
@@ -82,12 +83,10 @@
     <entityField>
       <name>ADDRESS_ID</name>
       <title>standard address</title>
-      <groupable v="true" />
       <displayValueProcess>%aditoprj%/entity/AnyContact_entity/entityfields/address_id/displayValueProcess.js</displayValueProcess>
     </entityField>
     <entityField>
       <name>LANGUAGE</name>
-      <groupable v="true" />
     </entityField>
     <entityField>
       <name>ORGANISATION_ID</name>
@@ -100,13 +99,13 @@
     </entityField>
     <entityField>
       <name>STATUS</name>
-      <groupable v="true" />
     </entityField>
     <entityField>
       <name>contactType</name>
       <description>Relation type. Value is based on the existance or non-existance of ORGANISATION_ID and PERSON_ID.
 See ContactUtils.getRelationTypeByPersOrg for possible values</description>
       <contentType>NUMBER</contentType>
+      <valueProcess>%aditoprj%/entity/AnyContact_entity/entityfields/contactType/valueProcess.js</valueProcess>
     </entityField>
     <entityField>
       <name>ORGANISATION_NAME</name>
@@ -124,6 +123,7 @@ See ContactUtils.getRelationTypeByPersOrg for possible values</description>
       <name>PERSON_PICTURE</name>
       <contentType>IMAGE</contentType>
       <valueProcess>%aditoprj%/entity/AnyContact_entity/entityfields/person_picture/valueProcess.js</valueProcess>
+      <displayValueProcess>%aditoprj%/entity/AnyContact_entity/entityfields/person_picture/displayValueProcess.js</displayValueProcess>
     </entityField>
     <entityField>
       <name>STANDARD_EMAIL_COMMUNICATION</name>
@@ -161,6 +161,12 @@ See ContactUtils.getRelationTypeByPersOrg for possible values</description>
           <fieldName>AnyContacts</fieldName>
           <isConsumer v="false" />
         </entityDependency>
+        <entityDependency>
+          <name>91db53ad-3748-4a24-8dba-11dc707c2d6b</name>
+          <entityName>VisitPlanEntry_entity</entityName>
+          <fieldName>AnyContacts</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
       </dependencies>
       <children>
         <entityParameter>
@@ -179,28 +185,6 @@ See ContactUtils.getRelationTypeByPersOrg for possible values</description>
       <name>AvatarText_param</name>
       <valueProcess>%aditoprj%/entity/AnyContact_entity/entityfields/avatartext_param/valueProcess.js</valueProcess>
     </entityParameter>
-    <entityProvider>
-      <name>ContactsByIds</name>
-      <documentation>%aditoprj%/entity/AnyContact_entity/entityfields/contactsbyids/documentation.adoc</documentation>
-      <dependencies>
-        <entityDependency>
-          <name>0206f7a8-fd58-47e8-8b7a-5ff4531e56fb</name>
-          <entityName>QuickEntry_entity</entityName>
-          <fieldName>OrgAndPersDuplicates</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
-      </dependencies>
-      <children>
-        <entityParameter>
-          <name>ContactId_param</name>
-          <expose v="false" />
-        </entityParameter>
-      </children>
-    </entityProvider>
-    <entityParameter>
-      <name>ContactIds_param</name>
-      <expose v="true" />
-    </entityParameter>
   </entityFields>
   <recordContainers>
     <dbRecordContainer>
diff --git a/entity/AnyContact_entity/afterUiInit.js b/entity/AnyContact_entity/afterUiInit.js
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/entity/Contact_entity/Contact_entity.aod b/entity/Contact_entity/Contact_entity.aod
index ad05310a9d..542030903e 100644
--- a/entity/Contact_entity/Contact_entity.aod
+++ b/entity/Contact_entity/Contact_entity.aod
@@ -8,6 +8,7 @@
   <grantUpdateProcess>%aditoprj%/entity/Contact_entity/grantUpdateProcess.js</grantUpdateProcess>
   <grantDeleteProcess>%aditoprj%/entity/Contact_entity/grantDeleteProcess.js</grantDeleteProcess>
   <contentTitleProcess>%aditoprj%/entity/Contact_entity/contentTitleProcess.js</contentTitleProcess>
+  <afterUiInit>%aditoprj%/entity/Contact_entity/afterUiInit.js</afterUiInit>
   <onValidation>%aditoprj%/entity/Contact_entity/onValidation.js</onValidation>
   <initFilterProcess>%aditoprj%/entity/Contact_entity/initFilterProcess.js</initFilterProcess>
   <iconId>VAADIN:USERS</iconId>
diff --git a/entity/Contact_entity/afterUiInit.js b/entity/Contact_entity/afterUiInit.js
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/entity/Organisation_entity/afterUiInit.js b/entity/Organisation_entity/afterUiInit.js
index d529418d07..02fda64bc9 100644
--- a/entity/Organisation_entity/afterUiInit.js
+++ b/entity/Organisation_entity/afterUiInit.js
@@ -3,5 +3,8 @@ import("system.vars");
 import("Context_lib");
 import("Attribute_lib");
 
-if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
-    AttributeRelationUtils.presetMandatoryAttributes(ContextUtils.getCurrentContextId(), "Attributes");
\ No newline at end of file
+
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
+{
+    AttributeRelationUtils.presetMandatoryAttributes(ContextUtils.getCurrentContextId(), "Attributes");
+}
diff --git a/entity/Organisation_entity/recordcontainers/db/onDBUpdate.js b/entity/Organisation_entity/recordcontainers/db/onDBUpdate.js
index 5b073c2fbe..8ded71e4d7 100644
--- a/entity/Organisation_entity/recordcontainers/db/onDBUpdate.js
+++ b/entity/Organisation_entity/recordcontainers/db/onDBUpdate.js
@@ -1,12 +1,16 @@
+import("Sql_lib");
 import("system.vars");
 import("Organisation_lib");
 import("Communication_lib");
 import("Entity_lib");
 import("Workflow_lib");
+import("KeywordRegistry_basic");
 
 // TODO: this is a workaround for missing possibility to react on changes of fields not connected to record Contqainer #1030023
 var rowdata =  vars.get("$local.rowdata");
+var changedRows = vars.get("$local.changed");
 var uid = rowdata["CONTACT.CONTACTID"];
+
 FieldChanges.assimilateChangeAndDispose("$field.STANDARD_EMAIL_COMMUNICATION", function(state, value){
     CommUtil.setStandardMail(uid, value);
 });
@@ -15,5 +19,16 @@ FieldChanges.assimilateChangeAndDispose("$field.STANDARD_PHONE_COMMUNICATION", f
     CommUtil.setStandardPhone(uid, value);
 });
 
+//
+if (changedRows.indexOf("CONTACT.STATUS") > -1 
+    && rowdata["CONTACT.STATUS"] && rowdata["CONTACT.STATUS"] == $KeywordRegistry.contactStatus$inactive())
+{
+    var orgId = rowdata["ORGANISATION.ORGANISATIONID"];
+    
+    newWhere("CONTACT.ORGANISATION_ID", orgId)
+        .and("CONTACT.PERSON_ID is not null")
+        .updateFields({"STATUS" : $KeywordRegistry.contactStatus$inactive()}, "CONTACT");
+}
+
 WorkflowStarter.updated();
 WorkflowSignalSender.updated();
\ No newline at end of file
diff --git a/entity/Organisation_entity/recordcontainers/index/query.js b/entity/Organisation_entity/recordcontainers/index/query.js
index 79b1326651..10ff797d42 100644
--- a/entity/Organisation_entity/recordcontainers/index/query.js
+++ b/entity/Organisation_entity/recordcontainers/index/query.js
@@ -1,51 +1,54 @@
-import("system.translate");
-import("system.result");
-import("system.vars");
-import("system.calendars");
-import("system.db");
-import("Sql_lib");
-import("Communication_lib");
-import("system.SQLTYPES");
-
-/*
-Before changing the results that are returned here:
-Please keep in mind that some of the indexfields are used in other modules (like the duplicate-scanner or cti-call-handler). 
-You may want to check out if your change affects other modules. However adding more fields should not be a problem therefor.
- */
-
-var commMediumPhoneIds = CommUtil.getMediumIdsByCategory("PHONE");
-var sqlHelper = new SqlMaskingUtils();
-var querySelect = newSelect([
-        "CONTACT.CONTACTID",
-        sqlHelper.concat(["ORGANISATION.NAME", "'|'", "ORGANISATION.CUSTOMERCODE"]),
-        sqlHelper.concat([
-            sqlHelper.concat(["defaultAddress.ADDRESS", "defaultAddress.BUILDINGNO", "'-'"
-                ,"defaultAddress.COUNTRY", "defaultAddress.ZIP", "defaultAddress.CITY"]),
-            sqlHelper.concat(["'" + translate.text("Phone") + ":'", "(" + CommUtil.getStandardSubSqlPhone() + ")"]),
-            sqlHelper.concat(["'" + translate.text("Email") + ":'", "(" + CommUtil.getStandardSubSqlMail() + ")"])
-        ], " | "),
-        sqlHelper.concat([sqlHelper.cast("defaultAddress.LAT", SQLTYPES.VARCHAR, 16), sqlHelper.cast("defaultAddress.LON", SQLTYPES.VARCHAR, 16)], ","),
-        //additional indexed fields
-        "ORGANISATION.NAME",
-        "ORGANISATION.ORGANISATIONID",
-        "CONTACT.CONTACTID",
-        "ORGANISATION.CUSTOMERCODE",
-        "ADDRESS.ADDRESS",
-        "ADDRESS.COUNTRY",
-        "ADDRESS.ZIP",
-        "ADDRESS.CITY",
-        "COMMUNICATION.ADDR",
-        "PHONE.ADDR" 
-    ])
-    .from("ORGANISATION")
-    .join("CONTACT", "CONTACT.ORGANISATION_ID = ORGANISATION.ORGANISATIONID and CONTACT.PERSON_ID is null")
-    .leftJoin("ADDRESS", "defaultAddress.ADDRESSID = CONTACT.ADDRESS_ID", "defaultAddress")
-    .leftJoin("ADDRESS", "ADDRESS.CONTACT_ID = CONTACT.CONTACTID")
-    .leftJoin("COMMUNICATION", "COMMUNICATION.CONTACT_ID = CONTACT.CONTACTID")
-    .leftJoin("COMMUNICATION", newWhere("phone.CONTACT_ID = CONTACT.CONTACTID")
-        .and(["COMMUNICATION", "MEDIUM_ID", "phone"], commMediumPhoneIds, SqlBuilder.IN()), "phone");
-
-if (vars.exists("$local.idvalue") && vars.get("$local.idvalue") && vars.get("$local.idvalue").length > 0) 
-    querySelect.where("CONTACT.CONTACTID", "$local.idvalue", SqlBuilder.IN());
-
-result.string(querySelect.toString());
+import("system.translate");
+import("system.calendars");
+import("system.result");
+import("system.vars");
+import("system.db");
+import("Communication_lib");
+import("Sql_lib");
+import("KeywordRegistry_basic");
+
+
+/*
+Before changing the results that are returned here:
+Please keep in mind that some of the indexfields are used in other modules (like the duplicate-scanner or cti-call-handler). 
+You may want to check out if your change affects other modules. However adding more fields should not be a problem therefor.
+ */
+
+var sqlQuery, sqlHelper, queryCondition, affectedIds;
+var CommMediumPhoneIds = db.array( db.COLUMN, "select KEYID from AB_KEYWORD_ENTRY join ab_keyword_attributerelation on AB_KEYWORD_ENTRYID = AB_KEYWORD_ENTRY_ID "
+        + " join ab_keyword_attribute on AB_KEYWORD_ATTRIBUTEID = AB_KEYWORD_ATTRIBUTE_ID and CHAR_VALUE = 'TELEPHONE' and AB_KEYWORD_ATTRIBUTE.CONTAINER = 'CommunicationMedium'");
+sqlHelper = new SqlMaskingUtils();
+var querySelect = newSelect("CONTACT.CONTACTID "
+                        + ", " + sqlHelper.concat(["ORGANISATION.NAME", "'|'", "ORGANISATION.CUSTOMERCODE"])
+                        + ", " + sqlHelper.concat([
+                             sqlHelper.concat(["defaultAddress.ADDRESS", "defaultAddress.BUILDINGNO", "'-'"
+                                ,"defaultAddress.COUNTRY", "defaultAddress.ZIP", "defaultAddress.CITY"])
+                            ,sqlHelper.concat(["'" + translate.text("Phone") + ":'", "(" + CommUtil.getStandardSubSqlPhone() + ")"])
+                            ,sqlHelper.concat(["'" + translate.text("Email") + ":'", "(" + CommUtil.getStandardSubSqlMail() + ")"])
+                            ], " | ") 
+                           //additional indexed fields
+                           + ", ORGANISATION.NAME"
+                           + ", ORGANISATION.ORGANISATIONID"
+                           + ", CONTACT.CONTACTID"
+                           + ", ORGANISATION.CUSTOMERCODE"
+                           + ", ADDRESS.ADDRESS " 
+                           + ", ADDRESS.COUNTRY " 
+                           + ", ADDRESS.ZIP " 
+                           + ", ADDRESS.CITY " 
+                           + ", COMMUNICATION.ADDR " 
+                           + ", PHONE.ADDR " 
+                       )
+                    .from("ORGANISATION")
+                    .join("CONTACT", "CONTACT.ORGANISATION_ID = ORGANISATION.ORGANISATIONID and CONTACT.PERSON_ID is null")
+                    .leftJoin("ADDRESS", "defaultAddress.ADDRESSID = CONTACT.ADDRESS_ID", "defaultAddress")
+                    .leftJoin("ADDRESS", "ADDRESS.CONTACT_ID = CONTACT.CONTACTID")
+                    .leftJoin("COMMUNICATION", "COMMUNICATION.CONTACT_ID = CONTACT.CONTACTID")
+                    .leftJoin("COMMUNICATION", "PHONE.CONTACT_ID = CONTACT.CONTACTID and PHONE.MEDIUM_ID in ('" + CommMediumPhoneIds.join("', '") + "')", "PHONE")//TODO: refactor to new SqlBuilder
+                    .where("CONTACT.STATUS", $KeywordRegistry.contactStatus$inactive(), SqlBuilder.NOT_EQUAL())
+
+if (vars.exists("$local.idvalue") && vars.get("$local.idvalue") && vars.get("$local.idvalue").length > 0) 
+{
+    querySelect.where("CONTACT.CONTACTID", vars.get("$local.idvalue"), SqlBuilder.IN());
+}
+
+result.string(querySelect.toString());
diff --git a/entity/Person_entity/Person_entity.aod b/entity/Person_entity/Person_entity.aod
index a9282ecbdf..f4eb6df51f 100644
--- a/entity/Person_entity/Person_entity.aod
+++ b/entity/Person_entity/Person_entity.aod
@@ -1006,6 +1006,7 @@
       <title>New task</title>
       <onActionProcess>%aditoprj%/entity/Person_entity/entityfields/newtask/onActionProcess.js</onActionProcess>
       <iconId>VAADIN:TASKS</iconId>
+      <iconIdProcess>%aditoprj%/entity/Person_entity/entityfields/newtask/iconIdProcess.js</iconIdProcess>
     </entityActionField>
     <entityActionField>
       <name>addToCampaign</name>
@@ -1138,6 +1139,7 @@
       <name>openTaskView</name>
       <isMenuAction v="false" />
       <isObjectAction v="false" />
+      <stateProcess>%aditoprj%/entity/Person_entity/entityfields/opentaskview/stateProcess.js</stateProcess>
     </entityActionField>
     <entityActionField>
       <name>startWorkflow</name>
diff --git a/entity/Person_entity/afterUiInit.js b/entity/Person_entity/afterUiInit.js
index d529418d07..8ef43c0a2e 100644
--- a/entity/Person_entity/afterUiInit.js
+++ b/entity/Person_entity/afterUiInit.js
@@ -1,7 +1,9 @@
-import("system.neon");
-import("system.vars");
 import("Context_lib");
 import("Attribute_lib");
+import("system.neon");
+import("system.vars");
 
-if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
-    AttributeRelationUtils.presetMandatoryAttributes(ContextUtils.getCurrentContextId(), "Attributes");
\ No newline at end of file
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
+{
+    AttributeRelationUtils.presetMandatoryAttributes(ContextUtils.getCurrentContextId(), "Attributes");
+}
diff --git a/entity/Person_entity/entityfields/newtask/iconIdProcess.js b/entity/Person_entity/entityfields/newtask/iconIdProcess.js
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/entity/Person_entity/entityfields/opentaskview/stateProcess.js b/entity/Person_entity/entityfields/opentaskview/stateProcess.js
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/entity/Person_entity/recordcontainers/index/query.js b/entity/Person_entity/recordcontainers/index/query.js
index a21cc7b2e3..efe2af2c2e 100644
--- a/entity/Person_entity/recordcontainers/index/query.js
+++ b/entity/Person_entity/recordcontainers/index/query.js
@@ -5,6 +5,7 @@ import("system.calendars");
 import("system.db");
 import("Sql_lib");
 import("Communication_lib");
+import("KeywordRegistry_basic");
 
 /*
 Before changing the results that are returned here:
@@ -13,43 +14,48 @@ You may want to check out if your change affects other modules. However adding m
  */
 
 var sqlQuery, sqlHelper, queryCondition, affectedIds;
-var commMediumPhoneIds = CommUtil.getMediumIdsByCategory("PHONE");
+var CommMediumPhoneIds = db.array( db.COLUMN, "select KEYID from AB_KEYWORD_ENTRY join ab_keyword_attributerelation on AB_KEYWORD_ENTRYID = AB_KEYWORD_ENTRY_ID "
+        + " join ab_keyword_attribute on AB_KEYWORD_ATTRIBUTEID = AB_KEYWORD_ATTRIBUTE_ID and CHAR_VALUE = 'TELEPHONE' and AB_KEYWORD_ATTRIBUTE.CONTAINER = 'CommunicationMedium'");
 sqlHelper = new SqlMaskingUtils();
-var querySelect = newSelect([
-        "CONTACT.CONTACTID", //#UID
-        sqlHelper.concat(["PERSON.SALUTATION", "PERSON.FIRSTNAME", "PERSON.LASTNAME", "'|'", "ORGANISATION.NAME"]), //#TITLE
-        sqlHelper.concat([
-            sqlHelper.concat(["defaultAddress.ADDRESS", "defaultAddress.BUILDINGNO", "'-'",
-                "defaultAddress.COUNTRY", "defaultAddress.ZIP", "defaultAddress.CITY"]),
-            sqlHelper.concat(["'" + translate.text("Phone") + ":'", "(" + CommUtil.getStandardSubSqlPhone() + ")"]),
-            sqlHelper.concat(["'" + translate.text("Email") + ":'", "(" + CommUtil.getStandardSubSqlMail() + ")"])
-        ], " | "), //#DESCRIPTION
-        //additional indexed fields
-        "CONTACT.CONTACTID",
-        "PERSON.PERSONID",
-        "PERSON.FIRSTNAME",
-        "PERSON.LASTNAME",
-        sqlHelper.trim("PERSON.GENDER"),
-        "CONTACT.ORGANISATION_ID",
-        "ORGANISATION.NAME",
-        "ADDRESS.ADDRESS",
-        "ADDRESS.COUNTRY",
-        "ADDRESS.ZIP",
-        "ADDRESS.CITY",
-        "COMMUNICATION.ADDR",
-        "PHONE.ADDR" 
-    ])
-    .from("PERSON")
-    .join("CONTACT", "CONTACT.PERSON_ID = PERSON.PERSONID")
-    .join("ORGANISATION", "CONTACT.ORGANISATION_ID = ORGANISATION.ORGANISATIONID")
-    .leftJoin("ADDRESS", "defaultAddress.ADDRESSID = CONTACT.ADDRESS_ID", "defaultAddress")
-    .leftJoin("ADDRESS", "ADDRESS.CONTACT_ID = CONTACT.CONTACTID")
-    .leftJoin("COMMUNICATION", "COMMUNICATION.CONTACT_ID = CONTACT.CONTACTID")
-    .leftJoin("COMMUNICATION", newWhere("phone.CONTACT_ID = CONTACT.CONTACTID")
-        .and(["COMMUNICATION", "MEDIUM_ID", "phone"], commMediumPhoneIds, SqlBuilder.IN()), "phone")
-    .orderBy("CONTACT.CONTACTID");
+var querySelect = newSelect("CONTACT.CONTACTID "
+                        + "," + sqlHelper.concat(["PERSON.SALUTATION", "PERSON.FIRSTNAME", "PERSON.LASTNAME", "'|'", "ORGANISATION.NAME"])
+                        + "," + sqlHelper.concat([
+                             sqlHelper.concat(["defaultAddress.ADDRESS", "defaultAddress.BUILDINGNO", "'-'"
+                                ,"defaultAddress.COUNTRY", "defaultAddress.ZIP", "defaultAddress.CITY"])
+                            ,sqlHelper.concat(["'" + translate.text("Phone") + ":'", "(" + CommUtil.getStandardSubSqlPhone() + ")"])
+                            ,sqlHelper.concat(["'" + translate.text("Email") + ":'", "(" + CommUtil.getStandardSubSqlMail() + ")"])
+                            ], " | ")
+                            //additional indexed fields
+                            + ", CONTACT.CONTACTID "
+                            + ", PERSON.PERSONID "
+                            + ", PERSON.FIRSTNAME "
+                            + ", PERSON.LASTNAME "
+                            + ", TRIM(PERSON.GENDER) "
+                            + ", CONTACT.ORGANISATION_ID "
+                            + ", ORGANISATION.NAME "
+                            + ", ADDRESS.ADDRESS " 
+                            + ", ADDRESS.COUNTRY "
+                            + ", ADDRESS.ZIP " 
+                            + ", ADDRESS.CITY " 
+                            + ", COMMUNICATION.ADDR " 
+                            + ", PHONE.ADDR " 
+                        )
+                    .from("PERSON")
+                    .join("CONTACT", "CONTACT.PERSON_ID = PERSON.PERSONID")
+                    .and("CONTACT.STATUS", $KeywordRegistry.contactStatus$inactive(), SqlBuilder.NOT_EQUAL())
+                    .join("ORGANISATION", "CONTACT.ORGANISATION_ID = ORGANISATION.ORGANISATIONID")
+                    .leftJoin("ADDRESS", "defaultAddress.ADDRESSID = CONTACT.ADDRESS_ID", "defaultAddress")
+                    .leftJoin("ADDRESS", "ADDRESS.CONTACT_ID = CONTACT.CONTACTID")
+                    .leftJoin("COMMUNICATION", "COMMUNICATION.CONTACT_ID = CONTACT.CONTACTID")
+                    .leftJoin("COMMUNICATION", "PHONE.CONTACT_ID = CONTACT.CONTACTID and PHONE.MEDIUM_ID in ('" + CommMediumPhoneIds.join("', '") + "')", "PHONE") //TODO: refactor to new SqlBuilder
+                    .where("CONTACT.STATUS", $KeywordRegistry.contactStatus$inactive(), SqlBuilder.NOT_EQUAL())
+                    .orderBy("CONTACT.CONTACTID");
+
+if (vars.exists("$local.idvalue")) 
+{
+    affectedIds = vars.get("$local.idvalue");
+    querySelect.whereIfSet("CONTACT.CONTACTID", affectedIds, SqlBuilder.IN());
+}
 
-if (vars.exists("$local.idvalue"))
-    querySelect.whereIfSet("CONTACT.CONTACTID", "$local.idvalue", SqlBuilder.IN());
 
 result.string(querySelect);
\ No newline at end of file
-- 
GitLab


From f9a1572d5dd0106217d70bcb3d2580c0cb3cd8cf Mon Sep 17 00:00:00 2001
From: "s.pongratz" <s.pongratz@adito.de>
Date: Tue, 18 Aug 2020 13:51:15 +0200
Subject: [PATCH 167/309] #1060627-LeadimportMappingassistent switch
 Liquibase-Files from 2020.1.2 to 2020.2.0

---
 .liquibase/Data_alias/basic/2020.1.2/changelog.xml               | 1 -
 .../LeadimportMappingAssistant/changelog.xml                     | 0
 .../create_leadimportMappingAssistant.xml                        | 0
 .liquibase/Data_alias/basic/2020.2.0/changelog.xml               | 1 +
 4 files changed, 1 insertion(+), 1 deletion(-)
 rename .liquibase/Data_alias/basic/{2020.1.2 => 2020.2.0}/LeadimportMappingAssistant/changelog.xml (100%)
 rename .liquibase/Data_alias/basic/{2020.1.2 => 2020.2.0}/LeadimportMappingAssistant/create_leadimportMappingAssistant.xml (100%)

diff --git a/.liquibase/Data_alias/basic/2020.1.2/changelog.xml b/.liquibase/Data_alias/basic/2020.1.2/changelog.xml
index b2a07a454b..1498b71d12 100644
--- a/.liquibase/Data_alias/basic/2020.1.2/changelog.xml
+++ b/.liquibase/Data_alias/basic/2020.1.2/changelog.xml
@@ -5,5 +5,4 @@
     <include file="AddNullableToDateNew.xml" relativeToChangelogFile="true" />    
     <include file="insert_workflowCategory_keyword.xml" relativeToChangelogFile="true"/>    
     <include file="Notification/changelog.xml" relativeToChangelogFile="true" />
-    <include file="LeadimportMappingAssistant/changelog.xml" relativeToChangelogFile="true" />
 </databaseChangeLog>
diff --git a/.liquibase/Data_alias/basic/2020.1.2/LeadimportMappingAssistant/changelog.xml b/.liquibase/Data_alias/basic/2020.2.0/LeadimportMappingAssistant/changelog.xml
similarity index 100%
rename from .liquibase/Data_alias/basic/2020.1.2/LeadimportMappingAssistant/changelog.xml
rename to .liquibase/Data_alias/basic/2020.2.0/LeadimportMappingAssistant/changelog.xml
diff --git a/.liquibase/Data_alias/basic/2020.1.2/LeadimportMappingAssistant/create_leadimportMappingAssistant.xml b/.liquibase/Data_alias/basic/2020.2.0/LeadimportMappingAssistant/create_leadimportMappingAssistant.xml
similarity index 100%
rename from .liquibase/Data_alias/basic/2020.1.2/LeadimportMappingAssistant/create_leadimportMappingAssistant.xml
rename to .liquibase/Data_alias/basic/2020.2.0/LeadimportMappingAssistant/create_leadimportMappingAssistant.xml
diff --git a/.liquibase/Data_alias/basic/2020.2.0/changelog.xml b/.liquibase/Data_alias/basic/2020.2.0/changelog.xml
index 68a89e3e7f..98162e8029 100644
--- a/.liquibase/Data_alias/basic/2020.2.0/changelog.xml
+++ b/.liquibase/Data_alias/basic/2020.2.0/changelog.xml
@@ -2,4 +2,5 @@
 <databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
                    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
     <include relativeToChangelogFile="true" file="Classification/changelog.xml"/>
+    <include file="LeadimportMappingAssistant/changelog.xml" relativeToChangelogFile="true" />
 </databaseChangeLog>
-- 
GitLab


From 1746de02ac4a76b85e0cf87bb40970ff91460ba8 Mon Sep 17 00:00:00 2001
From: Heinz Boesl <h.boesl@adito.de>
Date: Tue, 18 Aug 2020 15:38:14 +0200
Subject: [PATCH 168/309] no title defined

---
 process/Address_lib/process.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/process/Address_lib/process.js b/process/Address_lib/process.js
index dbbe4e390c..1a49b23e15 100644
--- a/process/Address_lib/process.js
+++ b/process/Address_lib/process.js
@@ -402,6 +402,8 @@ function _getAddrData( pData )
             pData[15] = "";
         case 3:
             sformat = _getSalutation( pData[22] + pData[19] + pData[20] );
+            //no title defined
+            if ( sformat == undefined )  sformat = _getSalutation( pData[22] + pData[19] );            
             //no language defined
             if ( sformat == undefined )  sformat = _getSalutation( pData[19] + pData[20] );
             // no language specific entry in salutation
-- 
GitLab


From aaae020ee9d0e094ada73df1d89311b272582008 Mon Sep 17 00:00:00 2001
From: "S.Listl" <s.listl@adito.de>
Date: Tue, 18 Aug 2020 17:29:13 +0200
Subject: [PATCH 169/309] #1060558 Address location demodata, server processes

---
 .../basic/_demoData/generatedData/address.xml | 88 ++++++++++++++++---
 process/Location_lib/process.js               | 42 ++++++++-
 process/WsValidation_lib/process.js           |  2 +-
 .../process.js                                | 31 +++++++
 ...tMissingAddressLocations_serverProcess.aod | 11 +++
 .../process.js                                | 29 ++++++
 ...pdateAllAddressLocations_serverProcess.aod | 11 +++
 7 files changed, 198 insertions(+), 16 deletions(-)
 create mode 100644 process/setMissingAddressLocations_serverProcess/process.js
 create mode 100644 process/setMissingAddressLocations_serverProcess/setMissingAddressLocations_serverProcess.aod
 create mode 100644 process/updateAllAddressLocations_serverProcess/process.js
 create mode 100644 process/updateAllAddressLocations_serverProcess/updateAllAddressLocations_serverProcess.aod

diff --git a/.liquibase/Data_alias/basic/_demoData/generatedData/address.xml b/.liquibase/Data_alias/basic/_demoData/generatedData/address.xml
index fef08cdf38..30f5bc836e 100644
--- a/.liquibase/Data_alias/basic/_demoData/generatedData/address.xml
+++ b/.liquibase/Data_alias/basic/_demoData/generatedData/address.xml
@@ -15,6 +15,8 @@
       <column name="PROVINCE" value="Freistaat Bayern"/>
       <column name="USER_NEW" value="Admin"/>
       <column name="ZIP" value="18074"/>
+      <column name="LAT" valueNumeric="50.0711647"/>
+      <column name="LON" valueNumeric="9.3442543"/>
     </insert>
     <insert tableName="address">
       <column name="ADDRESS" value="Neustadt"/>
@@ -30,6 +32,8 @@
       <column name="REGION" value="Niederbayern"/>
       <column name="USER_NEW" value="Admin"/>
       <column name="ZIP" value="84034"/>
+      <column name="LAT" valueNumeric="48.5352758"/>
+      <column name="LON" valueNumeric="12.1538109"/>
     </insert>
     <insert tableName="address">
       <column name="ADDRESS" value="Laufertorgraben"/>
@@ -46,6 +50,8 @@
       <column name="REGION" value="Mittelfranken"/>
       <column name="USER_NEW" value="Admin"/>
       <column name="ZIP" value="90419"/>
+      <column name="LAT" valueNumeric="49.4554978"/>
+      <column name="LON" valueNumeric="11.0892023"/>
     </insert>
     <insert tableName="address">
       <column name="ADDRESS" value="Wilhelm-Straße"/>
@@ -61,6 +67,8 @@
       <column name="PROVINCE" value="Bayern"/>
       <column name="USER_NEW" value="Admin"/>
       <column name="ZIP" value="80807"/>
+      <column name="LAT" valueNumeric="48.15795955"/>
+      <column name="LON" valueNumeric="11.58301632"/>
     </insert>
     <insert tableName="address">
       <column name="ADDRESS" value="Freiberger Str."/>
@@ -71,9 +79,11 @@
       <column name="CONTACT_ID" value="5a52304e-65e8-40ed-9aca-a76af6c8c3a0"/>
       <column name="COUNTRY" value="DE"/>
       <column name="DATE_NEW" valueDate="2019-05-17T09:46:28"/>
-      <column name="PROVINCE" value="Bayern"/>
+      <column name="PROVINCE" value="Sachsen"/>
       <column name="USER_NEW" value="Admin"/>
       <column name="ZIP" value="01159"/>
+      <column name="LAT" valueNumeric="51.0433705"/>
+      <column name="LON" valueNumeric="13.7049829"/>
     </insert>
     <insert tableName="address">
       <column name="ADDRESS" value="Regensburger Straße"/>
@@ -87,6 +97,8 @@
       <column name="PROVINCE" value="Bayern"/>
       <column name="USER_NEW" value="Admin"/>
       <column name="ZIP" value="85055"/>
+      <column name="LAT" valueNumeric="48.7677535"/>
+      <column name="LON" valueNumeric="11.4433236"/>
     </insert>
     <insert tableName="address">
       <column name="ADDRESS" value="Hildburghausen"/>
@@ -102,6 +114,8 @@
       <column name="REGION" value="Niederbayern "/>
       <column name="USER_NEW" value="Admin"/>
       <column name="ZIP" value="84034"/>
+      <column name="LAT" valueNumeric="48.53621870"/>
+      <column name="LON" valueNumeric="12.12398208"/>
     </insert>
     <insert tableName="address">
       <column name="ADDRESS" value="Landshuter Str."/>
@@ -115,6 +129,8 @@
       <column name="PROVINCE" value="Bayern"/>
       <column name="USER_NEW" value="Admin"/>
       <column name="ZIP" value="84144"/>
+      <column name="LAT" valueNumeric="48.4763188"/>
+      <column name="LON" valueNumeric="12.2521511"/>
     </insert>
     <insert tableName="address">
       <column name="ADDRESS" value="Bolzstraße"/>
@@ -125,9 +141,11 @@
       <column name="CONTACT_ID" value="fc465f2f-803b-4a1f-b79d-7b466d7ecff4"/>
       <column name="COUNTRY" value="DE"/>
       <column name="DATE_NEW" valueDate="2019-05-15T03:41:53"/>
-      <column name="PROVINCE" value="Deutschland"/>
+      <column name="PROVINCE" value="Baden-Württemberg"/>
       <column name="USER_NEW" value="Admin"/>
       <column name="ZIP" value="70173"/>
+      <column name="LAT" valueNumeric="48.7802679"/>
+      <column name="LON" valueNumeric="9.1771426"/>
     </insert>
     <insert tableName="address">
       <column name="ADDRESS" value="Torstraße"/>
@@ -138,9 +156,11 @@
       <column name="CONTACT_ID" value="2c14fb05-d48e-4eeb-8a7f-85d423746848"/>
       <column name="COUNTRY" value="DE"/>
       <column name="DATE_NEW" valueDate="2019-05-17T09:44:21"/>
-      <column name="PROVINCE" value="Deutschland"/>
+      <column name="PROVINCE" value="Berlin"/>
       <column name="USER_NEW" value="Admin"/>
       <column name="ZIP" value="10115"/>
+      <column name="LAT" valueNumeric="52.5274079"/>
+      <column name="LON" valueNumeric="13.3884627"/>
     </insert>
     <insert tableName="address">
       <column name="ADDRESS" value="Neustadt"/>
@@ -156,6 +176,8 @@
       <column name="REGION" value="Niederbayern"/>
       <column name="USER_NEW" value="Admin"/>
       <column name="ZIP" value="84034"/>
+      <column name="LAT" valueNumeric="48.5352758"/>
+      <column name="LON" valueNumeric="12.1538109"/>
     </insert>
     <insert tableName="address">
       <column name="ADDRESS" value="Königstraße"/>
@@ -169,6 +191,8 @@
       <column name="PROVINCE" value="Hamburg"/>
       <column name="USER_NEW" value="Admin"/>
       <column name="ZIP" value="22767 "/>
+      <column name="LAT" valueNumeric="53.549853"/>
+      <column name="LON" valueNumeric="9.9542231"/>
     </insert>
     <insert tableName="address">
       <column name="ADDRESS" value="Büsingstrasse"/>
@@ -183,6 +207,8 @@
       <column name="PROVINCE" value="Bayern"/>
       <column name="USER_NEW" value="Admin"/>
       <column name="ZIP" value="85230"/>
+      <column name="LAT" valueNumeric="48.1740741"/>
+      <column name="LON" valueNumeric="11.1358621"/>
     </insert>
     <insert tableName="address">
       <column name="ADDRESS" value="Sandstraße"/>
@@ -198,6 +224,8 @@
       <column name="PROVINCE" value="Bayern"/>
       <column name="USER_NEW" value="Admin"/>
       <column name="ZIP" value="90443"/>
+      <column name="LAT" valueNumeric="49.44684405"/>
+      <column name="LON" valueNumeric="11.06877420"/>
     </insert>
     <insert tableName="address">
       <column name="ADDRESS" value="Friedrichshafen"/>
@@ -208,9 +236,11 @@
       <column name="CONTACT_ID" value="6efb4fab-64f9-4d8e-aa6f-a158d13fc273"/>
       <column name="COUNTRY" value="DE"/>
       <column name="DATE_NEW" valueDate="2019-05-15T03:28:49"/>
-      <column name="PROVINCE" value="Deutschland"/>
+      <column name="PROVINCE" value="Baden-Württemberg"/>
       <column name="USER_NEW" value="Admin"/>
       <column name="ZIP" value="88046"/>
+      <column name="LAT" valueNumeric="47.66121225"/>
+      <column name="LON" valueNumeric="9.49441404"/>
     </insert>
     <insert tableName="address">
       <column name="ADDRESS" value="Grosse Praesidenten Str."/>
@@ -221,10 +251,11 @@
       <column name="CONTACT_ID" value="73d73404-e7f5-11e8-9f32-f2801f1b9fd1"/>
       <column name="COUNTRY" value="DE"/>
       <column name="DATE_NEW" valueDate="2019-05-13T01:16:38"/>
-      <column name="DISTRICT" value="Oberbayern"/>
-      <column name="PROVINCE" value="Bayern"/>
+      <column name="PROVINCE" value="Rheinland-Pfalz"/>
       <column name="USER_NEW" value="Admin"/>
       <column name="ZIP" value="67700"/>
+      <column name="LAT" valueNumeric="49.5784546"/>
+      <column name="LON" valueNumeric="7.6955565"/>
     </insert>
     <insert tableName="address">
       <column name="ADDRESS" value="Steinstraße"/>
@@ -238,6 +269,8 @@
       <column name="PROVINCE" value="Bayern"/>
       <column name="USER_NEW" value="Admin"/>
       <column name="ZIP" value="93047"/>
+      <column name="LAT" valueNumeric="49.0135924"/>
+      <column name="LON" valueNumeric="12.1225171"/>
     </insert>
     <insert tableName="address">
       <column name="ADDRESS" value="Kurfürstendamm"/>
@@ -252,6 +285,8 @@
       <column name="PROVINCE" value="Mecklenburg-Vorpommern"/>
       <column name="USER_NEW" value="Admin"/>
       <column name="ZIP" value="18074"/>
+      <column name="LAT" valueNumeric="54.0924445"/>
+      <column name="LON" valueNumeric="12.1286127"/>
     </insert>
     <insert tableName="address">
       <column name="ADDRESS" value="Fliederstraße"/>
@@ -265,6 +300,8 @@
       <column name="PROVINCE" value="Baden-Württemberg"/>
       <column name="USER_NEW" value="Admin"/>
       <column name="ZIP" value="71229"/>
+      <column name="LAT" valueNumeric="48.7956487"/>
+      <column name="LON" valueNumeric="9.0248443"/>
     </insert>
     <insert tableName="address">
       <column name="ADDRESS" value="Hauptstraße"/>
@@ -280,6 +317,8 @@
       <column name="REGION" value="Landsberg am Lech"/>
       <column name="USER_NEW" value="Admin"/>
       <column name="ZIP" value="86949"/>
+      <column name="LAT" valueNumeric="48.0642437"/>
+      <column name="LON" valueNumeric="10.9894142"/>
     </insert>
     <insert tableName="address">
       <column name="ADDRESS" value="Augsburger Straße"/>
@@ -293,6 +332,8 @@
       <column name="PROVINCE" value="Bayern"/>
       <column name="USER_NEW" value="Admin"/>
       <column name="ZIP" value="86150"/>
+      <column name="LAT" valueNumeric="48.3641223"/>
+      <column name="LON" valueNumeric="10.87471185"/>
     </insert>
     <insert tableName="address">
       <column name="ADDRESS" value="Landsberger Allee"/>
@@ -307,6 +348,8 @@
       <column name="PROVINCE" value="Bayern"/>
       <column name="USER_NEW" value="Admin"/>
       <column name="ZIP" value="80456"/>
+      <column name="LAT" valueNumeric="48.1394721"/>
+      <column name="LON" valueNumeric="11.5367592"/>
     </insert>
     <insert tableName="address">
       <column name="ADDRESS" value="Oeder Weg"/>
@@ -318,10 +361,11 @@
       <column name="CONTACT_ID" value="fd082db5-be43-4219-a705-588f9c06e59b"/>
       <column name="COUNTRY" value="DE"/>
       <column name="DATE_NEW" valueDate="2019-05-13T01:16:38"/>
-      <column name="DISTRICT" value="Oberbayern"/>
-      <column name="PROVINCE" value="Bayern"/>
+      <column name="PROVINCE" value="Hessen"/>
       <column name="USER_NEW" value="Admin"/>
       <column name="ZIP" value="60318"/>
+      <column name="LAT" valueNumeric="50.1186864"/>
+      <column name="LON" valueNumeric="8.6798809"/>
     </insert>
     <insert tableName="address">
       <column name="ADDRESS" value="Hildburghausen"/>
@@ -339,6 +383,8 @@
       <column name="USER_EDIT" value="Admin"/>
       <column name="USER_NEW" value="Admin"/>
       <column name="ZIP" value="84034"/>
+      <column name="LAT" valueNumeric="48.53621870"/>
+      <column name="LON" valueNumeric="12.12398208"/>
     </insert>
     <insert tableName="address">
       <column name="ADDRESS" value="Innere Münchner Straße"/>
@@ -348,9 +394,12 @@
       <column name="CITY" value="Landshut"/>
       <column name="CONTACT_ID" value="f682daa0-4da9-435c-b40a-552701d89570"/>
       <column name="COUNTRY" value="DE"/>
+      <column name="PROVINCE" value="Bayern"/>
       <column name="DATE_NEW" valueDate="2019-11-26T08:28:01"/>
       <column name="USER_NEW" value="Admin"/>
       <column name="ZIP" value="84028"/>
+      <column name="LAT" valueNumeric="48.53814234"/>
+      <column name="LON" valueNumeric="12.16404283"/>
     </insert>
     <insert tableName="address">
       <column name="ADDRESS" value="Konrad"/>
@@ -362,6 +411,8 @@
       <column name="DATE_NEW" valueDate="2019-11-25T01:52:48"/>
       <column name="USER_NEW" value="Admin"/>
       <column name="ZIP" value="84144"/>
+      <column name="LAT" valueNumeric="48.4772603"/>
+      <column name="LON" valueNumeric="12.2440481"/>
     </insert>
     <insert tableName="address">
       <column name="ADDRESS" value="Neustadt"/>
@@ -377,6 +428,8 @@
       <column name="REGION" value="Niederbayern"/>
       <column name="USER_NEW" value="Admin"/>
       <column name="ZIP" value="84034"/>
+      <column name="LAT" valueNumeric="48.5352758"/>
+      <column name="LON" valueNumeric="12.1538109"/>
     </insert>
     <insert tableName="address">
       <column name="ADDRESS" value="Am Alten Viehmarkt"/>
@@ -390,6 +443,8 @@
       <column name="PROVINCE" value="Bayern"/>
       <column name="USER_NEW" value="Admin"/>
       <column name="ZIP" value="84028"/>
+      <column name="LAT" valueNumeric="48.5391499"/>
+      <column name="LON" valueNumeric="12.1573214"/>
     </insert>
     <insert tableName="address">
       <column name="ADDRESS" value="Karlstraße"/>
@@ -403,6 +458,8 @@
       <column name="PROVINCE" value="Bayern"/>
       <column name="USER_NEW" value="Admin"/>
       <column name="ZIP" value="86150"/>
+      <column name="LAT" valueNumeric="48.370795"/>
+      <column name="LON" valueNumeric="10.897609"/>
     </insert>
     <insert tableName="address">
       <column name="ADDRESS" value="Bogenallee"/>
@@ -416,6 +473,8 @@
       <column name="PROVINCE" value="Bremen"/>
       <column name="USER_NEW" value="Admin"/>
       <column name="ZIP" value="28103"/>
+      <column name="LAT" valueNumeric="51.5033219"/>
+      <column name="LON" valueNumeric="7.9576538"/>
     </insert>
     <insert tableName="address">
       <column name="ADDRESS" value="Julius-Leber-Straße"/>
@@ -429,6 +488,8 @@
       <column name="PROVINCE" value="Hamburg"/>
       <column name="USER_NEW" value="Admin"/>
       <column name="ZIP" value="22765"/>
+      <column name="LAT" valueNumeric="53.555812"/>
+      <column name="LON" valueNumeric="9.9363988"/>
     </insert>
     <insert tableName="address">
       <column name="ADDRESS" value="Blumenstraße"/>
@@ -444,20 +505,23 @@
       <column name="USER_EDIT" value="Admin"/>
       <column name="USER_NEW" value="Admin"/>
       <column name="ZIP" value="93055"/>
+      <column name="LAT" valueNumeric="49.01276075"/>
+      <column name="LON" valueNumeric="12.11305452"/>
     </insert>
     <insert tableName="address">
       <column name="ADDRESS" value="Spresstrasse"/>
       <column name="ADDRESSID" value="f00966ec-693b-4bb5-8c66-26a40f18394f"/>
       <column name="ADDR_TYPE" value="HOMEADDR"/>
       <column name="BUILDINGNO" value="67"/>
-      <column name="CITY" value="Bielefeld Babenhausen"/>
+      <column name="CITY" value="Bielefeld"/>
       <column name="CONTACT_ID" value="57d524f6-ad66-4550-be83-fee6e31b7a52"/>
       <column name="COUNTRY" value="DE"/>
       <column name="DATE_NEW" valueDate="2019-05-13T01:16:38"/>
-      <column name="DISTRICT" value="Oberbayern"/>
-      <column name="PROVINCE" value="Bayern"/>
+      <column name="PROVINCE" value="Nordrhein-Westfalen"/>
       <column name="USER_NEW" value="Admin"/>
       <column name="ZIP" value="33739"/>
+      <column name="LAT" valueNumeric="52.08547342"/>
+      <column name="LON" valueNumeric="8.52114562"/>
     </insert>
     <insert tableName="address">
       <column name="ADDRESS" value="Gotthardstraße"/>
@@ -475,6 +539,8 @@
       <column name="USER_EDIT" value="Admin"/>
       <column name="USER_NEW" value="Admin"/>
       <column name="ZIP" value="80689"/>
+      <column name="LAT" valueNumeric="48.1358663"/>
+      <column name="LON" valueNumeric="11.4963975"/>
     </insert>
   </changeSet>
 </databaseChangeLog>
\ No newline at end of file
diff --git a/process/Location_lib/process.js b/process/Location_lib/process.js
index 96a3360c74..91ebd5ce8a 100644
--- a/process/Location_lib/process.js
+++ b/process/Location_lib/process.js
@@ -163,7 +163,9 @@ GeoLocationUtils.degreeToRadians = function (pAngle)
     return pAngle * Math.PI / 180;
 }
 
-
+/**
+ * Object for searching the geolocation of adresses.
+ */
 function LocationFinder ()
 {
     this._minAccuracy = AddressParts.ZIPCODE();
@@ -180,6 +182,8 @@ function LocationFinder ()
 }
 
 /**
+ * Function for loading the location data via nominatim
+ * 
  * @param {AddressObject} pAddress
  */
 LocationFinder._getLocationWithNominatim = function (pAddress)
@@ -204,28 +208,58 @@ LocationFinder._getLocationWithNominatim = function (pAddress)
     return WsValidationUtils.validate(null, "TYPE_FULLADDRESS_NOMINATIM", parameters);
 }
 
+/**
+ * Sets a custom function for getting the location of an address. The provided function must take an AddressObject as parameter
+ * and return an object containing the properties "lat" and "lon".
+ * 
+ * @param {Function} pLocationFn function that finds the location of an address
+ * @return {LocationFinder} current object
+ */
 LocationFinder.prototype.setLocationFindingFn = function (pLocationFn)
 {
-    if (typeof pLocationFn !== "function")
-        throw new TypeError(""); //TODO: error
+    if (!Utils.isFunction(pLocationFn))
+        throw new TypeError("LocationFinder: expected function, but got " + (typeof pLocationFn));
     this._getLocationFn = pLocationFn;
     this._isServiceAvailable = true; //if a custom function is set, assume that it works
     return this;
 }
 
+/**
+ * Sets the lowest accuracy of the location search before it gives up the search. 
+ * 
+ * @param {String} pAccuracy the accuracy, use AddressParts constants
+ * @return {LocationFinder} current object
+ */
 LocationFinder.prototype.setMinAccuracy = function (pAccuracy)
 {
     this._minAccuracy = pAccuracy;
     return this;
 }
 
+/**
+ * Tells if the LocationFinder is able to perform the location search. This can be false if the used service is not enabled.
+ * 
+ * @return {Boolean} true, if the LocationFinder can be used
+ */
+LocationFinder.prototype.isEnabled = function ()
+{
+    return this._isServiceAvailable;
+}
+
+/**
+ * Performs the location search for the given address. The LocationFinder tries to find addresses with decreasing accuracy until it gets a result
+ * or the min accuracy has been exceeded (the default min accuracy is zipCode).
+ * 
+ * @param {AddressObject} pAddress an object containing the address data
+ * @return {Object} object with the properties "lat", "lon" and "accuracy", or null if the address could not be found
+ */
 LocationFinder.prototype.getGeoLocation = function (pAddress)
 {
     if (!this._isServiceAvailable)
         return null;
     
     //copy address, so the searchAddress can be modified without changing the given address
-    var searchAddress = Object.assign(new AddressObject(), pAddress);
+    var searchAddress = Utils.clone(pAddress);
     
     var minAccuracyIndex = this._minAccuracy ? this._accuracyOrder.indexOf(this._minAccuracy) : this._accuracyOrder.length - 1;
     
diff --git a/process/WsValidation_lib/process.js b/process/WsValidation_lib/process.js
index 7e4347bc40..7a0e9b7e49 100644
--- a/process/WsValidation_lib/process.js
+++ b/process/WsValidation_lib/process.js
@@ -267,7 +267,7 @@ WsValidationType.get = function(pKey)
         if (!url)
             throw new Error("if the webservice '" + this.key + "' is enabled, you have to provide the url");
 
-        if (Object.keys(pParameters).length > 0)
+        if (!Utils.isNullOrEmpty(pParameters))
         {
             var nominatimRequest = new NominatimRequest(url)
                 .setResultLimit(1)
diff --git a/process/setMissingAddressLocations_serverProcess/process.js b/process/setMissingAddressLocations_serverProcess/process.js
new file mode 100644
index 0000000000..38efd07055
--- /dev/null
+++ b/process/setMissingAddressLocations_serverProcess/process.js
@@ -0,0 +1,31 @@
+import("system.db");
+import("Sql_lib");
+import("Address_lib");
+import("Location_lib");
+
+var locationSearch = new LocationFinder();
+
+if (locationSearch.isEnabled())
+{
+    newSelect("ADDRESSID, ADDRESS, BUILDINGNO, ZIP, CITY, COUNTRY, PROVINCE")
+        .from("ADDRESS")
+        .where("ADDRESS.LAT is null")
+            .or("ADDRESS.LON is null")
+        .pageSize(400)
+        .forEachPage(function (addresses)
+        {
+            var locationUpdates = [];
+            addresses.forEach(function ([addressId, address, buildingno, zip, city, country, state])
+            {
+                var addressData = new AddressObject(address, buildingno, zip, city, country, state);
+                var location = locationSearch.getGeoLocation(addressData);
+                if (location)
+                {
+                    locationUpdates.push(["ADDRESS", ["LAT", "LON"], null, [location.lat, location.lon], 
+                        newWhere("ADDRESS.ADDRESSID", addressId).buildCondition()]);
+                }
+            });
+            if (locationUpdates.length > 0)
+                db.updates(locationUpdates);
+        });
+}
\ No newline at end of file
diff --git a/process/setMissingAddressLocations_serverProcess/setMissingAddressLocations_serverProcess.aod b/process/setMissingAddressLocations_serverProcess/setMissingAddressLocations_serverProcess.aod
new file mode 100644
index 0000000000..3752f6718d
--- /dev/null
+++ b/process/setMissingAddressLocations_serverProcess/setMissingAddressLocations_serverProcess.aod
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.1">
+  <name>setMissingAddressLocations_serverProcess</name>
+  <title>Set missing address locations</title>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <process>%aditoprj%/process/setMissingAddressLocations_serverProcess/process.js</process>
+  <alias>Data_alias</alias>
+  <variants>
+    <element>EXECUTABLE</element>
+  </variants>
+</process>
diff --git a/process/updateAllAddressLocations_serverProcess/process.js b/process/updateAllAddressLocations_serverProcess/process.js
new file mode 100644
index 0000000000..5341f47ddf
--- /dev/null
+++ b/process/updateAllAddressLocations_serverProcess/process.js
@@ -0,0 +1,29 @@
+import("system.db");
+import("Sql_lib");
+import("Address_lib");
+import("Location_lib");
+
+var locationSearch = new LocationFinder();
+
+if (locationSearch.isEnabled())
+{
+    newSelect("ADDRESSID, ADDRESS, BUILDINGNO, ZIP, CITY, COUNTRY, PROVINCE")
+        .from("ADDRESS")
+        .pageSize(400)
+        .forEachPage(function (addresses)
+        {
+            var locationUpdates = [];
+            addresses.forEach(function ([addressId, address, buildingno, zip, city, country, state])
+            {
+                var addressData = new AddressObject(address, buildingno, zip, city, country, state);
+                var location = locationSearch.getGeoLocation(addressData);
+                if (location)
+                {
+                    locationUpdates.push(["ADDRESS", ["LAT", "LON"], null, [location.lat, location.lon], 
+                        newWhere("ADDRESS.ADDRESSID", addressId).buildCondition()]);
+                }
+            });
+            if (locationUpdates.length > 0)
+                db.updates(locationUpdates);
+        });
+}
\ No newline at end of file
diff --git a/process/updateAllAddressLocations_serverProcess/updateAllAddressLocations_serverProcess.aod b/process/updateAllAddressLocations_serverProcess/updateAllAddressLocations_serverProcess.aod
new file mode 100644
index 0000000000..e0b953cac1
--- /dev/null
+++ b/process/updateAllAddressLocations_serverProcess/updateAllAddressLocations_serverProcess.aod
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.1">
+  <name>updateAllAddressLocations_serverProcess</name>
+  <title>Set all address locations</title>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <process>%aditoprj%/process/updateAllAddressLocations_serverProcess/process.js</process>
+  <alias>Data_alias</alias>
+  <variants>
+    <element>EXECUTABLE</element>
+  </variants>
+</process>
-- 
GitLab


From e80aec9d12491ca4a0924e07309ab2f6f9af1a0c Mon Sep 17 00:00:00 2001
From: "j.goderbauer" <j.goderbauer@adito.de>
Date: Tue, 18 Aug 2020 13:49:09 +0200
Subject: [PATCH 170/309] [Projekt: Entwicklung - Neon][TicketNr.:
 1063926][DuplicateScanner: Fehler bei Neuanlage wenn kein pattern definiert
 ist]

---
 process/DuplicateScanner_lib/process.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/process/DuplicateScanner_lib/process.js b/process/DuplicateScanner_lib/process.js
index 92dee1a9b0..80b79ca716 100644
--- a/process/DuplicateScanner_lib/process.js
+++ b/process/DuplicateScanner_lib/process.js
@@ -894,6 +894,8 @@ _DuplicateScannerUtils._loadIndexPattern = function(pScannerName, pTargetEntity)
 
 
 _DuplicateScannerUtils._filterToScanPattern = function(filterString) {
+    if (filterString == "")
+        return "";
     let filter = JSON.parse(filterString);
     return _DuplicateScannerUtils._filterChildsToScanPattern(filter.filter.childs, filter.filter.operator);
 }
-- 
GitLab


From b68b127442c0a201b5606c8220b3ed966417eec9 Mon Sep 17 00:00:00 2001
From: "j.goderbauer" <j.goderbauer@adito.de>
Date: Wed, 19 Aug 2020 10:54:35 +0200
Subject: [PATCH 171/309] error in final liquibase-script:
 SALESORDER.CANCELLATION had a space character at the end of its name

---
 .../Data_alias/basic/2019.1.4/Salesorder/update_Salesorder.xml  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.liquibase/Data_alias/basic/2019.1.4/Salesorder/update_Salesorder.xml b/.liquibase/Data_alias/basic/2019.1.4/Salesorder/update_Salesorder.xml
index 61f8dee92b..3a824531f8 100644
--- a/.liquibase/Data_alias/basic/2019.1.4/Salesorder/update_Salesorder.xml
+++ b/.liquibase/Data_alias/basic/2019.1.4/Salesorder/update_Salesorder.xml
@@ -4,7 +4,7 @@
         
         <addColumn tableName="SALESORDER">
             <column name="OBJECT_TYPE" type="NVARCHAR(63)"/>
-            <column name="CANCELLATION " type="TINYINT"/>
+            <column name="CANCELLATION" type="TINYINT"/>
             <column name="UNPAID" type="INTEGER"/>
             <column name="PAID" type="INTEGER"/>
             <column name="PAYDUEDATE" type="DATETIME"/>
-- 
GitLab


From 2a008c72080693221769899e68891f79125c15b5 Mon Sep 17 00:00:00 2001
From: "S.Listl" <s.listl@adito.de>
Date: Wed, 19 Aug 2020 10:58:58 +0200
Subject: [PATCH 172/309] Removed deprecated WorkflowStarter

---
 entity/Offer_entity/Offer_entity.aod          |  1 -
 entity/Offer_entity/afterOperatingState.js    |  9 ---
 .../recordcontainers/db/onDBDelete.js         |  1 -
 .../recordcontainers/db/onDBInsert.js         |  2 -
 .../recordcontainers/db/onDBUpdate.js         |  7 ---
 .../Organisation_entity.aod                   |  1 -
 .../afterOperatingState.js                    |  8 ---
 .../recordcontainers/db/onDBDelete.js         |  1 -
 .../recordcontainers/db/onDBInsert.js         |  3 -
 .../recordcontainers/db/onDBUpdate.js         |  1 -
 entity/Person_entity/Person_entity.aod        |  1 -
 entity/Person_entity/afterOperatingState.js   |  8 ---
 .../recordcontainers/db/onDBDelete.js         |  1 -
 .../recordcontainers/db/onDBInsert.js         |  2 -
 .../recordcontainers/db/onDBUpdate.js         |  1 -
 .../Salesproject_entity.aod                   |  1 -
 .../afterOperatingState.js                    | 14 -----
 .../recordcontainers/db/onDBDelete.js         |  1 -
 .../recordcontainers/db/onDBInsert.js         |  2 -
 .../recordcontainers/db/onDBUpdate.js         |  1 -
 .../recordcontainers/jdito/contentProcess.js  |  2 +-
 process/Workflow_lib/process.js               | 55 +------------------
 22 files changed, 2 insertions(+), 121 deletions(-)
 delete mode 100644 entity/Offer_entity/afterOperatingState.js
 delete mode 100644 entity/Organisation_entity/afterOperatingState.js
 delete mode 100644 entity/Person_entity/afterOperatingState.js
 delete mode 100644 entity/Salesproject_entity/afterOperatingState.js

diff --git a/entity/Offer_entity/Offer_entity.aod b/entity/Offer_entity/Offer_entity.aod
index e7e889fdb6..a40ebeb081 100644
--- a/entity/Offer_entity/Offer_entity.aod
+++ b/entity/Offer_entity/Offer_entity.aod
@@ -11,7 +11,6 @@
   <grantDeleteProcess>%aditoprj%/entity/Offer_entity/grantDeleteProcess.js</grantDeleteProcess>
   <contentTitleProcess>%aditoprj%/entity/Offer_entity/contentTitleProcess.js</contentTitleProcess>
   <afterUiInit>%aditoprj%/entity/Offer_entity/afterUiInit.js</afterUiInit>
-  <afterOperatingState>%aditoprj%/entity/Offer_entity/afterOperatingState.js</afterOperatingState>
   <useFavorites v="true" />
   <iconId>VAADIN:CART</iconId>
   <imageProcess>%aditoprj%/entity/Offer_entity/imageProcess.js</imageProcess>
diff --git a/entity/Offer_entity/afterOperatingState.js b/entity/Offer_entity/afterOperatingState.js
deleted file mode 100644
index d80259f9b7..0000000000
--- a/entity/Offer_entity/afterOperatingState.js
+++ /dev/null
@@ -1,9 +0,0 @@
-import("Context_lib");
-import("system.vars");
-import("Workflow_lib");
-
-if (vars.exists("$context.workflowQueue") && vars.get("$context.workflowQueue"))
-{
-    WorkflowStarter.inserted(vars.get("$context.workflowQueue"));
-    vars.set("$context.workflowQueue", null);
-}
\ No newline at end of file
diff --git a/entity/Offer_entity/recordcontainers/db/onDBDelete.js b/entity/Offer_entity/recordcontainers/db/onDBDelete.js
index 1e1ad63fd5..d304685d8c 100644
--- a/entity/Offer_entity/recordcontainers/db/onDBDelete.js
+++ b/entity/Offer_entity/recordcontainers/db/onDBDelete.js
@@ -10,5 +10,4 @@ newWhere("OFFERITEM.OFFER_ID", "$field.OFFERID")
 new AttributeRelationQuery(vars.get("$field.OFFERID"), null, ContextUtils.getCurrentContextId())
     .deleteAllAttributes();
     
-WorkflowStarter.deleted({sum : Number(vars.get("$field.TotalGross")), status : vars.get("$field.STATUS")});
 WorkflowSignalSender.deleted();
\ No newline at end of file
diff --git a/entity/Offer_entity/recordcontainers/db/onDBInsert.js b/entity/Offer_entity/recordcontainers/db/onDBInsert.js
index abaadff690..086ca1c559 100644
--- a/entity/Offer_entity/recordcontainers/db/onDBInsert.js
+++ b/entity/Offer_entity/recordcontainers/db/onDBInsert.js
@@ -21,6 +21,4 @@ if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
     }
 }
 
-//start the execution in afterOperatingState, because here the dataset is not yet inserted
-vars.set("$context.workflowQueue", {sum : Number(vars.get("$field.TotalGross")), status : vars.get("$field.STATUS")});
 WorkflowSignalSender.inserted();
diff --git a/entity/Offer_entity/recordcontainers/db/onDBUpdate.js b/entity/Offer_entity/recordcontainers/db/onDBUpdate.js
index d278b4ce87..2e53f3cad9 100644
--- a/entity/Offer_entity/recordcontainers/db/onDBUpdate.js
+++ b/entity/Offer_entity/recordcontainers/db/onDBUpdate.js
@@ -1,10 +1,3 @@
-import("system.workflow");
-import("KeywordRegistry_basic");
-import("system.vars");
 import("Workflow_lib");
 
-var status = vars.get("$local.rowdata")["OFFER.STATUS"];
-if (vars.get("$local.changed").indexOf("OFFER.STATUS") !== -1 && status == $KeywordRegistry.offerStatus$toCheck())
-    WorkflowStarter.updated({sum : Number(vars.get("$field.TotalGross")), status : status});
-
 WorkflowSignalSender.updated();
\ No newline at end of file
diff --git a/entity/Organisation_entity/Organisation_entity.aod b/entity/Organisation_entity/Organisation_entity.aod
index 5338f7de73..16ee3b7444 100644
--- a/entity/Organisation_entity/Organisation_entity.aod
+++ b/entity/Organisation_entity/Organisation_entity.aod
@@ -8,7 +8,6 @@
   <grantDeleteProcess>%aditoprj%/entity/Organisation_entity/grantDeleteProcess.js</grantDeleteProcess>
   <contentTitleProcess>%aditoprj%/entity/Organisation_entity/contentTitleProcess.js</contentTitleProcess>
   <afterUiInit>%aditoprj%/entity/Organisation_entity/afterUiInit.js</afterUiInit>
-  <afterOperatingState>%aditoprj%/entity/Organisation_entity/afterOperatingState.js</afterOperatingState>
   <initFilterProcess>%aditoprj%/entity/Organisation_entity/initFilterProcess.js</initFilterProcess>
   <useFavorites v="true" />
   <iconId>VAADIN:BUILDING</iconId>
diff --git a/entity/Organisation_entity/afterOperatingState.js b/entity/Organisation_entity/afterOperatingState.js
deleted file mode 100644
index 95c2733509..0000000000
--- a/entity/Organisation_entity/afterOperatingState.js
+++ /dev/null
@@ -1,8 +0,0 @@
-import("system.vars");
-import("Workflow_lib");
-
-if (vars.exists("$context.workflowQueue") && vars.get("$context.workflowQueue"))
-{
-    WorkflowStarter.inserted(vars.get("$context.workflowQueue"));
-    vars.set("$context.workflowQueue", null);
-}
\ No newline at end of file
diff --git a/entity/Organisation_entity/recordcontainers/db/onDBDelete.js b/entity/Organisation_entity/recordcontainers/db/onDBDelete.js
index 3171f7e09c..ea3ae0e08a 100644
--- a/entity/Organisation_entity/recordcontainers/db/onDBDelete.js
+++ b/entity/Organisation_entity/recordcontainers/db/onDBDelete.js
@@ -16,5 +16,4 @@ newWhere("COMMUNICATION.CONTACT_ID", contactId).deleteData();
 newWhere("ADDRESS.CONTACT_ID", contactId).deleteData();
 newWhere("COMMRESTRICTION.CONTACT_ID", contactId).deleteData();
 
-//WorkflowStarter.deleted();
 WorkflowSignalSender.deleted();
\ No newline at end of file
diff --git a/entity/Organisation_entity/recordcontainers/db/onDBInsert.js b/entity/Organisation_entity/recordcontainers/db/onDBInsert.js
index e0e9130860..54f0349c9f 100644
--- a/entity/Organisation_entity/recordcontainers/db/onDBInsert.js
+++ b/entity/Organisation_entity/recordcontainers/db/onDBInsert.js
@@ -1,6 +1,3 @@
 import("Workflow_lib");
-import("system.vars");
 
-//start the execution in afterOperatingState, because here the dataset is not yet inserted
-vars.set("$context.workflowQueue", {});
 WorkflowSignalSender.inserted();
\ No newline at end of file
diff --git a/entity/Organisation_entity/recordcontainers/db/onDBUpdate.js b/entity/Organisation_entity/recordcontainers/db/onDBUpdate.js
index 5b073c2fbe..ff207e8fb7 100644
--- a/entity/Organisation_entity/recordcontainers/db/onDBUpdate.js
+++ b/entity/Organisation_entity/recordcontainers/db/onDBUpdate.js
@@ -15,5 +15,4 @@ FieldChanges.assimilateChangeAndDispose("$field.STANDARD_PHONE_COMMUNICATION", f
     CommUtil.setStandardPhone(uid, value);
 });
 
-WorkflowStarter.updated();
 WorkflowSignalSender.updated();
\ No newline at end of file
diff --git a/entity/Person_entity/Person_entity.aod b/entity/Person_entity/Person_entity.aod
index f480f74c37..8f664b759b 100644
--- a/entity/Person_entity/Person_entity.aod
+++ b/entity/Person_entity/Person_entity.aod
@@ -12,7 +12,6 @@
   <contentTitleProcess>%aditoprj%/entity/Person_entity/contentTitleProcess.js</contentTitleProcess>
   <afterUiInit>%aditoprj%/entity/Person_entity/afterUiInit.js</afterUiInit>
   <onValidation>%aditoprj%/entity/Person_entity/onValidation.js</onValidation>
-  <afterOperatingState>%aditoprj%/entity/Person_entity/afterOperatingState.js</afterOperatingState>
   <initFilterProcess>%aditoprj%/entity/Person_entity/initFilterProcess.js</initFilterProcess>
   <useFavorites v="true" />
   <iconId>VAADIN:USERS</iconId>
diff --git a/entity/Person_entity/afterOperatingState.js b/entity/Person_entity/afterOperatingState.js
deleted file mode 100644
index 95c2733509..0000000000
--- a/entity/Person_entity/afterOperatingState.js
+++ /dev/null
@@ -1,8 +0,0 @@
-import("system.vars");
-import("Workflow_lib");
-
-if (vars.exists("$context.workflowQueue") && vars.get("$context.workflowQueue"))
-{
-    WorkflowStarter.inserted(vars.get("$context.workflowQueue"));
-    vars.set("$context.workflowQueue", null);
-}
\ No newline at end of file
diff --git a/entity/Person_entity/recordcontainers/db/onDBDelete.js b/entity/Person_entity/recordcontainers/db/onDBDelete.js
index 62d6a3e6da..c6f452b97c 100644
--- a/entity/Person_entity/recordcontainers/db/onDBDelete.js
+++ b/entity/Person_entity/recordcontainers/db/onDBDelete.js
@@ -15,5 +15,4 @@ newWhere("COMMUNICATION.CONTACT_ID", contactId).deleteData();
 newWhere("ADDRESS.CONTACT_ID", contactId).deleteData();
 newWhere("COMMRESTRICTION.CONTACT_ID", contactId).deleteData();
 
-//WorkflowStarter.deleted();
 WorkflowSignalSender.deleted();
\ No newline at end of file
diff --git a/entity/Person_entity/recordcontainers/db/onDBInsert.js b/entity/Person_entity/recordcontainers/db/onDBInsert.js
index 650231513d..b0ba83b532 100644
--- a/entity/Person_entity/recordcontainers/db/onDBInsert.js
+++ b/entity/Person_entity/recordcontainers/db/onDBInsert.js
@@ -9,8 +9,6 @@ import("system.vars");
 let contactId = vars.get("$local.uid");
 DataPrivacyUtils.notifyNeedDataPrivacyUpdate(contactId);
 
-//start the execution in afterOperatingState, because here the dataset is not yet inserted
-vars.set("$context.workflowQueue", {});
 WorkflowSignalSender.inserted();
 
 //let valuesToCheck = {};
diff --git a/entity/Person_entity/recordcontainers/db/onDBUpdate.js b/entity/Person_entity/recordcontainers/db/onDBUpdate.js
index 4268b8a017..e598dfe5f5 100644
--- a/entity/Person_entity/recordcontainers/db/onDBUpdate.js
+++ b/entity/Person_entity/recordcontainers/db/onDBUpdate.js
@@ -43,5 +43,4 @@ vars.get("$local.changed").forEach(function(fieldName)
 
 DataPrivacyUtils.notifyNeedDataPrivacyUpdate(uid);
 
-WorkflowStarter.updated();
 WorkflowSignalSender.updated();
\ No newline at end of file
diff --git a/entity/Salesproject_entity/Salesproject_entity.aod b/entity/Salesproject_entity/Salesproject_entity.aod
index 72f400a372..6497e4d792 100644
--- a/entity/Salesproject_entity/Salesproject_entity.aod
+++ b/entity/Salesproject_entity/Salesproject_entity.aod
@@ -11,7 +11,6 @@
   <contentTitleProcess>%aditoprj%/entity/Salesproject_entity/contentTitleProcess.js</contentTitleProcess>
   <afterUiInit>%aditoprj%/entity/Salesproject_entity/afterUiInit.js</afterUiInit>
   <onValidation>%aditoprj%/entity/Salesproject_entity/onValidation.js</onValidation>
-  <afterOperatingState>%aditoprj%/entity/Salesproject_entity/afterOperatingState.js</afterOperatingState>
   <useFavorites v="true" />
   <iconId>VAADIN:BOOK_DOLLAR</iconId>
   <imageProcess>%aditoprj%/entity/Salesproject_entity/imageProcess.js</imageProcess>
diff --git a/entity/Salesproject_entity/afterOperatingState.js b/entity/Salesproject_entity/afterOperatingState.js
deleted file mode 100644
index 30dc6947ef..0000000000
--- a/entity/Salesproject_entity/afterOperatingState.js
+++ /dev/null
@@ -1,14 +0,0 @@
-import("system.vars");
-import("Workflow_lib");
-
-if (vars.exists("$context.workflowQueue") && vars.get("$context.workflowQueue"))
-{
-    WorkflowStarter.inserted(vars.get("$context.workflowQueue"));
-    vars.set("$context.workflowQueue", null);
-}
-
-//TODO: error on save, why should be  a refresh necessary
-//if(vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_VIEW) 
-//{
-//    neon.refresh();
-//}
diff --git a/entity/Salesproject_entity/recordcontainers/db/onDBDelete.js b/entity/Salesproject_entity/recordcontainers/db/onDBDelete.js
index aa9041d3bd..c292d0299c 100644
--- a/entity/Salesproject_entity/recordcontainers/db/onDBDelete.js
+++ b/entity/Salesproject_entity/recordcontainers/db/onDBDelete.js
@@ -44,5 +44,4 @@ if (currentId)
 new AttributeRelationQuery(currentId, null, ContextUtils.getCurrentContextId())
     .deleteAllAttributes();
 
-WorkflowStarter.deleted();
 WorkflowSignalSender.deleted();
\ No newline at end of file
diff --git a/entity/Salesproject_entity/recordcontainers/db/onDBInsert.js b/entity/Salesproject_entity/recordcontainers/db/onDBInsert.js
index ac292d8633..4d90164110 100644
--- a/entity/Salesproject_entity/recordcontainers/db/onDBInsert.js
+++ b/entity/Salesproject_entity/recordcontainers/db/onDBInsert.js
@@ -16,6 +16,4 @@ if (vars.get("$field.PROJECTTYPE"))
         .insertAttribute(vars.get("$field.PROJECTTYPE"), true);
 }
 
-//start the execution in afterOperatingState, because here the dataset is not yet inserted
-vars.set("$context.workflowQueue", {});
 WorkflowSignalSender.inserted();
\ No newline at end of file
diff --git a/entity/Salesproject_entity/recordcontainers/db/onDBUpdate.js b/entity/Salesproject_entity/recordcontainers/db/onDBUpdate.js
index 351ca78b95..e08b7fd3e8 100644
--- a/entity/Salesproject_entity/recordcontainers/db/onDBUpdate.js
+++ b/entity/Salesproject_entity/recordcontainers/db/onDBUpdate.js
@@ -100,7 +100,6 @@ vars.get("$local.changed").forEach(function(fieldName) {
 if (needToUpdateForecast)
     Salesproject.notifyToUpdateForecast();
 
-WorkflowStarter.updated();
 WorkflowSignalSender.updated();
 
 neon.refreshAll();
diff --git a/entity/WorkflowDefinition_entity/recordcontainers/jdito/contentProcess.js b/entity/WorkflowDefinition_entity/recordcontainers/jdito/contentProcess.js
index bec4b9a0b8..dcb98822dd 100644
--- a/entity/WorkflowDefinition_entity/recordcontainers/jdito/contentProcess.js
+++ b/entity/WorkflowDefinition_entity/recordcontainers/jdito/contentProcess.js
@@ -64,7 +64,7 @@ result.object((function ()
     if (context)
     {
         possibleKeysMap = {};
-        WorkflowUtils.getPossibleWorkflowDefinitions(context, $KeywordRegistry.workflowTrigger$manual()).forEach(function (key)
+        WorkflowUtils.getPossibleWorkflowDefinitions(context).forEach(function (key)
         {
             this[key] = true;
         }, possibleKeysMap);
diff --git a/process/Workflow_lib/process.js b/process/Workflow_lib/process.js
index 2387f13ee8..6bea1c6a4d 100644
--- a/process/Workflow_lib/process.js
+++ b/process/Workflow_lib/process.js
@@ -22,15 +22,13 @@ function WorkflowUtils () {}
  * selects all process definition keys that can be started in a context according to the workflow start config
  * 
  * @param {String} pContext context for the process
- * @param {String} pAction trigger action
  * @return {Array} array of all possible process definition keys
  */
-WorkflowUtils.getPossibleWorkflowDefinitions = function (pContext, pAction)
+WorkflowUtils.getPossibleWorkflowDefinitions = function (pContext)
 {
     return newSelect("PROCESSDEFINITION_KEY")
         .from("WORKFLOWSTARTCONFIG")
         .where("WORKFLOWSTARTCONFIG.OBJECT_TYPE", pContext)
-        .and("WORKFLOWSTARTCONFIG.TRIGGER_EVENT", pAction)
         .arrayColumn();
 }
 
@@ -97,57 +95,6 @@ WorkflowUtils.getModelerUrl = function (pModelId, pIsEditor)
     return modelerUrl;
 }
 
-/**
- * obsolete, use signals
- */
-function WorkflowStarter () {}
-
-WorkflowStarter.TRIGGER_INSERT = function ()
-{
-    return $KeywordRegistry.workflowTrigger$create();
-}
-
-WorkflowStarter.TRIGGER_UPDATE = function ()
-{
-    return $KeywordRegistry.workflowTrigger$update();
-}
-
-WorkflowStarter.TRIGGER_DELETE = function ()
-{
-    return $KeywordRegistry.workflowTrigger$delete();
-}
-
-WorkflowStarter.inserted = function (pVariables, pTargetId, pTargetContext)
-{
-    WorkflowStarter._startProcessByAction(WorkflowStarter.TRIGGER_INSERT(), pVariables, pTargetId, pTargetContext);
-}
-
-WorkflowStarter.updated = function (pVariables, pTargetId, pTargetContext)
-{
-    WorkflowStarter._startProcessByAction(WorkflowStarter.TRIGGER_UPDATE(), pVariables, pTargetId, pTargetContext);
-}
-
-WorkflowStarter.deleted = function (pVariables, pTargetId, pTargetContext)
-{
-    WorkflowStarter._startProcessByAction(WorkflowStarter.TRIGGER_DELETE(), pVariables, pTargetId, pTargetContext);
-}
-
-WorkflowStarter._startProcessByAction = function (pAction, pVariables, pTargetId, pTargetContext)
-{
-    if (!pVariables)
-        pVariables = {};
-    
-    Object.assign(pVariables, WorkflowVariables.getTargetVariables(pTargetId, pTargetContext));
-    
-    var context = pVariables.targetContext;
-    WorkflowUtils.getPossibleWorkflowDefinitions(context, pAction).forEach(function (processKey)
-    {
-        try {
-            workflow.startProcessByKey(processKey, pVariables);
-        } catch (err) {}
-    });
-}
-
 /**
  * provides functions for working with workflow signals
  */
-- 
GitLab


From c027f1af6ecf93547ccd22e1068c98454a83765e Mon Sep 17 00:00:00 2001
From: Benjamin Ulrich <b.ulrich@adito.de>
Date: Wed, 19 Aug 2020 11:26:54 +0000
Subject: [PATCH 173/309] =?UTF-8?q?[Projekt:=20Entwicklung=20-=20Neon][Tic?=
 =?UTF-8?q?ketNr.:=201061658][Besuchsvorschlag=20-=20neuer=20Wochenplanein?=
 =?UTF-8?q?trag:=20Kontakt=20nicht=20ausw=C3=A4hlbar=20obwohl=20vorhanden]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../VisitPlanEntry_entity.aod                   |  7 ++++---
 .../contact_id/displayValueProcess.js           |  4 ++--
 .../entityfields/contact_id/onValidation.js     | 11 -----------
 .../entityfields/contact_id/valueProcess.js     | 17 -----------------
 .../organisation_contact_id/valueProcess.js     |  1 -
 .../excludedcontactids_param/valueProcess.js    |  9 ---------
 .../onlyshowcontactids_param/valueProcess.js    | 13 +++++++++++++
 .../recordcontainers/jdito/contentProcess.js    |  5 +++--
 8 files changed, 22 insertions(+), 45 deletions(-)
 delete mode 100644 entity/VisitPlanEntry_entity/entityfields/contact_id/onValidation.js
 delete mode 100644 entity/VisitPlanEntry_entity/entityfields/contact_id/valueProcess.js
 delete mode 100644 entity/VisitPlanEntry_entity/entityfields/persons/children/excludedcontactids_param/valueProcess.js
 create mode 100644 entity/VisitPlanEntry_entity/entityfields/persons/children/onlyshowcontactids_param/valueProcess.js

diff --git a/entity/VisitPlanEntry_entity/VisitPlanEntry_entity.aod b/entity/VisitPlanEntry_entity/VisitPlanEntry_entity.aod
index 1af833e9b8..f30a57c186 100644
--- a/entity/VisitPlanEntry_entity/VisitPlanEntry_entity.aod
+++ b/entity/VisitPlanEntry_entity/VisitPlanEntry_entity.aod
@@ -182,9 +182,7 @@
       <title>Contact</title>
       <consumer>Persons</consumer>
       <mandatory v="true" />
-      <valueProcess>%aditoprj%/entity/VisitPlanEntry_entity/entityfields/contact_id/valueProcess.js</valueProcess>
       <displayValueProcess>%aditoprj%/entity/VisitPlanEntry_entity/entityfields/contact_id/displayValueProcess.js</displayValueProcess>
-      <onValidation>%aditoprj%/entity/VisitPlanEntry_entity/entityfields/contact_id/onValidation.js</onValidation>
     </entityField>
     <entityConsumer>
       <name>Persons</name>
@@ -196,9 +194,12 @@
       <children>
         <entityParameter>
           <name>ExcludedContactIds_param</name>
-          <valueProcess>%aditoprj%/entity/VisitPlanEntry_entity/entityfields/persons/children/excludedcontactids_param/valueProcess.js</valueProcess>
           <expose v="true" />
         </entityParameter>
+        <entityParameter>
+          <name>OnlyShowContactIds_param</name>
+          <valueProcess>%aditoprj%/entity/VisitPlanEntry_entity/entityfields/persons/children/onlyshowcontactids_param/valueProcess.js</valueProcess>
+        </entityParameter>
       </children>
     </entityConsumer>
     <entityParameter>
diff --git a/entity/VisitPlanEntry_entity/entityfields/contact_id/displayValueProcess.js b/entity/VisitPlanEntry_entity/entityfields/contact_id/displayValueProcess.js
index 5384d5effe..2c0374c939 100644
--- a/entity/VisitPlanEntry_entity/entityfields/contact_id/displayValueProcess.js
+++ b/entity/VisitPlanEntry_entity/entityfields/contact_id/displayValueProcess.js
@@ -1,10 +1,10 @@
-import("Person_lib");
+import("Contact_lib");
 import("system.db");
 import("system.result");
 import("system.vars");
 
 
 var contactId = vars.get("$field.CONTACT_ID");
-var res = db.cell(PersUtils.getResolvingDisplaySubSql("'" + contactId + "'"));
+var res = ContactUtils.getFullTitleByContactId(contactId);
 
 result.string(res);
\ No newline at end of file
diff --git a/entity/VisitPlanEntry_entity/entityfields/contact_id/onValidation.js b/entity/VisitPlanEntry_entity/entityfields/contact_id/onValidation.js
deleted file mode 100644
index bf3542dc52..0000000000
--- a/entity/VisitPlanEntry_entity/entityfields/contact_id/onValidation.js
+++ /dev/null
@@ -1,11 +0,0 @@
-import("system.translate");
-import("system.result");
-import("Contact_lib");
-import("system.vars");
-
-var orgId = vars.get("$field.ORGANISATION_CONTACT_ID");
-var contactId = vars.get("$field.CONTACT_ID");
-var orgContactId = ContactUtils.getPersOrgIds(contactId)[2];
-
-if(orgId != orgContactId)
-    result.string(translate.text("Contact has to be employee in the chosen Organisation"))
\ No newline at end of file
diff --git a/entity/VisitPlanEntry_entity/entityfields/contact_id/valueProcess.js b/entity/VisitPlanEntry_entity/entityfields/contact_id/valueProcess.js
deleted file mode 100644
index 0c443c0434..0000000000
--- a/entity/VisitPlanEntry_entity/entityfields/contact_id/valueProcess.js
+++ /dev/null
@@ -1,17 +0,0 @@
-import("Sql_lib");
-import("system.logging");
-import("system.neon");
-import("system.result");
-import("system.vars");
-
-if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.get("$this.value") == null 
-    && vars.exists("$param.ContactId_param") && vars.get("$param.ContactId_param"))
-{
-    var contactId = vars.get("$param.ContactId_param");
-    var orgId = newSelect("CONTACT.ORGANISATION_ID")
-                            .from("CONTACT")
-                            .where("CONTACT.CONTACTID", contactId)
-                            .cell();
-    neon.setFieldValue("$field.ORGANISATION_CONTACT_ID", orgId);
-    result.string(vars.get("$param.ContactId_param"));
-}
\ No newline at end of file
diff --git a/entity/VisitPlanEntry_entity/entityfields/organisation_contact_id/valueProcess.js b/entity/VisitPlanEntry_entity/entityfields/organisation_contact_id/valueProcess.js
index f641a6b32d..8e22e5c11f 100644
--- a/entity/VisitPlanEntry_entity/entityfields/organisation_contact_id/valueProcess.js
+++ b/entity/VisitPlanEntry_entity/entityfields/organisation_contact_id/valueProcess.js
@@ -1,4 +1,3 @@
-import("system.logging");
 import("system.neon");
 import("system.result");
 import("system.vars");
diff --git a/entity/VisitPlanEntry_entity/entityfields/persons/children/excludedcontactids_param/valueProcess.js b/entity/VisitPlanEntry_entity/entityfields/persons/children/excludedcontactids_param/valueProcess.js
deleted file mode 100644
index e6afefc861..0000000000
--- a/entity/VisitPlanEntry_entity/entityfields/persons/children/excludedcontactids_param/valueProcess.js
+++ /dev/null
@@ -1,9 +0,0 @@
-import("system.result");
-import("system.vars");
-import("Sql_lib");
-
-var contactIdArray = newSelect("CONTACT.CONTACTID")
-                                .from("CONTACT")
-                                .where("CONTACT.ORGANISATION_ID", vars.get("$field.ORGANISATION_CONTACT_ID"), SqlBuilder.NOT_EQUAL())
-                                .arrayColumn()
-result.object(contactIdArray)
\ No newline at end of file
diff --git a/entity/VisitPlanEntry_entity/entityfields/persons/children/onlyshowcontactids_param/valueProcess.js b/entity/VisitPlanEntry_entity/entityfields/persons/children/onlyshowcontactids_param/valueProcess.js
new file mode 100644
index 0000000000..a11c9601fe
--- /dev/null
+++ b/entity/VisitPlanEntry_entity/entityfields/persons/children/onlyshowcontactids_param/valueProcess.js
@@ -0,0 +1,13 @@
+import("Contact_lib");
+import("system.result");
+import("system.vars");
+import("Sql_lib");
+
+var orgContactId = vars.get("$field.ORGANISATION_CONTACT_ID");
+var contactIdArray = newSelect("CONTACT.CONTACTID")
+                                .from("CONTACT")
+                                .where("CONTACT.ORGANISATION_ID", ContactUtils.getPersOrgIds(orgContactId)[2], SqlBuilder.EQUAL())
+                                .and("CONTACT.CONTACTID", orgContactId, SqlBuilder.NOT_EQUAL())
+                                .arrayColumn();
+                                
+result.object(contactIdArray)
\ No newline at end of file
diff --git a/entity/VisitRecommendation_entity/recordcontainers/jdito/contentProcess.js b/entity/VisitRecommendation_entity/recordcontainers/jdito/contentProcess.js
index 341015c21e..c6952bf184 100644
--- a/entity/VisitRecommendation_entity/recordcontainers/jdito/contentProcess.js
+++ b/entity/VisitRecommendation_entity/recordcontainers/jdito/contentProcess.js
@@ -166,8 +166,9 @@ if(idValues == false)
         tmpData[3] = visitFrequencyData[i][2];                 //Address
         tmpData[5] = visitFrequencyData[i][4];                 //Source of Priority
         tmpData[8] = "";
-        tmpData[9] = visitFrequencyData[i][5];                 //last visit
-        tmpData[2] = visitFrequencyData[i][6];                 //CONTACT_ID
+        tmpData[4] = visitFrequencyData[i][5];                 //last visit
+        tmpData[9] = visitFrequencyData[i][6];                 //ContactId
+        tmpData[2] = visitFrequencyData[i][1];                 //OrganisationId
         var dueDate = "";
         var lastVisitDate = "";
 
-- 
GitLab


From 40da77e5cfaf639e512877e0e1881a62e6b3e665 Mon Sep 17 00:00:00 2001
From: Tom Lutzenberger <t.lutzenberger@adito.de>
Date: Wed, 19 Aug 2020 14:06:07 +0200
Subject: [PATCH 174/309] #1058829: Cleanup

---
 .../datestart_filter/filterConditionProcess.js              | 1 -
 .../recordcontainers/db/fromClauseProcess.js                | 6 +++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/entity/Campaign_entity/recordcontainers/db/filterextensions/datestart_filter/filterConditionProcess.js b/entity/Campaign_entity/recordcontainers/db/filterextensions/datestart_filter/filterConditionProcess.js
index 4424653e1e..2d15b9e58f 100644
--- a/entity/Campaign_entity/recordcontainers/db/filterextensions/datestart_filter/filterConditionProcess.js
+++ b/entity/Campaign_entity/recordcontainers/db/filterextensions/datestart_filter/filterConditionProcess.js
@@ -1,6 +1,5 @@
 import("system.result");
 import("system.vars");
-import("system.logging");
 import("Sql_lib");
 import("Util_lib");
 
diff --git a/entity/Campaign_entity/recordcontainers/db/fromClauseProcess.js b/entity/Campaign_entity/recordcontainers/db/fromClauseProcess.js
index ebb38fc05f..5eec4c678e 100644
--- a/entity/Campaign_entity/recordcontainers/db/fromClauseProcess.js
+++ b/entity/Campaign_entity/recordcontainers/db/fromClauseProcess.js
@@ -4,13 +4,13 @@ import("system.vars");
 
 
 var recordState = vars.get("$sys.recordstate");
+var res = "CAMPAIGN";
 
 if (recordState != neon.OPERATINGSTATE_NEW && recordState != neon.OPERATINGSTATE_EDIT) {
     var subSelectDateStart = "(select min(DATE_START) as STEPDATESTART_ALIAS, CAMPAIGN_ID from CAMPAIGNSTEP group by CAMPAIGN_ID) as STEPDATESTART_TABLEALIAS";
     var subSelectDateEnd = "(select max(DATE_END) as STEPDATEEND_ALIAS, CAMPAIGN_ID from CAMPAIGNSTEP group by CAMPAIGN_ID) as STEPDATEEND_TABLEALIAS";
          
-    result.string("CAMPAIGN, " + subSelectDateStart + ", " + subSelectDateEnd);
-} else {
-    result.string("CAMPAIGN");
+    res += ", " + subSelectDateStart + ", " + subSelectDateEnd;
 }
 
+result.string(res);
-- 
GitLab


From 020298ad3cff1b7444fbb0eacb5f35211095c959 Mon Sep 17 00:00:00 2001
From: Tom Lutzenberger <t.lutzenberger@adito.de>
Date: Wed, 19 Aug 2020 14:33:01 +0200
Subject: [PATCH 175/309] #1058829: Implement filters for participating person
 and organisation

---
 entity/Campaign_entity/Campaign_entity.aod    | 30 ++++++++++++++++++-
 .../filterConditionProcess.js                 | 11 +++++++
 .../personconsumer/filterConditionProcess.js  | 11 +++++++
 .../Organisation_entity.aod                   |  6 ++++
 entity/Person_entity/Person_entity.aod        |  6 ++++
 5 files changed, 63 insertions(+), 1 deletion(-)
 create mode 100644 entity/Campaign_entity/recordcontainers/db/recordfieldmappings/organisationconsumer/filterConditionProcess.js
 create mode 100644 entity/Campaign_entity/recordcontainers/db/recordfieldmappings/personconsumer/filterConditionProcess.js

diff --git a/entity/Campaign_entity/Campaign_entity.aod b/entity/Campaign_entity/Campaign_entity.aod
index 6ab1a9900e..aee2e67628 100644
--- a/entity/Campaign_entity/Campaign_entity.aod
+++ b/entity/Campaign_entity/Campaign_entity.aod
@@ -520,6 +520,22 @@
       <name>CAMPAIGN_OBEJCTTYPE</name>
       <valueProcess>%aditoprj%/entity/Campaign_entity/entityfields/campaign_obejcttype/valueProcess.js</valueProcess>
     </entityField>
+    <entityConsumer>
+      <name>PersonConsumer</name>
+      <dependency>
+        <name>dependency</name>
+        <entityName>Person_entity</entityName>
+        <fieldName>#PROVIDER</fieldName>
+      </dependency>
+    </entityConsumer>
+    <entityConsumer>
+      <name>OrganisationConsumer</name>
+      <dependency>
+        <name>dependency</name>
+        <entityName>Organisation_entity</entityName>
+        <fieldName>#PROVIDER</fieldName>
+      </dependency>
+    </entityConsumer>
   </entityFields>
   <recordContainers>
     <dbRecordContainer>
@@ -532,7 +548,7 @@
       <onDBDelete>%aditoprj%/entity/Campaign_entity/recordcontainers/db/onDBDelete.js</onDBDelete>
       <linkInformation>
         <linkInformation>
-          <name>f3893829-3af2-4e55-ae85-c3a24411a8b8</name>
+          <name>f95b8870-15cd-4302-99ec-8a104ae2262d</name>
           <tableName>CAMPAIGN</tableName>
           <primaryKey>CAMPAIGNID</primaryKey>
           <isUIDTable v="true" />
@@ -618,6 +634,18 @@
           <name>CURRENCY.displayValue</name>
           <expression>%aditoprj%/entity/Campaign_entity/recordcontainers/db/recordfieldmappings/currency.displayvalue/expression.js</expression>
         </dbRecordFieldMapping>
+        <consumerMapping>
+          <name>PersonConsumer</name>
+          <filterConditionProcess>%aditoprj%/entity/Campaign_entity/recordcontainers/db/recordfieldmappings/personconsumer/filterConditionProcess.js</filterConditionProcess>
+          <isFilterable v="true" />
+          <filtertype>BASIC</filtertype>
+        </consumerMapping>
+        <consumerMapping>
+          <name>OrganisationConsumer</name>
+          <filterConditionProcess>%aditoprj%/entity/Campaign_entity/recordcontainers/db/recordfieldmappings/organisationconsumer/filterConditionProcess.js</filterConditionProcess>
+          <isFilterable v="true" />
+          <filtertype>BASIC</filtertype>
+        </consumerMapping>
       </recordFieldMappings>
       <filterExtensions>
         <filterExtensionSet>
diff --git a/entity/Campaign_entity/recordcontainers/db/recordfieldmappings/organisationconsumer/filterConditionProcess.js b/entity/Campaign_entity/recordcontainers/db/recordfieldmappings/organisationconsumer/filterConditionProcess.js
new file mode 100644
index 0000000000..0d442ba6a6
--- /dev/null
+++ b/entity/Campaign_entity/recordcontainers/db/recordfieldmappings/organisationconsumer/filterConditionProcess.js
@@ -0,0 +1,11 @@
+import("system.vars");
+import("system.result");
+
+
+//it's necessary to join the organistion-contact since you may want to search for things like status, language, etc. from an organisation
+var from = "CAMPAIGNPARTICIPANT"
+    + " join CONTACT on (CONTACT.CONTACTID = CAMPAIGNPARTICIPANT.CONTACT_ID)"
+    + " join ORGANISATION on (ORGANISATION.ORGANISATIONID = CONTACT.ORGANISATION_ID)"
+;
+
+result.string("CAMPAIGNID in (select CAMPAIGNPARTICIPANT.CAMPAIGN_ID from " + from + " where " + vars.get("$local.condition")+ ")");
diff --git a/entity/Campaign_entity/recordcontainers/db/recordfieldmappings/personconsumer/filterConditionProcess.js b/entity/Campaign_entity/recordcontainers/db/recordfieldmappings/personconsumer/filterConditionProcess.js
new file mode 100644
index 0000000000..bab6edf775
--- /dev/null
+++ b/entity/Campaign_entity/recordcontainers/db/recordfieldmappings/personconsumer/filterConditionProcess.js
@@ -0,0 +1,11 @@
+import("system.vars");
+import("system.result");
+
+
+//it's necessary to join the person-contact since you may want to search for things like status, language, etc. from an organisation
+var from = "CAMPAIGNPARTICIPANT"
+    + " join CONTACT on (CONTACT.CONTACTID = CAMPAIGNPARTICIPANT.CONTACT_ID)"
+    + " join PERSON on (PERSON.PERSONID = CONTACT.PERSON_ID)"
+;
+
+result.string("CAMPAIGNID in (select CAMPAIGNPARTICIPANT.CAMPAIGN_ID from " + from + " where " + vars.get("$local.condition")+ ")");
diff --git a/entity/Organisation_entity/Organisation_entity.aod b/entity/Organisation_entity/Organisation_entity.aod
index 414ff2eb81..b20c236e60 100644
--- a/entity/Organisation_entity/Organisation_entity.aod
+++ b/entity/Organisation_entity/Organisation_entity.aod
@@ -272,6 +272,12 @@
           <fieldName>Organisations</fieldName>
           <isConsumer v="false" />
         </entityDependency>
+        <entityDependency>
+          <name>271c43f9-8807-4439-9ab4-906fbf019475</name>
+          <entityName>Campaign_entity</entityName>
+          <fieldName>OrganisationConsumer</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
       </dependencies>
     </entityProvider>
     <entityConsumer>
diff --git a/entity/Person_entity/Person_entity.aod b/entity/Person_entity/Person_entity.aod
index 828766d541..180e47f717 100644
--- a/entity/Person_entity/Person_entity.aod
+++ b/entity/Person_entity/Person_entity.aod
@@ -283,6 +283,12 @@
           <fieldName>PersonConsumer</fieldName>
           <isConsumer v="false" />
         </entityDependency>
+        <entityDependency>
+          <name>befbfd87-c065-4a4b-9d1e-8de8fba87302</name>
+          <entityName>Campaign_entity</entityName>
+          <fieldName>PersonConsumer</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
       </dependencies>
     </entityProvider>
     <entityField>
-- 
GitLab


From 2dbc746f360d41994bb210d0b3d035661f78ed5f Mon Sep 17 00:00:00 2001
From: "a.schindlbeck" <a.schindlbeck@adito.de>
Date: Wed, 19 Aug 2020 15:44:26 +0200
Subject: [PATCH 176/309] #1063939 Favorites: bigdata performance changes

---
 .../jditorecordcontainer/contentProcess.js    | 115 +++++++++++++++---
 .../FavoriteFilter_view.aod                   |   2 +
 2 files changed, 97 insertions(+), 20 deletions(-)

diff --git a/entity/Favorite_entity/recordcontainers/jditorecordcontainer/contentProcess.js b/entity/Favorite_entity/recordcontainers/jditorecordcontainer/contentProcess.js
index bc9d655212..e9c4ffa902 100644
--- a/entity/Favorite_entity/recordcontainers/jditorecordcontainer/contentProcess.js
+++ b/entity/Favorite_entity/recordcontainers/jditorecordcontainer/contentProcess.js
@@ -1,3 +1,6 @@
+import("system.translate");
+import("system.project");
+import("system.logging");
 import("system.vars");
 import("Context_lib");
 import("system.result");
@@ -10,30 +13,35 @@ if(vars.get("$local.idvalues") && vars.get("$local.idvalues").length != 0)
     var selected = vars.get("$local.idvalues");
     var selectedFavos = [];
     
-    for(let i = 0; i < selected.length; i++)
-    {
-        selectedFavos.push(buildFavorite(favorite.getFavoriteById(selected[i])));
-    }
+    for(h = 0; h < selected.length; h++)
+        selectedFavos.push(buildFavoriteForDeletion(favorite.getFavoriteById(selected[h])));
+
     result.object(selectedFavos);
 }
 else
 {
+    
     var filters = vars.get("$local.filter");
     var activeFilters = [];
     if(filters["filter"] != null)
-        filters["filter"]["childs"].forEach(child => activeFilters.push(child));
+        for(g = 0; g < filters["filter"]["childs"].length; g++)
+            activeFilters.push(filters["filter"]["childs"][g])
     
     
     var finishedFavoritesForDisplay = [];
-    var filteredFavorites = [];
-    var allFavorites = favorite.getAllFavorites(tools.getCurrentUser()["name"]);
     
-    for(let i = 0; i < allFavorites.length; i++)
+    var allContexts = getAllFavoriteEnabledContexts();
+    for(i = 0; i < allContexts.length; i++)
     {
-        var favo = allFavorites[i];
-        var builtFavo = buildFavorite(favo);
-        if(isFiltered(activeFilters, builtFavo))
-            finishedFavoritesForDisplay.push(builtFavo);
+        var allFavorites = favorite.getAllFavorites(tools.getCurrentUser()["name"], allContexts[i]);
+        var builtFavos = buildFavorites(allFavorites, allContexts[i]);
+    
+        for(let x = 0; x < builtFavos.length; x++)
+        {
+            var favo = builtFavos[x];
+            if(isFiltered(activeFilters, favo))
+                finishedFavoritesForDisplay.push(favo);
+        }
     }
     
     result.object(finishedFavoritesForDisplay);
@@ -103,21 +111,87 @@ function isValid(value, filter)
     return false;
 }
 
-function buildFavorite(favo)
-{    
+function buildFavorites(favos, objecttype)
+{     
+    var builtFavos = []
+    
+    var ids = [];
+    for(y = 0; y < favos.length; y++)
+        ids.push(favos[y]["rowid"]);
+    
     var loadConfig = entities.createConfigForLoadingRows();
-    loadConfig.entity(ContextUtils.getEntity(favo["objecttype"]));
-    loadConfig.uid(favo["rowid"]);
-    loadConfig.fields(["#CONTENTTITLE", "#IMAGE"]);
-    var row = entities.getRow(loadConfig);
+    loadConfig.entity(ContextUtils.getEntity(objecttype));
+    loadConfig.uids(ids);
+    loadConfig.count(200);
+    loadConfig.fields(["#CONTENTTITLE", "#IMAGE", "#UID"]);
+    var loadedRows = entities.getRows(loadConfig);
+    
+    for(z = 0; z < loadedRows.length; z++)
+        getFavoriteWith(loadedRows[z], builtFavos, favos, loadedRows[z]["#UID"], objecttype);
     
+    return builtFavos;
+}
+
+function getFavoriteWith(loadedRow, builtFavos, favoriten, pRowid, objecttype)
+{
+    for(b = 0; b < favoriten.length; b++)
+    {
+        if(favoriten[b]["rowid"].equals(pRowid))
+        {
+                
+            var groupid = favoriten[b]["group"]["groupid"];
+            var grouptitle = favoriten[b]["group"]["grouptitle"];
+            var grouptype = favoriten[b]["group"]["grouptype"];
+            var image = loadedRow["#IMAGE"];
+            var rowid = favoriten[b]["rowid"];
+            var title = loadedRow["#CONTENTTITLE"];
+            var id = favoriten[b]["id"];
+            var user = favoriten[b]["group"]["groupuser"];
+
+            builtFavos.push([
+                groupid,
+                grouptitle,
+                grouptype, 
+                objecttype, 
+                image,
+                rowid,
+                title,
+                id,
+                user
+            ]);
+        }
+    }
+}
+
+function getAllFavoriteEnabledContexts()
+{
+    var allContexts = project.getDataModels(project.DATAMODEL_KIND_CONTEXT);
+    var permittedContexts = [];
+
+    for(k = 0; k < allContexts.length; k++) 
+    {
+        var isFavoEnabled = false;
+        var entityname = ContextUtils.getEntity(allContexts[k][0]);
+        var entity = null;
+        if(entityname)
+            entity = project.getDataModel(project.DATAMODEL_KIND_ENTITY,entityname);
+
+        if(entity && entity[7].equals("true")) //favoritesEnabled
+            permittedContexts.push(allContexts[k][0]);
+    }
+
+    return permittedContexts;
+}
+
+function buildFavoriteForDeletion(favo)
+{        
     var groupid = favo["group"]["groupid"];
     var grouptitle = favo["group"]["grouptitle"];
     var grouptype = favo["group"]["grouptype"];
     var objecttype = favo["objecttype"];
-    var image = row["#IMAGE"];
+    var image = "";
     var rowid = favo["rowid"];
-    var title = row["#CONTENTTITLE"];
+    var title = "";
     var id = favo["id"];
     var user = favo["group"]["groupuser"];
     
@@ -134,3 +208,4 @@ function buildFavorite(favo)
     ];
 }
 
+
diff --git a/neonView/FavoriteFilter_view/FavoriteFilter_view.aod b/neonView/FavoriteFilter_view/FavoriteFilter_view.aod
index 9e6f008225..69c2f20b23 100644
--- a/neonView/FavoriteFilter_view/FavoriteFilter_view.aod
+++ b/neonView/FavoriteFilter_view/FavoriteFilter_view.aod
@@ -34,6 +34,8 @@
         <element>GROUP_TITLE</element>
       </defaultGroupFields>
       <entityField>#ENTITY</entityField>
+      <isCreatable v="false" />
+      <isEditable v="false" />
       <columns>
         <neonTreeTableColumn>
           <name>3f35104a-7ccc-44aa-8b9a-9de31d410f81</name>
-- 
GitLab


From 57a63ce13585aa422800360d69d21ba13189ca2b Mon Sep 17 00:00:00 2001
From: Tobias Feldmann <t.feldmann@adito.de>
Date: Wed, 19 Aug 2020 16:38:49 +0200
Subject: [PATCH 177/309] ORGANISATION_REPORT_DATA Field in Organisation_entity
 was calculated unnecessarily

---
 .../entityfields/organisation_report_data/valueProcess.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/entity/Organisation_entity/entityfields/organisation_report_data/valueProcess.js b/entity/Organisation_entity/entityfields/organisation_report_data/valueProcess.js
index 873ef5f798..0088b85da1 100644
--- a/entity/Organisation_entity/entityfields/organisation_report_data/valueProcess.js
+++ b/entity/Organisation_entity/entityfields/organisation_report_data/valueProcess.js
@@ -1,13 +1,13 @@
-import("system.logging");
 import("system.vars");
 import("system.result");
 import("system.neon");
 import("Organisation_lib");
 
 var presentationMode = vars.get("$sys.presentationmode");
-if (presentationMode != neon.CONTEXT_PRESENTATIONMODE_EDIT) {
-    var reportData = OrgUtils.buildOrgReport(vars.get("$field.ORGANISATIONID"), vars.get("$field.CONTACTID"))
-
+var opState = vars.get("$sys.operatingstate");
+if (opState == neon.OPERATINGSTATE_VIEW && presentationMode == neon.CONTEXT_PRESENTATIONMODE_FULL ) 
+{
+    var reportData = OrgUtils.buildOrgReport(vars.get("$field.ORGANISATIONID"), vars.get("$field.CONTACTID"));
     if (reportData != null) {
         result.string(reportData[1]);
     }
-- 
GitLab


From 71d605ca794d6b61081553528c3924c15509b913 Mon Sep 17 00:00:00 2001
From: Tobias Feldmann <t.feldmann@adito.de>
Date: Wed, 19 Aug 2020 16:38:49 +0200
Subject: [PATCH 178/309] ORGANISATION_REPORT_DATA Field in Organisation_entity
 was calculated unnecessarily

---
 .../entityfields/organisation_report_data/valueProcess.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/entity/Organisation_entity/entityfields/organisation_report_data/valueProcess.js b/entity/Organisation_entity/entityfields/organisation_report_data/valueProcess.js
index 873ef5f798..0088b85da1 100644
--- a/entity/Organisation_entity/entityfields/organisation_report_data/valueProcess.js
+++ b/entity/Organisation_entity/entityfields/organisation_report_data/valueProcess.js
@@ -1,13 +1,13 @@
-import("system.logging");
 import("system.vars");
 import("system.result");
 import("system.neon");
 import("Organisation_lib");
 
 var presentationMode = vars.get("$sys.presentationmode");
-if (presentationMode != neon.CONTEXT_PRESENTATIONMODE_EDIT) {
-    var reportData = OrgUtils.buildOrgReport(vars.get("$field.ORGANISATIONID"), vars.get("$field.CONTACTID"))
-
+var opState = vars.get("$sys.operatingstate");
+if (opState == neon.OPERATINGSTATE_VIEW && presentationMode == neon.CONTEXT_PRESENTATIONMODE_FULL ) 
+{
+    var reportData = OrgUtils.buildOrgReport(vars.get("$field.ORGANISATIONID"), vars.get("$field.CONTACTID"));
     if (reportData != null) {
         result.string(reportData[1]);
     }
-- 
GitLab


From e73d26cda54be8aa2efcf086ebb41cc553795ad4 Mon Sep 17 00:00:00 2001
From: Tom Lutzenberger <t.lutzenberger@adito.de>
Date: Wed, 19 Aug 2020 18:05:47 +0200
Subject: [PATCH 179/309] #1061843: Rename "entrydate" labels in
 Activity-related contexts

---
 entity/Activity_entity/Activity_entity.aod    |  8 +++---
 .../entityfields/entrydate/onValidation.js    |  2 +-
 .../_____LANGUAGE_EXTRA.aod                   | 27 +++++++++++++++++++
 .../_____LANGUAGE_de/_____LANGUAGE_de.aod     | 23 +++++++++++++---
 .../_____LANGUAGE_en/_____LANGUAGE_en.aod     | 27 +++++++++++++++++++
 .../serviceTaskParameterProcess.js            |  2 +-
 6 files changed, 80 insertions(+), 9 deletions(-)

diff --git a/entity/Activity_entity/Activity_entity.aod b/entity/Activity_entity/Activity_entity.aod
index c0a781e0a9..3f89523fd9 100644
--- a/entity/Activity_entity/Activity_entity.aod
+++ b/entity/Activity_entity/Activity_entity.aod
@@ -27,7 +27,7 @@
     </entityField>
     <entityField>
       <name>ENTRYDATE</name>
-      <title>Entrydate</title>
+      <title>Date</title>
       <contentType>DATE</contentType>
       <resolution>MINUTE</resolution>
       <outputFormat>dd.MM.yyyy HH:mm</outputFormat>
@@ -157,7 +157,7 @@
     </entityConsumer>
     <entityField>
       <name>ENTRYMONTH</name>
-      <title>Entrydate (Month)</title>
+      <title>Date (Month)</title>
       <contentType>TEXT</contentType>
       <groupable v="true" />
       <valueProcess>%aditoprj%/entity/Activity_entity/entityfields/entrymonth/valueProcess.js</valueProcess>
@@ -395,7 +395,7 @@
     </entityConsumer>
     <entityField>
       <name>ENTRYDAY</name>
-      <title>Entrydate (Day)</title>
+      <title>Date (Day)</title>
       <groupable v="true" />
       <valueProcess>%aditoprj%/entity/Activity_entity/entityfields/entryday/valueProcess.js</valueProcess>
     </entityField>
@@ -563,7 +563,7 @@
     </entityConsumer>
     <entityField>
       <name>ENTRYYEAR</name>
-      <title>Entrydate (Year)</title>
+      <title>Date (Year)</title>
       <groupable v="true" />
       <valueProcess>%aditoprj%/entity/Activity_entity/entityfields/entryyear/valueProcess.js</valueProcess>
     </entityField>
diff --git a/entity/Activity_entity/entityfields/entrydate/onValidation.js b/entity/Activity_entity/entityfields/entrydate/onValidation.js
index 437a5ee635..67c94e8d00 100644
--- a/entity/Activity_entity/entityfields/entrydate/onValidation.js
+++ b/entity/Activity_entity/entityfields/entrydate/onValidation.js
@@ -6,4 +6,4 @@ import("Entity_lib");
 
 var entryDate = vars.get("local.value");
 if (!DateUtils.validateNotInFuture(entryDate))
-    result.string(translate.text("Entrydate must not be in the future"));
\ No newline at end of file
+    result.string(translate.text("Date must not be in the future"));
\ No newline at end of file
diff --git a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
index 057fb03cf8..d3a8ed8ce3 100644
--- a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
+++ b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
@@ -2082,6 +2082,12 @@
     <entry>
       <key>Entrydate (Day)</key>
     </entry>
+    <entry>
+      <key>Date (Month)</key>
+    </entry>
+    <entry>
+      <key>Date (Day)</key>
+    </entry>
     <entry>
       <key>My Dashboard</key>
     </entry>
@@ -3195,6 +3201,9 @@
     <entry>
       <key>Entrydate must not be in the future</key>
     </entry>
+    <entry>
+      <key>Date must not be in the future</key>
+    </entry>
     <entry>
       <key>Delivery specification</key>
     </entry>
@@ -4725,6 +4734,9 @@
     <entry>
       <key>Entrydate (Year)</key>
     </entry>
+    <entry>
+      <key>Date (Year)</key>
+    </entry>
     <entry>
       <key>Attributes must be unique!</key>
     </entry>
@@ -6263,6 +6275,9 @@
     <entry>
       <key>Entrydate has to be in the selected calendar week!</key>
     </entry>
+    <entry>
+      <key>Date has to be in the selected calendar week!</key>
+    </entry>
     <entry>
       <key>Invalid year!</key>
     </entry>
@@ -7028,6 +7043,18 @@
     <entry>
       <key>Default</key>
     </entry>
+    <entry>
+      <key>Grant new Department Permission</key>
+    </entry>
+    <entry>
+      <key>Permission Procurer Department</key>
+    </entry>
+    <entry>
+      <key>Permission Procurer User</key>
+    </entry>
+    <entry>
+      <key>Grant new User Permission</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 42db1fe6ff..2fb0c345ee 100644
--- a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
+++ b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
@@ -379,6 +379,10 @@
       <key>Entrydate (Day)</key>
       <value>Eingangsdatum (Tag)</value>
     </entry>
+    <entry>
+      <key>Date (Day)</key>
+      <value>Datum (Tag)</value>
+    </entry>
     <entry>
       <key>still incorrect</key>
       <value>weiterhin fehlerhaft</value>
@@ -531,6 +535,10 @@
       <key>Entrydate (Month)</key>
       <value>Eingangsdatum (Monat)</value>
     </entry>
+    <entry>
+      <key>Date (Month)</key>
+      <value>Datum (Monat)</value>
+    </entry>
     <entry>
       <key>Usage</key>
       <value>Verwendung</value>
@@ -1990,6 +1998,10 @@
       <key>Entrydate must not be in the future</key>
       <value>Eingangsdatum darf nicht in der Zukunft liegen</value>
     </entry>
+    <entry>
+      <key>Date must not be in the future</key>
+      <value>Datum darf nicht in der Zukunft liegen</value>
+    </entry>
     <entry>
       <key>Copy receipt</key>
       <value>Beleg kopieren</value>
@@ -6516,6 +6528,10 @@
       <key>Entrydate (Year)</key>
       <value>Eingangsdatum (Jahr)</value>
     </entry>
+    <entry>
+      <key>Date (Year)</key>
+      <value>Datum (Jahr)</value>
+    </entry>
     <entry>
       <key>Attributes must be unique!</key>
       <value>Attribute müssen eindeutig sein</value>
@@ -8197,6 +8213,10 @@ Bitte Datumseingabe prüfen</value>
       <key>Entrydate has to be in the selected calendar week!</key>
       <value>Eingangsdatum muss in der ausgewählten Kalenderwoche liegen!</value>
     </entry>
+    <entry>
+      <key>Date has to be in the selected calendar week!</key>
+      <value>Datum muss in der ausgewählten Kalenderwoche liegen!</value>
+    </entry>
     <entry>
       <key>Invalid year!</key>
       <value>Ungültiges jahr!</value>
@@ -8974,9 +8994,6 @@ Bitte Datumseingabe prüfen</value>
       <key>Grant new User Permission</key>
       <value>Neue Benutzer-Berechtigung vergeben</value>
     </entry>
-    <entry>
-      <key>Workflow Model</key>
-    </entry>
     <entry>
       <key>Permission Procurer Department</key>
       <value>Rechteempfänger Abteilung</value>
diff --git a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
index 0e8d5a2949..8fa14fafb4 100644
--- a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
+++ b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
@@ -2099,6 +2099,12 @@
     <entry>
       <key>Entrydate (Day)</key>
     </entry>
+    <entry>
+      <key>Date (Month)</key>
+    </entry>
+    <entry>
+      <key>Date (Day)</key>
+    </entry>
     <entry>
       <key>My Dashboard</key>
     </entry>
@@ -3257,6 +3263,9 @@
     <entry>
       <key>Entrydate must not be in the future</key>
     </entry>
+    <entry>
+      <key>Date must not be in the future</key>
+    </entry>
     <entry>
       <key>Delivery specification</key>
     </entry>
@@ -4786,6 +4795,9 @@
     <entry>
       <key>Entrydate (Year)</key>
     </entry>
+    <entry>
+      <key>Date (Year)</key>
+    </entry>
     <entry>
       <key>Attributes must be unique!</key>
     </entry>
@@ -6305,6 +6317,9 @@
     <entry>
       <key>Entrydate has to be in the selected calendar week!</key>
     </entry>
+    <entry>
+      <key>Date has to be in the selected calendar week!</key>
+    </entry>
     <entry>
       <key>Invalid year!</key>
     </entry>
@@ -7095,6 +7110,18 @@
     <entry>
       <key>Default</key>
     </entry>
+    <entry>
+      <key>Grant new Department Permission</key>
+    </entry>
+    <entry>
+      <key>Permission Procurer Department</key>
+    </entry>
+    <entry>
+      <key>Permission Procurer User</key>
+    </entry>
+    <entry>
+      <key>Grant new User Permission</key>
+    </entry>
   </keyValueMap>
   <font name="Dialog" style="0" size="11" />
 </language>
diff --git a/process/CreateActivity_workflowService/serviceTaskParameterProcess.js b/process/CreateActivity_workflowService/serviceTaskParameterProcess.js
index 65519e25d8..3760d48ad7 100644
--- a/process/CreateActivity_workflowService/serviceTaskParameterProcess.js
+++ b/process/CreateActivity_workflowService/serviceTaskParameterProcess.js
@@ -25,7 +25,7 @@ result.object([
     new WorkflowServiceTaskParameter("activityResponsible", "Responsible", WorkflowServiceTaskParameter.ENUM(), users),
     new WorkflowServiceTaskParameter("activityDirection", "Direction", WorkflowServiceTaskParameter.ENUM(), _getKeywords($KeywordRegistry.activityDirection())),
     new WorkflowServiceTaskParameter("activityCategory", "Category", WorkflowServiceTaskParameter.ENUM(), _getKeywords($KeywordRegistry.activityCategory())),
-    new WorkflowServiceTaskParameter("activityEntryDate", "Entry date", WorkflowServiceTaskParameter.DATE()),
+    new WorkflowServiceTaskParameter("activityEntryDate", "Date", WorkflowServiceTaskParameter.DATE()),
     new WorkflowServiceTaskParameter("activityContent", "Content", WorkflowServiceTaskParameter.STRING()),
     new WorkflowServiceTaskParameter("activityTitle", "Title", WorkflowServiceTaskParameter.STRING())
 ]);
-- 
GitLab


From 5f14aa88ec207efbb7c72242e2dd4118b92680c2 Mon Sep 17 00:00:00 2001
From: "S.Listl" <s.listl@adito.de>
Date: Thu, 20 Aug 2020 10:05:28 +0200
Subject: [PATCH 180/309] #1061843: Rename "entrydate" labels in
 Activity-related contexts

---
 entity/Activity_entity/Activity_entity.aod    |   8 +-
 .../entityfields/entrydate/onValidation.js    |   2 +-
 .../_____LANGUAGE_EXTRA.aod                   | 132 ++++++++++
 .../_____LANGUAGE_de/_____LANGUAGE_de.aod     | 247 ++++++++++++++++++
 .../_____LANGUAGE_en/_____LANGUAGE_en.aod     | 132 ++++++++++
 .../serviceTaskParameterProcess.js            |   2 +-
 6 files changed, 517 insertions(+), 6 deletions(-)

diff --git a/entity/Activity_entity/Activity_entity.aod b/entity/Activity_entity/Activity_entity.aod
index 0dc1eae96a..cc9489d06d 100644
--- a/entity/Activity_entity/Activity_entity.aod
+++ b/entity/Activity_entity/Activity_entity.aod
@@ -27,7 +27,7 @@
     </entityField>
     <entityField>
       <name>ENTRYDATE</name>
-      <title>Entrydate</title>
+      <title>Date</title>
       <contentType>DATE</contentType>
       <resolution>MINUTE</resolution>
       <outputFormat>dd.MM.yyyy HH:mm</outputFormat>
@@ -157,7 +157,7 @@
     </entityConsumer>
     <entityField>
       <name>ENTRYMONTH</name>
-      <title>Entrydate (Month)</title>
+      <title>Date (Month)</title>
       <contentType>TEXT</contentType>
       <groupable v="true" />
       <valueProcess>%aditoprj%/entity/Activity_entity/entityfields/entrymonth/valueProcess.js</valueProcess>
@@ -395,7 +395,7 @@
     </entityConsumer>
     <entityField>
       <name>ENTRYDAY</name>
-      <title>Entrydate (Day)</title>
+      <title>Date (Day)</title>
       <groupable v="true" />
       <valueProcess>%aditoprj%/entity/Activity_entity/entityfields/entryday/valueProcess.js</valueProcess>
     </entityField>
@@ -563,7 +563,7 @@
     </entityConsumer>
     <entityField>
       <name>ENTRYYEAR</name>
-      <title>Entrydate (Year)</title>
+      <title>Date (Year)</title>
       <groupable v="true" />
       <valueProcess>%aditoprj%/entity/Activity_entity/entityfields/entryyear/valueProcess.js</valueProcess>
     </entityField>
diff --git a/entity/Activity_entity/entityfields/entrydate/onValidation.js b/entity/Activity_entity/entityfields/entrydate/onValidation.js
index 437a5ee635..67c94e8d00 100644
--- a/entity/Activity_entity/entityfields/entrydate/onValidation.js
+++ b/entity/Activity_entity/entityfields/entrydate/onValidation.js
@@ -6,4 +6,4 @@ import("Entity_lib");
 
 var entryDate = vars.get("local.value");
 if (!DateUtils.validateNotInFuture(entryDate))
-    result.string(translate.text("Entrydate must not be in the future"));
\ No newline at end of file
+    result.string(translate.text("Date must not be in the future"));
\ No newline at end of file
diff --git a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
index 977fdd9d8d..d3a8ed8ce3 100644
--- a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
+++ b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
@@ -2082,6 +2082,12 @@
     <entry>
       <key>Entrydate (Day)</key>
     </entry>
+    <entry>
+      <key>Date (Month)</key>
+    </entry>
+    <entry>
+      <key>Date (Day)</key>
+    </entry>
     <entry>
       <key>My Dashboard</key>
     </entry>
@@ -3195,6 +3201,9 @@
     <entry>
       <key>Entrydate must not be in the future</key>
     </entry>
+    <entry>
+      <key>Date must not be in the future</key>
+    </entry>
     <entry>
       <key>Delivery specification</key>
     </entry>
@@ -4725,6 +4734,9 @@
     <entry>
       <key>Entrydate (Year)</key>
     </entry>
+    <entry>
+      <key>Date (Year)</key>
+    </entry>
     <entry>
       <key>Attributes must be unique!</key>
     </entry>
@@ -6263,6 +6275,9 @@
     <entry>
       <key>Entrydate has to be in the selected calendar week!</key>
     </entry>
+    <entry>
+      <key>Date has to be in the selected calendar week!</key>
+    </entry>
     <entry>
       <key>Invalid year!</key>
     </entry>
@@ -6782,21 +6797,96 @@
     <entry>
       <key>Offerrequest</key>
     </entry>
+    <entry>
+      <key>Number of employees</key>
+    </entry>
+    <entry>
+      <key>2. Customer value</key>
+    </entry>
+    <entry>
+      <key>Product preference</key>
+    </entry>
+    <entry>
+      <key>Business development</key>
+    </entry>
+    <entry>
+      <key>Headquarters</key>
+    </entry>
+    <entry>
+      <key>Current supply share</key>
+    </entry>
+    <entry>
+      <key>Purchasing potential p. a.</key>
+    </entry>
+    <entry>
+      <key>ScoreTargetGgroup</key>
+    </entry>
+    <entry>
+      <key>Stagnated</key>
+    </entry>
+    <entry>
+      <key>Negative</key>
+    </entry>
+    <entry>
+      <key>1. Target group</key>
+    </entry>
+    <entry>
+      <key>Positive</key>
+    </entry>
+    <entry>
+      <key>0-50</key>
+    </entry>
+    <entry>
+      <key>Till Score</key>
+    </entry>
+    <entry>
+      <key>251-1000</key>
+    </entry>
+    <entry>
+      <key>ab 1000</key>
+    </entry>
     <entry>
       <key>Full Permissions</key>
     </entry>
+    <entry>
+      <key>200-349 T€</key>
+    </entry>
+    <entry>
+      <key>100-199 T€</key>
+    </entry>
     <entry>
       <key>Full permissions already assigned</key>
     </entry>
+    <entry>
+      <key>51-100</key>
+    </entry>
     <entry>
       <key>Import Daten</key>
     </entry>
+    <entry>
+      <key>ab 350 T€</key>
+    </entry>
+    <entry>
+      <key>0-49 T€</key>
+    </entry>
+    <entry>
+      <key>Grading</key>
+    </entry>
     <entry>
       <key>Import Logs</key>
     </entry>
     <entry>
       <key>Transferdaten</key>
     </entry>
+    <entry>
+      <key>50-99 T€</key>
+    </entry>
+    <entry>
+      <key>101-250</key>
+    </entry>
+    <entry>
+      <key>Gradings</key>
+    </entry>
     <entry>
       <key>Valid from (as </key>
     </entry>
@@ -6911,6 +7001,12 @@
     <entry>
       <key>Workflow deploy failed</key>
     </entry>
+    <entry>
+      <key>Ø Probability</key>
+    </entry>
+    <entry>
+      <key>Probability AI</key>
+    </entry>
     <entry>
       <key>{SEND_MAIL}</key>
     </entry>
@@ -6923,6 +7019,42 @@
     <entry>
       <key>Archived</key>
     </entry>
+    <entry>
+      <key>asdf</key>
+    </entry>
+    <entry>
+      <key>Settings</key>
+    </entry>
+    <entry>
+      <key>Latitude</key>
+    </entry>
+    <entry>
+      <key>Longitude</key>
+    </entry>
+    <entry>
+      <key>Favorites</key>
+    </entry>
+    <entry>
+      <key>Favorite</key>
+    </entry>
+    <entry>
+      <key>Show all Favorites</key>
+    </entry>
+    <entry>
+      <key>Default</key>
+    </entry>
+    <entry>
+      <key>Grant new Department Permission</key>
+    </entry>
+    <entry>
+      <key>Permission Procurer Department</key>
+    </entry>
+    <entry>
+      <key>Permission Procurer User</key>
+    </entry>
+    <entry>
+      <key>Grant new User Permission</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 b5e2a98425..2e9dd22054 100644
--- a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
+++ b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
@@ -375,6 +375,10 @@
       <key>Entrydate (Day)</key>
       <value>Eingangsdatum (Tag)</value>
     </entry>
+    <entry>
+      <key>Date (Day)</key>
+      <value>Datum (Tag)</value>
+    </entry>
     <entry>
       <key>still incorrect</key>
       <value>weiterhin fehlerhaft</value>
@@ -527,6 +531,10 @@
       <key>Entrydate (Month)</key>
       <value>Eingangsdatum (Monat)</value>
     </entry>
+    <entry>
+      <key>Date (Month)</key>
+      <value>Datum (Monat)</value>
+    </entry>
     <entry>
       <key>Usage</key>
       <value>Verwendung</value>
@@ -1028,6 +1036,10 @@
       <key>City</key>
       <value>Stadt</value>
     </entry>
+    <entry>
+      <key>Default</key>
+      <value>Standard</value>
+    </entry>
     <entry>
       <key>Region</key>
       <value>Gebiet</value>
@@ -1754,6 +1766,7 @@
     </entry>
     <entry>
       <key>Other</key>
+      <value>Andere</value>
     </entry>
     <entry>
       <key>Show all sent offers</key>
@@ -1981,6 +1994,10 @@
       <key>Entrydate must not be in the future</key>
       <value>Eingangsdatum darf nicht in der Zukunft liegen</value>
     </entry>
+    <entry>
+      <key>Date must not be in the future</key>
+      <value>Datum darf nicht in der Zukunft liegen</value>
+    </entry>
     <entry>
       <key>Copy receipt</key>
       <value>Beleg kopieren</value>
@@ -2429,6 +2446,10 @@
       <key>Mayotte</key>
       <value>Mayotte</value>
     </entry>
+    <entry>
+      <key>Favorite</key>
+      <value>Favorit</value>
+    </entry>
     <entry>
       <key>Israel</key>
       <value>Israel</value>
@@ -3283,6 +3304,10 @@
       <key>Anguilla</key>
       <value>Anguilla</value>
     </entry>
+    <entry>
+      <key>Favorites</key>
+      <value>Favoriten</value>
+    </entry>
     <entry>
       <key>Euro</key>
       <value>Euro</value>
@@ -3335,6 +3360,10 @@
       <key>Turkmenistan</key>
       <value>Turkmenistan</value>
     </entry>
+    <entry>
+      <key>Show all Favorites</key>
+      <value>Alle Favoriten anzeigen</value>
+    </entry>
     <entry>
       <key>Venezuela (Bolivarian Republic of)</key>
       <value>Venezuela (Bolivarische Republik)</value>
@@ -3517,6 +3546,10 @@
       <key>Gambia</key>
       <value>Gambia</value>
     </entry>
+    <entry>
+      <key>Ø Probability</key>
+      <value>Ø Wahrscheinlichkeit</value>
+    </entry>
     <entry>
       <key>Qatar</key>
       <value>Katar</value>
@@ -5563,6 +5596,10 @@
       <key>Target group</key>
       <value>Zielgruppe</value>
     </entry>
+    <entry>
+      <key>ScoreTargetGgroup</key>
+      <value>Zielgruppe</value>
+    </entry>
     <entry>
       <key>Interested person</key>
       <value>Interessent</value>
@@ -6487,6 +6524,10 @@
       <key>Entrydate (Year)</key>
       <value>Eingangsdatum (Jahr)</value>
     </entry>
+    <entry>
+      <key>Date (Year)</key>
+      <value>Datum (Jahr)</value>
+    </entry>
     <entry>
       <key>Attributes must be unique!</key>
       <value>Attribute müssen eindeutig sein</value>
@@ -7713,6 +7754,7 @@ Bitte Datumseingabe prüfen</value>
     </entry>
     <entry>
       <key>low</key>
+      <value>niedrig</value>
     </entry>
     <entry>
       <key>Show only own</key>
@@ -8167,6 +8209,10 @@ Bitte Datumseingabe prüfen</value>
       <key>Entrydate has to be in the selected calendar week!</key>
       <value>Eingangsdatum muss in der ausgewählten Kalenderwoche liegen!</value>
     </entry>
+    <entry>
+      <key>Date has to be in the selected calendar week!</key>
+      <value>Datum muss in der ausgewählten Kalenderwoche liegen!</value>
+    </entry>
     <entry>
       <key>Invalid year!</key>
       <value>Ungültiges jahr!</value>
@@ -8704,21 +8750,107 @@ Bitte Datumseingabe prüfen</value>
       <key>Offerrequest</key>
       <value>Angebotsanfrage</value>
     </entry>
+    <entry>
+      <key>Number of employees</key>
+      <value>Anzahl Mitarbeiter</value>
+    </entry>
+    <entry>
+      <key>2. Customer value</key>
+      <value>2. Kundenwert</value>
+    </entry>
+    <entry>
+      <key>Product preference</key>
+      <value>Produktpräferenz</value>
+    </entry>
+    <entry>
+      <key>Business development</key>
+      <value>Wirtschaftliche Entwicklung</value>
+    </entry>
+    <entry>
+      <key>Headquarters</key>
+      <value>Hauptsitz</value>
+    </entry>
+    <entry>
+      <key>Current supply share</key>
+      <value>Aktueller Lieferanteil</value>
+    </entry>
+    <entry>
+      <key>Purchasing potential p. a.</key>
+      <value>Einkaufspotential p. a.</value>
+    </entry>
+    <entry>
+      <key>Stagnated</key>
+      <value>Stagniert </value>
+    </entry>
+    <entry>
+      <key>Negative</key>
+    </entry>
+    <entry>
+      <key>1. Target group</key>
+      <value>1. Zielgruppe</value>
+    </entry>
+    <entry>
+      <key>Positive</key>
+    </entry>
+    <entry>
+      <key>0-50</key>
+    </entry>
+    <entry>
+      <key>Till Score</key>
+    </entry>
+    <entry>
+      <key>251-1000</key>
+    </entry>
+    <entry>
+      <key>asdf</key>
+    </entry>
+    <entry>
+      <key>ab 1000</key>
+    </entry>
+    <entry>
+      <key>Gradings</key>
+      <value>Bewertungen</value>
+    </entry>
     <entry>
       <key>Full Permissions</key>
     </entry>
+    <entry>
+      <key>200-349 T€</key>
+    </entry>
+    <entry>
+      <key>100-199 T€</key>
+    </entry>
     <entry>
       <key>Full permissions already assigned</key>
     </entry>
+    <entry>
+      <key>51-100</key>
+    </entry>
     <entry>
       <key>Import Daten</key>
     </entry>
+    <entry>
+      <key>ab 350 T€</key>
+    </entry>
+    <entry>
+      <key>0-49 T€</key>
+    </entry>
+    <entry>
+      <key>Grading</key>
+      <value>Bewertung</value>
+    </entry>
     <entry>
       <key>Import Logs</key>
     </entry>
     <entry>
       <key>Transferdaten</key>
     </entry>
+    <entry>
+      <key>50-99 T€</key>
+    </entry>
+    <entry>
+      <key>101-250</key>
+    </entry>
     <entry>
       <key>Valid from (as </key>
       <value>gültig ab (in </value>
@@ -8754,6 +8886,121 @@ Bitte Datumseingabe prüfen</value>
     <entry>
       <key>Actionthriller</key>
     </entry>
+    <entry>
+      <key>and open modeler</key>
+    </entry>
+    <entry>
+      <key>export</key>
+    </entry>
+    <entry>
+      <key>Receive new Department Permission</key>
+    </entry>
+    <entry>
+      <key>No new recipients found that can be added to the serial letter.</key>
+    </entry>
+    <entry>
+      <key>New</key>
+    </entry>
+    <entry>
+      <key>Archived</key>
+    </entry>
+    <entry>
+      <key>Receive new User Permission</key>
+    </entry>
+    <entry>
+      <key>workflow notification</key>
+    </entry>
+    <entry>
+      <key>Permission received</key>
+    </entry>
+    <entry>
+      <key>leadimport notification</key>
+    </entry>
+    <entry>
+      <key>Workflow Model</key>
+    </entry>
+    <entry>
+      <key>No new recipients found that can be added to the bulk mail.</key>
+    </entry>
+    <entry>
+      <key>Total in euros</key>
+    </entry>
+    <entry>
+      <key>export using the selected  template</key>
+    </entry>
+    <entry>
+      <key>send mail</key>
+    </entry>
+    <entry>
+      <key>Download letter and create Activity</key>
+    </entry>
+    <entry>
+      <key>{SENT_MAIL}</key>
+    </entry>
+    <entry>
+      <key>The workflow could not be deployed</key>
+    </entry>
+    <entry>
+      <key>Add Participants</key>
+    </entry>
+    <entry>
+      <key>Workflow deploy failed</key>
+    </entry>
+    <entry>
+      <key>Create model</key>
+    </entry>
+    <entry>
+      <key>Release</key>
+    </entry>
+    <entry>
+      <key>granted permission</key>
+    </entry>
+    <entry>
+      <key>bulk mail sent</key>
+    </entry>
+    <entry>
+      <key>Edit workflow</key>
+    </entry>
+    <entry>
+      <key>and open Report</key>
+    </entry>
+    <entry>
+      <key>The Sales Project can only be filled when a company has been specified</key>
+    </entry>
+    <entry>
+      <key>Add Recipients</key>
+    </entry>
+    <entry>
+      <key>{SEND_MAIL}</key>
+    </entry>
+    <entry>
+      <key>download ready</key>
+    </entry>
+    <entry>
+      <key>Latitude</key>
+    </entry>
+    <entry>
+      <key>Longitude</key>
+    </entry>
+    <entry>
+      <key>Permission Procurer User</key>
+      <value>Rechteempfänger Benutzer</value>
+    </entry>
+    <entry>
+      <key>Grant new User Permission</key>
+      <value>Neue Benutzer-Berechtigung vergeben</value>
+    </entry>
+    <entry>
+      <key>Permission Procurer Department</key>
+      <value>Rechteempfänger Abteilung</value>
+    </entry>
+    <entry>
+      <key>Grant new Department Permission</key>
+      <value>Neue Abteilungs-Berechtigung vergeben</value>
+    </entry>
+    <entry>
+      <key>Probability AI</key>
+    </entry>
   </keyValueMap>
   <font name="Dialog" style="0" size="11" />
 </language>
diff --git a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
index 1db9b01933..77d0fd44c6 100644
--- a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
+++ b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
@@ -2099,6 +2099,12 @@
     <entry>
       <key>Entrydate (Day)</key>
     </entry>
+    <entry>
+      <key>Date (Month)</key>
+    </entry>
+    <entry>
+      <key>Date (Day)</key>
+    </entry>
     <entry>
       <key>My Dashboard</key>
     </entry>
@@ -3254,6 +3260,9 @@
     <entry>
       <key>Entrydate must not be in the future</key>
     </entry>
+    <entry>
+      <key>Date must not be in the future</key>
+    </entry>
     <entry>
       <key>Delivery specification</key>
     </entry>
@@ -4783,6 +4792,9 @@
     <entry>
       <key>Entrydate (Year)</key>
     </entry>
+    <entry>
+      <key>Date (Year)</key>
+    </entry>
     <entry>
       <key>Attributes must be unique!</key>
     </entry>
@@ -6302,6 +6314,9 @@
     <entry>
       <key>Entrydate has to be in the selected calendar week!</key>
     </entry>
+    <entry>
+      <key>Date has to be in the selected calendar week!</key>
+    </entry>
     <entry>
       <key>Invalid year!</key>
     </entry>
@@ -6990,6 +7005,123 @@
     <entry>
       <key>Archived</key>
     </entry>
+    <entry>
+      <key>Grant new Department Permission</key>
+    </entry>
+    <entry>
+      <key>Permission Procurer Department</key>
+    </entry>
+    <entry>
+      <key>Permission Procurer User</key>
+    </entry>
+    <entry>
+      <key>Grant new User Permission</key>
+    </entry>
+    <entry>
+      <key>Number of employees</key>
+    </entry>
+    <entry>
+      <key>0-50</key>
+    </entry>
+    <entry>
+      <key>Default</key>
+    </entry>
+    <entry>
+      <key>2. Customer value</key>
+    </entry>
+    <entry>
+      <key>Product preference</key>
+    </entry>
+    <entry>
+      <key>Business development</key>
+    </entry>
+    <entry>
+      <key>Till Score</key>
+    </entry>
+    <entry>
+      <key>Headquarters</key>
+    </entry>
+    <entry>
+      <key>251-1000</key>
+    </entry>
+    <entry>
+      <key>Ø Probability</key>
+    </entry>
+    <entry>
+      <key>asdf</key>
+    </entry>
+    <entry>
+      <key>ab 1000</key>
+    </entry>
+    <entry>
+      <key>Gradings</key>
+    </entry>
+    <entry>
+      <key>Probability AI</key>
+    </entry>
+    <entry>
+      <key>200-349 T€</key>
+    </entry>
+    <entry>
+      <key>100-199 T€</key>
+    </entry>
+    <entry>
+      <key>Longitude</key>
+    </entry>
+    <entry>
+      <key>Current supply share</key>
+    </entry>
+    <entry>
+      <key>51-100</key>
+    </entry>
+    <entry>
+      <key>Purchasing potential p. a.</key>
+    </entry>
+    <entry>
+      <key>Favorites</key>
+    </entry>
+    <entry>
+      <key>ab 350 T€</key>
+    </entry>
+    <entry>
+      <key>0-49 T€</key>
+    </entry>
+    <entry>
+      <key>Settings</key>
+    </entry>
+    <entry>
+      <key>Grading</key>
+    </entry>
+    <entry>
+      <key>ScoreTargetGgroup</key>
+    </entry>
+    <entry>
+      <key>Stagnated</key>
+    </entry>
+    <entry>
+      <key>Show all Favorites</key>
+    </entry>
+    <entry>
+      <key>Negative</key>
+    </entry>
+    <entry>
+      <key>1. Target group</key>
+    </entry>
+    <entry>
+      <key>Positive</key>
+    </entry>
+    <entry>
+      <key>Latitude</key>
+    </entry>
+    <entry>
+      <key>50-99 T€</key>
+    </entry>
+    <entry>
+      <key>101-250</key>
+    </entry>
+    <entry>
+      <key>Favorite</key>
+    </entry>
   </keyValueMap>
   <font name="Dialog" style="0" size="11" />
 </language>
diff --git a/process/CreateActivity_workflowService/serviceTaskParameterProcess.js b/process/CreateActivity_workflowService/serviceTaskParameterProcess.js
index 65519e25d8..3760d48ad7 100644
--- a/process/CreateActivity_workflowService/serviceTaskParameterProcess.js
+++ b/process/CreateActivity_workflowService/serviceTaskParameterProcess.js
@@ -25,7 +25,7 @@ result.object([
     new WorkflowServiceTaskParameter("activityResponsible", "Responsible", WorkflowServiceTaskParameter.ENUM(), users),
     new WorkflowServiceTaskParameter("activityDirection", "Direction", WorkflowServiceTaskParameter.ENUM(), _getKeywords($KeywordRegistry.activityDirection())),
     new WorkflowServiceTaskParameter("activityCategory", "Category", WorkflowServiceTaskParameter.ENUM(), _getKeywords($KeywordRegistry.activityCategory())),
-    new WorkflowServiceTaskParameter("activityEntryDate", "Entry date", WorkflowServiceTaskParameter.DATE()),
+    new WorkflowServiceTaskParameter("activityEntryDate", "Date", WorkflowServiceTaskParameter.DATE()),
     new WorkflowServiceTaskParameter("activityContent", "Content", WorkflowServiceTaskParameter.STRING()),
     new WorkflowServiceTaskParameter("activityTitle", "Title", WorkflowServiceTaskParameter.STRING())
 ]);
-- 
GitLab


From ec58ec2cec84bc0f2a436e2374aa0f9fb9ccda24 Mon Sep 17 00:00:00 2001
From: "S.Listl" <s.listl@adito.de>
Date: Thu, 20 Aug 2020 10:09:47 +0200
Subject: [PATCH 181/309] Language files updated

---
 .../_____LANGUAGE_EXTRA.aod                   | 174 +++++++++++++++++-
 .../_____LANGUAGE_en/_____LANGUAGE_en.aod     |  66 +++++++
 2 files changed, 237 insertions(+), 3 deletions(-)

diff --git a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
index 924c814366..83c3153deb 100644
--- a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
+++ b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
@@ -6920,9 +6920,6 @@
     <entry>
       <key>asdf</key>
     </entry>
-    <entry>
-      <key>Settings</key>
-    </entry>
     <entry>
       <key>Latitude</key>
     </entry>
@@ -6953,6 +6950,177 @@
     <entry>
       <key>Grant new User Permission</key>
     </entry>
+    <entry>
+      <key>yellow</key>
+    </entry>
+    <entry>
+      <key>Number of employees</key>
+    </entry>
+    <entry>
+      <key>Borrow</key>
+    </entry>
+    <entry>
+      <key>Selection placeholder</key>
+    </entry>
+    <entry>
+      <key>0-50</key>
+    </entry>
+    <entry>
+      <key>2. Customer value</key>
+    </entry>
+    <entry>
+      <key>Product preference</key>
+    </entry>
+    <entry>
+      <key>Business development</key>
+    </entry>
+    <entry>
+      <key>Till Score</key>
+    </entry>
+    <entry>
+      <key>Current password</key>
+    </entry>
+    <entry>
+      <key>Headquarters</key>
+    </entry>
+    <entry>
+      <key>Calendar maintime start</key>
+    </entry>
+    <entry>
+      <key>251-1000</key>
+    </entry>
+    <entry>
+      <key>ab 1000</key>
+    </entry>
+    <entry>
+      <key>favorties</key>
+    </entry>
+    <entry>
+      <key>Gradings</key>
+    </entry>
+    <entry>
+      <key>200-349 T€</key>
+    </entry>
+    <entry>
+      <key>Fantasy</key>
+    </entry>
+    <entry>
+      <key>100-199 T€</key>
+    </entry>
+    <entry>
+      <key>Password must contain special characters</key>
+    </entry>
+    <entry>
+      <key>Current supply share</key>
+    </entry>
+    <entry>
+      <key>51-100</key>
+    </entry>
+    <entry>
+      <key>Password must be at least %0 characters</key>
+    </entry>
+    <entry>
+      <key>Purchasing potential p. a.</key>
+    </entry>
+    <entry>
+      <key>favorite</key>
+    </entry>
+    <entry>
+      <key>Repeat password</key>
+    </entry>
+    <entry>
+      <key>Extend</key>
+    </entry>
+    <entry>
+      <key>ab 350 T€</key>
+    </entry>
+    <entry>
+      <key>Krimi</key>
+    </entry>
+    <entry>
+      <key>red</key>
+    </entry>
+    <entry>
+      <key>0-49 T€</key>
+    </entry>
+    <entry>
+      <key>Return</key>
+    </entry>
+    <entry>
+      <key>Grading</key>
+    </entry>
+    <entry>
+      <key>SELECTION_NULL</key>
+    </entry>
+    <entry>
+      <key>ScoreTargetGgroup</key>
+    </entry>
+    <entry>
+      <key>Stagnated</key>
+    </entry>
+    <entry>
+      <key>Is unlinked activity</key>
+    </entry>
+    <entry>
+      <key>Selection ignore case</key>
+    </entry>
+    <entry>
+      <key>Negative</key>
+    </entry>
+    <entry>
+      <key>Calendar maintime end</key>
+    </entry>
+    <entry>
+      <key>green</key>
+    </entry>
+    <entry>
+      <key>1. Target group</key>
+    </entry>
+    <entry>
+      <key>SELECTION_NEITHER</key>
+    </entry>
+    <entry>
+      <key>Password must contain numbers</key>
+    </entry>
+    <entry>
+      <key>New password</key>
+    </entry>
+    <entry>
+      <key>Actionthriller</key>
+    </entry>
+    <entry>
+      <key>Calendar hour divider</key>
+    </entry>
+    <entry>
+      <key>Positive</key>
+    </entry>
+    <entry>
+      <key>SELECTION_BOTH</key>
+    </entry>
+    <entry>
+      <key>50-99 T€</key>
+    </entry>
+    <entry>
+      <key>SELECTION_POSTFIX</key>
+    </entry>
+    <entry>
+      <key>101-250</key>
+    </entry>
+    <entry>
+      <key>Password must contain letters</key>
+    </entry>
+    <entry>
+      <key>SELECTION_PREFIX</key>
+    </entry>
+    <entry>
+      <key>Password must contain spaces</key>
+    </entry>
+    <entry>
+      <key>favorites</key>
+    </entry>
+    <entry>
+      <key>The use of any of your previous %0 passwords is prohibited</key>
+    </entry>
   </keyValueMap>
   <font name="Dialog" style="0" size="11" />
   <sqlModels>
diff --git a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
index 8fa14fafb4..d30f5ce0de 100644
--- a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
+++ b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
@@ -7122,6 +7122,72 @@
     <entry>
       <key>Grant new User Permission</key>
     </entry>
+    <entry>
+      <key>Selection placeholder</key>
+    </entry>
+    <entry>
+      <key>Current password</key>
+    </entry>
+    <entry>
+      <key>Calendar maintime start</key>
+    </entry>
+    <entry>
+      <key>favorties</key>
+    </entry>
+    <entry>
+      <key>Password must contain special characters</key>
+    </entry>
+    <entry>
+      <key>Password must be at least %0 characters</key>
+    </entry>
+    <entry>
+      <key>favorite</key>
+    </entry>
+    <entry>
+      <key>Repeat password</key>
+    </entry>
+    <entry>
+      <key>SELECTION_NULL</key>
+    </entry>
+    <entry>
+      <key>Selection ignore case</key>
+    </entry>
+    <entry>
+      <key>Calendar maintime end</key>
+    </entry>
+    <entry>
+      <key>SELECTION_NEITHER</key>
+    </entry>
+    <entry>
+      <key>Password must contain numbers</key>
+    </entry>
+    <entry>
+      <key>New password</key>
+    </entry>
+    <entry>
+      <key>Calendar hour divider</key>
+    </entry>
+    <entry>
+      <key>SELECTION_BOTH</key>
+    </entry>
+    <entry>
+      <key>SELECTION_POSTFIX</key>
+    </entry>
+    <entry>
+      <key>Password must contain letters</key>
+    </entry>
+    <entry>
+      <key>SELECTION_PREFIX</key>
+    </entry>
+    <entry>
+      <key>Password must contain spaces</key>
+    </entry>
+    <entry>
+      <key>favorites</key>
+    </entry>
+    <entry>
+      <key>The use of any of your previous %0 passwords is prohibited</key>
+    </entry>
   </keyValueMap>
   <font name="Dialog" style="0" size="11" />
 </language>
-- 
GitLab


From e4cf639a3331f861b2af0143df6dff3f447d1104 Mon Sep 17 00:00:00 2001
From: "s.pongratz" <s.pongratz@adito.de>
Date: Thu, 20 Aug 2020 10:19:32 +0200
Subject: [PATCH 182/309] #1064042-BugDuplicateScanner Bug behoben

---
 process/DuplicateScanner_lib/process.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/process/DuplicateScanner_lib/process.js b/process/DuplicateScanner_lib/process.js
index 92dee1a9b0..7cc968d72b 100644
--- a/process/DuplicateScanner_lib/process.js
+++ b/process/DuplicateScanner_lib/process.js
@@ -894,6 +894,9 @@ _DuplicateScannerUtils._loadIndexPattern = function(pScannerName, pTargetEntity)
 
 
 _DuplicateScannerUtils._filterToScanPattern = function(filterString) {
+    if (filterString == null || filterString.trim() == "")
+        return "";
+    
     let filter = JSON.parse(filterString);
     return _DuplicateScannerUtils._filterChildsToScanPattern(filter.filter.childs, filter.filter.operator);
 }
-- 
GitLab


From 71b47a8871c44150bdbb7e7e3d3a95d7c86d7a5d Mon Sep 17 00:00:00 2001
From: "S.Listl" <s.listl@adito.de>
Date: Thu, 20 Aug 2020 13:14:17 +0200
Subject: [PATCH 183/309] Address location search performance fix

---
 entity/Address_entity/recordcontainers/db/onDBInsert.js | 2 +-
 entity/Address_entity/recordcontainers/db/onDBUpdate.js | 3 ++-
 process/Location_lib/process.js                         | 3 +++
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/entity/Address_entity/recordcontainers/db/onDBInsert.js b/entity/Address_entity/recordcontainers/db/onDBInsert.js
index 8d5c684b6c..ac6e09eee0 100644
--- a/entity/Address_entity/recordcontainers/db/onDBInsert.js
+++ b/entity/Address_entity/recordcontainers/db/onDBInsert.js
@@ -50,7 +50,7 @@ if(scopeType == "Organisation")
 
 DataPrivacyUtils.notifyNeedDataPrivacyUpdate(rowdata["ADDRESS.CONTACT_ID"], vars.get("$param.ShowDsgvoMessage_param"));
 
-var address = new AddressObject(rowdata["ADDRESS.ADDRESS"], rowdata["ADDRESS.BUILDINGNO"], rowdata["ADDRESS.ZIP"], rowdata["ADDRESS.CITY"], rowdata["ADDRESS.COUNTRY"]);
+var address = new AddressObject(rowdata["ADDRESS.ADDRESS"], rowdata["ADDRESS.BUILDINGNO"], rowdata["ADDRESS.ZIP"], rowdata["ADDRESS.CITY"], rowdata["ADDRESS.COUNTRY"], rowdata["ADDRESS.STATE"]);
 var addressLocation = new LocationFinder().getGeoLocation(address);
 if (addressLocation)
 {
diff --git a/entity/Address_entity/recordcontainers/db/onDBUpdate.js b/entity/Address_entity/recordcontainers/db/onDBUpdate.js
index f92b7b77ce..80e0c649be 100644
--- a/entity/Address_entity/recordcontainers/db/onDBUpdate.js
+++ b/entity/Address_entity/recordcontainers/db/onDBUpdate.js
@@ -13,11 +13,12 @@ var isAddressChanged = changed.includes("ADDRESS.ADDRESS")
     || changed.includes("ADDRESS.BUILDINGNO")
     || changed.includes("ADDRESS.ZIP")
     || changed.includes("ADDRESS.CITY")
+    || changed.includes("ADDRESS.STATE")
     || changed.includes("ADDRESS.COUNTRY");
 
 if (isAddressChanged)
 {
-    var address = new AddressObject(rowdata["ADDRESS.ADDRESS"], rowdata["ADDRESS.BUILDINGNO"], rowdata["ADDRESS.ZIP"], rowdata["ADDRESS.CITY"], rowdata["ADDRESS.COUNTRY"]);
+    var address = new AddressObject(rowdata["ADDRESS.ADDRESS"], rowdata["ADDRESS.BUILDINGNO"], rowdata["ADDRESS.ZIP"], rowdata["ADDRESS.CITY"], rowdata["ADDRESS.COUNTRY"], rowdata["ADDRESS.STATE"]);
     var addressLocation = new LocationFinder().getGeoLocation(address);
     if (addressLocation)
     {
diff --git a/process/Location_lib/process.js b/process/Location_lib/process.js
index 91ebd5ce8a..e57ae643c7 100644
--- a/process/Location_lib/process.js
+++ b/process/Location_lib/process.js
@@ -203,7 +203,10 @@ LocationFinder._getLocationWithNominatim = function (pAddress)
     if (pAddress.state)
         parameters.state = pAddress.state;
     if (pAddress.country)
+    {
         parameters.country = pAddress.country;
+        parameters.countrycodes = pAddress.country;
+    }
     
     return WsValidationUtils.validate(null, "TYPE_FULLADDRESS_NOMINATIM", parameters);
 }
-- 
GitLab


From 825bf2f73443ded750d21d83b8ad20435907740b Mon Sep 17 00:00:00 2001
From: "a.schindlbeck" <a.schindlbeck@adito.de>
Date: Thu, 20 Aug 2020 13:23:04 +0200
Subject: [PATCH 184/309] #1063996 Favorites: Table indizes liquibase

---
 .../basic/init/struct/create_asys_record.xml             | 9 +++++++++
 .../basic/init/struct/create_asys_recordgroup.xml        | 6 ++++++
 2 files changed, 15 insertions(+)

diff --git a/.liquibase/_____SYSTEMALIAS/basic/init/struct/create_asys_record.xml b/.liquibase/_____SYSTEMALIAS/basic/init/struct/create_asys_record.xml
index 8d6a080ec2..49b6b2e62f 100644
--- a/.liquibase/_____SYSTEMALIAS/basic/init/struct/create_asys_record.xml
+++ b/.liquibase/_____SYSTEMALIAS/basic/init/struct/create_asys_record.xml
@@ -9,5 +9,14 @@
         <column name="ROW_ID" type="CHAR(36)"/>
         <column name="RECORDGROUP_ID" type="CHAR(36)"/>
     </createTable>
+    <createIndex indexName="idx_asysrecord_objecttype" tableName="ASYS_RECORD">
+        <column name="OBJECT_TYPE"/>
+    </createIndex>
+    <createIndex indexName="idx_asysrecord_rowid" tableName="ASYS_RECORD">
+        <column name="ROW_ID"/>
+    </createIndex>
+    <createIndex indexName="idx_asysrecord_rdgpid" tableName="ASYS_RECORD">
+        <column name="RECORDGROUP_ID"/>
+    </createIndex>
 </changeSet>
 </databaseChangeLog>
diff --git a/.liquibase/_____SYSTEMALIAS/basic/init/struct/create_asys_recordgroup.xml b/.liquibase/_____SYSTEMALIAS/basic/init/struct/create_asys_recordgroup.xml
index 189f0040b1..395325a7e7 100644
--- a/.liquibase/_____SYSTEMALIAS/basic/init/struct/create_asys_recordgroup.xml
+++ b/.liquibase/_____SYSTEMALIAS/basic/init/struct/create_asys_recordgroup.xml
@@ -9,5 +9,11 @@
         <column name="TITLE" type="VARCHAR(256)"/>
         <column name="GROUP_TYPE" type="VARCHAR(64)"/>
     </createTable>
+    <createIndex indexName="idx_asysrecordgroup_id" tableName="ASYS_RECORDGROUP">
+        <column name="ID"/>
+    </createIndex>
+    <createIndex indexName="idx_asysrecordgroup_userid" tableName="ASYS_RECORDGROUP">
+        <column name="USER_ID"/>
+    </createIndex>
 </changeSet>
 </databaseChangeLog>
-- 
GitLab


From 43255d63528f63e0cc5815948846ddd903e47207 Mon Sep 17 00:00:00 2001
From: "a.schindlbeck" <a.schindlbeck@adito.de>
Date: Thu, 20 Aug 2020 13:26:40 +0200
Subject: [PATCH 185/309] Notifications: Tables indizes liquibase

---
 .../init/struct/create_asys_notificationcontents.xml     | 4 ++++
 .../basic/init/struct/create_asys_notifications.xml      | 9 +++++++++
 2 files changed, 13 insertions(+)

diff --git a/.liquibase/_____SYSTEMALIAS/basic/init/struct/create_asys_notificationcontents.xml b/.liquibase/_____SYSTEMALIAS/basic/init/struct/create_asys_notificationcontents.xml
index 8da1987f7f..fb1ae2f5ee 100644
--- a/.liquibase/_____SYSTEMALIAS/basic/init/struct/create_asys_notificationcontents.xml
+++ b/.liquibase/_____SYSTEMALIAS/basic/init/struct/create_asys_notificationcontents.xml
@@ -18,5 +18,9 @@
         <column name="TYPECODE" type="VARCHAR(63)"/>
         <column name="VERSION" type="INTEGER"/>
     </createTable>
+    
+    <createIndex indexName="idx_asysnoticontents_contid" tableName="ASYS_NOTIFICATIONCONTENTS">
+        <column name="CONTENTID"/>
+    </createIndex>
 </changeSet>
 </databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/_____SYSTEMALIAS/basic/init/struct/create_asys_notifications.xml b/.liquibase/_____SYSTEMALIAS/basic/init/struct/create_asys_notifications.xml
index 0175584524..f3ff1e9ae1 100644
--- a/.liquibase/_____SYSTEMALIAS/basic/init/struct/create_asys_notifications.xml
+++ b/.liquibase/_____SYSTEMALIAS/basic/init/struct/create_asys_notifications.xml
@@ -10,5 +10,14 @@
         <column name="USERID" type="VARCHAR(63)"/>
         <column name="RESOLVEDPRIORITY" type="VARCHAR(15)"/>
     </createTable>
+    <createIndex indexName="idx_asysnoti_contentid" tableName="ASYS_NOTIFICATIONS">
+        <column name="CONTENTID"/>
+    </createIndex>
+    <createIndex indexName="idx_asysnoti_state" tableName="ASYS_NOTIFICATIONS">
+        <column name="STATE"/>
+    </createIndex>
+    <createIndex indexName="idx_asysnoti_userid" tableName="ASYS_NOTIFICATIONS">
+        <column name="USERID"/>
+    </createIndex>
 </changeSet>
 </databaseChangeLog>
-- 
GitLab


From 16f6a6c956e3059ec230e828738ecdcb6ef19311 Mon Sep 17 00:00:00 2001
From: "a.schindlbeck" <a.schindlbeck@adito.de>
Date: Thu, 20 Aug 2020 13:41:56 +0200
Subject: [PATCH 186/309] Favoriten: Tables indizes #2

---
 .../basic/init/struct/create_asys_recordgroup.xml              | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.liquibase/_____SYSTEMALIAS/basic/init/struct/create_asys_recordgroup.xml b/.liquibase/_____SYSTEMALIAS/basic/init/struct/create_asys_recordgroup.xml
index 395325a7e7..c8fae3a479 100644
--- a/.liquibase/_____SYSTEMALIAS/basic/init/struct/create_asys_recordgroup.xml
+++ b/.liquibase/_____SYSTEMALIAS/basic/init/struct/create_asys_recordgroup.xml
@@ -15,5 +15,8 @@
     <createIndex indexName="idx_asysrecordgroup_userid" tableName="ASYS_RECORDGROUP">
         <column name="USER_ID"/>
     </createIndex>
+    <createIndex indexName="idx_asysrecordgroup_title" tableName="ASYS_RECORDGROUP">
+        <column name="TITLE"/>
+    </createIndex>
 </changeSet>
 </databaseChangeLog>
-- 
GitLab


From 941da4c2d133ddd3e115d00ed5d2eafaa8adc026 Mon Sep 17 00:00:00 2001
From: "a.schindlbeck" <a.schindlbeck@adito.de>
Date: Thu, 20 Aug 2020 13:46:48 +0200
Subject: [PATCH 187/309] Favorites: ScanService fixes

---
 entity/Favorite_entity/Favorite_entity.aod                    | 4 +---
 entity/Favorite_entity/documentation.adoc                     | 3 +++
 .../entityfields/#provider/targetConsumerProcess.js           | 0
 3 files changed, 4 insertions(+), 3 deletions(-)
 create mode 100644 entity/Favorite_entity/documentation.adoc
 delete mode 100644 entity/Favorite_entity/entityfields/#provider/targetConsumerProcess.js

diff --git a/entity/Favorite_entity/Favorite_entity.aod b/entity/Favorite_entity/Favorite_entity.aod
index 1abaa9d435..22740ecddf 100644
--- a/entity/Favorite_entity/Favorite_entity.aod
+++ b/entity/Favorite_entity/Favorite_entity.aod
@@ -2,6 +2,7 @@
 <entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
   <name>Favorite_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
+  <documentation>%aditoprj%/entity/Favorite_entity/documentation.adoc</documentation>
   <icon>VAADIN:STAR</icon>
   <title>Favorite</title>
   <siblings>
@@ -18,7 +19,6 @@
       <name>#PROVIDER</name>
       <targetContextField>OBJECT_TYPE</targetContextField>
       <targetIdField>ROW_ID</targetIdField>
-      <targetConsumerProcess>%aditoprj%/entity/Favorite_entity/entityfields/#provider/targetConsumerProcess.js</targetConsumerProcess>
     </entityProvider>
     <entityField>
       <name>UID</name>
@@ -51,7 +51,6 @@
       <name>TITLE</name>
       <title></title>
       <titleProcess>%aditoprj%/entity/Favorite_entity/entityfields/title/titleProcess.js</titleProcess>
-      <valueProcess>%aditoprj%/entity/Favorite_entity/entityfields/title/valueProcess.js</valueProcess>
     </entityField>
     <entityField>
       <name>PICTURE</name>
@@ -108,7 +107,6 @@
           <name>groupTitleExtension</name>
           <title>Titel</title>
           <contentType>TEXT</contentType>
-          <filterValuesProcess>%aditoprj%/entity/Favorite_entity/recordcontainers/jditorecordcontainer/filterextensions/grouptitleextension/filterValuesProcess.js</filterValuesProcess>
           <filtertype>BASIC</filtertype>
         </filterExtension>
         <filterExtension>
diff --git a/entity/Favorite_entity/documentation.adoc b/entity/Favorite_entity/documentation.adoc
new file mode 100644
index 0000000000..0fd73ab7e9
--- /dev/null
+++ b/entity/Favorite_entity/documentation.adoc
@@ -0,0 +1,3 @@
+= Favorite_entity
+
+Entity for managing a users dataset-favorites
\ No newline at end of file
diff --git a/entity/Favorite_entity/entityfields/#provider/targetConsumerProcess.js b/entity/Favorite_entity/entityfields/#provider/targetConsumerProcess.js
deleted file mode 100644
index e69de29bb2..0000000000
-- 
GitLab


From f3ef78d1a96d18658ef16c673cfc125870d8d083 Mon Sep 17 00:00:00 2001
From: "S.Listl" <s.listl@adito.de>
Date: Thu, 20 Aug 2020 15:11:23 +0200
Subject: [PATCH 188/309] #1064055 use afterSave instead of saveActions

---
 entity/DSGVOInfo_entity/DSGVOInfo_entity.aod               | 7 +------
 .../safeandopenreport/onActionProcess.js => afterSave.js}  | 5 ++++-
 entity/WorkflowModel_entity/WorkflowModel_entity.aod       | 7 +------
 .../openmodeleditor/onActionProcess.js => afterSave.js}    | 2 ++
 4 files changed, 8 insertions(+), 13 deletions(-)
 rename entity/DSGVOInfo_entity/{entityfields/safeandopenreport/onActionProcess.js => afterSave.js} (83%)
 rename entity/WorkflowModel_entity/{entityfields/openmodeleditor/onActionProcess.js => afterSave.js} (86%)

diff --git a/entity/DSGVOInfo_entity/DSGVOInfo_entity.aod b/entity/DSGVOInfo_entity/DSGVOInfo_entity.aod
index 1dfd409f91..f17723334e 100644
--- a/entity/DSGVOInfo_entity/DSGVOInfo_entity.aod
+++ b/entity/DSGVOInfo_entity/DSGVOInfo_entity.aod
@@ -4,6 +4,7 @@
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/DSGVOInfo_entity/documentation.adoc</documentation>
   <onValidation>%aditoprj%/entity/DSGVOInfo_entity/onValidation.js</onValidation>
+  <afterSave>%aditoprj%/entity/DSGVOInfo_entity/afterSave.js</afterSave>
   <recordContainer>db</recordContainer>
   <entityFields>
     <entityProvider>
@@ -151,12 +152,6 @@
         </entityParameter>
       </children>
     </entityConsumer>
-    <entityActionField>
-      <name>SafeAndOpenReport</name>
-      <title>and open Report</title>
-      <onActionProcess>%aditoprj%/entity/DSGVOInfo_entity/entityfields/safeandopenreport/onActionProcess.js</onActionProcess>
-      <isSaveAction v="true" />
-    </entityActionField>
   </entityFields>
   <recordContainers>
     <dbRecordContainer>
diff --git a/entity/DSGVOInfo_entity/entityfields/safeandopenreport/onActionProcess.js b/entity/DSGVOInfo_entity/afterSave.js
similarity index 83%
rename from entity/DSGVOInfo_entity/entityfields/safeandopenreport/onActionProcess.js
rename to entity/DSGVOInfo_entity/afterSave.js
index 9a6195801a..fab6c5f77c 100644
--- a/entity/DSGVOInfo_entity/entityfields/safeandopenreport/onActionProcess.js
+++ b/entity/DSGVOInfo_entity/afterSave.js
@@ -1,3 +1,4 @@
+import("system.result");
 import("system.vars");
 import("DataPrivacy_lib");
 
@@ -17,4 +18,6 @@ var contactId = entityData["param.ContactId_param"];
 var reportType = entityData["param.ReportType_param"];
 
 if (reportType)
-    DataPrivacyUtils.openReport(contactId, reportType, params);
\ No newline at end of file
+    DataPrivacyUtils.openReport(contactId, reportType, params);
+
+result.string(true);
\ No newline at end of file
diff --git a/entity/WorkflowModel_entity/WorkflowModel_entity.aod b/entity/WorkflowModel_entity/WorkflowModel_entity.aod
index 0829152a67..6ffc3e4bc9 100644
--- a/entity/WorkflowModel_entity/WorkflowModel_entity.aod
+++ b/entity/WorkflowModel_entity/WorkflowModel_entity.aod
@@ -5,17 +5,12 @@
   <documentation>%aditoprj%/entity/WorkflowModel_entity/documentation.adoc</documentation>
   <title>Workflow Model</title>
   <contentTitleProcess>%aditoprj%/entity/WorkflowModel_entity/contentTitleProcess.js</contentTitleProcess>
+  <afterSave>%aditoprj%/entity/WorkflowModel_entity/afterSave.js</afterSave>
   <recordContainer>jdito</recordContainer>
   <entityFields>
     <entityProvider>
       <name>#PROVIDER</name>
     </entityProvider>
-    <entityActionField>
-      <name>openModelEditor</name>
-      <title>and open modeler</title>
-      <onActionProcess>%aditoprj%/entity/WorkflowModel_entity/entityfields/openmodeleditor/onActionProcess.js</onActionProcess>
-      <isSaveAction v="true" />
-    </entityActionField>
     <entityField>
       <name>KEY</name>
       <title>Key</title>
diff --git a/entity/WorkflowModel_entity/entityfields/openmodeleditor/onActionProcess.js b/entity/WorkflowModel_entity/afterSave.js
similarity index 86%
rename from entity/WorkflowModel_entity/entityfields/openmodeleditor/onActionProcess.js
rename to entity/WorkflowModel_entity/afterSave.js
index a7ebffe289..98156c50f8 100644
--- a/entity/WorkflowModel_entity/entityfields/openmodeleditor/onActionProcess.js
+++ b/entity/WorkflowModel_entity/afterSave.js
@@ -1,5 +1,6 @@
 import("system.vars");
 import("system.neon");
+import("system.result");
 import("Workflow_lib");
 
 var createdModelId = vars.exists("$context.createdModelId") ? vars.get("$context.createdModelId") : null;
@@ -7,4 +8,5 @@ if (createdModelId)
 {
     vars.set("$context.createdModelId", null);
     neon.openUrl(WorkflowUtils.getModelerUrl(createdModelId, true), false);
+    result.string(true);
 }
\ No newline at end of file
-- 
GitLab


From f1299876c42dfbf4a94711dd302e6d687a8288f6 Mon Sep 17 00:00:00 2001
From: "j.goderbauer" <j.goderbauer@adito.de>
Date: Fri, 21 Aug 2020 13:21:19 +0200
Subject: [PATCH 189/309] LogHistory: add hint in documentation

---
 entity/LogHistory_entity/documentation.adoc | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/entity/LogHistory_entity/documentation.adoc b/entity/LogHistory_entity/documentation.adoc
index 4aa8b0704c..20fa16faa4 100644
--- a/entity/LogHistory_entity/documentation.adoc
+++ b/entity/LogHistory_entity/documentation.adoc
@@ -1,3 +1,6 @@
 = LogHistory_entity
 
-Entity for the log entries in the individual modules
\ No newline at end of file
+Entity for the log entries in the individual modules.
+
+This entity is based on the `AB_LOGHISTORY`-table. Note that this database table has no primary key associated to it.
+This is because it is only a pit of log-record and not necessary.
\ No newline at end of file
-- 
GitLab


From ad5674a53f25321170bfc639e05f1dd7f8061e76 Mon Sep 17 00:00:00 2001
From: "j.goderbauer" <j.goderbauer@adito.de>
Date: Fri, 21 Aug 2020 13:22:46 +0200
Subject: [PATCH 190/309] remove UUIDNameMap.txt

---
 .aditoprj/UUIDNameMap.txt | 98 ---------------------------------------
 1 file changed, 98 deletions(-)
 delete mode 100644 .aditoprj/UUIDNameMap.txt

diff --git a/.aditoprj/UUIDNameMap.txt b/.aditoprj/UUIDNameMap.txt
deleted file mode 100644
index afd666e317..0000000000
--- a/.aditoprj/UUIDNameMap.txt
+++ /dev/null
@@ -1,98 +0,0 @@
-*************************************************
-*                                               *
-* This is a generated file, please do not edit! *
-*                                               *
-*************************************************
- 5
- 6
- 7
- 8
- 9
- 10
- 11
- 12
- 13
- 14
- 15
- 16
- 17
- 18
- 19
- 20
- 21
- 22
- 23
- 24
- 25
- 26
- 27
- 28
- 29
- 30
- 31
- 32
- 33
- 34
- 35
- 36
- 37
- 38
- 39
- 40
- 41
-1.0.0
-1596634257480
-#ENTITY
-#ENTITY
-#PROVIDER_FIELD
-#PROVIDER_FIELD
-#CONTENTTITLE
-#CONTENTTITLE
-#TITLE
-#TITLE
-#INDEX_GROUP
-#INDEX_GROUP
-#TARGETCONTEXT
-#TARGETCONTEXT
-INTERNAL_ADMINISTRATOR
-INTERNAL_ADMINISTRATOR
-INTERNAL_WEBSERVICE
-INTERNAL_WEBSERVICE
-#DESCRIPTION
-#DESCRIPTION
-INTERNAL_GROUPWARE
-INTERNAL_GROUPWARE
-INTERNAL_TECHNICAL
-INTERNAL_TECHNICAL
-#MAPPING
-#MAPPING
-#LOCATION
-#LOCATION
-#PROVIDER
-#PROVIDER
-INTERNAL_DESIGNER
-INTERNAL_DESIGNER
-#USERHELP
-#USERHELP
-#TARGETID
-#TARGETID
-#CONTENTDESCRIPTION
-#CONTENTDESCRIPTION
-#LOOKUPID
-#LOOKUPID
-#GROUPING
-#GROUPING
-#ICON
-#ICON
-INTERNAL_DASHBOARDSTOREADMIN
-INTERNAL_DASHBOARDSTOREADMIN
-#IMAGE
-#IMAGE
-#UID
-#UID
-INTERNAL_SNMP
-INTERNAL_SNMP
-#TARGETCONSUMER
-#TARGETCONSUMER
-INTERNAL_EVERYONE
-INTERNAL_EVERYONE
\ No newline at end of file
-- 
GitLab


From c7aee1be67256533383927fca275c70c6b7f5073 Mon Sep 17 00:00:00 2001
From: "j.goderbauer" <j.goderbauer@adito.de>
Date: Fri, 21 Aug 2020 13:23:35 +0200
Subject: [PATCH 191/309] add UUIDNameMap.txt to gitignore

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index c0fbe9c2a9..7f791a6b5a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,5 @@
 /.aditoprj/cache
+/.aditoprj/UUIDNameMap.txt
 /data
 /others/db_changes/liqui_update.bat
 /others/db_changes/liqui_reset.ps1
-- 
GitLab


From 95a00da06ebf207a6460b5ad83543bcb7027685c Mon Sep 17 00:00:00 2001
From: "S.Listl" <S.Listl@SLISTL-VOSTRO.aditosoftware.local>
Date: Fri, 21 Aug 2020 16:56:15 +0200
Subject: [PATCH 192/309] Systemalial indizes

---
 .aditoprj/ignoredScanServiceTasks.json        |    6 +
 .../Data_alias/basic/2020.2.0/changelog.xml   |    1 +
 .../basic/2020.2.0/optimizeIndizes.xml        |    9 +
 .../defaultBlob/_____system_sysdb_version.xml |    2 +-
 .../basic/init/data/insert_asys_system.xml    |    2 +-
 .../init/struct/create_asys_binaries.xml      |    3 +
 .../basic/init/struct/create_asys_users.xml   |    3 +
 aliasDefinition/Data_alias/Data_alias.aod     |   18 +-
 .../_____SYSTEMALIAS/_____SYSTEMALIAS.aod     | 1870 ++++++++++++++---
 .../recordcontainers/jdito/contentProcess.js  |    4 +-
 .../EmployeeFilter_view.aod                   |    4 -
 11 files changed, 1583 insertions(+), 339 deletions(-)
 create mode 100644 .liquibase/Data_alias/basic/2020.2.0/optimizeIndizes.xml

diff --git a/.aditoprj/ignoredScanServiceTasks.json b/.aditoprj/ignoredScanServiceTasks.json
index 341e02b446..5732c4b35b 100644
--- a/.aditoprj/ignoredScanServiceTasks.json
+++ b/.aditoprj/ignoredScanServiceTasks.json
@@ -1,5 +1,11 @@
 {
   "entries": [
+    {
+      "target": "aliasDefinition/Data_alias/Data_alias.aod",
+      "line": -1,
+      "description": "The table \"AB_LOGHISTORY\" has no primary key [65]",
+      "groupName": "nb-tasklist-warning"
+    },
     {
       "target": "aliasDefinition/Data_alias/Data_alias.aod",
       "line": -1,
diff --git a/.liquibase/Data_alias/basic/2020.2.0/changelog.xml b/.liquibase/Data_alias/basic/2020.2.0/changelog.xml
index 3522fbc922..a1d4dae8d1 100644
--- a/.liquibase/Data_alias/basic/2020.2.0/changelog.xml
+++ b/.liquibase/Data_alias/basic/2020.2.0/changelog.xml
@@ -4,4 +4,5 @@
     <include relativeToChangelogFile="true" file="Classification/changelog.xml"/>
     <include relativeToChangelogFile="true" file="ImportFields/changelog.xml"/>
     <include relativeToChangelogFile="true" file="LeadimportMappingAssistant/changelog.xml"/>
+    <include relativeToChangelogFile="true" file="optimizeIndizes.xml"/>
 </databaseChangeLog>
diff --git a/.liquibase/Data_alias/basic/2020.2.0/optimizeIndizes.xml b/.liquibase/Data_alias/basic/2020.2.0/optimizeIndizes.xml
new file mode 100644
index 0000000000..274fcf0e17
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2020.2.0/optimizeIndizes.xml
@@ -0,0 +1,9 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+                   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+    <changeSet author="s.listl" id="a303ace0-b324-435a-84d8-7ef4d0419af8">
+        <createIndex tableName="COMMUNICATION" indexName="IDX_COMMUNICATION_MEDIUM_ID">
+            <column name="MEDIUM_ID"/>
+        </createIndex>
+    </changeSet>
+</databaseChangeLog>
diff --git a/.liquibase/_____SYSTEMALIAS/basic/init/data/defaultBlob/_____system_sysdb_version.xml b/.liquibase/_____SYSTEMALIAS/basic/init/data/defaultBlob/_____system_sysdb_version.xml
index 4d4a0a7d7a..3069c0fabc 100644
--- a/.liquibase/_____SYSTEMALIAS/basic/init/data/defaultBlob/_____system_sysdb_version.xml
+++ b/.liquibase/_____SYSTEMALIAS/basic/init/data/defaultBlob/_____system_sysdb_version.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <sysDbVersion xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/sysDbVersion/1.2.0">
   <name>_____SYSTEM_SYSDB_VERSION</name>
-  <systemDbVersion>2.8.3</systemDbVersion>
+  <systemDbVersion>2.8.5</systemDbVersion>
 </sysDbVersion>
diff --git a/.liquibase/_____SYSTEMALIAS/basic/init/data/insert_asys_system.xml b/.liquibase/_____SYSTEMALIAS/basic/init/data/insert_asys_system.xml
index ca53b5a37a..b194d0c6dc 100644
--- a/.liquibase/_____SYSTEMALIAS/basic/init/data/insert_asys_system.xml
+++ b/.liquibase/_____SYSTEMALIAS/basic/init/data/insert_asys_system.xml
@@ -7,7 +7,7 @@
         <column name="DATE_NEW" valueDate="2018-05-24T14:53:57.763"/>
         <column name="KIND" valueNumeric="600"/>
         <column name="NAME" value="_____SYSTEM_SYSDB_VERSION"/>
-        <column name="TITLE" value="2.8.3"/>
+        <column name="TITLE" value="2.8.5"/>
         <column name="USER_EDIT" value="_____DESIGNERANONYM"/>
         <column name="USER_NEW" value="_____DESIGNERANONYM"/>
         <column name="XMLDATA" valueBlobFile="defaultBlob/_____system_sysdb_version.xml"/>
diff --git a/.liquibase/_____SYSTEMALIAS/basic/init/struct/create_asys_binaries.xml b/.liquibase/_____SYSTEMALIAS/basic/init/struct/create_asys_binaries.xml
index 13b4d9f0ee..7783a9014a 100644
--- a/.liquibase/_____SYSTEMALIAS/basic/init/struct/create_asys_binaries.xml
+++ b/.liquibase/_____SYSTEMALIAS/basic/init/struct/create_asys_binaries.xml
@@ -21,5 +21,8 @@
         <column name="DATE_EDIT" type="DATETIME"/>
         <column name="DATE_NEW" type="DATETIME"/>
     </createTable>
+    <createIndex tableName="ASYS_BINARIES" indexName="IDX_ASYS_BINARIES_ROW_ID">
+        <column name="ROW_ID"/>
+    </createIndex>
 </changeSet>
 </databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/_____SYSTEMALIAS/basic/init/struct/create_asys_users.xml b/.liquibase/_____SYSTEMALIAS/basic/init/struct/create_asys_users.xml
index b9105d5ca5..00947fe252 100644
--- a/.liquibase/_____SYSTEMALIAS/basic/init/struct/create_asys_users.xml
+++ b/.liquibase/_____SYSTEMALIAS/basic/init/struct/create_asys_users.xml
@@ -23,5 +23,8 @@
     <createIndex indexName="idx_asysusers_groupid" tableName="ASYS_USERS">
         <column name="GROUPID"/>
     </createIndex>
+    <createIndex indexName="IDX_ASYS_USERS_NAME" tableName="ASYS_USERS">
+        <column name="NAME"/>
+    </createIndex>
 </changeSet>
 </databaseChangeLog>
\ No newline at end of file
diff --git a/aliasDefinition/Data_alias/Data_alias.aod b/aliasDefinition/Data_alias/Data_alias.aod
index b3a1710140..4d5c69b051 100644
--- a/aliasDefinition/Data_alias/Data_alias.aod
+++ b/aliasDefinition/Data_alias/Data_alias.aod
@@ -1213,7 +1213,7 @@
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
-                <index v="false" />
+                <index v="true" />
                 <title>Medium</title>
                 <description></description>
                 <customProperties>
@@ -6337,7 +6337,7 @@
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
-                <index v="false" />
+                <index v="true" />
                 <documentation></documentation>
                 <title>Activity Id</title>
                 <description></description>
@@ -13766,6 +13766,20 @@
                 <title></title>
                 <description></description>
               </entityFieldDb>
+              <entityFieldDb>
+                <name>ATTRIBUTE_INDUSTRY</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="100" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
             </entityFields>
           </entityDb>
           <entityDb>
diff --git a/aliasDefinition/_____SYSTEMALIAS/_____SYSTEMALIAS.aod b/aliasDefinition/_____SYSTEMALIAS/_____SYSTEMALIAS.aod
index 4344381f76..6adb2d2901 100644
--- a/aliasDefinition/_____SYSTEMALIAS/_____SYSTEMALIAS.aod
+++ b/aliasDefinition/_____SYSTEMALIAS/_____SYSTEMALIAS.aod
@@ -19,9 +19,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
-                <notNull v="false" />
+                <size v="0" />
+                <scale v="0" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -32,9 +32,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
-                <notNull v="false" />
+                <size v="0" />
+                <scale v="0" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -47,7 +47,7 @@
                 <columnType v="12" />
                 <size v="255" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -58,9 +58,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="2004" />
-                <size v="2147483647" />
+                <size v="0" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -73,7 +73,7 @@
                 <columnType v="1" />
                 <size v="63" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="true" />
                 <index v="true" />
                 <title></title>
@@ -84,9 +84,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="4" />
-                <size v="10" />
+                <size v="0" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -99,9 +99,9 @@
                 <columnType v="12" />
                 <size v="63" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
-                <index v="false" />
+                <index v="true" />
                 <title></title>
                 <description></description>
               </entityFieldDb>
@@ -112,7 +112,7 @@
                 <columnType v="12" />
                 <size v="63" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -125,7 +125,7 @@
                 <columnType v="12" />
                 <size v="63" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -138,7 +138,7 @@
                 <columnType v="12" />
                 <size v="63" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -149,9 +149,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="2004" />
-                <size v="2147483647" />
+                <size v="0" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -172,9 +172,9 @@
                 <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
-                <index v="false" />
+                <index v="true" />
                 <title></title>
                 <description></description>
               </entityFieldDb>
@@ -183,9 +183,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="4" />
-                <size v="10" />
+                <size v="0" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -196,9 +196,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="4" />
-                <size v="10" />
+                <size v="0" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -211,7 +211,7 @@
                 <columnType v="12" />
                 <size v="127" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="true" />
                 <index v="true" />
                 <title></title>
@@ -231,9 +231,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="2004" />
-                <size v="2147483647" />
+                <size v="0" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -246,7 +246,7 @@
                 <columnType v="12" />
                 <size v="31" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -257,9 +257,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="-5" />
-                <size v="19" />
+                <size v="0" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -270,9 +270,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
-                <notNull v="false" />
+                <size v="0" />
+                <scale v="0" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -283,9 +283,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
-                <notNull v="false" />
+                <size v="0" />
+                <scale v="0" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -298,7 +298,7 @@
                 <columnType v="12" />
                 <size v="127" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -311,7 +311,7 @@
                 <columnType v="12" />
                 <size v="127" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -324,7 +324,7 @@
                 <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="true" />
                 <index v="true" />
                 <title></title>
@@ -337,7 +337,7 @@
                 <columnType v="12" />
                 <size v="255" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -350,7 +350,7 @@
                 <columnType v="12" />
                 <size v="127" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -363,7 +363,7 @@
                 <columnType v="12" />
                 <size v="1024" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -374,9 +374,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="2004" />
-                <size v="2147483647" />
+                <size v="0" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -389,9 +389,9 @@
                 <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
-                <index v="false" />
+                <index v="true" />
                 <title></title>
                 <description></description>
               </entityFieldDb>
@@ -402,7 +402,7 @@
                 <columnType v="12" />
                 <size v="127" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -415,7 +415,7 @@
                 <columnType v="12" />
                 <size v="63" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -428,7 +428,7 @@
                 <columnType v="12" />
                 <size v="63" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -447,9 +447,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="4" />
-                <size v="10" />
+                <size v="0" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -462,7 +462,7 @@
                 <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="true" />
                 <index v="true" />
                 <title></title>
@@ -473,11 +473,11 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
-                <notNull v="false" />
+                <size v="0" />
+                <scale v="0" />
+                <notNull v="true" />
                 <isUnique v="false" />
-                <index v="false" />
+                <index v="true" />
                 <title></title>
                 <description></description>
               </entityFieldDb>
@@ -486,11 +486,11 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
-                <notNull v="false" />
+                <size v="0" />
+                <scale v="0" />
+                <notNull v="true" />
                 <isUnique v="false" />
-                <index v="false" />
+                <index v="true" />
                 <title></title>
                 <description></description>
               </entityFieldDb>
@@ -501,9 +501,9 @@
                 <columnType v="12" />
                 <size v="512" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
-                <index v="false" />
+                <index v="true" />
                 <title></title>
                 <description></description>
               </entityFieldDb>
@@ -512,11 +512,11 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
-                <notNull v="false" />
+                <size v="0" />
+                <scale v="0" />
+                <notNull v="true" />
                 <isUnique v="false" />
-                <index v="false" />
+                <index v="true" />
                 <title></title>
                 <description></description>
               </entityFieldDb>
@@ -525,11 +525,11 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="4" />
-                <size v="10" />
+                <size v="0" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
-                <index v="false" />
+                <index v="true" />
                 <title></title>
                 <description></description>
               </entityFieldDb>
@@ -538,9 +538,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="4" />
-                <size v="10" />
+                <size v="0" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -551,9 +551,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="4" />
-                <size v="10" />
+                <size v="0" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -564,11 +564,11 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
-                <notNull v="false" />
+                <size v="0" />
+                <scale v="0" />
+                <notNull v="true" />
                 <isUnique v="false" />
-                <index v="false" />
+                <index v="true" />
                 <title></title>
                 <description></description>
               </entityFieldDb>
@@ -579,9 +579,9 @@
                 <columnType v="12" />
                 <size v="255" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
-                <index v="false" />
+                <index v="true" />
                 <title></title>
                 <description></description>
               </entityFieldDb>
@@ -592,7 +592,7 @@
                 <columnType v="12" />
                 <size v="255" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -605,7 +605,7 @@
                 <columnType v="12" />
                 <size v="255" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -616,11 +616,11 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
-                <notNull v="false" />
+                <size v="0" />
+                <scale v="0" />
+                <notNull v="true" />
                 <isUnique v="false" />
-                <index v="false" />
+                <index v="true" />
                 <title></title>
                 <description></description>
               </entityFieldDb>
@@ -631,9 +631,9 @@
                 <columnType v="12" />
                 <size v="32" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
-                <index v="false" />
+                <index v="true" />
                 <title></title>
                 <description></description>
               </entityFieldDb>
@@ -644,7 +644,7 @@
                 <columnType v="12" />
                 <size v="255" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -657,7 +657,7 @@
                 <columnType v="1" />
                 <size v="1" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -668,9 +668,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="2005" />
-                <size v="2147483647" />
+                <size v="0" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -691,7 +691,7 @@
                 <columnType v="12" />
                 <size v="127" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -700,12 +700,12 @@
               <entityFieldDb>
                 <name>DBID</name>
                 <dbName></dbName>
-                <primaryKey v="true" />
+                <primaryKey v="false" />
                 <columnType v="12" />
-                <size v="191" />
+                <size v="1023" />
                 <scale v="0" />
                 <notNull v="true" />
-                <isUnique v="true" />
+                <isUnique v="false" />
                 <index v="true" />
                 <title></title>
                 <description></description>
@@ -717,7 +717,7 @@
                 <columnType v="12" />
                 <size v="127" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -730,7 +730,7 @@
                 <columnType v="12" />
                 <size v="127" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -743,9 +743,9 @@
                 <columnType v="12" />
                 <size v="512" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
-                <index v="false" />
+                <index v="true" />
                 <title></title>
                 <description></description>
               </entityFieldDb>
@@ -756,7 +756,7 @@
                 <columnType v="12" />
                 <size v="255" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -769,7 +769,7 @@
                 <columnType v="12" />
                 <size v="1023" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -778,13 +778,13 @@
               <entityFieldDb>
                 <name>ID</name>
                 <dbName></dbName>
-                <primaryKey v="false" />
+                <primaryKey v="true" />
                 <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
-                <notNull v="true" />
-                <isUnique v="false" />
-                <index v="false" />
+                <notNull v="false" />
+                <isUnique v="true" />
+                <index v="true" />
                 <title></title>
                 <description></description>
               </entityFieldDb>
@@ -795,7 +795,7 @@
                 <columnType v="12" />
                 <size v="2000" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -814,9 +814,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
-                <notNull v="false" />
+                <size v="0" />
+                <scale v="0" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -827,9 +827,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
-                <notNull v="false" />
+                <size v="0" />
+                <scale v="0" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -842,9 +842,9 @@
                 <columnType v="12" />
                 <size v="63" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
-                <index v="false" />
+                <index v="true" />
                 <title></title>
                 <description></description>
               </entityFieldDb>
@@ -855,7 +855,7 @@
                 <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="true" />
                 <index v="true" />
                 <title></title>
@@ -868,9 +868,9 @@
                 <columnType v="12" />
                 <size v="63" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
-                <index v="false" />
+                <index v="true" />
                 <title></title>
                 <description></description>
               </entityFieldDb>
@@ -881,9 +881,9 @@
                 <columnType v="12" />
                 <size v="1024" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
-                <index v="false" />
+                <index v="true" />
                 <title></title>
                 <description></description>
               </entityFieldDb>
@@ -894,9 +894,9 @@
                 <columnType v="12" />
                 <size v="1024" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
-                <index v="false" />
+                <index v="true" />
                 <title></title>
                 <description></description>
               </entityFieldDb>
@@ -905,9 +905,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="2005" />
-                <size v="2147483647" />
+                <size v="0" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -928,9 +928,9 @@
                 <columnType v="12" />
                 <size v="63" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
-                <index v="false" />
+                <index v="true" />
                 <title></title>
                 <description></description>
               </entityFieldDb>
@@ -939,9 +939,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
-                <notNull v="false" />
+                <size v="0" />
+                <scale v="0" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -952,9 +952,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
-                <notNull v="false" />
+                <size v="0" />
+                <scale v="0" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -964,10 +964,10 @@
                 <name>DESCRIPTION</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="2005" />
-                <size v="2147483647" />
+                <columnType v="12" />
+                <size v="255" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -978,9 +978,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="2004" />
-                <size v="2147483647" />
+                <size v="0" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -993,7 +993,7 @@
                 <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="true" />
                 <index v="true" />
                 <title></title>
@@ -1004,9 +1004,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="4" />
-                <size v="10" />
+                <size v="0" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -1019,8 +1019,8 @@
                 <columnType v="12" />
                 <size v="63" />
                 <scale v="0" />
-                <notNull v="true" />
-                <isUnique v="false" />
+                <notNull v="false" />
+                <isUnique v="true" />
                 <index v="false" />
                 <title></title>
                 <description></description>
@@ -1032,7 +1032,7 @@
                 <columnType v="12" />
                 <size v="63" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -1045,7 +1045,7 @@
                 <columnType v="12" />
                 <size v="63" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -1058,7 +1058,7 @@
                 <columnType v="12" />
                 <size v="63" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -1071,7 +1071,7 @@
                 <columnType v="12" />
                 <size v="63" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -1084,7 +1084,7 @@
                 <columnType v="12" />
                 <size v="63" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -1095,9 +1095,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="2004" />
-                <size v="2147483647" />
+                <size v="0" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -1118,9 +1118,9 @@
                 <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
-                <index v="false" />
+                <index v="true" />
                 <title></title>
                 <description></description>
               </entityFieldDb>
@@ -1131,7 +1131,7 @@
                 <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="true" />
                 <index v="true" />
                 <title></title>
@@ -1142,11 +1142,11 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
-                <size v="15" />
+                <size v="16" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
-                <index v="false" />
+                <index v="true" />
                 <title></title>
                 <description></description>
               </entityFieldDb>
@@ -1157,9 +1157,9 @@
                 <columnType v="12" />
                 <size v="63" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
-                <index v="false" />
+                <index v="true" />
                 <title></title>
                 <description></description>
               </entityFieldDb>
@@ -1170,7 +1170,7 @@
                 <columnType v="12" />
                 <size v="15" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -1190,9 +1190,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="4" />
-                <size v="10" />
+                <size v="0" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -1205,7 +1205,7 @@
                 <columnType v="12" />
                 <size v="63" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -1218,7 +1218,7 @@
                 <columnType v="12" />
                 <size v="63" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -1231,7 +1231,7 @@
                 <columnType v="12" />
                 <size v="1023" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -1242,9 +1242,9 @@
                 <dbName></dbName>
                 <primaryKey v="true" />
                 <columnType v="1" />
-                <size v="36" />
+                <size v="63" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="true" />
                 <index v="true" />
                 <title></title>
@@ -1255,9 +1255,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="2005" />
-                <size v="2147483647" />
+                <size v="0" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -1268,9 +1268,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="4" />
-                <size v="10" />
+                <size v="0" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -1283,7 +1283,7 @@
                 <columnType v="12" />
                 <size v="63" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -1294,9 +1294,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="4" />
-                <size v="10" />
+                <size v="0" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -1307,9 +1307,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="4" />
-                <size v="10" />
+                <size v="0" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -1328,9 +1328,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="2005" />
-                <size v="2147483647" />
+                <size v="0" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -1343,7 +1343,7 @@
                 <columnType v="12" />
                 <size v="512" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -1356,7 +1356,7 @@
                 <columnType v="12" />
                 <size v="1023" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -1367,9 +1367,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="4" />
-                <size v="10" />
+                <size v="0" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -1382,7 +1382,7 @@
                 <columnType v="12" />
                 <size v="63" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -1393,9 +1393,9 @@
                 <dbName></dbName>
                 <primaryKey v="true" />
                 <columnType v="1" />
-                <size v="36" />
+                <size v="63" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="true" />
                 <index v="true" />
                 <title></title>
@@ -1408,7 +1408,7 @@
                 <columnType v="12" />
                 <size v="63" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -1419,9 +1419,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="2005" />
-                <size v="2147483647" />
+                <size v="0" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -1432,9 +1432,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="2005" />
-                <size v="2147483647" />
+                <size v="0" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -1445,9 +1445,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="4" />
-                <size v="10" />
+                <size v="0" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -1458,9 +1458,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="4" />
-                <size v="10" />
+                <size v="0" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -1473,7 +1473,7 @@
                 <columnType v="12" />
                 <size v="1023" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -1486,7 +1486,7 @@
                 <columnType v="12" />
                 <size v="63" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -1497,9 +1497,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
-                <size v="63" />
+                <size v="512" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -1532,7 +1532,7 @@
                 <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="true" />
                 <index v="true" />
                 <documentation></documentation>
@@ -1546,7 +1546,7 @@
                 <columnType v="12" />
                 <size v="15" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -1560,7 +1560,7 @@
                 <columnType v="12" />
                 <size v="1023" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -1572,9 +1572,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
-                <notNull v="false" />
+                <size v="0" />
+                <scale v="0" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -1586,9 +1586,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
-                <notNull v="false" />
+                <size v="0" />
+                <scale v="0" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -1602,7 +1602,7 @@
                 <columnType v="12" />
                 <size v="1023" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -1616,7 +1616,7 @@
                 <columnType v="12" />
                 <size v="1023" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -1628,9 +1628,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="4" />
-                <size v="10" />
+                <size v="0" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -1642,9 +1642,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="2005" />
-                <size v="2147483647" />
+                <size v="0" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -1658,7 +1658,7 @@
                 <columnType v="12" />
                 <size v="63" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -1670,9 +1670,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="2005" />
-                <size v="2147483647" />
+                <size v="0" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -1686,7 +1686,7 @@
                 <columnType v="12" />
                 <size v="512" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -1700,7 +1700,7 @@
                 <columnType v="12" />
                 <size v="63" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -1734,7 +1734,7 @@
                 <columnType v="12" />
                 <size v="255" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -1748,7 +1748,7 @@
                 <columnType v="12" />
                 <size v="255" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -1762,7 +1762,7 @@
                 <columnType v="1" />
                 <size v="1" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -1776,7 +1776,7 @@
                 <columnType v="12" />
                 <size v="255" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -1790,7 +1790,7 @@
                 <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -1804,7 +1804,7 @@
                 <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="true" />
                 <index v="true" />
                 <documentation></documentation>
@@ -1838,7 +1838,7 @@
                 <columnType v="12" />
                 <size v="255" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -1852,7 +1852,7 @@
                 <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -1866,7 +1866,7 @@
                 <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="true" />
                 <index v="true" />
                 <documentation></documentation>
@@ -1897,10 +1897,10 @@
                 <name>CONDTYPE</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="5" />
-                <size v="5" />
+                <columnType v="-6" />
+                <size v="0" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -1912,9 +1912,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="2005" />
-                <size v="2147483647" />
+                <size v="0" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -1928,7 +1928,7 @@
                 <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="true" />
                 <index v="true" />
                 <documentation></documentation>
@@ -1942,7 +1942,7 @@
                 <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -1976,7 +1976,7 @@
                 <columnType v="12" />
                 <size v="63" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -1990,7 +1990,7 @@
                 <columnType v="12" />
                 <size v="63" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -2004,7 +2004,7 @@
                 <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="true" />
                 <index v="true" />
                 <documentation></documentation>
@@ -2038,7 +2038,7 @@
                 <columnType v="12" />
                 <size v="63" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -2049,10 +2049,10 @@
                 <name>ASSIGNABLE</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="4" />
-                <size v="10" />
+                <columnType v="-6" />
+                <size v="0" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -2066,7 +2066,7 @@
                 <columnType v="12" />
                 <size v="63" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="true" />
                 <index v="true" />
                 <documentation></documentation>
@@ -2078,9 +2078,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="2005" />
-                <size v="2147483647" />
+                <size v="0" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -2094,7 +2094,7 @@
                 <columnType v="12" />
                 <size v="255" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -2126,9 +2126,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="4" />
-                <size v="10" />
+                <size v="0" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -2140,9 +2140,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="2005" />
-                <size v="2147483647" />
+                <size v="0" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -2156,7 +2156,7 @@
                 <columnType v="12" />
                 <size v="63" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -2168,9 +2168,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="4" />
-                <size v="10" />
+                <size v="0" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -2184,7 +2184,7 @@
                 <columnType v="1" />
                 <size v="63" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="true" />
                 <index v="true" />
                 <documentation></documentation>
@@ -2196,9 +2196,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="4" />
-                <size v="10" />
+                <size v="0" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -2210,9 +2210,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="4" />
-                <size v="10" />
+                <size v="0" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -2242,12 +2242,12 @@
               <entityFieldDb>
                 <name>DATAID</name>
                 <dbName></dbName>
-                <primaryKey v="true" />
+                <primaryKey v="false" />
                 <columnType v="1" />
                 <size v="63" />
                 <scale v="0" />
-                <notNull v="true" />
-                <isUnique v="true" />
+                <notNull v="false" />
+                <isUnique v="false" />
                 <index v="true" />
                 <documentation></documentation>
                 <title></title>
@@ -2260,7 +2260,7 @@
                 <columnType v="1" />
                 <size v="63" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -2272,9 +2272,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="2005" />
-                <size v="2147483647" />
+                <size v="0" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -2288,7 +2288,7 @@
                 <columnType v="12" />
                 <size v="255" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -2300,11 +2300,11 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
-                <notNull v="false" />
+                <size v="0" />
+                <scale v="0" />
+                <notNull v="true" />
                 <isUnique v="false" />
-                <index v="false" />
+                <index v="true" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
@@ -2336,9 +2336,9 @@
                 <columnType v="12" />
                 <size v="127" />
                 <scale v="0" />
-                <notNull v="true" />
-                <isUnique v="false" />
-                <index v="false" />
+                <notNull v="false" />
+                <isUnique v="true" />
+                <index v="true" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
@@ -2348,9 +2348,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
-                <notNull v="false" />
+                <size v="0" />
+                <scale v="0" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -2364,9 +2364,9 @@
                 <columnType v="12" />
                 <size v="127" />
                 <scale v="0" />
-                <notNull v="true" />
-                <isUnique v="false" />
-                <index v="false" />
+                <notNull v="false" />
+                <isUnique v="true" />
+                <index v="true" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
@@ -2614,7 +2614,7 @@
                 <columnType v="1" />
                 <size v="63" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="true" />
                 <index v="true" />
                 <documentation></documentation>
@@ -2624,13 +2624,13 @@
               <entityFieldDb>
                 <name>TAGNAME</name>
                 <dbName></dbName>
-                <primaryKey v="false" />
+                <primaryKey v="true" />
                 <columnType v="12" />
                 <size v="63" />
                 <scale v="0" />
                 <notNull v="false" />
-                <isUnique v="false" />
-                <index v="false" />
+                <isUnique v="true" />
+                <index v="true" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
@@ -2638,13 +2638,13 @@
               <entityFieldDb>
                 <name>TAGVALUE</name>
                 <dbName></dbName>
-                <primaryKey v="false" />
+                <primaryKey v="true" />
                 <columnType v="12" />
                 <size v="63" />
                 <scale v="0" />
                 <notNull v="false" />
-                <isUnique v="false" />
-                <index v="false" />
+                <isUnique v="true" />
+                <index v="true" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
@@ -2750,9 +2750,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="4" />
-                <size v="10" />
+                <size v="0" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -2764,9 +2764,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="4" />
-                <size v="10" />
+                <size v="0" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -2778,9 +2778,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
-                <notNull v="false" />
+                <size v="0" />
+                <scale v="0" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -2794,7 +2794,7 @@
                 <columnType v="12" />
                 <size v="5" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -2808,7 +2808,7 @@
                 <columnType v="12" />
                 <size v="5" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -2820,9 +2820,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
-                <notNull v="false" />
+                <size v="0" />
+                <scale v="0" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -2836,7 +2836,7 @@
                 <columnType v="12" />
                 <size v="127" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="true" />
                 <index v="true" />
                 <documentation></documentation>
@@ -2850,7 +2850,7 @@
                 <columnType v="12" />
                 <size v="255" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -2864,7 +2864,7 @@
                 <columnType v="12" />
                 <size v="255" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -2876,9 +2876,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="4" />
-                <size v="10" />
+                <size v="0" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -2892,7 +2892,7 @@
                 <columnType v="12" />
                 <size v="255" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -2904,9 +2904,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="4" />
-                <size v="10" />
+                <size v="0" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -2926,9 +2926,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
-                <notNull v="false" />
+                <size v="0" />
+                <scale v="0" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -2939,9 +2939,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
-                <notNull v="false" />
+                <size v="0" />
+                <scale v="0" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -2954,7 +2954,7 @@
                 <columnType v="12" />
                 <size v="63" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -2967,7 +2967,7 @@
                 <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="true" />
                 <index v="true" />
                 <title></title>
@@ -2980,7 +2980,7 @@
                 <columnType v="12" />
                 <size v="63" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -2993,7 +2993,7 @@
                 <columnType v="12" />
                 <size v="63" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -3006,7 +3006,7 @@
                 <columnType v="12" />
                 <size v="63" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -3019,7 +3019,7 @@
                 <columnType v="12" />
                 <size v="63" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -3030,9 +3030,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="4" />
-                <size v="10" />
+                <size v="0" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -3043,9 +3043,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
-                <notNull v="false" />
+                <size v="0" />
+                <scale v="0" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -3056,9 +3056,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="4" />
-                <size v="10" />
+                <size v="0" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -3069,9 +3069,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
-                <notNull v="false" />
+                <size v="0" />
+                <scale v="0" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -3134,7 +3134,7 @@
                 <scale v="0" />
                 <notNull v="true" />
                 <isUnique v="false" />
-                <index v="false" />
+                <index v="true" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
@@ -3148,7 +3148,7 @@
                 <scale v="0" />
                 <notNull v="true" />
                 <isUnique v="false" />
-                <index v="false" />
+                <index v="true" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
@@ -3196,7 +3196,7 @@
                 <scale v="0" />
                 <notNull v="true" />
                 <isUnique v="false" />
-                <index v="false" />
+                <index v="true" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
@@ -3210,7 +3210,7 @@
                 <scale v="0" />
                 <notNull v="true" />
                 <isUnique v="false" />
-                <index v="false" />
+                <index v="true" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
@@ -3224,6 +3224,1220 @@
                 <scale v="0" />
                 <notNull v="true" />
                 <isUnique v="false" />
+                <index v="true" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+            </entityFields>
+          </entityDb>
+          <entityDb>
+            <name>ASYS_ICONS</name>
+            <dbName></dbName>
+            <idColumn></idColumn>
+            <idGeneratorType v="0" />
+            <idGeneratorInterval v="0" />
+            <documentation></documentation>
+            <title></title>
+            <description></description>
+            <auditSyncConfig>
+              <name>auditSyncConfig</name>
+              <auditMode v="0" />
+              <syncActive v="false" />
+              <syncComplete v="true" />
+              <syncDirection v="1" />
+              <syncIds></syncIds>
+            </auditSyncConfig>
+            <entityFields>
+              <entityFieldDb>
+                <name>BINDATA</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="2004" />
+                <size v="0" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>DATE_EDIT</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="93" />
+                <size v="0" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>DATE_NEW</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="93" />
+                <size v="0" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>DESCRIPTION</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="127" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>ICON_TYPE</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="255" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>ID</name>
+                <dbName></dbName>
+                <primaryKey v="true" />
+                <columnType v="1" />
+                <size v="36" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="true" />
+                <index v="true" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>USER_EDIT</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="63" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>USER_NEW</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="63" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+            </entityFields>
+          </entityDb>
+          <entityDb>
+            <name>ASYS_MAILREPOSIT_HASH</name>
+            <dbName></dbName>
+            <idColumn></idColumn>
+            <idGeneratorType v="0" />
+            <idGeneratorInterval v="0" />
+            <documentation></documentation>
+            <title></title>
+            <description></description>
+            <auditSyncConfig>
+              <name>auditSyncConfig</name>
+              <auditMode v="0" />
+              <syncActive v="false" />
+              <syncComplete v="true" />
+              <syncDirection v="1" />
+              <syncIds></syncIds>
+            </auditSyncConfig>
+            <entityFields>
+              <entityFieldDb>
+                <name>MAILHASH</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="31" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>MAILINFO</name>
+                <dbName></dbName>
+                <primaryKey v="true" />
+                <columnType v="12" />
+                <size v="127" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="true" />
+                <index v="true" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+            </entityFields>
+          </entityDb>
+          <entityDb>
+            <name>ASYS_UIDRESOLVER</name>
+            <dbName></dbName>
+            <idColumn></idColumn>
+            <idGeneratorType v="0" />
+            <idGeneratorInterval v="0" />
+            <documentation></documentation>
+            <title></title>
+            <description></description>
+            <auditSyncConfig>
+              <name>auditSyncConfig</name>
+              <auditMode v="0" />
+              <syncActive v="false" />
+              <syncComplete v="true" />
+              <syncDirection v="1" />
+              <syncIds></syncIds>
+            </auditSyncConfig>
+            <entityFields>
+              <entityFieldDb>
+                <name>ENTRY_TYPE</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="255" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>ENTRY_UID</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="512" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>ENTRY_USER</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="255" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+            </entityFields>
+          </entityDb>
+          <entityDb>
+            <name>ASYS_MAILREPOSIT</name>
+            <dbName></dbName>
+            <idColumn></idColumn>
+            <idGeneratorType v="0" />
+            <idGeneratorInterval v="0" />
+            <documentation></documentation>
+            <title></title>
+            <description></description>
+            <auditSyncConfig>
+              <name>auditSyncConfig</name>
+              <auditMode v="0" />
+              <syncActive v="false" />
+              <syncComplete v="true" />
+              <syncDirection v="1" />
+              <syncIds></syncIds>
+            </auditSyncConfig>
+            <entityFields>
+              <entityFieldDb>
+                <name>FLAGGED</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="4" />
+                <size v="0" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>FOLDER</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="255" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>ID</name>
+                <dbName></dbName>
+                <primaryKey v="true" />
+                <columnType v="1" />
+                <size v="36" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="true" />
+                <index v="true" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>MAIL</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="2005" />
+                <size v="0" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>MAILUSER</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="255" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="false" />
+                <index v="true" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>RECEIVEDATE</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="93" />
+                <size v="0" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>RECENT</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="4" />
+                <size v="0" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="false" />
+                <index v="true" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>RECIPIENT</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="2046" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>SEEN</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="4" />
+                <size v="0" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>SENDER</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="127" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>SENTDATE</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="93" />
+                <size v="0" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>SUBJECT</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="1023" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+            </entityFields>
+          </entityDb>
+          <entityDb>
+            <name>ASYS_CALENDARSYNC</name>
+            <dbName></dbName>
+            <idColumn></idColumn>
+            <idGeneratorType v="0" />
+            <idGeneratorInterval v="0" />
+            <documentation></documentation>
+            <title></title>
+            <description></description>
+            <auditSyncConfig>
+              <name>auditSyncConfig</name>
+              <auditMode v="0" />
+              <syncActive v="false" />
+              <syncComplete v="true" />
+              <syncDirection v="1" />
+              <syncIds></syncIds>
+            </auditSyncConfig>
+            <entityFields>
+              <entityFieldDb>
+                <name>LASTMODIFIED</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="93" />
+                <size v="0" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>MASTERUID</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="512" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="true" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>SLAVEUID</name>
+                <dbName></dbName>
+                <primaryKey v="true" />
+                <columnType v="12" />
+                <size v="127" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="true" />
+                <index v="true" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>SUSER</name>
+                <dbName></dbName>
+                <primaryKey v="true" />
+                <columnType v="12" />
+                <size v="63" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="true" />
+                <index v="true" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+            </entityFields>
+          </entityDb>
+          <entityDb>
+            <name>ASYS_FARM</name>
+            <dbName></dbName>
+            <idColumn></idColumn>
+            <idGeneratorType v="0" />
+            <idGeneratorInterval v="0" />
+            <documentation></documentation>
+            <title></title>
+            <description></description>
+            <auditSyncConfig>
+              <name>auditSyncConfig</name>
+              <auditMode v="0" />
+              <syncActive v="false" />
+              <syncComplete v="true" />
+              <syncDirection v="1" />
+              <syncIds></syncIds>
+            </auditSyncConfig>
+            <entityFields>
+              <entityFieldDb>
+                <name>ADDRESS</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="255" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>CLIENTS</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="4" />
+                <size v="0" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>FARMVERSION</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="12" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>LICENSE</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="255" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>SENCODING</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="4" />
+                <size v="0" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>SERVERID</name>
+                <dbName></dbName>
+                <primaryKey v="true" />
+                <columnType v="12" />
+                <size v="127" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="true" />
+                <index v="true" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>WORKLOAD</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="4" />
+                <size v="0" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+            </entityFields>
+          </entityDb>
+          <entityDb>
+            <name>ASYS_FARM_CLIENT</name>
+            <dbName></dbName>
+            <idColumn></idColumn>
+            <idGeneratorType v="0" />
+            <idGeneratorInterval v="0" />
+            <documentation></documentation>
+            <title></title>
+            <description></description>
+            <auditSyncConfig>
+              <name>auditSyncConfig</name>
+              <auditMode v="0" />
+              <syncActive v="false" />
+              <syncComplete v="true" />
+              <syncDirection v="1" />
+              <syncIds></syncIds>
+            </auditSyncConfig>
+            <entityFields>
+              <entityFieldDb>
+                <name>CHARACTERISTIC</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="4" />
+                <size v="0" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>CLIENTID</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="255" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>ID</name>
+                <dbName></dbName>
+                <primaryKey v="true" />
+                <columnType v="1" />
+                <size v="36" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="true" />
+                <index v="true" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>SADDRESS</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="255" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>SERVERID</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="255" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>USERNAME</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="255" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+            </entityFields>
+          </entityDb>
+          <entityDb>
+            <name>ASYS_AUDIT</name>
+            <dbName></dbName>
+            <idColumn></idColumn>
+            <idGeneratorType v="0" />
+            <idGeneratorInterval v="0" />
+            <documentation></documentation>
+            <title></title>
+            <description></description>
+            <auditSyncConfig>
+              <name>auditSyncConfig</name>
+              <auditMode v="0" />
+              <syncActive v="false" />
+              <syncComplete v="true" />
+              <syncDirection v="1" />
+              <syncIds></syncIds>
+            </auditSyncConfig>
+            <entityFields>
+              <entityFieldDb>
+                <name>ACOLUMNNAME</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="127" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>ALIAS</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="255" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>ATABLENAME</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="127" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>ATIMESTAMP</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="93" />
+                <size v="0" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>AUSER</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="255" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>DATASETID</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="1023" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>DATASETNEWVALUE_BLOB</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="2004" />
+                <size v="0" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>DATASETNEWVALUE_CLOB</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="2005" />
+                <size v="0" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>DATASETNEWVALUE_STRING</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="1023" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>LOGTIME</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="93" />
+                <size v="0" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="false" />
+                <index v="true" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>LOGTYPE</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="4" />
+                <size v="0" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>LOGWRITERUID</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="127" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>SQLACTION</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="1" />
+                <size v="1" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+            </entityFields>
+          </entityDb>
+          <entityDb>
+            <name>ASYS_SYNCSLAVES</name>
+            <dbName></dbName>
+            <idColumn></idColumn>
+            <idGeneratorType v="0" />
+            <idGeneratorInterval v="0" />
+            <documentation></documentation>
+            <title></title>
+            <description></description>
+            <auditSyncConfig>
+              <name>auditSyncConfig</name>
+              <auditMode v="0" />
+              <syncActive v="false" />
+              <syncComplete v="true" />
+              <syncDirection v="1" />
+              <syncIds></syncIds>
+            </auditSyncConfig>
+            <entityFields>
+              <entityFieldDb>
+                <name>ACTIVE</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="4" />
+                <size v="0" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>DESCRIPTION</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="255" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>DEVICEID</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="40" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>INTERVALL</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="4" />
+                <size v="0" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>LASTSYNC</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="93" />
+                <size v="0" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>SLAVEUID</name>
+                <dbName></dbName>
+                <primaryKey v="true" />
+                <columnType v="12" />
+                <size v="127" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="true" />
+                <index v="true" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+            </entityFields>
+          </entityDb>
+          <entityDb>
+            <name>ASYS_XMPP_OFFLINESTANZA</name>
+            <dbName></dbName>
+            <idColumn></idColumn>
+            <idGeneratorType v="0" />
+            <idGeneratorInterval v="0" />
+            <documentation></documentation>
+            <title></title>
+            <description></description>
+            <auditSyncConfig>
+              <name>auditSyncConfig</name>
+              <auditMode v="0" />
+              <syncActive v="false" />
+              <syncComplete v="true" />
+              <syncDirection v="1" />
+              <syncIds></syncIds>
+            </auditSyncConfig>
+            <entityFields>
+              <entityFieldDb>
+                <name>ATIMESTAMP</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="93" />
+                <size v="0" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>JID</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="64" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="false" />
+                <index v="true" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>STANZA</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="2005" />
+                <size v="0" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+            </entityFields>
+          </entityDb>
+          <entityDb>
+            <name>ASYS_XMPP_HISTORY</name>
+            <dbName></dbName>
+            <idColumn></idColumn>
+            <idGeneratorType v="0" />
+            <idGeneratorInterval v="0" />
+            <documentation></documentation>
+            <title></title>
+            <description></description>
+            <auditSyncConfig>
+              <name>auditSyncConfig</name>
+              <auditMode v="0" />
+              <syncActive v="false" />
+              <syncComplete v="true" />
+              <syncDirection v="1" />
+              <syncIds></syncIds>
+            </auditSyncConfig>
+            <entityFields>
+              <entityFieldDb>
+                <name>ATIMESTAMP</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="93" />
+                <size v="0" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="false" />
+                <index v="true" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>CHATMARKER</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="16" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>JID_FROM</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="64" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="false" />
+                <index v="true" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>JID_TO</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="64" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="false" />
+                <index v="true" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>MSGMARKER</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="255" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="false" />
+                <index v="true" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>MSGTYPE</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="16" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>STANZA</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="2005" />
+                <size v="0" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
                 <title></title>
diff --git a/entity/Employee_entity/recordcontainers/jdito/contentProcess.js b/entity/Employee_entity/recordcontainers/jdito/contentProcess.js
index b823dfd396..42ea78f8ca 100644
--- a/entity/Employee_entity/recordcontainers/jdito/contentProcess.js
+++ b/entity/Employee_entity/recordcontainers/jdito/contentProcess.js
@@ -17,7 +17,7 @@ else
     var values = ["true", "false"];
     if (vars.exists("$param.OnlyActives_param") && vars.get("$param.OnlyActives_param") == "true")
         values = ["true"];
-    users = tools.getUsersByAttribute(tools.ISACTIVE, values, tools.PROFILE_FULL);
+    users = tools.getUsersByAttribute(tools.ISACTIVE, values, tools.PROFILE_DEFAULT);
 }
 
 users = users.map(function (user)
@@ -83,8 +83,6 @@ var filterFns = {
 };
 users = JditoFilterUtils.filterRecords(filterFields, users, filter.filter, filterFns);
 
-users.forEach(function (user) {user[12] = "";}); //clean up the ROLE_FILTER field, we don't need it after filtering
-
 var order = vars.get("$local.order");
 var columnOrder = {
     "TITLE.value" : 1,
diff --git a/neonView/EmployeeFilter_view/EmployeeFilter_view.aod b/neonView/EmployeeFilter_view/EmployeeFilter_view.aod
index 4758021fb5..7cb12f6d37 100644
--- a/neonView/EmployeeFilter_view/EmployeeFilter_view.aod
+++ b/neonView/EmployeeFilter_view/EmployeeFilter_view.aod
@@ -48,10 +48,6 @@
           <name>acf1037c-e198-4b2d-9c7f-a2438fa70089</name>
           <entityField>EMAIL_ADDRESS</entityField>
         </neonTableColumn>
-        <neonTableColumn>
-          <name>5acac530-7ff7-4fd1-ac48-4a9c441a8b13</name>
-          <entityField>DESCRIPTION</entityField>
-        </neonTableColumn>
       </columns>
     </tableViewTemplate>
   </children>
-- 
GitLab


From 1f27cbf1bcf258cf65621afda0e01f274c6a20c2 Mon Sep 17 00:00:00 2001
From: Daniel Tran <d.tran@adito.de>
Date: Mon, 24 Aug 2020 07:47:54 +0200
Subject: [PATCH 193/309] Renamed "AlterButtonlabelTitles" to
 "AlterButtonLabelTitles", to fix typo.

---
 .../AlterButtonLabelTitles.xml                                    | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename .liquibase/Data_alias/basic/2020.1.3/{AlterButtonlabelTitles => AlterButtonLabelTitles}/AlterButtonLabelTitles.xml (100%)

diff --git a/.liquibase/Data_alias/basic/2020.1.3/AlterButtonlabelTitles/AlterButtonLabelTitles.xml b/.liquibase/Data_alias/basic/2020.1.3/AlterButtonLabelTitles/AlterButtonLabelTitles.xml
similarity index 100%
rename from .liquibase/Data_alias/basic/2020.1.3/AlterButtonlabelTitles/AlterButtonLabelTitles.xml
rename to .liquibase/Data_alias/basic/2020.1.3/AlterButtonLabelTitles/AlterButtonLabelTitles.xml
-- 
GitLab


From c547a7dc57c24c288899a353f2ec4f1d352237df Mon Sep 17 00:00:00 2001
From: Tom Lutzenberger <t.lutzenberger@adito.de>
Date: Mon, 24 Aug 2020 09:58:05 +0200
Subject: [PATCH 194/309] #1058829: Apply demanded changes

---
 .../recordcontainers/db/conditionProcess.js       | 15 +++++++--------
 .../member_filter/filterValuesProcess.js          |  4 ++--
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/entity/Campaign_entity/recordcontainers/db/conditionProcess.js b/entity/Campaign_entity/recordcontainers/db/conditionProcess.js
index de6ee1b893..80bfe7f521 100644
--- a/entity/Campaign_entity/recordcontainers/db/conditionProcess.js
+++ b/entity/Campaign_entity/recordcontainers/db/conditionProcess.js
@@ -9,12 +9,11 @@ if(vars.get("$param.ShowOnlyCurrentUsersCampaigns_param") == 'true')
 {
     //TODO: use a preparedCondition (.build instead of .translate) when available #1030812 #1034026
     result.string(newWhere("CAMPAIGN.EMPLOYEE_CONTACT_ID", EmployeeUtils.getCurrentContactId()).toString());
-}
+} else {
+    var condition = new SqlBuilder()
+        .whereIfSet("STEPDATESTART_TABLEALIAS.CAMPAIGN_ID = CAMPAIGN.CAMPAIGNID")
+        .andIfSet("STEPDATEEND_TABLEALIAS.CAMPAIGN_ID = CAMPAIGN.CAMPAIGNID")
+        ;
 
-
-var condition = new SqlBuilder()
-    .whereIfSet("STEPDATESTART_TABLEALIAS.CAMPAIGN_ID = CAMPAIGN.CAMPAIGNID")
-    .andIfSet("STEPDATEEND_TABLEALIAS.CAMPAIGN_ID = CAMPAIGN.CAMPAIGNID")
-    ;
-
-result.string(condition.toString());
+    result.string(condition.toString());
+}
\ No newline at end of file
diff --git a/entity/Campaign_entity/recordcontainers/db/filterextensions/member_filter/filterValuesProcess.js b/entity/Campaign_entity/recordcontainers/db/filterextensions/member_filter/filterValuesProcess.js
index f0a61566a9..569b13dcd3 100644
--- a/entity/Campaign_entity/recordcontainers/db/filterextensions/member_filter/filterValuesProcess.js
+++ b/entity/Campaign_entity/recordcontainers/db/filterextensions/member_filter/filterValuesProcess.js
@@ -6,8 +6,8 @@ import("Person_lib");
 var query = new SqlBuilder()
     .select("OBJECTMEMBER.CONTACT_ID, (" + PersUtils.getResolvingDisplaySubSql("OBJECTMEMBER.CONTACT_ID") + ") as C")
     .from("OBJECTMEMBER")
-    .join("CAMPAIGN on OBJECTMEMBER.OBJECT_ROWID = CAMPAIGN.CAMPAIGNID", "", "", "inner")
-    .join("CONTACT on OBJECTMEMBER.CONTACT_ID = CONTACT.CONTACTID", "", "", "inner")
+    .join("CAMPAIGN", "OBJECTMEMBER.OBJECT_ROWID = CAMPAIGN.CAMPAIGNID")
+    .join("CONTACT", "OBJECTMEMBER.CONTACT_ID = CONTACT.CONTACTID")
     ;
     
 result.object(query.table());
\ No newline at end of file
-- 
GitLab


From fb635ce3451c6b9664af1ae0bee7b4c250e6fff9 Mon Sep 17 00:00:00 2001
From: "S.Listl" <s.listl@adito.de>
Date: Mon, 24 Aug 2020 14:25:53 +0200
Subject: [PATCH 195/309] #1064124 added database indexes

---
 .aditoprj/ignoredScanServiceTasks.json        | 18 ++++++++++++++
 .../basic/2020.2.0/optimizeIndizes.xml        | 24 +++++++++++++++++++
 aliasDefinition/Data_alias/Data_alias.aod     | 16 ++++++-------
 .../recordcontainers/db/conditionProcess.js   |  7 +++---
 4 files changed, 54 insertions(+), 11 deletions(-)

diff --git a/.aditoprj/ignoredScanServiceTasks.json b/.aditoprj/ignoredScanServiceTasks.json
index 5732c4b35b..9885aa1275 100644
--- a/.aditoprj/ignoredScanServiceTasks.json
+++ b/.aditoprj/ignoredScanServiceTasks.json
@@ -12,6 +12,24 @@
       "description": "The table \"DATABASECHANGELOG\" has no primary key [65]",
       "groupName": "nb-tasklist-warning"
     },
+    {
+      "target": "aliasDefinition/Data_alias/Data_alias.aod",
+      "line": -1,
+      "description": "There is no index for the column \"APPOINTMENT_ID\" in the table \"VISITPLANENTRY\" [59]",
+      "groupName": "nb-tasklist-warning"
+    },
+    {
+      "target": "aliasDefinition/Data_alias/Data_alias.aod",
+      "line": -1,
+      "description": "There is no index for the column \"DEPLOYMENT_ID\" in the table \"DATABASECHANGELOG\" [59]",
+      "groupName": "nb-tasklist-warning"
+    },
+    {
+      "target": "aliasDefinition/Data_alias/Data_alias.aod",
+      "line": -1,
+      "description": "There is no index for the column \"TESTING_CONTACT_ID\" in the table \"BULKMAIL\" [59]",
+      "groupName": "nb-tasklist-warning"
+    },
     {
       "target": "aliasDefinition/_____SYSTEMALIAS/_____SYSTEMALIAS.aod",
       "line": -1,
diff --git a/.liquibase/Data_alias/basic/2020.2.0/optimizeIndizes.xml b/.liquibase/Data_alias/basic/2020.2.0/optimizeIndizes.xml
index 274fcf0e17..b94480075b 100644
--- a/.liquibase/Data_alias/basic/2020.2.0/optimizeIndizes.xml
+++ b/.liquibase/Data_alias/basic/2020.2.0/optimizeIndizes.xml
@@ -5,5 +5,29 @@
         <createIndex tableName="COMMUNICATION" indexName="IDX_COMMUNICATION_MEDIUM_ID">
             <column name="MEDIUM_ID"/>
         </createIndex>
+        <createIndex tableName="AB_APPOINTMENTLINK" indexName="IDX_APPOINTMENTLINK_AP_ID">
+            <column name="APPOINTMENT_ID"/>
+        </createIndex>
+        <createIndex tableName="EXPORTTEMPLATEPLACEOFUSE" indexName="IDX_EXPORTTEMPLATEUSE_T_ID">
+            <column name="EXPORTTEMPLATE_ID"/>
+        </createIndex>
+        <createIndex tableName="DOCUMENTTEMPLATEPLACEOFUSE" indexName="IDX_DOCUMENTTEMPLATEUSE_DT_ID">
+            <column name="DOCUMENTTEMPLATE_ID"/>
+        </createIndex>
+        <createIndex tableName="EXPORTTEMPLATEFIELD" indexName="IDX_EXPORTTEMPLATEFIELD_ET_ID">
+            <column name="EXPORTTEMPLATE_ID"/>
+        </createIndex>
+        <createIndex tableName="VISITRECOMMENDATION" indexName="IDX_VISITRECOMMEND_CONTACT_ID">
+            <column name="CONTACT_ID"/>
+        </createIndex>
+        <createIndex tableName="VISITPLANEMPLOYEEWEEK" indexName="IDX_VISITPLANWEEK_CONTACT_ID">
+            <column name="CONTACT_ID"/>
+        </createIndex>
+        <createIndex tableName="VISITPLANENTRY" indexName="IDX_VISITPLANENTRY_VPEMW_ID">
+            <column name="VISITPLANEMPLOYEEWEEK_ID"/>
+        </createIndex>
+        <createIndex tableName="LEADIMPORTMAPPINGASSISTANT" indexName="IDX_LEADIMPORTMAPPING_LI_ID">
+            <column name="LEADIMPORT_ID"/>
+        </createIndex>
     </changeSet>
 </databaseChangeLog>
diff --git a/aliasDefinition/Data_alias/Data_alias.aod b/aliasDefinition/Data_alias/Data_alias.aod
index 4d5c69b051..34e089b535 100644
--- a/aliasDefinition/Data_alias/Data_alias.aod
+++ b/aliasDefinition/Data_alias/Data_alias.aod
@@ -7021,7 +7021,7 @@
                 <scale v="0" />
                 <notNull v="true" />
                 <isUnique v="false" />
-                <index v="false" />
+                <index v="true" />
                 <documentation></documentation>
                 <title>Appointment Id</title>
                 <description></description>
@@ -14031,7 +14031,7 @@
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
-                <index v="false" />
+                <index v="true" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
@@ -14072,7 +14072,7 @@
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
-                <index v="false" />
+                <index v="true" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
@@ -14357,7 +14357,7 @@
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
-                <index v="false" />
+                <index v="true" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
@@ -14669,7 +14669,7 @@
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
-                <index v="false" />
+                <index v="true" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
@@ -14745,7 +14745,7 @@
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
-                <index v="false" />
+                <index v="true" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
@@ -14863,7 +14863,7 @@
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
-                <index v="false" />
+                <index v="true" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
@@ -15155,7 +15155,7 @@
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
-                <index v="false" />
+                <index v="true" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
diff --git a/entity/DocumentTemplate_entity/recordcontainers/db/conditionProcess.js b/entity/DocumentTemplate_entity/recordcontainers/db/conditionProcess.js
index a6caa092b1..40ced6b7b9 100644
--- a/entity/DocumentTemplate_entity/recordcontainers/db/conditionProcess.js
+++ b/entity/DocumentTemplate_entity/recordcontainers/db/conditionProcess.js
@@ -9,9 +9,10 @@ var cond = newWhere()
 
 if(vars.get("$param.ComingFrom_param"))
 {
-     cond.and("DOCUMENTTEMPLATE.DOCUMENTTEMPLATEID", newSelect("DOCUMENTTEMPLATEPLACEOFUSE.DOCUMENTTEMPLATE_ID")
-                                                                    .from("DOCUMENTTEMPLATEPLACEOFUSE")
-                                                                    .where("DOCUMENTTEMPLATEPLACEOFUSE.PLACEOFUSE", "$param.ComingFrom_param"),SqlBuilder.IN());
+    cond.and(null, newSelect("DOCUMENTTEMPLATEPLACEOFUSE.DOCUMENTTEMPLATEPLACEOFUSEID")
+        .from("DOCUMENTTEMPLATEPLACEOFUSE")
+        .where("DOCUMENTTEMPLATEPLACEOFUSE.PLACEOFUSE", "$param.ComingFrom_param")
+        .and("DOCUMENTTEMPLATEPLACEOFUSE.DOCUMENTTEMPLATE_ID = DOCUMENTTEMPLATE.DOCUMENTTEMPLATEID"), SqlBuilder.EXISTS());
 }
 
 result.string(cond);
\ No newline at end of file
-- 
GitLab


From 4e76d261f5cf006b0971e1815a8b688368c77394 Mon Sep 17 00:00:00 2001
From: "S.Listl" <s.listl@adito.de>
Date: Mon, 24 Aug 2020 15:33:45 +0200
Subject: [PATCH 196/309] Added function Utils.parseBoolean

---
 process/Util_lib/process.js | 46 +++++++++++++++++++++++++------------
 1 file changed, 31 insertions(+), 15 deletions(-)

diff --git a/process/Util_lib/process.js b/process/Util_lib/process.js
index b005263bfa..f7f70a01f2 100644
--- a/process/Util_lib/process.js
+++ b/process/Util_lib/process.js
@@ -134,56 +134,72 @@ Utils.isEqual = function (pFirstObject, pSecondObject)
 /**
  * Checks if the given value is a function.
  * 
- * @param {Object} pObject the value to check
+ * @param {Object} pValue the value to check
  * @return {Boolean} true if the value is a function
  */
-Utils.isFunction = function (pObject)
+Utils.isFunction = function (pValue)
 {
-    return typeof pObject === "function";
+    return typeof pValue === "function";
 }
 
 /**
  * Checks if the given value is a string.
  * 
- * @param {Object} pObject the value to check
+ * @param {Object} pValue the value to check
  * @return {Boolean} true if the value is a string
  */
-Utils.isString = function (pObject)
+Utils.isString = function (pValue)
 {
-    return typeof pObject === "string";
+    return typeof pValue === "string";
 }
 
 /**
  * Checks if the given value is a number.
  * 
- * @param {Object} pObject the value to check
+ * @param {Object} pValue the value to check
  * @return {Boolean} true if the value is a number
  */
-Utils.isNumber = function (pObject)
+Utils.isNumber = function (pValue)
 {
-    return typeof pObject === "number";
+    return typeof pValue === "number";
 }
 
 /**
  * Checks if the given value is an object. Be careful, null is also considered "object".
  * 
- * @param {Object} pObject the value to check
+ * @param {Object} pValue the value to check
  * @return {Boolean} true if the value is an object
  */
-Utils.isObject = function (pObject)
+Utils.isObject = function (pValue)
 {
-    return typeof pObject === "object";
+    return typeof pValue === "object";
 }
 
 /**
  * Checks if the given value is a boolean.
  * 
- * @param {Object} pObject the value to check
+ * @param {Object} pValue the value to check
  * @return {Boolean} true if the value is a boolean
  */
-Utils.isBoolean = function (pObject)
+Utils.isBoolean = function (pValue)
 {
-    return typeof pObject === "boolean";
+    return typeof pValue === "boolean";
+}
+
+/**
+ * Parses the given value to Boolean, this can be used to check for stringified Booleans. These rules apply:
+ * <ul>
+ *  <li>If the value is either falsy, the string "false" or the string "0", false is returned</li>
+ *  <li>If the valueOf method of the value returns a falsy value, false is returned 
+ *  (this is to make sure the function returns false for weird stuff like 'new Boolean(false)')</li>
+ *  <li>Every other value results in true</li>
+ *  
+ * @param {String|Object} pValue the value to parse
+ * @return {Boolean} a real boolean
+ */
+Utils.parseBoolean = function (pValue)
+{
+    return !(!pValue || pValue === "0" || pValue === "false" || !(pValue.valueOf()));
 }
 
 /**
-- 
GitLab


From 9cc100de8dee9ed07772cea2cdb1b75d6f3d23fb Mon Sep 17 00:00:00 2001
From: "S.Listl" <s.listl@adito.de>
Date: Mon, 24 Aug 2020 15:52:09 +0200
Subject: [PATCH 197/309] System alias updated

---
 .../_____SYSTEMALIAS/_____SYSTEMALIAS.aod     | 1868 +++--------------
 1 file changed, 327 insertions(+), 1541 deletions(-)

diff --git a/aliasDefinition/_____SYSTEMALIAS/_____SYSTEMALIAS.aod b/aliasDefinition/_____SYSTEMALIAS/_____SYSTEMALIAS.aod
index 6adb2d2901..6f4f1b2dca 100644
--- a/aliasDefinition/_____SYSTEMALIAS/_____SYSTEMALIAS.aod
+++ b/aliasDefinition/_____SYSTEMALIAS/_____SYSTEMALIAS.aod
@@ -19,9 +19,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
-                <size v="0" />
-                <scale v="0" />
-                <notNull v="true" />
+                <size v="29" />
+                <scale v="9" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -32,9 +32,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
-                <size v="0" />
-                <scale v="0" />
-                <notNull v="true" />
+                <size v="29" />
+                <scale v="9" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -47,7 +47,7 @@
                 <columnType v="12" />
                 <size v="255" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -58,9 +58,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="2004" />
-                <size v="0" />
+                <size v="2147483647" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -73,7 +73,7 @@
                 <columnType v="1" />
                 <size v="63" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="true" />
                 <index v="true" />
                 <title></title>
@@ -84,9 +84,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="4" />
-                <size v="0" />
+                <size v="10" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -99,9 +99,9 @@
                 <columnType v="12" />
                 <size v="63" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
-                <index v="true" />
+                <index v="false" />
                 <title></title>
                 <description></description>
               </entityFieldDb>
@@ -112,7 +112,7 @@
                 <columnType v="12" />
                 <size v="63" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -125,7 +125,7 @@
                 <columnType v="12" />
                 <size v="63" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -138,7 +138,7 @@
                 <columnType v="12" />
                 <size v="63" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -149,9 +149,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="2004" />
-                <size v="0" />
+                <size v="2147483647" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -172,9 +172,9 @@
                 <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
-                <index v="true" />
+                <index v="false" />
                 <title></title>
                 <description></description>
               </entityFieldDb>
@@ -183,9 +183,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="4" />
-                <size v="0" />
+                <size v="10" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -196,9 +196,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="4" />
-                <size v="0" />
+                <size v="10" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -211,7 +211,7 @@
                 <columnType v="12" />
                 <size v="127" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="true" />
                 <index v="true" />
                 <title></title>
@@ -231,9 +231,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="2004" />
-                <size v="0" />
+                <size v="2147483647" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -246,7 +246,7 @@
                 <columnType v="12" />
                 <size v="31" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -257,9 +257,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="-5" />
-                <size v="0" />
+                <size v="19" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -270,9 +270,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
-                <size v="0" />
-                <scale v="0" />
-                <notNull v="true" />
+                <size v="29" />
+                <scale v="9" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -283,9 +283,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
-                <size v="0" />
-                <scale v="0" />
-                <notNull v="true" />
+                <size v="29" />
+                <scale v="9" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -298,7 +298,7 @@
                 <columnType v="12" />
                 <size v="127" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -311,7 +311,7 @@
                 <columnType v="12" />
                 <size v="127" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -324,7 +324,7 @@
                 <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="true" />
                 <index v="true" />
                 <title></title>
@@ -337,7 +337,7 @@
                 <columnType v="12" />
                 <size v="255" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -350,7 +350,7 @@
                 <columnType v="12" />
                 <size v="127" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -363,7 +363,7 @@
                 <columnType v="12" />
                 <size v="1024" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -374,9 +374,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="2004" />
-                <size v="0" />
+                <size v="2147483647" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -389,7 +389,7 @@
                 <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="true" />
                 <title></title>
@@ -402,7 +402,7 @@
                 <columnType v="12" />
                 <size v="127" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -415,7 +415,7 @@
                 <columnType v="12" />
                 <size v="63" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -428,7 +428,7 @@
                 <columnType v="12" />
                 <size v="63" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -447,9 +447,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="4" />
-                <size v="0" />
+                <size v="10" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -462,7 +462,7 @@
                 <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="true" />
                 <index v="true" />
                 <title></title>
@@ -473,11 +473,11 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
-                <size v="0" />
-                <scale v="0" />
-                <notNull v="true" />
+                <size v="29" />
+                <scale v="9" />
+                <notNull v="false" />
                 <isUnique v="false" />
-                <index v="true" />
+                <index v="false" />
                 <title></title>
                 <description></description>
               </entityFieldDb>
@@ -486,11 +486,11 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
-                <size v="0" />
-                <scale v="0" />
-                <notNull v="true" />
+                <size v="29" />
+                <scale v="9" />
+                <notNull v="false" />
                 <isUnique v="false" />
-                <index v="true" />
+                <index v="false" />
                 <title></title>
                 <description></description>
               </entityFieldDb>
@@ -501,9 +501,9 @@
                 <columnType v="12" />
                 <size v="512" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
-                <index v="true" />
+                <index v="false" />
                 <title></title>
                 <description></description>
               </entityFieldDb>
@@ -512,11 +512,11 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
-                <size v="0" />
-                <scale v="0" />
-                <notNull v="true" />
+                <size v="29" />
+                <scale v="9" />
+                <notNull v="false" />
                 <isUnique v="false" />
-                <index v="true" />
+                <index v="false" />
                 <title></title>
                 <description></description>
               </entityFieldDb>
@@ -525,11 +525,11 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="4" />
-                <size v="0" />
+                <size v="10" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
-                <index v="true" />
+                <index v="false" />
                 <title></title>
                 <description></description>
               </entityFieldDb>
@@ -538,9 +538,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="4" />
-                <size v="0" />
+                <size v="10" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -551,9 +551,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="4" />
-                <size v="0" />
+                <size v="10" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -564,11 +564,11 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
-                <size v="0" />
-                <scale v="0" />
-                <notNull v="true" />
+                <size v="29" />
+                <scale v="9" />
+                <notNull v="false" />
                 <isUnique v="false" />
-                <index v="true" />
+                <index v="false" />
                 <title></title>
                 <description></description>
               </entityFieldDb>
@@ -579,9 +579,9 @@
                 <columnType v="12" />
                 <size v="255" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
-                <index v="true" />
+                <index v="false" />
                 <title></title>
                 <description></description>
               </entityFieldDb>
@@ -592,7 +592,7 @@
                 <columnType v="12" />
                 <size v="255" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -605,7 +605,7 @@
                 <columnType v="12" />
                 <size v="255" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -616,11 +616,11 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
-                <size v="0" />
-                <scale v="0" />
-                <notNull v="true" />
+                <size v="29" />
+                <scale v="9" />
+                <notNull v="false" />
                 <isUnique v="false" />
-                <index v="true" />
+                <index v="false" />
                 <title></title>
                 <description></description>
               </entityFieldDb>
@@ -631,9 +631,9 @@
                 <columnType v="12" />
                 <size v="32" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
-                <index v="true" />
+                <index v="false" />
                 <title></title>
                 <description></description>
               </entityFieldDb>
@@ -644,7 +644,7 @@
                 <columnType v="12" />
                 <size v="255" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -657,7 +657,7 @@
                 <columnType v="1" />
                 <size v="1" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -668,9 +668,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="2005" />
-                <size v="0" />
+                <size v="2147483647" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -691,7 +691,7 @@
                 <columnType v="12" />
                 <size v="127" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -700,12 +700,12 @@
               <entityFieldDb>
                 <name>DBID</name>
                 <dbName></dbName>
-                <primaryKey v="false" />
+                <primaryKey v="true" />
                 <columnType v="12" />
-                <size v="1023" />
+                <size v="191" />
                 <scale v="0" />
                 <notNull v="true" />
-                <isUnique v="false" />
+                <isUnique v="true" />
                 <index v="true" />
                 <title></title>
                 <description></description>
@@ -717,7 +717,7 @@
                 <columnType v="12" />
                 <size v="127" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -730,7 +730,7 @@
                 <columnType v="12" />
                 <size v="127" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -743,9 +743,9 @@
                 <columnType v="12" />
                 <size v="512" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
-                <index v="true" />
+                <index v="false" />
                 <title></title>
                 <description></description>
               </entityFieldDb>
@@ -756,7 +756,7 @@
                 <columnType v="12" />
                 <size v="255" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -769,7 +769,7 @@
                 <columnType v="12" />
                 <size v="1023" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -778,13 +778,13 @@
               <entityFieldDb>
                 <name>ID</name>
                 <dbName></dbName>
-                <primaryKey v="true" />
+                <primaryKey v="false" />
                 <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
-                <notNull v="false" />
-                <isUnique v="true" />
-                <index v="true" />
+                <notNull v="true" />
+                <isUnique v="false" />
+                <index v="false" />
                 <title></title>
                 <description></description>
               </entityFieldDb>
@@ -795,7 +795,7 @@
                 <columnType v="12" />
                 <size v="2000" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -814,9 +814,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
-                <size v="0" />
-                <scale v="0" />
-                <notNull v="true" />
+                <size v="29" />
+                <scale v="9" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -827,9 +827,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
-                <size v="0" />
-                <scale v="0" />
-                <notNull v="true" />
+                <size v="29" />
+                <scale v="9" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -842,7 +842,7 @@
                 <columnType v="12" />
                 <size v="63" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="true" />
                 <title></title>
@@ -855,7 +855,7 @@
                 <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="true" />
                 <index v="true" />
                 <title></title>
@@ -868,7 +868,7 @@
                 <columnType v="12" />
                 <size v="63" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="true" />
                 <title></title>
@@ -881,9 +881,9 @@
                 <columnType v="12" />
                 <size v="1024" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
-                <index v="true" />
+                <index v="false" />
                 <title></title>
                 <description></description>
               </entityFieldDb>
@@ -894,9 +894,9 @@
                 <columnType v="12" />
                 <size v="1024" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
-                <index v="true" />
+                <index v="false" />
                 <title></title>
                 <description></description>
               </entityFieldDb>
@@ -905,9 +905,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="2005" />
-                <size v="0" />
+                <size v="2147483647" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -928,9 +928,9 @@
                 <columnType v="12" />
                 <size v="63" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
-                <index v="true" />
+                <index v="false" />
                 <title></title>
                 <description></description>
               </entityFieldDb>
@@ -939,9 +939,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
-                <size v="0" />
-                <scale v="0" />
-                <notNull v="true" />
+                <size v="29" />
+                <scale v="9" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -952,9 +952,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
-                <size v="0" />
-                <scale v="0" />
-                <notNull v="true" />
+                <size v="29" />
+                <scale v="9" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -964,10 +964,10 @@
                 <name>DESCRIPTION</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="255" />
+                <columnType v="2005" />
+                <size v="2147483647" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -978,9 +978,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="2004" />
-                <size v="0" />
+                <size v="2147483647" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -993,7 +993,7 @@
                 <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="true" />
                 <index v="true" />
                 <title></title>
@@ -1004,9 +1004,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="4" />
-                <size v="0" />
+                <size v="10" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -1019,8 +1019,8 @@
                 <columnType v="12" />
                 <size v="63" />
                 <scale v="0" />
-                <notNull v="false" />
-                <isUnique v="true" />
+                <notNull v="true" />
+                <isUnique v="false" />
                 <index v="false" />
                 <title></title>
                 <description></description>
@@ -1032,7 +1032,7 @@
                 <columnType v="12" />
                 <size v="63" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -1045,7 +1045,7 @@
                 <columnType v="12" />
                 <size v="63" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -1058,7 +1058,7 @@
                 <columnType v="12" />
                 <size v="63" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -1071,7 +1071,7 @@
                 <columnType v="12" />
                 <size v="63" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -1084,7 +1084,7 @@
                 <columnType v="12" />
                 <size v="63" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -1095,9 +1095,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="2004" />
-                <size v="0" />
+                <size v="2147483647" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -1118,7 +1118,7 @@
                 <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="true" />
                 <title></title>
@@ -1131,7 +1131,7 @@
                 <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="true" />
                 <index v="true" />
                 <title></title>
@@ -1142,9 +1142,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
-                <size v="16" />
+                <size v="15" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="true" />
                 <title></title>
@@ -1157,7 +1157,7 @@
                 <columnType v="12" />
                 <size v="63" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="true" />
                 <title></title>
@@ -1170,7 +1170,7 @@
                 <columnType v="12" />
                 <size v="15" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -1190,9 +1190,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="4" />
-                <size v="0" />
+                <size v="10" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -1205,7 +1205,7 @@
                 <columnType v="12" />
                 <size v="63" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -1218,7 +1218,7 @@
                 <columnType v="12" />
                 <size v="63" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -1231,7 +1231,7 @@
                 <columnType v="12" />
                 <size v="1023" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -1242,9 +1242,9 @@
                 <dbName></dbName>
                 <primaryKey v="true" />
                 <columnType v="1" />
-                <size v="63" />
+                <size v="36" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="true" />
                 <index v="true" />
                 <title></title>
@@ -1255,9 +1255,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="2005" />
-                <size v="0" />
+                <size v="2147483647" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -1268,9 +1268,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="4" />
-                <size v="0" />
+                <size v="10" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -1283,7 +1283,7 @@
                 <columnType v="12" />
                 <size v="63" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -1294,9 +1294,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="4" />
-                <size v="0" />
+                <size v="10" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -1307,9 +1307,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="4" />
-                <size v="0" />
+                <size v="10" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -1328,9 +1328,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="2005" />
-                <size v="0" />
+                <size v="2147483647" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -1343,7 +1343,7 @@
                 <columnType v="12" />
                 <size v="512" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -1356,7 +1356,7 @@
                 <columnType v="12" />
                 <size v="1023" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -1367,9 +1367,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="4" />
-                <size v="0" />
+                <size v="10" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -1382,7 +1382,7 @@
                 <columnType v="12" />
                 <size v="63" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -1393,9 +1393,9 @@
                 <dbName></dbName>
                 <primaryKey v="true" />
                 <columnType v="1" />
-                <size v="63" />
+                <size v="36" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="true" />
                 <index v="true" />
                 <title></title>
@@ -1408,7 +1408,7 @@
                 <columnType v="12" />
                 <size v="63" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -1419,9 +1419,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="2005" />
-                <size v="0" />
+                <size v="2147483647" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -1432,9 +1432,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="2005" />
-                <size v="0" />
+                <size v="2147483647" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -1445,9 +1445,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="4" />
-                <size v="0" />
+                <size v="10" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -1458,9 +1458,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="4" />
-                <size v="0" />
+                <size v="10" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -1473,7 +1473,7 @@
                 <columnType v="12" />
                 <size v="1023" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -1486,7 +1486,7 @@
                 <columnType v="12" />
                 <size v="63" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -1497,9 +1497,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
-                <size v="512" />
+                <size v="63" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -1532,7 +1532,7 @@
                 <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="true" />
                 <index v="true" />
                 <documentation></documentation>
@@ -1546,7 +1546,7 @@
                 <columnType v="12" />
                 <size v="15" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -1560,7 +1560,7 @@
                 <columnType v="12" />
                 <size v="1023" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -1572,9 +1572,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
-                <size v="0" />
-                <scale v="0" />
-                <notNull v="true" />
+                <size v="29" />
+                <scale v="9" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -1586,9 +1586,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
-                <size v="0" />
-                <scale v="0" />
-                <notNull v="true" />
+                <size v="29" />
+                <scale v="9" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -1602,7 +1602,7 @@
                 <columnType v="12" />
                 <size v="1023" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -1616,7 +1616,7 @@
                 <columnType v="12" />
                 <size v="1023" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -1628,9 +1628,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="4" />
-                <size v="0" />
+                <size v="10" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -1642,9 +1642,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="2005" />
-                <size v="0" />
+                <size v="2147483647" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -1658,7 +1658,7 @@
                 <columnType v="12" />
                 <size v="63" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -1670,9 +1670,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="2005" />
-                <size v="0" />
+                <size v="2147483647" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -1686,7 +1686,7 @@
                 <columnType v="12" />
                 <size v="512" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -1700,7 +1700,7 @@
                 <columnType v="12" />
                 <size v="63" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -1734,7 +1734,7 @@
                 <columnType v="12" />
                 <size v="255" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -1748,7 +1748,7 @@
                 <columnType v="12" />
                 <size v="255" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -1762,7 +1762,7 @@
                 <columnType v="1" />
                 <size v="1" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -1776,7 +1776,7 @@
                 <columnType v="12" />
                 <size v="255" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -1790,7 +1790,7 @@
                 <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -1804,7 +1804,7 @@
                 <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="true" />
                 <index v="true" />
                 <documentation></documentation>
@@ -1838,7 +1838,7 @@
                 <columnType v="12" />
                 <size v="255" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -1852,7 +1852,7 @@
                 <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -1866,7 +1866,7 @@
                 <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="true" />
                 <index v="true" />
                 <documentation></documentation>
@@ -1897,10 +1897,10 @@
                 <name>CONDTYPE</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="-6" />
-                <size v="0" />
+                <columnType v="5" />
+                <size v="5" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -1912,9 +1912,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="2005" />
-                <size v="0" />
+                <size v="2147483647" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -1928,7 +1928,7 @@
                 <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="true" />
                 <index v="true" />
                 <documentation></documentation>
@@ -1942,7 +1942,7 @@
                 <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -1976,7 +1976,7 @@
                 <columnType v="12" />
                 <size v="63" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -1990,7 +1990,7 @@
                 <columnType v="12" />
                 <size v="63" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -2004,7 +2004,7 @@
                 <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="true" />
                 <index v="true" />
                 <documentation></documentation>
@@ -2038,7 +2038,7 @@
                 <columnType v="12" />
                 <size v="63" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -2049,10 +2049,10 @@
                 <name>ASSIGNABLE</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="-6" />
-                <size v="0" />
+                <columnType v="4" />
+                <size v="10" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -2066,7 +2066,7 @@
                 <columnType v="12" />
                 <size v="63" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="true" />
                 <index v="true" />
                 <documentation></documentation>
@@ -2078,9 +2078,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="2005" />
-                <size v="0" />
+                <size v="2147483647" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -2094,7 +2094,7 @@
                 <columnType v="12" />
                 <size v="255" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -2126,9 +2126,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="4" />
-                <size v="0" />
+                <size v="10" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -2140,9 +2140,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="2005" />
-                <size v="0" />
+                <size v="2147483647" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -2156,7 +2156,7 @@
                 <columnType v="12" />
                 <size v="63" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -2168,9 +2168,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="4" />
-                <size v="0" />
+                <size v="10" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -2184,7 +2184,7 @@
                 <columnType v="1" />
                 <size v="63" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="true" />
                 <index v="true" />
                 <documentation></documentation>
@@ -2196,9 +2196,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="4" />
-                <size v="0" />
+                <size v="10" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -2210,9 +2210,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="4" />
-                <size v="0" />
+                <size v="10" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -2242,12 +2242,12 @@
               <entityFieldDb>
                 <name>DATAID</name>
                 <dbName></dbName>
-                <primaryKey v="false" />
+                <primaryKey v="true" />
                 <columnType v="1" />
                 <size v="63" />
                 <scale v="0" />
-                <notNull v="false" />
-                <isUnique v="false" />
+                <notNull v="true" />
+                <isUnique v="true" />
                 <index v="true" />
                 <documentation></documentation>
                 <title></title>
@@ -2260,7 +2260,7 @@
                 <columnType v="1" />
                 <size v="63" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -2272,9 +2272,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="2005" />
-                <size v="0" />
+                <size v="2147483647" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -2288,7 +2288,7 @@
                 <columnType v="12" />
                 <size v="255" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -2300,11 +2300,11 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
-                <size v="0" />
-                <scale v="0" />
-                <notNull v="true" />
+                <size v="29" />
+                <scale v="9" />
+                <notNull v="false" />
                 <isUnique v="false" />
-                <index v="true" />
+                <index v="false" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
@@ -2336,9 +2336,9 @@
                 <columnType v="12" />
                 <size v="127" />
                 <scale v="0" />
-                <notNull v="false" />
-                <isUnique v="true" />
-                <index v="true" />
+                <notNull v="true" />
+                <isUnique v="false" />
+                <index v="false" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
@@ -2348,9 +2348,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
-                <size v="0" />
-                <scale v="0" />
-                <notNull v="true" />
+                <size v="29" />
+                <scale v="9" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -2364,9 +2364,9 @@
                 <columnType v="12" />
                 <size v="127" />
                 <scale v="0" />
-                <notNull v="false" />
-                <isUnique v="true" />
-                <index v="true" />
+                <notNull v="true" />
+                <isUnique v="false" />
+                <index v="false" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
@@ -2614,7 +2614,7 @@
                 <columnType v="1" />
                 <size v="63" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="true" />
                 <index v="true" />
                 <documentation></documentation>
@@ -2624,13 +2624,13 @@
               <entityFieldDb>
                 <name>TAGNAME</name>
                 <dbName></dbName>
-                <primaryKey v="true" />
+                <primaryKey v="false" />
                 <columnType v="12" />
                 <size v="63" />
                 <scale v="0" />
                 <notNull v="false" />
-                <isUnique v="true" />
-                <index v="true" />
+                <isUnique v="false" />
+                <index v="false" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
@@ -2638,13 +2638,13 @@
               <entityFieldDb>
                 <name>TAGVALUE</name>
                 <dbName></dbName>
-                <primaryKey v="true" />
+                <primaryKey v="false" />
                 <columnType v="12" />
                 <size v="63" />
                 <scale v="0" />
                 <notNull v="false" />
-                <isUnique v="true" />
-                <index v="true" />
+                <isUnique v="false" />
+                <index v="false" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
@@ -2750,9 +2750,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="4" />
-                <size v="0" />
+                <size v="10" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -2764,9 +2764,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="4" />
-                <size v="0" />
+                <size v="10" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -2778,9 +2778,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
-                <size v="0" />
-                <scale v="0" />
-                <notNull v="true" />
+                <size v="29" />
+                <scale v="9" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -2794,7 +2794,7 @@
                 <columnType v="12" />
                 <size v="5" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -2808,7 +2808,7 @@
                 <columnType v="12" />
                 <size v="5" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -2820,9 +2820,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
-                <size v="0" />
-                <scale v="0" />
-                <notNull v="true" />
+                <size v="29" />
+                <scale v="9" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -2836,7 +2836,7 @@
                 <columnType v="12" />
                 <size v="127" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="true" />
                 <index v="true" />
                 <documentation></documentation>
@@ -2850,7 +2850,7 @@
                 <columnType v="12" />
                 <size v="255" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -2864,7 +2864,7 @@
                 <columnType v="12" />
                 <size v="255" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -2876,9 +2876,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="4" />
-                <size v="0" />
+                <size v="10" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -2892,7 +2892,7 @@
                 <columnType v="12" />
                 <size v="255" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -2904,9 +2904,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="4" />
-                <size v="0" />
+                <size v="10" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -2926,9 +2926,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
-                <size v="0" />
-                <scale v="0" />
-                <notNull v="true" />
+                <size v="29" />
+                <scale v="9" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -2939,11 +2939,11 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
-                <size v="0" />
-                <scale v="0" />
-                <notNull v="true" />
-                <isUnique v="false" />
-                <index v="false" />
+                <size v="29" />
+                <scale v="9" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
                 <title></title>
                 <description></description>
               </entityFieldDb>
@@ -2954,7 +2954,7 @@
                 <columnType v="12" />
                 <size v="63" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -2967,7 +2967,7 @@
                 <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="true" />
                 <index v="true" />
                 <title></title>
@@ -2980,7 +2980,7 @@
                 <columnType v="12" />
                 <size v="63" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -2993,7 +2993,7 @@
                 <columnType v="12" />
                 <size v="63" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -3006,7 +3006,7 @@
                 <columnType v="12" />
                 <size v="63" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -3019,7 +3019,7 @@
                 <columnType v="12" />
                 <size v="63" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -3030,9 +3030,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="4" />
-                <size v="0" />
+                <size v="10" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -3043,9 +3043,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
-                <size v="0" />
-                <scale v="0" />
-                <notNull v="true" />
+                <size v="29" />
+                <scale v="9" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -3056,9 +3056,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="4" />
-                <size v="0" />
+                <size v="10" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -3069,9 +3069,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
-                <size v="0" />
-                <scale v="0" />
-                <notNull v="true" />
+                <size v="29" />
+                <scale v="9" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -3104,7 +3104,7 @@
                 <columnType v="12" />
                 <size v="64" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -3118,7 +3118,7 @@
                 <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="true" />
                 <index v="true" />
                 <documentation></documentation>
@@ -3132,7 +3132,7 @@
                 <columnType v="12" />
                 <size v="256" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="true" />
                 <documentation></documentation>
@@ -3146,7 +3146,7 @@
                 <columnType v="1" />
                 <size v="46" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="true" />
                 <documentation></documentation>
@@ -3180,7 +3180,7 @@
                 <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="true" />
                 <index v="true" />
                 <documentation></documentation>
@@ -3194,7 +3194,7 @@
                 <columnType v="12" />
                 <size v="64" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="true" />
                 <documentation></documentation>
@@ -3208,7 +3208,7 @@
                 <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="true" />
                 <documentation></documentation>
@@ -3222,188 +3222,8 @@
                 <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
-                <notNull v="true" />
-                <isUnique v="false" />
-                <index v="true" />
-                <documentation></documentation>
-                <title></title>
-                <description></description>
-              </entityFieldDb>
-            </entityFields>
-          </entityDb>
-          <entityDb>
-            <name>ASYS_ICONS</name>
-            <dbName></dbName>
-            <idColumn></idColumn>
-            <idGeneratorType v="0" />
-            <idGeneratorInterval v="0" />
-            <documentation></documentation>
-            <title></title>
-            <description></description>
-            <auditSyncConfig>
-              <name>auditSyncConfig</name>
-              <auditMode v="0" />
-              <syncActive v="false" />
-              <syncComplete v="true" />
-              <syncDirection v="1" />
-              <syncIds></syncIds>
-            </auditSyncConfig>
-            <entityFields>
-              <entityFieldDb>
-                <name>BINDATA</name>
-                <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="2004" />
-                <size v="0" />
-                <scale v="0" />
-                <notNull v="true" />
-                <isUnique v="false" />
-                <index v="false" />
-                <documentation></documentation>
-                <title></title>
-                <description></description>
-              </entityFieldDb>
-              <entityFieldDb>
-                <name>DATE_EDIT</name>
-                <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="93" />
-                <size v="0" />
-                <scale v="0" />
-                <notNull v="true" />
-                <isUnique v="false" />
-                <index v="false" />
-                <documentation></documentation>
-                <title></title>
-                <description></description>
-              </entityFieldDb>
-              <entityFieldDb>
-                <name>DATE_NEW</name>
-                <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="93" />
-                <size v="0" />
-                <scale v="0" />
-                <notNull v="true" />
-                <isUnique v="false" />
-                <index v="false" />
-                <documentation></documentation>
-                <title></title>
-                <description></description>
-              </entityFieldDb>
-              <entityFieldDb>
-                <name>DESCRIPTION</name>
-                <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="127" />
-                <scale v="0" />
-                <notNull v="true" />
-                <isUnique v="false" />
-                <index v="false" />
-                <documentation></documentation>
-                <title></title>
-                <description></description>
-              </entityFieldDb>
-              <entityFieldDb>
-                <name>ICON_TYPE</name>
-                <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="255" />
-                <scale v="0" />
-                <notNull v="true" />
-                <isUnique v="false" />
-                <index v="false" />
-                <documentation></documentation>
-                <title></title>
-                <description></description>
-              </entityFieldDb>
-              <entityFieldDb>
-                <name>ID</name>
-                <dbName></dbName>
-                <primaryKey v="true" />
-                <columnType v="1" />
-                <size v="36" />
-                <scale v="0" />
                 <notNull v="false" />
-                <isUnique v="true" />
-                <index v="true" />
-                <documentation></documentation>
-                <title></title>
-                <description></description>
-              </entityFieldDb>
-              <entityFieldDb>
-                <name>USER_EDIT</name>
-                <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="63" />
-                <scale v="0" />
-                <notNull v="true" />
-                <isUnique v="false" />
-                <index v="false" />
-                <documentation></documentation>
-                <title></title>
-                <description></description>
-              </entityFieldDb>
-              <entityFieldDb>
-                <name>USER_NEW</name>
-                <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="63" />
-                <scale v="0" />
-                <notNull v="true" />
-                <isUnique v="false" />
-                <index v="false" />
-                <documentation></documentation>
-                <title></title>
-                <description></description>
-              </entityFieldDb>
-            </entityFields>
-          </entityDb>
-          <entityDb>
-            <name>ASYS_MAILREPOSIT_HASH</name>
-            <dbName></dbName>
-            <idColumn></idColumn>
-            <idGeneratorType v="0" />
-            <idGeneratorInterval v="0" />
-            <documentation></documentation>
-            <title></title>
-            <description></description>
-            <auditSyncConfig>
-              <name>auditSyncConfig</name>
-              <auditMode v="0" />
-              <syncActive v="false" />
-              <syncComplete v="true" />
-              <syncDirection v="1" />
-              <syncIds></syncIds>
-            </auditSyncConfig>
-            <entityFields>
-              <entityFieldDb>
-                <name>MAILHASH</name>
-                <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="31" />
-                <scale v="0" />
-                <notNull v="true" />
                 <isUnique v="false" />
-                <index v="false" />
-                <documentation></documentation>
-                <title></title>
-                <description></description>
-              </entityFieldDb>
-              <entityFieldDb>
-                <name>MAILINFO</name>
-                <dbName></dbName>
-                <primaryKey v="true" />
-                <columnType v="12" />
-                <size v="127" />
-                <scale v="0" />
-                <notNull v="false" />
-                <isUnique v="true" />
                 <index v="true" />
                 <documentation></documentation>
                 <title></title>
@@ -3411,1040 +3231,6 @@
               </entityFieldDb>
             </entityFields>
           </entityDb>
-          <entityDb>
-            <name>ASYS_UIDRESOLVER</name>
-            <dbName></dbName>
-            <idColumn></idColumn>
-            <idGeneratorType v="0" />
-            <idGeneratorInterval v="0" />
-            <documentation></documentation>
-            <title></title>
-            <description></description>
-            <auditSyncConfig>
-              <name>auditSyncConfig</name>
-              <auditMode v="0" />
-              <syncActive v="false" />
-              <syncComplete v="true" />
-              <syncDirection v="1" />
-              <syncIds></syncIds>
-            </auditSyncConfig>
-            <entityFields>
-              <entityFieldDb>
-                <name>ENTRY_TYPE</name>
-                <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="255" />
-                <scale v="0" />
-                <notNull v="true" />
-                <isUnique v="false" />
-                <index v="false" />
-                <documentation></documentation>
-                <title></title>
-                <description></description>
-              </entityFieldDb>
-              <entityFieldDb>
-                <name>ENTRY_UID</name>
-                <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="512" />
-                <scale v="0" />
-                <notNull v="true" />
-                <isUnique v="false" />
-                <index v="false" />
-                <documentation></documentation>
-                <title></title>
-                <description></description>
-              </entityFieldDb>
-              <entityFieldDb>
-                <name>ENTRY_USER</name>
-                <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="255" />
-                <scale v="0" />
-                <notNull v="true" />
-                <isUnique v="false" />
-                <index v="false" />
-                <documentation></documentation>
-                <title></title>
-                <description></description>
-              </entityFieldDb>
-            </entityFields>
-          </entityDb>
-          <entityDb>
-            <name>ASYS_MAILREPOSIT</name>
-            <dbName></dbName>
-            <idColumn></idColumn>
-            <idGeneratorType v="0" />
-            <idGeneratorInterval v="0" />
-            <documentation></documentation>
-            <title></title>
-            <description></description>
-            <auditSyncConfig>
-              <name>auditSyncConfig</name>
-              <auditMode v="0" />
-              <syncActive v="false" />
-              <syncComplete v="true" />
-              <syncDirection v="1" />
-              <syncIds></syncIds>
-            </auditSyncConfig>
-            <entityFields>
-              <entityFieldDb>
-                <name>FLAGGED</name>
-                <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="4" />
-                <size v="0" />
-                <scale v="0" />
-                <notNull v="true" />
-                <isUnique v="false" />
-                <index v="false" />
-                <documentation></documentation>
-                <title></title>
-                <description></description>
-              </entityFieldDb>
-              <entityFieldDb>
-                <name>FOLDER</name>
-                <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="255" />
-                <scale v="0" />
-                <notNull v="true" />
-                <isUnique v="false" />
-                <index v="false" />
-                <documentation></documentation>
-                <title></title>
-                <description></description>
-              </entityFieldDb>
-              <entityFieldDb>
-                <name>ID</name>
-                <dbName></dbName>
-                <primaryKey v="true" />
-                <columnType v="1" />
-                <size v="36" />
-                <scale v="0" />
-                <notNull v="false" />
-                <isUnique v="true" />
-                <index v="true" />
-                <documentation></documentation>
-                <title></title>
-                <description></description>
-              </entityFieldDb>
-              <entityFieldDb>
-                <name>MAIL</name>
-                <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="2005" />
-                <size v="0" />
-                <scale v="0" />
-                <notNull v="true" />
-                <isUnique v="false" />
-                <index v="false" />
-                <documentation></documentation>
-                <title></title>
-                <description></description>
-              </entityFieldDb>
-              <entityFieldDb>
-                <name>MAILUSER</name>
-                <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="255" />
-                <scale v="0" />
-                <notNull v="true" />
-                <isUnique v="false" />
-                <index v="true" />
-                <documentation></documentation>
-                <title></title>
-                <description></description>
-              </entityFieldDb>
-              <entityFieldDb>
-                <name>RECEIVEDATE</name>
-                <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="93" />
-                <size v="0" />
-                <scale v="0" />
-                <notNull v="true" />
-                <isUnique v="false" />
-                <index v="false" />
-                <documentation></documentation>
-                <title></title>
-                <description></description>
-              </entityFieldDb>
-              <entityFieldDb>
-                <name>RECENT</name>
-                <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="4" />
-                <size v="0" />
-                <scale v="0" />
-                <notNull v="true" />
-                <isUnique v="false" />
-                <index v="true" />
-                <documentation></documentation>
-                <title></title>
-                <description></description>
-              </entityFieldDb>
-              <entityFieldDb>
-                <name>RECIPIENT</name>
-                <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="2046" />
-                <scale v="0" />
-                <notNull v="true" />
-                <isUnique v="false" />
-                <index v="false" />
-                <documentation></documentation>
-                <title></title>
-                <description></description>
-              </entityFieldDb>
-              <entityFieldDb>
-                <name>SEEN</name>
-                <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="4" />
-                <size v="0" />
-                <scale v="0" />
-                <notNull v="true" />
-                <isUnique v="false" />
-                <index v="false" />
-                <documentation></documentation>
-                <title></title>
-                <description></description>
-              </entityFieldDb>
-              <entityFieldDb>
-                <name>SENDER</name>
-                <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="127" />
-                <scale v="0" />
-                <notNull v="true" />
-                <isUnique v="false" />
-                <index v="false" />
-                <documentation></documentation>
-                <title></title>
-                <description></description>
-              </entityFieldDb>
-              <entityFieldDb>
-                <name>SENTDATE</name>
-                <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="93" />
-                <size v="0" />
-                <scale v="0" />
-                <notNull v="true" />
-                <isUnique v="false" />
-                <index v="false" />
-                <documentation></documentation>
-                <title></title>
-                <description></description>
-              </entityFieldDb>
-              <entityFieldDb>
-                <name>SUBJECT</name>
-                <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="1023" />
-                <scale v="0" />
-                <notNull v="true" />
-                <isUnique v="false" />
-                <index v="false" />
-                <documentation></documentation>
-                <title></title>
-                <description></description>
-              </entityFieldDb>
-            </entityFields>
-          </entityDb>
-          <entityDb>
-            <name>ASYS_CALENDARSYNC</name>
-            <dbName></dbName>
-            <idColumn></idColumn>
-            <idGeneratorType v="0" />
-            <idGeneratorInterval v="0" />
-            <documentation></documentation>
-            <title></title>
-            <description></description>
-            <auditSyncConfig>
-              <name>auditSyncConfig</name>
-              <auditMode v="0" />
-              <syncActive v="false" />
-              <syncComplete v="true" />
-              <syncDirection v="1" />
-              <syncIds></syncIds>
-            </auditSyncConfig>
-            <entityFields>
-              <entityFieldDb>
-                <name>LASTMODIFIED</name>
-                <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="93" />
-                <size v="0" />
-                <scale v="0" />
-                <notNull v="true" />
-                <isUnique v="false" />
-                <index v="false" />
-                <documentation></documentation>
-                <title></title>
-                <description></description>
-              </entityFieldDb>
-              <entityFieldDb>
-                <name>MASTERUID</name>
-                <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="512" />
-                <scale v="0" />
-                <notNull v="false" />
-                <isUnique v="false" />
-                <index v="true" />
-                <documentation></documentation>
-                <title></title>
-                <description></description>
-              </entityFieldDb>
-              <entityFieldDb>
-                <name>SLAVEUID</name>
-                <dbName></dbName>
-                <primaryKey v="true" />
-                <columnType v="12" />
-                <size v="127" />
-                <scale v="0" />
-                <notNull v="false" />
-                <isUnique v="true" />
-                <index v="true" />
-                <documentation></documentation>
-                <title></title>
-                <description></description>
-              </entityFieldDb>
-              <entityFieldDb>
-                <name>SUSER</name>
-                <dbName></dbName>
-                <primaryKey v="true" />
-                <columnType v="12" />
-                <size v="63" />
-                <scale v="0" />
-                <notNull v="false" />
-                <isUnique v="true" />
-                <index v="true" />
-                <documentation></documentation>
-                <title></title>
-                <description></description>
-              </entityFieldDb>
-            </entityFields>
-          </entityDb>
-          <entityDb>
-            <name>ASYS_FARM</name>
-            <dbName></dbName>
-            <idColumn></idColumn>
-            <idGeneratorType v="0" />
-            <idGeneratorInterval v="0" />
-            <documentation></documentation>
-            <title></title>
-            <description></description>
-            <auditSyncConfig>
-              <name>auditSyncConfig</name>
-              <auditMode v="0" />
-              <syncActive v="false" />
-              <syncComplete v="true" />
-              <syncDirection v="1" />
-              <syncIds></syncIds>
-            </auditSyncConfig>
-            <entityFields>
-              <entityFieldDb>
-                <name>ADDRESS</name>
-                <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="255" />
-                <scale v="0" />
-                <notNull v="true" />
-                <isUnique v="false" />
-                <index v="false" />
-                <documentation></documentation>
-                <title></title>
-                <description></description>
-              </entityFieldDb>
-              <entityFieldDb>
-                <name>CLIENTS</name>
-                <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="4" />
-                <size v="0" />
-                <scale v="0" />
-                <notNull v="true" />
-                <isUnique v="false" />
-                <index v="false" />
-                <documentation></documentation>
-                <title></title>
-                <description></description>
-              </entityFieldDb>
-              <entityFieldDb>
-                <name>FARMVERSION</name>
-                <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="12" />
-                <scale v="0" />
-                <notNull v="true" />
-                <isUnique v="false" />
-                <index v="false" />
-                <documentation></documentation>
-                <title></title>
-                <description></description>
-              </entityFieldDb>
-              <entityFieldDb>
-                <name>LICENSE</name>
-                <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="255" />
-                <scale v="0" />
-                <notNull v="true" />
-                <isUnique v="false" />
-                <index v="false" />
-                <documentation></documentation>
-                <title></title>
-                <description></description>
-              </entityFieldDb>
-              <entityFieldDb>
-                <name>SENCODING</name>
-                <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="4" />
-                <size v="0" />
-                <scale v="0" />
-                <notNull v="true" />
-                <isUnique v="false" />
-                <index v="false" />
-                <documentation></documentation>
-                <title></title>
-                <description></description>
-              </entityFieldDb>
-              <entityFieldDb>
-                <name>SERVERID</name>
-                <dbName></dbName>
-                <primaryKey v="true" />
-                <columnType v="12" />
-                <size v="127" />
-                <scale v="0" />
-                <notNull v="false" />
-                <isUnique v="true" />
-                <index v="true" />
-                <documentation></documentation>
-                <title></title>
-                <description></description>
-              </entityFieldDb>
-              <entityFieldDb>
-                <name>WORKLOAD</name>
-                <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="4" />
-                <size v="0" />
-                <scale v="0" />
-                <notNull v="true" />
-                <isUnique v="false" />
-                <index v="false" />
-                <documentation></documentation>
-                <title></title>
-                <description></description>
-              </entityFieldDb>
-            </entityFields>
-          </entityDb>
-          <entityDb>
-            <name>ASYS_FARM_CLIENT</name>
-            <dbName></dbName>
-            <idColumn></idColumn>
-            <idGeneratorType v="0" />
-            <idGeneratorInterval v="0" />
-            <documentation></documentation>
-            <title></title>
-            <description></description>
-            <auditSyncConfig>
-              <name>auditSyncConfig</name>
-              <auditMode v="0" />
-              <syncActive v="false" />
-              <syncComplete v="true" />
-              <syncDirection v="1" />
-              <syncIds></syncIds>
-            </auditSyncConfig>
-            <entityFields>
-              <entityFieldDb>
-                <name>CHARACTERISTIC</name>
-                <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="4" />
-                <size v="0" />
-                <scale v="0" />
-                <notNull v="true" />
-                <isUnique v="false" />
-                <index v="false" />
-                <documentation></documentation>
-                <title></title>
-                <description></description>
-              </entityFieldDb>
-              <entityFieldDb>
-                <name>CLIENTID</name>
-                <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="255" />
-                <scale v="0" />
-                <notNull v="true" />
-                <isUnique v="false" />
-                <index v="false" />
-                <documentation></documentation>
-                <title></title>
-                <description></description>
-              </entityFieldDb>
-              <entityFieldDb>
-                <name>ID</name>
-                <dbName></dbName>
-                <primaryKey v="true" />
-                <columnType v="1" />
-                <size v="36" />
-                <scale v="0" />
-                <notNull v="false" />
-                <isUnique v="true" />
-                <index v="true" />
-                <documentation></documentation>
-                <title></title>
-                <description></description>
-              </entityFieldDb>
-              <entityFieldDb>
-                <name>SADDRESS</name>
-                <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="255" />
-                <scale v="0" />
-                <notNull v="true" />
-                <isUnique v="false" />
-                <index v="false" />
-                <documentation></documentation>
-                <title></title>
-                <description></description>
-              </entityFieldDb>
-              <entityFieldDb>
-                <name>SERVERID</name>
-                <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="255" />
-                <scale v="0" />
-                <notNull v="true" />
-                <isUnique v="false" />
-                <index v="false" />
-                <documentation></documentation>
-                <title></title>
-                <description></description>
-              </entityFieldDb>
-              <entityFieldDb>
-                <name>USERNAME</name>
-                <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="255" />
-                <scale v="0" />
-                <notNull v="true" />
-                <isUnique v="false" />
-                <index v="false" />
-                <documentation></documentation>
-                <title></title>
-                <description></description>
-              </entityFieldDb>
-            </entityFields>
-          </entityDb>
-          <entityDb>
-            <name>ASYS_AUDIT</name>
-            <dbName></dbName>
-            <idColumn></idColumn>
-            <idGeneratorType v="0" />
-            <idGeneratorInterval v="0" />
-            <documentation></documentation>
-            <title></title>
-            <description></description>
-            <auditSyncConfig>
-              <name>auditSyncConfig</name>
-              <auditMode v="0" />
-              <syncActive v="false" />
-              <syncComplete v="true" />
-              <syncDirection v="1" />
-              <syncIds></syncIds>
-            </auditSyncConfig>
-            <entityFields>
-              <entityFieldDb>
-                <name>ACOLUMNNAME</name>
-                <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="127" />
-                <scale v="0" />
-                <notNull v="true" />
-                <isUnique v="false" />
-                <index v="false" />
-                <documentation></documentation>
-                <title></title>
-                <description></description>
-              </entityFieldDb>
-              <entityFieldDb>
-                <name>ALIAS</name>
-                <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="255" />
-                <scale v="0" />
-                <notNull v="true" />
-                <isUnique v="false" />
-                <index v="false" />
-                <documentation></documentation>
-                <title></title>
-                <description></description>
-              </entityFieldDb>
-              <entityFieldDb>
-                <name>ATABLENAME</name>
-                <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="127" />
-                <scale v="0" />
-                <notNull v="true" />
-                <isUnique v="false" />
-                <index v="false" />
-                <documentation></documentation>
-                <title></title>
-                <description></description>
-              </entityFieldDb>
-              <entityFieldDb>
-                <name>ATIMESTAMP</name>
-                <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="93" />
-                <size v="0" />
-                <scale v="0" />
-                <notNull v="true" />
-                <isUnique v="false" />
-                <index v="false" />
-                <documentation></documentation>
-                <title></title>
-                <description></description>
-              </entityFieldDb>
-              <entityFieldDb>
-                <name>AUSER</name>
-                <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="255" />
-                <scale v="0" />
-                <notNull v="true" />
-                <isUnique v="false" />
-                <index v="false" />
-                <documentation></documentation>
-                <title></title>
-                <description></description>
-              </entityFieldDb>
-              <entityFieldDb>
-                <name>DATASETID</name>
-                <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="1023" />
-                <scale v="0" />
-                <notNull v="true" />
-                <isUnique v="false" />
-                <index v="false" />
-                <documentation></documentation>
-                <title></title>
-                <description></description>
-              </entityFieldDb>
-              <entityFieldDb>
-                <name>DATASETNEWVALUE_BLOB</name>
-                <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="2004" />
-                <size v="0" />
-                <scale v="0" />
-                <notNull v="true" />
-                <isUnique v="false" />
-                <index v="false" />
-                <documentation></documentation>
-                <title></title>
-                <description></description>
-              </entityFieldDb>
-              <entityFieldDb>
-                <name>DATASETNEWVALUE_CLOB</name>
-                <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="2005" />
-                <size v="0" />
-                <scale v="0" />
-                <notNull v="true" />
-                <isUnique v="false" />
-                <index v="false" />
-                <documentation></documentation>
-                <title></title>
-                <description></description>
-              </entityFieldDb>
-              <entityFieldDb>
-                <name>DATASETNEWVALUE_STRING</name>
-                <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="1023" />
-                <scale v="0" />
-                <notNull v="true" />
-                <isUnique v="false" />
-                <index v="false" />
-                <documentation></documentation>
-                <title></title>
-                <description></description>
-              </entityFieldDb>
-              <entityFieldDb>
-                <name>LOGTIME</name>
-                <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="93" />
-                <size v="0" />
-                <scale v="0" />
-                <notNull v="true" />
-                <isUnique v="false" />
-                <index v="true" />
-                <documentation></documentation>
-                <title></title>
-                <description></description>
-              </entityFieldDb>
-              <entityFieldDb>
-                <name>LOGTYPE</name>
-                <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="4" />
-                <size v="0" />
-                <scale v="0" />
-                <notNull v="true" />
-                <isUnique v="false" />
-                <index v="false" />
-                <documentation></documentation>
-                <title></title>
-                <description></description>
-              </entityFieldDb>
-              <entityFieldDb>
-                <name>LOGWRITERUID</name>
-                <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="127" />
-                <scale v="0" />
-                <notNull v="true" />
-                <isUnique v="false" />
-                <index v="false" />
-                <documentation></documentation>
-                <title></title>
-                <description></description>
-              </entityFieldDb>
-              <entityFieldDb>
-                <name>SQLACTION</name>
-                <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="1" />
-                <size v="1" />
-                <scale v="0" />
-                <notNull v="true" />
-                <isUnique v="false" />
-                <index v="false" />
-                <documentation></documentation>
-                <title></title>
-                <description></description>
-              </entityFieldDb>
-            </entityFields>
-          </entityDb>
-          <entityDb>
-            <name>ASYS_SYNCSLAVES</name>
-            <dbName></dbName>
-            <idColumn></idColumn>
-            <idGeneratorType v="0" />
-            <idGeneratorInterval v="0" />
-            <documentation></documentation>
-            <title></title>
-            <description></description>
-            <auditSyncConfig>
-              <name>auditSyncConfig</name>
-              <auditMode v="0" />
-              <syncActive v="false" />
-              <syncComplete v="true" />
-              <syncDirection v="1" />
-              <syncIds></syncIds>
-            </auditSyncConfig>
-            <entityFields>
-              <entityFieldDb>
-                <name>ACTIVE</name>
-                <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="4" />
-                <size v="0" />
-                <scale v="0" />
-                <notNull v="true" />
-                <isUnique v="false" />
-                <index v="false" />
-                <documentation></documentation>
-                <title></title>
-                <description></description>
-              </entityFieldDb>
-              <entityFieldDb>
-                <name>DESCRIPTION</name>
-                <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="255" />
-                <scale v="0" />
-                <notNull v="true" />
-                <isUnique v="false" />
-                <index v="false" />
-                <documentation></documentation>
-                <title></title>
-                <description></description>
-              </entityFieldDb>
-              <entityFieldDb>
-                <name>DEVICEID</name>
-                <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="40" />
-                <scale v="0" />
-                <notNull v="true" />
-                <isUnique v="false" />
-                <index v="false" />
-                <documentation></documentation>
-                <title></title>
-                <description></description>
-              </entityFieldDb>
-              <entityFieldDb>
-                <name>INTERVALL</name>
-                <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="4" />
-                <size v="0" />
-                <scale v="0" />
-                <notNull v="true" />
-                <isUnique v="false" />
-                <index v="false" />
-                <documentation></documentation>
-                <title></title>
-                <description></description>
-              </entityFieldDb>
-              <entityFieldDb>
-                <name>LASTSYNC</name>
-                <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="93" />
-                <size v="0" />
-                <scale v="0" />
-                <notNull v="true" />
-                <isUnique v="false" />
-                <index v="false" />
-                <documentation></documentation>
-                <title></title>
-                <description></description>
-              </entityFieldDb>
-              <entityFieldDb>
-                <name>SLAVEUID</name>
-                <dbName></dbName>
-                <primaryKey v="true" />
-                <columnType v="12" />
-                <size v="127" />
-                <scale v="0" />
-                <notNull v="false" />
-                <isUnique v="true" />
-                <index v="true" />
-                <documentation></documentation>
-                <title></title>
-                <description></description>
-              </entityFieldDb>
-            </entityFields>
-          </entityDb>
-          <entityDb>
-            <name>ASYS_XMPP_OFFLINESTANZA</name>
-            <dbName></dbName>
-            <idColumn></idColumn>
-            <idGeneratorType v="0" />
-            <idGeneratorInterval v="0" />
-            <documentation></documentation>
-            <title></title>
-            <description></description>
-            <auditSyncConfig>
-              <name>auditSyncConfig</name>
-              <auditMode v="0" />
-              <syncActive v="false" />
-              <syncComplete v="true" />
-              <syncDirection v="1" />
-              <syncIds></syncIds>
-            </auditSyncConfig>
-            <entityFields>
-              <entityFieldDb>
-                <name>ATIMESTAMP</name>
-                <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="93" />
-                <size v="0" />
-                <scale v="0" />
-                <notNull v="true" />
-                <isUnique v="false" />
-                <index v="false" />
-                <documentation></documentation>
-                <title></title>
-                <description></description>
-              </entityFieldDb>
-              <entityFieldDb>
-                <name>JID</name>
-                <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="64" />
-                <scale v="0" />
-                <notNull v="true" />
-                <isUnique v="false" />
-                <index v="true" />
-                <documentation></documentation>
-                <title></title>
-                <description></description>
-              </entityFieldDb>
-              <entityFieldDb>
-                <name>STANZA</name>
-                <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="2005" />
-                <size v="0" />
-                <scale v="0" />
-                <notNull v="true" />
-                <isUnique v="false" />
-                <index v="false" />
-                <documentation></documentation>
-                <title></title>
-                <description></description>
-              </entityFieldDb>
-            </entityFields>
-          </entityDb>
-          <entityDb>
-            <name>ASYS_XMPP_HISTORY</name>
-            <dbName></dbName>
-            <idColumn></idColumn>
-            <idGeneratorType v="0" />
-            <idGeneratorInterval v="0" />
-            <documentation></documentation>
-            <title></title>
-            <description></description>
-            <auditSyncConfig>
-              <name>auditSyncConfig</name>
-              <auditMode v="0" />
-              <syncActive v="false" />
-              <syncComplete v="true" />
-              <syncDirection v="1" />
-              <syncIds></syncIds>
-            </auditSyncConfig>
-            <entityFields>
-              <entityFieldDb>
-                <name>ATIMESTAMP</name>
-                <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="93" />
-                <size v="0" />
-                <scale v="0" />
-                <notNull v="true" />
-                <isUnique v="false" />
-                <index v="true" />
-                <documentation></documentation>
-                <title></title>
-                <description></description>
-              </entityFieldDb>
-              <entityFieldDb>
-                <name>CHATMARKER</name>
-                <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="16" />
-                <scale v="0" />
-                <notNull v="true" />
-                <isUnique v="false" />
-                <index v="false" />
-                <documentation></documentation>
-                <title></title>
-                <description></description>
-              </entityFieldDb>
-              <entityFieldDb>
-                <name>JID_FROM</name>
-                <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="64" />
-                <scale v="0" />
-                <notNull v="true" />
-                <isUnique v="false" />
-                <index v="true" />
-                <documentation></documentation>
-                <title></title>
-                <description></description>
-              </entityFieldDb>
-              <entityFieldDb>
-                <name>JID_TO</name>
-                <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="64" />
-                <scale v="0" />
-                <notNull v="true" />
-                <isUnique v="false" />
-                <index v="true" />
-                <documentation></documentation>
-                <title></title>
-                <description></description>
-              </entityFieldDb>
-              <entityFieldDb>
-                <name>MSGMARKER</name>
-                <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="255" />
-                <scale v="0" />
-                <notNull v="true" />
-                <isUnique v="false" />
-                <index v="true" />
-                <documentation></documentation>
-                <title></title>
-                <description></description>
-              </entityFieldDb>
-              <entityFieldDb>
-                <name>MSGTYPE</name>
-                <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="16" />
-                <scale v="0" />
-                <notNull v="true" />
-                <isUnique v="false" />
-                <index v="false" />
-                <documentation></documentation>
-                <title></title>
-                <description></description>
-              </entityFieldDb>
-              <entityFieldDb>
-                <name>STANZA</name>
-                <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="2005" />
-                <size v="0" />
-                <scale v="0" />
-                <notNull v="true" />
-                <isUnique v="false" />
-                <index v="false" />
-                <documentation></documentation>
-                <title></title>
-                <description></description>
-              </entityFieldDb>
-            </entityFields>
-          </entityDb>
         </entities>
       </entityGroup>
     </aliasDefDb>
-- 
GitLab


From c21887e57a4c309b80d3a519d27860b94ed67828 Mon Sep 17 00:00:00 2001
From: "S.Listl" <s.listl@adito.de>
Date: Mon, 24 Aug 2020 16:57:59 +0200
Subject: [PATCH 198/309] Refactoring: SqlBuilder.NORESULT_CONDITION() instead
 of 1=2

---
 .../recordcontainers/db/conditionProcess.js   | 11 +++++-----
 .../recordcontainers/db/conditionProcess.js   |  2 +-
 .../objecttrees/filterConditionProcess.js     |  3 ++-
 .../recordcontainers/db/conditionProcess.js   | 10 ++-------
 .../objecttrees/filterConditionProcess.js     |  3 ++-
 .../recordcontainers/db/conditionProcess.js   | 15 +++----------
 .../recordcontainers/db/conditionProcess.js   |  2 +-
 process/Campaign_lib/process.js               |  6 ++---
 process/Context_lib/process.js                |  2 +-
 process/Offer_lib/process.js                  |  2 +-
 process/Order_lib/process.js                  |  2 +-
 process/Sql_lib/process.js                    | 22 ++++++++++++++++++-
 12 files changed, 43 insertions(+), 37 deletions(-)

diff --git a/entity/Activity_entity/recordcontainers/db/conditionProcess.js b/entity/Activity_entity/recordcontainers/db/conditionProcess.js
index ee923b83f2..e090677518 100644
--- a/entity/Activity_entity/recordcontainers/db/conditionProcess.js
+++ b/entity/Activity_entity/recordcontainers/db/conditionProcess.js
@@ -23,7 +23,7 @@ if (vars.exists("$param.RowId_param") && vars.get("$param.RowId_param") && vars.
             .arrayColumn();
             
         if (allPersonRelatedContactIds.length === 0)
-            condition.and("1=2");
+            condition.noResult();
         else
         {
             activityLinkSubselect.and("ACTIVITYLINK.OBJECT_ROWID", allPersonRelatedContactIds, SqlBuilder.IN());
@@ -40,11 +40,10 @@ if (vars.exists("$param.RowId_param") && vars.get("$param.RowId_param") && vars.
 if (vars.exists("$param.ActivityIDs_param") && vars.get("$param.ActivityIDs_param")) 
 {
     var acticityIds = JSON.parse(vars.get("$param.ActivityIDs_param"));
-    if (acticityIds.length == 0) {
-        condition.and("ACTIVITY.ACTIVITYID", ""); // Bedingung um kein Ergebnis zu bekommen
-    } else {
+    if (acticityIds.length == 0) 
+        condition.noResult();
+    else
         condition.and("ACTIVITY.ACTIVITYID", acticityIds, SqlBuilder.IN());
-    }
 }
 
 if (vars.getString("$param.OnlyInnate_param") == "true") 
@@ -53,7 +52,7 @@ if (vars.getString("$param.OnlyInnate_param") == "true")
     if (ownContactId)
         condition.and("ACTIVITY.RESPONSIBLE", ownContactId);
     else
-        condition.clearWhere().and("1=2");
+        condition.noResult();
 }
 
 //TODO: use a preparedCondition (.build instead of .toString) when available #1030812 #1034026
diff --git a/entity/KeywordEntry_entity/recordcontainers/db/conditionProcess.js b/entity/KeywordEntry_entity/recordcontainers/db/conditionProcess.js
index 68666406b4..6fcb81de35 100644
--- a/entity/KeywordEntry_entity/recordcontainers/db/conditionProcess.js
+++ b/entity/KeywordEntry_entity/recordcontainers/db/conditionProcess.js
@@ -20,7 +20,7 @@ if (vars.getString("$param.WhitelistIds_param"))
     if (whitelist.length > 0)
         cond.and("AB_KEYWORD_ENTRY.KEYID", JSON.parse(vars.getString("$param.WhitelistIds_param")), SqlBuilder.IN());
     else
-        cond.and("1=2"); // force empty result if whitelist is empty
+        cond.noResult(); // force empty result if whitelist is empty
 }
 
 //TODO: use a preparedCondition (.build instead of .toString) when available #1030812 #1034026
diff --git a/entity/Organisation_entity/recordcontainers/db/recordfieldmappings/objecttrees/filterConditionProcess.js b/entity/Organisation_entity/recordcontainers/db/recordfieldmappings/objecttrees/filterConditionProcess.js
index f20cd50003..0f8a38ee79 100644
--- a/entity/Organisation_entity/recordcontainers/db/recordfieldmappings/objecttrees/filterConditionProcess.js
+++ b/entity/Organisation_entity/recordcontainers/db/recordfieldmappings/objecttrees/filterConditionProcess.js
@@ -1,3 +1,4 @@
+import("Sql_lib");
 import("Context_lib");
 import("system.result");
 import("ObjectRelation_lib");
@@ -7,4 +8,4 @@ import("ObjectRelation_lib");
 var mapping = {};
 mapping[ContextUtils.getCurrentContextId()] = "CONTACT.CONTACTID";
 
-result.string(ObjectRelationUtils.getFilterCondition(mapping).toString("1=2"));
\ No newline at end of file
+result.string(ObjectRelationUtils.getFilterCondition(mapping).toString(SqlBuilder.NORESULT_CONDITION()));
\ No newline at end of file
diff --git a/entity/Person_entity/recordcontainers/db/conditionProcess.js b/entity/Person_entity/recordcontainers/db/conditionProcess.js
index 96a93d2dde..105cede403 100644
--- a/entity/Person_entity/recordcontainers/db/conditionProcess.js
+++ b/entity/Person_entity/recordcontainers/db/conditionProcess.js
@@ -24,15 +24,9 @@ if (vars.exists("$param.ExcludedContactIds_param") && vars.get("$param.ExcludedC
 
 var onlyShowContactIds = JSON.parse(vars.get("$param.OnlyShowContactIds_param"));
 
-if(onlyShowContactIds != null && onlyShowContactIds.length > 0)
+if (onlyShowContactIds != null && onlyShowContactIds.length > 0)
 {
-    let additionalCondition = newWhere();
-    onlyShowContactIds.forEach(function(pContactId)
-    {
-        additionalCondition.or("CONTACT.CONTACTID", pContactId);
-    });
-    cond.and(additionalCondition);
-    alternativeCondition = "1 = 2";
+    cond.and("CONTACT.CONTACTID", onlyShowContactIds, SqlBuilder.IN());
 }
 
 if (vars.exists("$param.OnlyOwnSupervised_param") && vars.get("$param.OnlyOwnSupervised_param") == "true")
diff --git a/entity/Person_entity/recordcontainers/db/recordfieldmappings/objecttrees/filterConditionProcess.js b/entity/Person_entity/recordcontainers/db/recordfieldmappings/objecttrees/filterConditionProcess.js
index 60242965b3..4516eb7b9b 100644
--- a/entity/Person_entity/recordcontainers/db/recordfieldmappings/objecttrees/filterConditionProcess.js
+++ b/entity/Person_entity/recordcontainers/db/recordfieldmappings/objecttrees/filterConditionProcess.js
@@ -1,3 +1,4 @@
+import("Sql_lib");
 import("Context_lib");
 import("system.result");
 import("ObjectRelation_lib");
@@ -8,4 +9,4 @@ var mapping = {};
 mapping[ContextUtils.getCurrentContextId()] = "CONTACT.CONTACTID";
 mapping["PrivatePerson"] = "CONTACT.PERSON_ID";
 
-result.string(ObjectRelationUtils.getFilterCondition(mapping).toString("1=2"));
\ No newline at end of file
+result.string(ObjectRelationUtils.getFilterCondition(mapping).toString(SqlBuilder.NORESULT_CONDITION()));
\ No newline at end of file
diff --git a/entity/SupportTicket_entity/recordcontainers/db/conditionProcess.js b/entity/SupportTicket_entity/recordcontainers/db/conditionProcess.js
index 05d2e05eca..a3fb601aa0 100644
--- a/entity/SupportTicket_entity/recordcontainers/db/conditionProcess.js
+++ b/entity/SupportTicket_entity/recordcontainers/db/conditionProcess.js
@@ -9,15 +9,13 @@ var cond = newWhere()
             .and("TASK.KIND", $KeywordRegistry.taskType$ticket())
             .andIfSet("TICKET.TICKETTYPE", "$param.TicketType_param")
 
-var loadNothing = false;
-
 if (vars.getString("$param.FilterOnlyOwnTicket_param") == "true")
 {
     var ownContactId = EmployeeUtils.getCurrentContactId();
     if (ownContactId)
         cond.andIfSet("TASK.EDITOR_CONTACT_ID", ownContactId);
     else
-        loadNothing = true;
+        cond.noResult();
 }
 
 if (vars.get("$param.RowId_param") && vars.get("$param.ObjectId_param"))
@@ -30,12 +28,5 @@ if (vars.get("$param.RowId_param") && vars.get("$param.ObjectId_param"))
                             , SqlBuilder.IN());
 }
 
-if (loadNothing) 
-{
-    result.string("1=2");
-}
-else
-{
-    //TODO: use a preparedCondition (.build instead of .toString) when available #1030812 #1034026
-    result.string(cond.toString());
-}
\ No newline at end of file
+//TODO: use a preparedCondition (.build instead of .toString) when available #1030812 #1034026
+result.string(cond.toString());
\ No newline at end of file
diff --git a/entity/Task_entity/recordcontainers/db/conditionProcess.js b/entity/Task_entity/recordcontainers/db/conditionProcess.js
index bf89d69810..aeaf998bec 100644
--- a/entity/Task_entity/recordcontainers/db/conditionProcess.js
+++ b/entity/Task_entity/recordcontainers/db/conditionProcess.js
@@ -29,7 +29,7 @@ if (vars.exists("$param.RowId_param") && vars.get("$param.RowId_param") && vars.
 
 if (loadNothing)
 {
-    result.string("1=2");
+    result.string(SqlBuilder.NORESULT_CONDITION());
 }
 else
 {
diff --git a/process/Campaign_lib/process.js b/process/Campaign_lib/process.js
index b38ab24f96..2c9252dbe4 100644
--- a/process/Campaign_lib/process.js
+++ b/process/Campaign_lib/process.js
@@ -453,7 +453,7 @@ CampaignUtils.GetParticipantsCountByCondition = function(pWhereCondition)
                 // If pWhereCondition would be used directly, 
                 // .cell() would return number of all participants and
                 // .cell(true) would return an empty string "", not 0
-                .where(pWhereCondition.build("1=2")) 
+                .where(pWhereCondition.build(SqlBuilder.NORESULT_CONDITION())) 
                 .cell();
 }
 
@@ -484,7 +484,7 @@ CampaignUtils.GetParticipantsAlreadyAddedCountByCondition = function(pWhereCondi
           // If pWhereCondition would be used directly, 
           // .cell() would return number of all participants and
           // .cell(true) would return an empty string "", not 0
-          .where(pWhereCondition.build("1=2"))
+          .where(pWhereCondition.build(SqlBuilder.NORESULT_CONDITION()))
           
     return select.cell();
 }
@@ -649,7 +649,7 @@ CampaignUtils.copyCampaignSteps = function(pSourceCampaignId, pTargetCampaignId)
 {
     var InputMapping = {
         "CAMPAIGNSTEP": {
-            condition: newWhereIfSet("CAMPAIGN.CAMPAIGN_ID", pSourceCampaignId).orderBy("SORTING").toString("1=2", true),
+            condition: newWhereIfSet("CAMPAIGN.CAMPAIGN_ID", pSourceCampaignId).orderBy("SORTING").toString(SqlBuilder.NORESULT_CONDITION(), true),
             ValueMapping: {
                 "CAMPAIGN_ID" : pTargetCampaignId
             }
diff --git a/process/Context_lib/process.js b/process/Context_lib/process.js
index 59bed65186..953330e3b3 100644
--- a/process/Context_lib/process.js
+++ b/process/Context_lib/process.js
@@ -632,7 +632,7 @@ ContextUtils.getNameSql = function(pContextId, pRowId)
         return newSelect(selectMap[pContextId].titleExpression)
                     .from(selectMap[pContextId].getFullFromClause())
                     .whereIfSet(selectMap[pContextId].getFullIdField(), pRowId)
-                    .build("1=2");
+                    .build(SqlBuilder.NORESULT_CONDITION());
     }
     else
         return "select 1 from person where 1=2";
diff --git a/process/Offer_lib/process.js b/process/Offer_lib/process.js
index 0c256379c1..3ba48d7e1d 100644
--- a/process/Offer_lib/process.js
+++ b/process/Offer_lib/process.js
@@ -356,7 +356,7 @@ OfferUtils.copyOfferItems = function (pSourceOfferId, pTargetOfferId)
 {
     var InputMapping = {
         "OFFERITEM": {
-            condition: newWhereIfSet("OFFERITEM.OFFER_ID", pSourceOfferId).orderBy("ITEMSORT").toString("1=2", true),
+            condition: newWhereIfSet("OFFERITEM.OFFER_ID", pSourceOfferId).orderBy("ITEMSORT").toString(SqlBuilder.NORESULT_CONDITION(), true),
             ValueMapping: {
                 "OFFER_ID" : pTargetOfferId
             }
diff --git a/process/Order_lib/process.js b/process/Order_lib/process.js
index 22b0f95f8f..d6938458c5 100644
--- a/process/Order_lib/process.js
+++ b/process/Order_lib/process.js
@@ -156,7 +156,7 @@ OrderUtils.copyOfferItemsToOrder = function (pSourceOfferId, pOrderId)
                 "INFO" : "INFO",
                 "VAT" : "VAT"
             },
-            condition: newWhereIfSet("OFFERITEM.OFFER_ID", pSourceOfferId).orderBy("ITEMSORT").toString("1=2", true),
+            condition: newWhereIfSet("OFFERITEM.OFFER_ID", pSourceOfferId).orderBy("ITEMSORT").toString(SqlBuilder.NORESULT_CONDITION(), true),
             ValueMapping: {
                 "OFFER_ID" : pOrderId
             }
diff --git a/process/Sql_lib/process.js b/process/Sql_lib/process.js
index 3039c1cf1c..93cf3bee05 100644
--- a/process/Sql_lib/process.js
+++ b/process/Sql_lib/process.js
@@ -1825,13 +1825,23 @@ SqlBuilder.GREATER_OR_EQUAL = function ()
 /**
  * Constant-like function which provides a value for pCondition if you need a "# &lt;= ?" statement.
  * 
- * @return {String} 
+ * @return {String}
  */
 SqlBuilder.LESS_OR_EQUAL = function ()
 {
     return "# <= ?";
 }
 
+/**
+ * Constant-like function which returns an impossible condition ("1 = 2").
+ * 
+ * @return {String}
+ */
+SqlBuilder.NORESULT_CONDITION = function ()
+{
+    return "1 = 2";
+}
+
 /**
  * Object providing constant-like functions for sql-any-conditions.
  */
@@ -2870,6 +2880,16 @@ SqlBuilder.prototype.forEachPage = function (pCallBackFn, pExecuteOnlyIfConditio
         run = pCallBackFn.call(null, this.nextTablePage(pExecuteOnlyIfConditionExists, pTimeout)) != false;
 }
 
+/**
+ * Sets an impossible where-condition, so that the query won't return any rows.
+ * 
+ * @return {SqlBuilder} current object
+ */
+SqlBuilder.prototype.noResult = function ()
+{
+    return this.clearWhere().where(SqlBuilder.NORESULT_CONDITION());
+}
+
 /**
  * checks if an update /delete statement should be called or not
  * @return {Boolean}
-- 
GitLab


From 21bcc3824bc6658127e59993ac012392fc37afdd Mon Sep 17 00:00:00 2001
From: Benjamin Ulrich <b.ulrich@adito.de>
Date: Tue, 25 Aug 2020 08:36:27 +0000
Subject: [PATCH 199/309] [Projekt: Entwicklung - Neon][TicketNr.:
 1058030][Falsches Verhalten der Aktionen in Filterview (Kontakte und Firmen)]

---
 .../BulkMailAddRecipients_entity.aod          |  19 ++++
 .../currentrecipients/documentation.adoc      |   2 +
 .../currentrecipients/valueProcess.js         |  15 +++
 .../futurerecipients/documentation.adoc       |   2 +
 .../futurerecipients/valueProcess.js          |   9 ++
 .../recipientcontactids/valueProcess.js       |  28 ++++-
 .../recipientcountmessage/valueProcess.js     |  11 +-
 .../CampaignAddParticipants_entity.aod        |  28 ++---
 .../addparticipants/onActionProcess.js        |   2 +-
 .../documentation.adoc                        |   3 +
 .../valueProcess.js                           |  29 +++++
 .../valueProcess.js                           |  36 +++++++
 .../campaignstep_id/onValueChange.js          |   2 -
 .../campaignstep_id/valueProcess.js}          |   0
 .../documentation.adoc                        |   2 +
 .../documentation.adoc                        |   2 +
 .../valueProcess.js                           |   8 ++
 .../isoperationvalid/valueProcess.js          |   1 -
 .../recordcontainers/jdito/contentProcess.js  |   9 --
 .../CampaignParticipant_entity.aod            |   2 +-
 .../displayValueProcess.js                    |   5 -
 .../valueProcess.js                           |   8 ++
 .../ExportTemplateSelection_entity.aod        |   9 +-
 .../exportcount/documentation.adoc            |   2 +
 .../entityfields/exportcount/titleProcess.js  |  13 +++
 .../entityfields/exportcount/valueProcess.js  |  10 ++
 .../safeandexport/onActionProcess.js          |   3 +-
 .../entityfields/selection/valueProcess.js    |  18 +++-
 .../Organisation_entity.aod                   |   4 +-
 .../addtobulkmailfromtable/onActionProcess.js |  14 ++-
 .../addtobulkmailfromtable/stateProcess.js    |  10 +-
 .../addtocampaignfromtable/onActionProcess.js |  16 +--
 .../addtocampaignfromtable/stateProcess.js    |  16 +--
 .../addtoserialletter/onActionProcess.js      |  14 ++-
 .../addtoserialletter/stateProcess.js         |   9 +-
 .../children/export/onActionProcess.js        |  17 +--
 .../children/export/stateProcess.js           |   7 ++
 entity/Person_entity/Person_entity.aod        |   4 +-
 .../addtobulkmailfromtable/onActionProcess.js |  14 ++-
 .../addtobulkmailfromtable/stateProcess.js    |   9 +-
 .../addtocampaignfromtable/onActionProcess.js |  14 +--
 .../addtocampaignfromtable/stateProcess.js    |  18 +---
 .../addtoserialletter/onActionProcess.js      |  14 ++-
 .../addtoserialletter/stateProcess.js         |   8 +-
 .../children/export/onActionProcess.js        |  16 +--
 .../children/export/stateProcess.js           |   7 ++
 .../SerialLetterAddRecipients_entity.aod      |  16 +++
 .../currentrecipients/documentation.adoc      |   2 +
 .../currentrecipients/valueProcess.js         |  13 +++
 .../futurerecipients/documentation.adoc       |   2 +
 .../futurerecipients/valueProcess.js          |   9 ++
 .../recipientcontactids/valueProcess.js       |  17 ++-
 .../_____LANGUAGE_EXTRA.aod                   |  43 ++++++--
 .../_____LANGUAGE_de/_____LANGUAGE_de.aod     |  76 +++++++++----
 .../_____LANGUAGE_en/_____LANGUAGE_en.aod     |  49 ++++++---
 .../CampaignAddParticipants.aod               |   4 -
 .../BulkMailAddRecipientsEdit_view.aod        |  19 +++-
 .../CampaignAddParticipantsEdit_view.aod      |  10 +-
 .../ExportTemplateSelectionEdit_view.aod      |  15 ++-
 .../SerialLetterAddRecipientsEdit_view.aod    |  30 +++---
 .../campaignParticipantMessage_view.aod       |  24 -----
 process/Bulkmail_lib/process.js               |  62 +++++++++++
 process/Campaign_lib/process.js               |   2 +-
 process/ExportTemplate_lib/process.js         | 100 ++++++++----------
 process/FilterCondition_lib/process.js        |   2 +
 .../FilterviewMenuAction_lib.aod              |   9 ++
 process/FilterviewMenuAction_lib/process.js   |  63 +++++++++++
 67 files changed, 754 insertions(+), 302 deletions(-)
 create mode 100644 entity/BulkMailAddRecipients_entity/entityfields/currentrecipients/documentation.adoc
 create mode 100644 entity/BulkMailAddRecipients_entity/entityfields/currentrecipients/valueProcess.js
 create mode 100644 entity/BulkMailAddRecipients_entity/entityfields/futurerecipients/documentation.adoc
 create mode 100644 entity/BulkMailAddRecipients_entity/entityfields/futurerecipients/valueProcess.js
 create mode 100644 entity/CampaignAddParticipants_entity/entityfields/campaignparticipantcontactids/documentation.adoc
 create mode 100644 entity/CampaignAddParticipants_entity/entityfields/campaignparticipantcontactids/valueProcess.js
 create mode 100644 entity/CampaignAddParticipants_entity/entityfields/campaignparticipantmessage/valueProcess.js
 delete mode 100644 entity/CampaignAddParticipants_entity/entityfields/campaignstep_id/onValueChange.js
 rename entity/CampaignAddParticipants_entity/{recordcontainers/jdito/onInsert.js => entityfields/campaignstep_id/valueProcess.js} (100%)
 create mode 100644 entity/CampaignAddParticipants_entity/entityfields/campaignstepcurrentparticipantcount/documentation.adoc
 create mode 100644 entity/CampaignAddParticipants_entity/entityfields/campaignstepmaxparticipantcount/documentation.adoc
 create mode 100644 entity/CampaignAddParticipants_entity/entityfields/campaignstepmaxparticipantcount/valueProcess.js
 delete mode 100644 entity/CampaignAddParticipants_entity/recordcontainers/jdito/contentProcess.js
 delete mode 100644 entity/CampaignParticipant_entity/entityfields/campaignstepmaxparticipantcount/displayValueProcess.js
 create mode 100644 entity/CampaignParticipant_entity/entityfields/campaignstepmaxparticipantcount/valueProcess.js
 create mode 100644 entity/ExportTemplateSelection_entity/entityfields/exportcount/documentation.adoc
 create mode 100644 entity/ExportTemplateSelection_entity/entityfields/exportcount/titleProcess.js
 create mode 100644 entity/ExportTemplateSelection_entity/entityfields/exportcount/valueProcess.js
 create mode 100644 entity/Organisation_entity/entityfields/filterviewactiongroup/children/export/stateProcess.js
 create mode 100644 entity/Person_entity/entityfields/filterviewactiongroup/children/export/stateProcess.js
 create mode 100644 entity/SerialLetterAddRecipients_entity/entityfields/currentrecipients/documentation.adoc
 create mode 100644 entity/SerialLetterAddRecipients_entity/entityfields/currentrecipients/valueProcess.js
 create mode 100644 entity/SerialLetterAddRecipients_entity/entityfields/futurerecipients/documentation.adoc
 create mode 100644 entity/SerialLetterAddRecipients_entity/entityfields/futurerecipients/valueProcess.js
 delete mode 100644 neonView/campaignParticipantMessage_view/campaignParticipantMessage_view.aod
 create mode 100644 process/FilterviewMenuAction_lib/FilterviewMenuAction_lib.aod
 create mode 100644 process/FilterviewMenuAction_lib/process.js

diff --git a/entity/BulkMailAddRecipients_entity/BulkMailAddRecipients_entity.aod b/entity/BulkMailAddRecipients_entity/BulkMailAddRecipients_entity.aod
index e75ed95232..31597bcc5d 100644
--- a/entity/BulkMailAddRecipients_entity/BulkMailAddRecipients_entity.aod
+++ b/entity/BulkMailAddRecipients_entity/BulkMailAddRecipients_entity.aod
@@ -58,6 +58,25 @@
       <state>EDITABLE</state>
       <valueProcess>%aditoprj%/entity/BulkMailAddRecipients_entity/entityfields/recipientcount/valueProcess.js</valueProcess>
     </entityField>
+    <entityParameter>
+      <name>comingFrom_param</name>
+      <expose v="true" />
+    </entityParameter>
+    <entityField>
+      <name>currentRecipients</name>
+      <documentation>%aditoprj%/entity/BulkMailAddRecipients_entity/entityfields/currentrecipients/documentation.adoc</documentation>
+      <title>Current Recipients</title>
+      <valueProcess>%aditoprj%/entity/BulkMailAddRecipients_entity/entityfields/currentrecipients/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>notAddedRecipients</name>
+    </entityField>
+    <entityField>
+      <name>futureRecipients</name>
+      <documentation>%aditoprj%/entity/BulkMailAddRecipients_entity/entityfields/futurerecipients/documentation.adoc</documentation>
+      <title>Recipients after adding</title>
+      <valueProcess>%aditoprj%/entity/BulkMailAddRecipients_entity/entityfields/futurerecipients/valueProcess.js</valueProcess>
+    </entityField>
   </entityFields>
   <recordContainers>
     <datalessRecordContainer>
diff --git a/entity/BulkMailAddRecipients_entity/entityfields/currentrecipients/documentation.adoc b/entity/BulkMailAddRecipients_entity/entityfields/currentrecipients/documentation.adoc
new file mode 100644
index 0000000000..74e2caafdf
--- /dev/null
+++ b/entity/BulkMailAddRecipients_entity/entityfields/currentrecipients/documentation.adoc
@@ -0,0 +1,2 @@
+== currentRecipients;
+needed for the score card, to display extra information.
diff --git a/entity/BulkMailAddRecipients_entity/entityfields/currentrecipients/valueProcess.js b/entity/BulkMailAddRecipients_entity/entityfields/currentrecipients/valueProcess.js
new file mode 100644
index 0000000000..ab684915b0
--- /dev/null
+++ b/entity/BulkMailAddRecipients_entity/entityfields/currentrecipients/valueProcess.js
@@ -0,0 +1,15 @@
+import("system.logging");
+import("system.result");
+import("system.vars");
+import("Sql_lib");
+
+var currentCount = newSelect("count(BULKMAILRECIPIENT.CONTACT_ID)")
+                            .from("BULKMAILRECIPIENT")
+                            .where("BULKMAILRECIPIENT.BULKMAIL_ID", vars.get("$field.BULKMAIL_ID"))
+                            .cell()
+if(currentCount)
+    result.string(currentCount)
+else
+    result.string("0")
+
+
diff --git a/entity/BulkMailAddRecipients_entity/entityfields/futurerecipients/documentation.adoc b/entity/BulkMailAddRecipients_entity/entityfields/futurerecipients/documentation.adoc
new file mode 100644
index 0000000000..b3fd706b46
--- /dev/null
+++ b/entity/BulkMailAddRecipients_entity/entityfields/futurerecipients/documentation.adoc
@@ -0,0 +1,2 @@
+== futureRecipients;
+needed for the score card, to display extra information.
diff --git a/entity/BulkMailAddRecipients_entity/entityfields/futurerecipients/valueProcess.js b/entity/BulkMailAddRecipients_entity/entityfields/futurerecipients/valueProcess.js
new file mode 100644
index 0000000000..9c50bb1b4d
--- /dev/null
+++ b/entity/BulkMailAddRecipients_entity/entityfields/futurerecipients/valueProcess.js
@@ -0,0 +1,9 @@
+import("system.vars");
+import("system.result");
+import("system.eMath")
+
+var res = eMath.addInt(vars.get("$field.recipientCount"), vars.get("$field.currentRecipients"));
+if(res)
+    result.string(res);
+else
+    result.string(0);
\ No newline at end of file
diff --git a/entity/BulkMailAddRecipients_entity/entityfields/recipientcontactids/valueProcess.js b/entity/BulkMailAddRecipients_entity/entityfields/recipientcontactids/valueProcess.js
index 9705275249..4b3206dc22 100644
--- a/entity/BulkMailAddRecipients_entity/entityfields/recipientcontactids/valueProcess.js
+++ b/entity/BulkMailAddRecipients_entity/entityfields/recipientcontactids/valueProcess.js
@@ -1,13 +1,37 @@
+import("system.eMath");
+import("FilterviewMenuAction_lib");
+import("Contact_lib");
 import("system.result");
 import("Bulkmail_lib");
+import("KeywordRegistry_basic");
+import("system.util");
+import("system.db");
+import("Sql_lib");
 import("system.vars");
+import("system.neon");
+
+var selection = JSON.parse(vars.getString("$param.ContactIds_param"));
+var comingfrom = vars.getString("$param.comingFrom_param");
+var contactIds;
+
+if(!Array.isArray(selection)) //if selection is an array, data has been selected
+{
+    var condition = selection.condition;
+    if(comingfrom == "Organisation")
+        contactIds = FilterviewMenuActionUtils.organisationIdsFilter(condition);
+    else if (comingfrom == "Person")
+        contactIds = FilterviewMenuActionUtils.contactIdsFilter(condition);
+}
 
-var contactIds = JSON.parse(vars.getString("$param.ContactIds_param"));
 var bulkMailId = vars.get("$field.BULKMAIL_ID");
 
 var res;
 if (bulkMailId)
-    res = JSON.stringify(BulkMailUtils.filterNewRecipients(bulkMailId, contactIds));
+{
+    var recipients = BulkMailUtils.filterNewRecipients(bulkMailId, contactIds);
+    res = JSON.stringify(recipients);
+    neon.setFieldValue("$field.notAddedRecipients", eMath.subInt(parseInt(contactIds.length), parseInt(recipients.length)));
+}
 else
     res = null;
     
diff --git a/entity/BulkMailAddRecipients_entity/entityfields/recipientcountmessage/valueProcess.js b/entity/BulkMailAddRecipients_entity/entityfields/recipientcountmessage/valueProcess.js
index ca3a11b99b..80f08142f0 100644
--- a/entity/BulkMailAddRecipients_entity/entityfields/recipientcountmessage/valueProcess.js
+++ b/entity/BulkMailAddRecipients_entity/entityfields/recipientcountmessage/valueProcess.js
@@ -2,14 +2,21 @@ import("system.translate");
 import("system.result");
 import("system.vars");
 
-var count = vars.getString("$field.recipientCount")
+var count = vars.get("$field.recipientCount")
 var res = "";
+var resNotAdded = "\n\
+";
 if (count && !vars.get("$sys.validationerrors"))
 {
     if (count == "0")
         res = translate.text("No new recipients found that can be added to the bulk mail.");
     else
+    {
         res = translate.withArguments("%0 new recipients will be added to the bulk mail.", [count]);
+        var notAdded = vars.get("$field.notAddedRecipients")
+        if (notAdded > 0)
+            resNotAdded += translate.withArguments("%0 of the chosen records are already recipients or don't have an e-mail set", [notAdded]);
+    }
 }
 
-result.string(res);
\ No newline at end of file
+result.string(res + resNotAdded);
\ No newline at end of file
diff --git a/entity/CampaignAddParticipants_entity/CampaignAddParticipants_entity.aod b/entity/CampaignAddParticipants_entity/CampaignAddParticipants_entity.aod
index 427c1e2626..09334d4097 100644
--- a/entity/CampaignAddParticipants_entity/CampaignAddParticipants_entity.aod
+++ b/entity/CampaignAddParticipants_entity/CampaignAddParticipants_entity.aod
@@ -35,12 +35,13 @@
       <consumer>CampaignStepConsumer</consumer>
       <mandatory v="true" />
       <state>EDITABLE</state>
+      <valueProcess>%aditoprj%/entity/CampaignAddParticipants_entity/entityfields/campaignstep_id/valueProcess.js</valueProcess>
       <displayValueProcess>%aditoprj%/entity/CampaignAddParticipants_entity/entityfields/campaignstep_id/displayValueProcess.js</displayValueProcess>
-      <onValueChange>%aditoprj%/entity/CampaignAddParticipants_entity/entityfields/campaignstep_id/onValueChange.js</onValueChange>
     </entityField>
     <entityField>
       <name>campaignParticipantMessage</name>
       <state>EDITABLE</state>
+      <valueProcess>%aditoprj%/entity/CampaignAddParticipants_entity/entityfields/campaignparticipantmessage/valueProcess.js</valueProcess>
       <onValueChangeTypes>
         <element>PROCESS</element>
       </onValueChangeTypes>
@@ -102,15 +103,17 @@
     </entityConsumer>
     <entityField>
       <name>campaignStepCurrentParticipantCount</name>
+      <documentation>%aditoprj%/entity/CampaignAddParticipants_entity/entityfields/campaignstepcurrentparticipantcount/documentation.adoc</documentation>
       <title>Current participants</title>
       <state>EDITABLE</state>
       <displayValueProcess>%aditoprj%/entity/CampaignAddParticipants_entity/entityfields/campaignstepcurrentparticipantcount/displayValueProcess.js</displayValueProcess>
     </entityField>
     <entityField>
       <name>campaignStepMaxParticipantCount</name>
+      <documentation>%aditoprj%/entity/CampaignAddParticipants_entity/entityfields/campaignstepmaxparticipantcount/documentation.adoc</documentation>
       <title>Max participants</title>
       <state>EDITABLE</state>
-      <displayValueProcess>%aditoprj%/entity/CampaignAddParticipants_entity/entityfields/campaignstepmaxparticipantcount/displayValueProcess.js</displayValueProcess>
+      <valueProcess>%aditoprj%/entity/CampaignAddParticipants_entity/entityfields/campaignstepmaxparticipantcount/valueProcess.js</valueProcess>
     </entityField>
     <entityField>
       <name>isUpdate</name>
@@ -138,19 +141,18 @@
       <state>DISABLED</state>
       <stateProcess>%aditoprj%/entity/CampaignAddParticipants_entity/entityfields/addparticipants/stateProcess.js</stateProcess>
     </entityActionField>
+    <entityField>
+      <name>campaignparticipantContactIds</name>
+      <documentation>%aditoprj%/entity/CampaignAddParticipants_entity/entityfields/campaignparticipantcontactids/documentation.adoc</documentation>
+      <title></title>
+      <valueProcess>%aditoprj%/entity/CampaignAddParticipants_entity/entityfields/campaignparticipantcontactids/valueProcess.js</valueProcess>
+    </entityField>
+    <entityParameter>
+      <name>comingFrom_param</name>
+      <expose v="true" />
+    </entityParameter>
   </entityFields>
   <recordContainers>
-    <jDitoRecordContainer>
-      <name>jdito</name>
-      <jDitoRecordAlias>Data_alias</jDitoRecordAlias>
-      <contentProcess>%aditoprj%/entity/CampaignAddParticipants_entity/recordcontainers/jdito/contentProcess.js</contentProcess>
-      <onInsert>%aditoprj%/entity/CampaignAddParticipants_entity/recordcontainers/jdito/onInsert.js</onInsert>
-      <recordFieldMappings>
-        <jDitoRecordFieldMapping>
-          <name>UID.value</name>
-        </jDitoRecordFieldMapping>
-      </recordFieldMappings>
-    </jDitoRecordContainer>
     <datalessRecordContainer>
       <name>datalessConfig</name>
       <alias>Data_alias</alias>
diff --git a/entity/CampaignAddParticipants_entity/entityfields/addparticipants/onActionProcess.js b/entity/CampaignAddParticipants_entity/entityfields/addparticipants/onActionProcess.js
index bbf377c5c3..6d047b2cd0 100644
--- a/entity/CampaignAddParticipants_entity/entityfields/addparticipants/onActionProcess.js
+++ b/entity/CampaignAddParticipants_entity/entityfields/addparticipants/onActionProcess.js
@@ -22,7 +22,7 @@ if(participantRowIds != null && participantRowIds.length > 0)
     let contactIdsToHandle = participantRowIds;
     
     if(isUpdate == "false")
-        contactIdsToHandle = CampaignUtils.GetContactIdsNotInCampaignByRowIds(campaignId, participantRowIds);
+        contactIdsToHandle = vars.get("$field.campaignparticipantContactIds");
     
     _handleRowIds(contactIdsToHandle, campaignId);
 }
diff --git a/entity/CampaignAddParticipants_entity/entityfields/campaignparticipantcontactids/documentation.adoc b/entity/CampaignAddParticipants_entity/entityfields/campaignparticipantcontactids/documentation.adoc
new file mode 100644
index 0000000000..d5d2cbde80
--- /dev/null
+++ b/entity/CampaignAddParticipants_entity/entityfields/campaignparticipantcontactids/documentation.adoc
@@ -0,0 +1,3 @@
+== campaignparticipantContactIds;
+
+The ContactIds or OrganisationIds of the selected/filtered records.
\ No newline at end of file
diff --git a/entity/CampaignAddParticipants_entity/entityfields/campaignparticipantcontactids/valueProcess.js b/entity/CampaignAddParticipants_entity/entityfields/campaignparticipantcontactids/valueProcess.js
new file mode 100644
index 0000000000..e831ec632c
--- /dev/null
+++ b/entity/CampaignAddParticipants_entity/entityfields/campaignparticipantcontactids/valueProcess.js
@@ -0,0 +1,29 @@
+import("Campaign_lib");
+import("system.eMath");
+import("FilterviewMenuAction_lib");
+import("system.result");
+import("system.vars");
+import("system.neon");
+
+if(vars.get("$field.CAMPAIGN_ID"))
+{
+    var comingfrom = vars.getString("$param.dataSourceTableName_param");
+    var contactIds;
+    var filteredContactIds;
+    var selection = vars.getString("$param.campaignParticipantsRowIds_param");
+    
+    if(vars.exists("$param.campaignParticipantsCondition_param") && vars.get("$param.campaignParticipantsCondition_param"))
+    {
+        selection = JSON.parse(vars.getString("$param.campaignParticipantsCondition_param")).condition;
+        if(comingfrom == "Organisation")
+            filteredContactIds = FilterviewMenuActionUtils.organisationIdsFilter(selection);
+        else if(comingfrom == "Person")
+            filteredContactIds = FilterviewMenuActionUtils.contactIdsFilter(selection)
+        contactIds = CampaignUtils.GetContactIdsNotInCampaignByRowIds(vars.get("$field.CAMPAIGN_ID"), filteredContactIds);
+    }
+    else
+    {
+        contactIds = CampaignUtils.GetContactIdsNotInCampaignByRowIds(vars.get("$field.CAMPAIGN_ID"), JSON.parse(selection));
+    }
+    result.string(JSON.stringify(contactIds));
+}
\ No newline at end of file
diff --git a/entity/CampaignAddParticipants_entity/entityfields/campaignparticipantmessage/valueProcess.js b/entity/CampaignAddParticipants_entity/entityfields/campaignparticipantmessage/valueProcess.js
new file mode 100644
index 0000000000..b08b067a18
--- /dev/null
+++ b/entity/CampaignAddParticipants_entity/entityfields/campaignparticipantmessage/valueProcess.js
@@ -0,0 +1,36 @@
+import("system.eMath");
+import("FilterviewMenuAction_lib");
+import("system.translate");
+import("system.result");
+import("system.vars");
+
+var res = "";
+var resNotAdded = "\n\
+";
+if(vars.get("$field.CAMPAIGN_ID") && vars.get("$field.campaignparticipantContactIds") && !vars.get("$sys.validationerrors"))
+{
+    var validCount = JSON.parse(vars.get("$field.campaignparticipantContactIds")).length;
+    var selectedIds;
+    var comingfrom = vars.get("$param.dataSourceTableName_param");
+    
+    if (validCount && !vars.get("$sys.validationerrors") && vars.get("$field.CAMPAIGN_ID"))
+    {
+        if (validCount != 0)
+        {
+            res = translate.withArguments("%0 new participants will be added to the campaign.", [validCount]);
+            if(vars.exists("$param.campaignParticipantsRowIds_param") && vars.getString("$param.campaignParticipantsRowIds_param"))
+                selectedIds = JSON.parse(vars.getString("$param.campaignParticipantsRowIds_param")).length;
+            else
+            {
+                var selection = JSON.parse(vars.getString("$param.campaignParticipantsCondition_param")).condition;
+                if(comingfrom == "Organisation")
+                    selectedIds = FilterviewMenuActionUtils.organisationIdsFilter(selection).length;
+                else if(comingfrom == "Person")
+                    selectedIds = FilterviewMenuActionUtils.contactIdsFilter(selection).length;
+            }
+            var alreadyParticipant = eMath.subInt(selectedIds, validCount)
+            resNotAdded += translate.withArguments("%0 of the chosen records are already in the campaign", [alreadyParticipant]);
+        }
+    }
+}
+result.string(res + resNotAdded);
\ No newline at end of file
diff --git a/entity/CampaignAddParticipants_entity/entityfields/campaignstep_id/onValueChange.js b/entity/CampaignAddParticipants_entity/entityfields/campaignstep_id/onValueChange.js
deleted file mode 100644
index 20f59c4bac..0000000000
--- a/entity/CampaignAddParticipants_entity/entityfields/campaignstep_id/onValueChange.js
+++ /dev/null
@@ -1,2 +0,0 @@
-import("system.neon");
-neon.refresh(["$field.campaignParticipantMessage"])
\ No newline at end of file
diff --git a/entity/CampaignAddParticipants_entity/recordcontainers/jdito/onInsert.js b/entity/CampaignAddParticipants_entity/entityfields/campaignstep_id/valueProcess.js
similarity index 100%
rename from entity/CampaignAddParticipants_entity/recordcontainers/jdito/onInsert.js
rename to entity/CampaignAddParticipants_entity/entityfields/campaignstep_id/valueProcess.js
diff --git a/entity/CampaignAddParticipants_entity/entityfields/campaignstepcurrentparticipantcount/documentation.adoc b/entity/CampaignAddParticipants_entity/entityfields/campaignstepcurrentparticipantcount/documentation.adoc
new file mode 100644
index 0000000000..223c3e99d1
--- /dev/null
+++ b/entity/CampaignAddParticipants_entity/entityfields/campaignstepcurrentparticipantcount/documentation.adoc
@@ -0,0 +1,2 @@
+== campaignStepCurrentParticipantCount;
+needed for the score card, to display extra information.
diff --git a/entity/CampaignAddParticipants_entity/entityfields/campaignstepmaxparticipantcount/documentation.adoc b/entity/CampaignAddParticipants_entity/entityfields/campaignstepmaxparticipantcount/documentation.adoc
new file mode 100644
index 0000000000..cc579ceb74
--- /dev/null
+++ b/entity/CampaignAddParticipants_entity/entityfields/campaignstepmaxparticipantcount/documentation.adoc
@@ -0,0 +1,2 @@
+== campaignStepMaxParticipantCount;
+needed for the score card, to display extra information.
diff --git a/entity/CampaignAddParticipants_entity/entityfields/campaignstepmaxparticipantcount/valueProcess.js b/entity/CampaignAddParticipants_entity/entityfields/campaignstepmaxparticipantcount/valueProcess.js
new file mode 100644
index 0000000000..824a3331db
--- /dev/null
+++ b/entity/CampaignAddParticipants_entity/entityfields/campaignstepmaxparticipantcount/valueProcess.js
@@ -0,0 +1,8 @@
+import("system.result");
+import("system.vars");
+import("Campaign_lib");
+
+if(vars.get("$field.CAMPAIGNSTEP_ID"))
+    result.string(CampaignUtils.getMaxParticipantCountForStep(vars.get("$field.CAMPAIGNSTEP_ID")));
+else
+    result.string(0)
\ No newline at end of file
diff --git a/entity/CampaignAddParticipants_entity/entityfields/isoperationvalid/valueProcess.js b/entity/CampaignAddParticipants_entity/entityfields/isoperationvalid/valueProcess.js
index 47fb5627a5..512ffebcbe 100644
--- a/entity/CampaignAddParticipants_entity/entityfields/isoperationvalid/valueProcess.js
+++ b/entity/CampaignAddParticipants_entity/entityfields/isoperationvalid/valueProcess.js
@@ -111,7 +111,6 @@ if(selectedCampaignId != '')
             resultValue = "true";
         }
     }
-    neon.setFieldValue("$field.campaignParticipantMessage", messageString);
     result.string(resultValue);
 }
 
diff --git a/entity/CampaignAddParticipants_entity/recordcontainers/jdito/contentProcess.js b/entity/CampaignAddParticipants_entity/recordcontainers/jdito/contentProcess.js
deleted file mode 100644
index e197aca8b7..0000000000
--- a/entity/CampaignAddParticipants_entity/recordcontainers/jdito/contentProcess.js
+++ /dev/null
@@ -1,9 +0,0 @@
-import("system.result");
-import("system.vars");
-
-//TODO: This dummy implementation shouldn't be nescessary here. Remove this process eventually. #1051003
-var rows = [];
-if (vars.get("$local.idvalues"))
-    rows = vars.get("$local.idvalues").map(function (id) {return [id];});
-
-result.object(rows);
\ No newline at end of file
diff --git a/entity/CampaignParticipant_entity/CampaignParticipant_entity.aod b/entity/CampaignParticipant_entity/CampaignParticipant_entity.aod
index 8905d49054..97aaaa0c2e 100644
--- a/entity/CampaignParticipant_entity/CampaignParticipant_entity.aod
+++ b/entity/CampaignParticipant_entity/CampaignParticipant_entity.aod
@@ -186,7 +186,7 @@
     <entityField>
       <name>campaignStepMaxParticipantCount</name>
       <title>Max participants</title>
-      <displayValueProcess>%aditoprj%/entity/CampaignParticipant_entity/entityfields/campaignstepmaxparticipantcount/displayValueProcess.js</displayValueProcess>
+      <valueProcess>%aditoprj%/entity/CampaignParticipant_entity/entityfields/campaignstepmaxparticipantcount/valueProcess.js</valueProcess>
     </entityField>
     <entityField>
       <name>ADVERTISINGBAN_ICON</name>
diff --git a/entity/CampaignParticipant_entity/entityfields/campaignstepmaxparticipantcount/displayValueProcess.js b/entity/CampaignParticipant_entity/entityfields/campaignstepmaxparticipantcount/displayValueProcess.js
deleted file mode 100644
index eb835646c7..0000000000
--- a/entity/CampaignParticipant_entity/entityfields/campaignstepmaxparticipantcount/displayValueProcess.js
+++ /dev/null
@@ -1,5 +0,0 @@
-import("system.result");
-import("system.vars");
-import("Campaign_lib");
-
-result.string(CampaignUtils.getMaxParticipantCountForStep(vars.get("$field.CAMPAIGNSTEP_ID")));
\ No newline at end of file
diff --git a/entity/CampaignParticipant_entity/entityfields/campaignstepmaxparticipantcount/valueProcess.js b/entity/CampaignParticipant_entity/entityfields/campaignstepmaxparticipantcount/valueProcess.js
new file mode 100644
index 0000000000..824a3331db
--- /dev/null
+++ b/entity/CampaignParticipant_entity/entityfields/campaignstepmaxparticipantcount/valueProcess.js
@@ -0,0 +1,8 @@
+import("system.result");
+import("system.vars");
+import("Campaign_lib");
+
+if(vars.get("$field.CAMPAIGNSTEP_ID"))
+    result.string(CampaignUtils.getMaxParticipantCountForStep(vars.get("$field.CAMPAIGNSTEP_ID")));
+else
+    result.string(0)
\ No newline at end of file
diff --git a/entity/ExportTemplateSelection_entity/ExportTemplateSelection_entity.aod b/entity/ExportTemplateSelection_entity/ExportTemplateSelection_entity.aod
index de7cb9ab35..657143da0e 100644
--- a/entity/ExportTemplateSelection_entity/ExportTemplateSelection_entity.aod
+++ b/entity/ExportTemplateSelection_entity/ExportTemplateSelection_entity.aod
@@ -71,11 +71,18 @@
     </entityField>
     <entityActionField>
       <name>safeandexport</name>
-      <title>export using the selected  template</title>
+      <title>export using the selected template</title>
       <onActionProcess>%aditoprj%/entity/ExportTemplateSelection_entity/entityfields/safeandexport/onActionProcess.js</onActionProcess>
+      <isMenuAction v="true" />
       <iconId>NEON:EXPORT</iconId>
       <stateProcess>%aditoprj%/entity/ExportTemplateSelection_entity/entityfields/safeandexport/stateProcess.js</stateProcess>
     </entityActionField>
+    <entityField>
+      <name>exportCount</name>
+      <documentation>%aditoprj%/entity/ExportTemplateSelection_entity/entityfields/exportcount/documentation.adoc</documentation>
+      <titleProcess>%aditoprj%/entity/ExportTemplateSelection_entity/entityfields/exportcount/titleProcess.js</titleProcess>
+      <valueProcess>%aditoprj%/entity/ExportTemplateSelection_entity/entityfields/exportcount/valueProcess.js</valueProcess>
+    </entityField>
   </entityFields>
   <recordContainers>
     <datalessRecordContainer>
diff --git a/entity/ExportTemplateSelection_entity/entityfields/exportcount/documentation.adoc b/entity/ExportTemplateSelection_entity/entityfields/exportcount/documentation.adoc
new file mode 100644
index 0000000000..8d103628b9
--- /dev/null
+++ b/entity/ExportTemplateSelection_entity/entityfields/exportcount/documentation.adoc
@@ -0,0 +1,2 @@
+== exportCount;
+needed for the score card, to display extra information.
diff --git a/entity/ExportTemplateSelection_entity/entityfields/exportcount/titleProcess.js b/entity/ExportTemplateSelection_entity/entityfields/exportcount/titleProcess.js
new file mode 100644
index 0000000000..d12a65747f
--- /dev/null
+++ b/entity/ExportTemplateSelection_entity/entityfields/exportcount/titleProcess.js
@@ -0,0 +1,13 @@
+import("system.translate");
+import("system.result");
+import("system.vars");
+
+var comingFrom = vars.get("$field.comingfrom")
+var res
+
+if(comingFrom == "Organisation")
+    res = translate.text("Organisations will be exported");
+else if(comingFrom == "Person")
+    res = translate.text("Contacts will be exported");
+
+result.string(res)
\ No newline at end of file
diff --git a/entity/ExportTemplateSelection_entity/entityfields/exportcount/valueProcess.js b/entity/ExportTemplateSelection_entity/entityfields/exportcount/valueProcess.js
new file mode 100644
index 0000000000..a650684a24
--- /dev/null
+++ b/entity/ExportTemplateSelection_entity/entityfields/exportcount/valueProcess.js
@@ -0,0 +1,10 @@
+import("FilterviewMenuAction_lib");
+import("system.vars");
+import("system.result");
+
+var selection = vars.getString("$field.selection");
+
+if(selection)
+    result.string(JSON.parse(selection).length);
+else
+    result.string(0);
\ No newline at end of file
diff --git a/entity/ExportTemplateSelection_entity/entityfields/safeandexport/onActionProcess.js b/entity/ExportTemplateSelection_entity/entityfields/safeandexport/onActionProcess.js
index c4237df19e..0eecb635d1 100644
--- a/entity/ExportTemplateSelection_entity/entityfields/safeandexport/onActionProcess.js
+++ b/entity/ExportTemplateSelection_entity/entityfields/safeandexport/onActionProcess.js
@@ -7,7 +7,8 @@ var templateId = vars.get("$field.EXPORTTEMPLATE_ID");
 var selection = vars.get("$field.selection");
 var comingFrom = vars.get("$field.comingfrom");
 
-if(templateId){
+if(templateId)
+{
 var document = ExportTemplateUtils.buildExport(templateId, selection, comingFrom, filename);
 neon.download(document.content, document.filename);
 }
\ No newline at end of file
diff --git a/entity/ExportTemplateSelection_entity/entityfields/selection/valueProcess.js b/entity/ExportTemplateSelection_entity/entityfields/selection/valueProcess.js
index 6779bc32ba..3d860b7c27 100644
--- a/entity/ExportTemplateSelection_entity/entityfields/selection/valueProcess.js
+++ b/entity/ExportTemplateSelection_entity/entityfields/selection/valueProcess.js
@@ -1,5 +1,19 @@
+import("FilterviewMenuAction_lib");
 import("system.vars");
 import("system.result");
 
-if(vars.get("$param.selectedData_param"))
-result.string(vars.get("$param.selectedData_param"));
\ No newline at end of file
+var selection = JSON.parse(vars.getString("$param.selectedData_param"));
+var comingfrom = vars.getString("$param.comingFrom_param");
+var contactIds;
+
+
+if(!Array.isArray(selection)) //if selection is an array, data has been selected
+{
+    var condition = selection.condition;
+    if(comingfrom == "Organisation")
+        contactIds = FilterviewMenuActionUtils.organisationIdsFilter(condition);
+    else if (comingfrom == "Person")
+        contactIds = FilterviewMenuActionUtils.contactIdsFilter(condition);
+}
+result.string(JSON.stringify(contactIds));
+
diff --git a/entity/Organisation_entity/Organisation_entity.aod b/entity/Organisation_entity/Organisation_entity.aod
index 9fe5066d15..d4baac32bb 100644
--- a/entity/Organisation_entity/Organisation_entity.aod
+++ b/entity/Organisation_entity/Organisation_entity.aod
@@ -896,8 +896,8 @@
           <title>Add to Bulkmail</title>
           <onActionProcess>%aditoprj%/entity/Organisation_entity/entityfields/filterviewactiongroup/children/addtobulkmailfromtable/onActionProcess.js</onActionProcess>
           <isObjectAction v="false" />
-          <isSelectionAction v="true" />
           <iconId>VAADIN:AT</iconId>
+          <state>EDITABLE</state>
           <stateProcess>%aditoprj%/entity/Organisation_entity/entityfields/filterviewactiongroup/children/addtobulkmailfromtable/stateProcess.js</stateProcess>
           <tooltipProcess>%aditoprj%/entity/Organisation_entity/entityfields/filterviewactiongroup/children/addtobulkmailfromtable/tooltipProcess.js</tooltipProcess>
         </entityActionField>
@@ -906,7 +906,6 @@
           <title>Add to serial letter</title>
           <onActionProcess>%aditoprj%/entity/Organisation_entity/entityfields/filterviewactiongroup/children/addtoserialletter/onActionProcess.js</onActionProcess>
           <isObjectAction v="false" />
-          <isSelectionAction v="true" />
           <iconId>VAADIN:ENVELOPES</iconId>
           <stateProcess>%aditoprj%/entity/Organisation_entity/entityfields/filterviewactiongroup/children/addtoserialletter/stateProcess.js</stateProcess>
           <tooltipProcess>%aditoprj%/entity/Organisation_entity/entityfields/filterviewactiongroup/children/addtoserialletter/tooltipProcess.js</tooltipProcess>
@@ -918,6 +917,7 @@
           <isMenuAction v="true" />
           <isObjectAction v="false" />
           <iconId>NEON:EXPORT</iconId>
+          <stateProcess>%aditoprj%/entity/Organisation_entity/entityfields/filterviewactiongroup/children/export/stateProcess.js</stateProcess>
           <tooltip>Export fields of this table</tooltip>
           <tooltipProcess>%aditoprj%/entity/Organisation_entity/entityfields/filterviewactiongroup/children/export/tooltipProcess.js</tooltipProcess>
         </entityActionField>
diff --git a/entity/Organisation_entity/entityfields/filterviewactiongroup/children/addtobulkmailfromtable/onActionProcess.js b/entity/Organisation_entity/entityfields/filterviewactiongroup/children/addtobulkmailfromtable/onActionProcess.js
index d723a8841f..9a2a483e4c 100644
--- a/entity/Organisation_entity/entityfields/filterviewactiongroup/children/addtobulkmailfromtable/onActionProcess.js
+++ b/entity/Organisation_entity/entityfields/filterviewactiongroup/children/addtobulkmailfromtable/onActionProcess.js
@@ -1,6 +1,14 @@
 import("Bulkmail_lib");
 import("system.vars");
-import("system.neon");
 
-if (vars.exists("$sys.selection"))
-    BulkMailUtils.openAddRecipientView(vars.getString("$sys.selection"));
\ No newline at end of file
+var sysSelection = vars.get("$sys.selection");
+
+if(sysSelection.length > 0)     //if data selected -> use selected data
+{
+    BulkMailUtils.addParticipantsByRowIds(JSON.stringify(sysSelection));
+}
+else                            //else -> use Filtercondition
+{
+    let sysFilter = vars.get("$sys.filter");
+    BulkMailUtils.addParticipantsByCondition(JSON.stringify(sysFilter), vars.get("$sys.currentcontextname"));
+}
diff --git a/entity/Organisation_entity/entityfields/filterviewactiongroup/children/addtobulkmailfromtable/stateProcess.js b/entity/Organisation_entity/entityfields/filterviewactiongroup/children/addtobulkmailfromtable/stateProcess.js
index 1a24bf4924..81097eaaf9 100644
--- a/entity/Organisation_entity/entityfields/filterviewactiongroup/children/addtobulkmailfromtable/stateProcess.js
+++ b/entity/Organisation_entity/entityfields/filterviewactiongroup/children/addtobulkmailfromtable/stateProcess.js
@@ -1,9 +1,7 @@
-import("system.neon");
-import("system.neon");
-import("system.result");
-import("KeywordRegistry_basic");
+import("FilterviewMenuAction_lib");
 import("system.vars");
+import("system.result");
 
+var contactCount = vars.get("$sys.datarowcount");
 
-if (vars.get("$field.STATUS") == $KeywordRegistry.contactStatus$inactive())
-    result.string(neon.COMPONENTSTATE_DISABLED);
\ No newline at end of file
+result.string(FilterviewMenuActionUtils.getComponentStateByRowCount(contactCount));
\ No newline at end of file
diff --git a/entity/Organisation_entity/entityfields/filterviewactiongroup/children/addtocampaignfromtable/onActionProcess.js b/entity/Organisation_entity/entityfields/filterviewactiongroup/children/addtocampaignfromtable/onActionProcess.js
index c9b89f86a8..d2b26e842b 100644
--- a/entity/Organisation_entity/entityfields/filterviewactiongroup/children/addtocampaignfromtable/onActionProcess.js
+++ b/entity/Organisation_entity/entityfields/filterviewactiongroup/children/addtocampaignfromtable/onActionProcess.js
@@ -4,18 +4,12 @@ import("Campaign_lib");
 
 var sysSelection = vars.get("$sys.selection");
 
-/*
- * If there's a selection only those are ought to be added.
- * Otherwise the filter gets checked, if a filter has beed set, the condition
- * is used to determine the objects to be added.
- * If no selection has been set, all objects will be added.
- */
-if(sysSelection.length > 0) //selektierte IDs als Array
+if(sysSelection.length > 0)     //if data selected -> use selected data
 {
-    CampaignUtils.addParticipantsByRowIds(JSON.stringify(sysSelection), "ORGANISATION");
+    CampaignUtils.addParticipantsByRowIds(JSON.stringify(sysSelection), vars.get("$sys.currentcontextname"));
 }
-else
+else                            //else -> use Filtercondition
 {
-    let sysFilter = vars.get("$sys.filter");//todo change name
-    CampaignUtils.addParticipantsByCondition(JSON.stringify(sysFilter), "ORGANISATION");
+    let sysFilter = vars.get("$sys.filter");
+    CampaignUtils.addParticipantsByCondition(JSON.stringify(sysFilter), vars.get("$sys.currentcontextname"));
 }
\ No newline at end of file
diff --git a/entity/Organisation_entity/entityfields/filterviewactiongroup/children/addtocampaignfromtable/stateProcess.js b/entity/Organisation_entity/entityfields/filterviewactiongroup/children/addtocampaignfromtable/stateProcess.js
index a4f62ede0a..98d07ed943 100644
--- a/entity/Organisation_entity/entityfields/filterviewactiongroup/children/addtocampaignfromtable/stateProcess.js
+++ b/entity/Organisation_entity/entityfields/filterviewactiongroup/children/addtocampaignfromtable/stateProcess.js
@@ -1,19 +1,7 @@
-import("KeywordRegistry_basic");
-import("system.db");
+import("FilterviewMenuAction_lib");
 import("system.vars");
-import("system.neon");
 import("system.result");
 
 var contactCount = vars.get("$sys.datarowcount");
 
-if(contactCount > 0)
-{
-    result.string(neon.COMPONENTSTATE_EDITABLE);
-}
-else
-{
-    result.string(neon.COMPONENTSTATE_DISABLED);
-}
-
-if (vars.get("$field.STATUS") == $KeywordRegistry.contactStatus$inactive())
-    result.string(neon.COMPONENTSTATE_DISABLED);
\ No newline at end of file
+FilterviewMenuActionUtils.getComponentStateByRowCount(contactCount);
\ No newline at end of file
diff --git a/entity/Organisation_entity/entityfields/filterviewactiongroup/children/addtoserialletter/onActionProcess.js b/entity/Organisation_entity/entityfields/filterviewactiongroup/children/addtoserialletter/onActionProcess.js
index 3bbd8231ed..dc03abb3d7 100644
--- a/entity/Organisation_entity/entityfields/filterviewactiongroup/children/addtoserialletter/onActionProcess.js
+++ b/entity/Organisation_entity/entityfields/filterviewactiongroup/children/addtoserialletter/onActionProcess.js
@@ -1,6 +1,14 @@
 import("Bulkmail_lib");
 import("system.vars");
-import("system.neon");
 
-if (vars.exists("$sys.selection"))
-    SerialLetterUtils.openAddRecipientView(vars.getString("$sys.selection"));
\ No newline at end of file
+var sysSelection = vars.get("$sys.selection");
+
+if(sysSelection.length > 0)     //if data selected -> use selected data
+{
+    SerialLetterUtils.addParticipantsByRowIds(JSON.stringify(sysSelection));
+}
+else                            //else -> use Filtercondition
+{
+    let sysFilter = vars.get("$sys.filter");
+    SerialLetterUtils.addParticipantsByCondition(JSON.stringify(sysFilter), vars.get("$sys.currentcontextname"));
+}
\ No newline at end of file
diff --git a/entity/Organisation_entity/entityfields/filterviewactiongroup/children/addtoserialletter/stateProcess.js b/entity/Organisation_entity/entityfields/filterviewactiongroup/children/addtoserialletter/stateProcess.js
index daa09139c5..81097eaaf9 100644
--- a/entity/Organisation_entity/entityfields/filterviewactiongroup/children/addtoserialletter/stateProcess.js
+++ b/entity/Organisation_entity/entityfields/filterviewactiongroup/children/addtoserialletter/stateProcess.js
@@ -1,8 +1,7 @@
-import("system.neon");
-import("system.result");
-import("KeywordRegistry_basic");
+import("FilterviewMenuAction_lib");
 import("system.vars");
+import("system.result");
 
+var contactCount = vars.get("$sys.datarowcount");
 
-if (vars.get("$field.STATUS") == $KeywordRegistry.contactStatus$inactive())
-    result.string(neon.COMPONENTSTATE_DISABLED);
\ No newline at end of file
+result.string(FilterviewMenuActionUtils.getComponentStateByRowCount(contactCount));
\ No newline at end of file
diff --git a/entity/Organisation_entity/entityfields/filterviewactiongroup/children/export/onActionProcess.js b/entity/Organisation_entity/entityfields/filterviewactiongroup/children/export/onActionProcess.js
index d33e137213..ecad88623a 100644
--- a/entity/Organisation_entity/entityfields/filterviewactiongroup/children/export/onActionProcess.js
+++ b/entity/Organisation_entity/entityfields/filterviewactiongroup/children/export/onActionProcess.js
@@ -1,21 +1,14 @@
-import("system.neon");
+import("ExportTemplate_lib");
 import("system.vars");
 
 var sysSelection = vars.get("$sys.selection");
-var params;
+
 if(sysSelection.length > 0)     //if data selected -> use selected data
 {
-    params = {
-        "selectedData_param" : JSON.stringify(sysSelection),
-        "comingFrom_param" : vars.get("$sys.currentcontextname")}
-    neon.openContext("ExportTemplateSelection", "ExportTemplateSelectionEdit_view", null, neon.OPERATINGSTATE_VIEW, params);
+    ExportTemplateUtils.addParticipantsByRowIds(JSON.stringify(sysSelection), vars.get("$sys.currentcontextname"));
 }
 else                            //else -> use Filtercondition
 {
     let sysFilter = vars.get("$sys.filter");
-    params = {
-        "selectedData_param" : JSON.stringify(sysFilter),
-        "comingFrom_param" : vars.get("$sys.currentcontextname")}
-    neon.openContext("ExportTemplateSelection", "ExportTemplateSelectionEdit_view", null, neon.OPERATINGSTATE_VIEW, params);
-}
-
+    ExportTemplateUtils.addParticipantsByCondition(JSON.stringify(sysFilter), vars.get("$sys.currentcontextname"));
+}
\ No newline at end of file
diff --git a/entity/Organisation_entity/entityfields/filterviewactiongroup/children/export/stateProcess.js b/entity/Organisation_entity/entityfields/filterviewactiongroup/children/export/stateProcess.js
new file mode 100644
index 0000000000..6695332241
--- /dev/null
+++ b/entity/Organisation_entity/entityfields/filterviewactiongroup/children/export/stateProcess.js
@@ -0,0 +1,7 @@
+import("system.result");
+import("FilterviewMenuAction_lib");
+import("system.vars");
+
+var contactCount = vars.get("$sys.datarowcount");
+
+result.string(FilterviewMenuActionUtils.getComponentStateByRowCount(contactCount));
\ No newline at end of file
diff --git a/entity/Person_entity/Person_entity.aod b/entity/Person_entity/Person_entity.aod
index f4eb6df51f..cc779e4985 100644
--- a/entity/Person_entity/Person_entity.aod
+++ b/entity/Person_entity/Person_entity.aod
@@ -1040,7 +1040,6 @@
           <title>Add to Bulkmail</title>
           <onActionProcess>%aditoprj%/entity/Person_entity/entityfields/filterviewactiongroup/children/addtobulkmailfromtable/onActionProcess.js</onActionProcess>
           <isObjectAction v="false" />
-          <isSelectionAction v="true" />
           <iconId>VAADIN:AT</iconId>
           <stateProcess>%aditoprj%/entity/Person_entity/entityfields/filterviewactiongroup/children/addtobulkmailfromtable/stateProcess.js</stateProcess>
           <tooltipProcess>%aditoprj%/entity/Person_entity/entityfields/filterviewactiongroup/children/addtobulkmailfromtable/tooltipProcess.js</tooltipProcess>
@@ -1049,8 +1048,8 @@
           <name>addToSerialLetter</name>
           <title>Add to serial letter</title>
           <onActionProcess>%aditoprj%/entity/Person_entity/entityfields/filterviewactiongroup/children/addtoserialletter/onActionProcess.js</onActionProcess>
+          <isMenuAction v="true" />
           <isObjectAction v="false" />
-          <isSelectionAction v="true" />
           <iconId>VAADIN:ENVELOPES</iconId>
           <stateProcess>%aditoprj%/entity/Person_entity/entityfields/filterviewactiongroup/children/addtoserialletter/stateProcess.js</stateProcess>
           <tooltipProcess>%aditoprj%/entity/Person_entity/entityfields/filterviewactiongroup/children/addtoserialletter/tooltipProcess.js</tooltipProcess>
@@ -1061,6 +1060,7 @@
           <onActionProcess>%aditoprj%/entity/Person_entity/entityfields/filterviewactiongroup/children/export/onActionProcess.js</onActionProcess>
           <isObjectAction v="false" />
           <iconId>NEON:EXPORT</iconId>
+          <stateProcess>%aditoprj%/entity/Person_entity/entityfields/filterviewactiongroup/children/export/stateProcess.js</stateProcess>
           <tooltip>Export fields of this table</tooltip>
           <tooltipProcess>%aditoprj%/entity/Person_entity/entityfields/filterviewactiongroup/children/export/tooltipProcess.js</tooltipProcess>
         </entityActionField>
diff --git a/entity/Person_entity/entityfields/filterviewactiongroup/children/addtobulkmailfromtable/onActionProcess.js b/entity/Person_entity/entityfields/filterviewactiongroup/children/addtobulkmailfromtable/onActionProcess.js
index d723a8841f..ead03187df 100644
--- a/entity/Person_entity/entityfields/filterviewactiongroup/children/addtobulkmailfromtable/onActionProcess.js
+++ b/entity/Person_entity/entityfields/filterviewactiongroup/children/addtobulkmailfromtable/onActionProcess.js
@@ -1,6 +1,14 @@
 import("Bulkmail_lib");
 import("system.vars");
-import("system.neon");
 
-if (vars.exists("$sys.selection"))
-    BulkMailUtils.openAddRecipientView(vars.getString("$sys.selection"));
\ No newline at end of file
+var sysSelection = vars.get("$sys.selection");
+
+if(sysSelection.length > 0)     //if data selected -> use selected data
+{
+    BulkMailUtils.addParticipantsByRowIds(JSON.stringify(sysSelection));
+}
+else                            //else -> use Filtercondition
+{
+    let sysFilter = vars.get("$sys.filter");
+    BulkMailUtils.addParticipantsByCondition(JSON.stringify(sysFilter), vars.get("$sys.currentcontextname"));
+}
\ No newline at end of file
diff --git a/entity/Person_entity/entityfields/filterviewactiongroup/children/addtobulkmailfromtable/stateProcess.js b/entity/Person_entity/entityfields/filterviewactiongroup/children/addtobulkmailfromtable/stateProcess.js
index 92f584818a..98d07ed943 100644
--- a/entity/Person_entity/entityfields/filterviewactiongroup/children/addtobulkmailfromtable/stateProcess.js
+++ b/entity/Person_entity/entityfields/filterviewactiongroup/children/addtobulkmailfromtable/stateProcess.js
@@ -1,8 +1,7 @@
+import("FilterviewMenuAction_lib");
 import("system.vars");
-import("system.neon");
 import("system.result");
-import("system.result");
-import("KeywordRegistry_basic");
 
-if (vars.get("$field.STATUS") == $KeywordRegistry.contactStatus$inactive())
-    result.string(neon.COMPONENTSTATE_DISABLED);
\ No newline at end of file
+var contactCount = vars.get("$sys.datarowcount");
+
+FilterviewMenuActionUtils.getComponentStateByRowCount(contactCount);
\ No newline at end of file
diff --git a/entity/Person_entity/entityfields/filterviewactiongroup/children/addtocampaignfromtable/onActionProcess.js b/entity/Person_entity/entityfields/filterviewactiongroup/children/addtocampaignfromtable/onActionProcess.js
index 5306ab46ad..dec741db1e 100644
--- a/entity/Person_entity/entityfields/filterviewactiongroup/children/addtocampaignfromtable/onActionProcess.js
+++ b/entity/Person_entity/entityfields/filterviewactiongroup/children/addtocampaignfromtable/onActionProcess.js
@@ -2,20 +2,14 @@ import("system.vars");
 import("system.neon");
 import("Campaign_lib");
 
-/*
- * If there's a selection only those are ought to be added.
- * Otherwise the filter gets checked, if a filter has beed set, the condition
- * is used to determine the objects to be added.
- * If no selection has been set, all objects will be added.
- */
 var sysSelection = vars.get("$sys.selection");
 
-if(sysSelection.length > 0) //selektierte IDs als Array
+if(sysSelection.length > 0)     //if data selected -> use selected data
 {
-    CampaignUtils.addParticipantsByRowIds(JSON.stringify(sysSelection), "PERSON");
+    CampaignUtils.addParticipantsByRowIds(JSON.stringify(sysSelection), vars.get("$sys.currentcontextname"));
 }
-else
+else                            //else -> use Filtercondition
 {
     let sysFilter = vars.get("$sys.filter");//todo change name
-    CampaignUtils.addParticipantsByCondition(JSON.stringify(sysFilter), "PERSON");
+    CampaignUtils.addParticipantsByCondition(JSON.stringify(sysFilter), vars.get("$sys.currentcontextname"));
 }
\ No newline at end of file
diff --git a/entity/Person_entity/entityfields/filterviewactiongroup/children/addtocampaignfromtable/stateProcess.js b/entity/Person_entity/entityfields/filterviewactiongroup/children/addtocampaignfromtable/stateProcess.js
index 1692669f6c..98d07ed943 100644
--- a/entity/Person_entity/entityfields/filterviewactiongroup/children/addtocampaignfromtable/stateProcess.js
+++ b/entity/Person_entity/entityfields/filterviewactiongroup/children/addtocampaignfromtable/stateProcess.js
@@ -1,19 +1,7 @@
-import("KeywordRegistry_basic");
-import("system.db");
+import("FilterviewMenuAction_lib");
 import("system.vars");
-import("system.neon");
 import("system.result");
 
-var contactCount = vars.get("$sys.datarowcount")
+var contactCount = vars.get("$sys.datarowcount");
 
-if(contactCount > 0)
-{
-    result.string(neon.COMPONENTSTATE_EDITABLE);
-}
-else
-{
-    result.string(neon.COMPONENTSTATE_DISABLED);
-}
-
-if (vars.get("$field.STATUS") == $KeywordRegistry.contactStatus$inactive())
-    result.string(neon.COMPONENTSTATE_DISABLED);
\ No newline at end of file
+FilterviewMenuActionUtils.getComponentStateByRowCount(contactCount);
\ No newline at end of file
diff --git a/entity/Person_entity/entityfields/filterviewactiongroup/children/addtoserialletter/onActionProcess.js b/entity/Person_entity/entityfields/filterviewactiongroup/children/addtoserialletter/onActionProcess.js
index 3bbd8231ed..dc03abb3d7 100644
--- a/entity/Person_entity/entityfields/filterviewactiongroup/children/addtoserialletter/onActionProcess.js
+++ b/entity/Person_entity/entityfields/filterviewactiongroup/children/addtoserialletter/onActionProcess.js
@@ -1,6 +1,14 @@
 import("Bulkmail_lib");
 import("system.vars");
-import("system.neon");
 
-if (vars.exists("$sys.selection"))
-    SerialLetterUtils.openAddRecipientView(vars.getString("$sys.selection"));
\ No newline at end of file
+var sysSelection = vars.get("$sys.selection");
+
+if(sysSelection.length > 0)     //if data selected -> use selected data
+{
+    SerialLetterUtils.addParticipantsByRowIds(JSON.stringify(sysSelection));
+}
+else                            //else -> use Filtercondition
+{
+    let sysFilter = vars.get("$sys.filter");
+    SerialLetterUtils.addParticipantsByCondition(JSON.stringify(sysFilter), vars.get("$sys.currentcontextname"));
+}
\ No newline at end of file
diff --git a/entity/Person_entity/entityfields/filterviewactiongroup/children/addtoserialletter/stateProcess.js b/entity/Person_entity/entityfields/filterviewactiongroup/children/addtoserialletter/stateProcess.js
index 0712af6997..98d07ed943 100644
--- a/entity/Person_entity/entityfields/filterviewactiongroup/children/addtoserialletter/stateProcess.js
+++ b/entity/Person_entity/entityfields/filterviewactiongroup/children/addtoserialletter/stateProcess.js
@@ -1,7 +1,7 @@
-import("system.neon");
+import("FilterviewMenuAction_lib");
 import("system.vars");
 import("system.result");
-import("KeywordRegistry_basic");
 
-if (vars.get("$field.STATUS") == $KeywordRegistry.contactStatus$inactive())
-    result.string(neon.COMPONENTSTATE_DISABLED);
\ No newline at end of file
+var contactCount = vars.get("$sys.datarowcount");
+
+FilterviewMenuActionUtils.getComponentStateByRowCount(contactCount);
\ No newline at end of file
diff --git a/entity/Person_entity/entityfields/filterviewactiongroup/children/export/onActionProcess.js b/entity/Person_entity/entityfields/filterviewactiongroup/children/export/onActionProcess.js
index 2ad35007ff..ecad88623a 100644
--- a/entity/Person_entity/entityfields/filterviewactiongroup/children/export/onActionProcess.js
+++ b/entity/Person_entity/entityfields/filterviewactiongroup/children/export/onActionProcess.js
@@ -1,20 +1,14 @@
-import("system.neon");
+import("ExportTemplate_lib");
 import("system.vars");
 
 var sysSelection = vars.get("$sys.selection");
-var params;
+
 if(sysSelection.length > 0)     //if data selected -> use selected data
 {
-    params = {
-        "selectedData_param" : JSON.stringify(sysSelection),
-        "comingFrom_param" : vars.get("$sys.currentcontextname")}
-    neon.openContext("ExportTemplateSelection", "ExportTemplateSelectionEdit_view", null, neon.OPERATINGSTATE_VIEW, params);
+    ExportTemplateUtils.addParticipantsByRowIds(JSON.stringify(sysSelection), vars.get("$sys.currentcontextname"));
 }
 else                            //else -> use Filtercondition
 {
-    var sysFilter = vars.get("$sys.filter");
-    params = {
-        "selectedData_param" : JSON.stringify(sysFilter),
-        "comingFrom_param" : vars.get("$sys.currentcontextname")}
-    neon.openContext("ExportTemplateSelection", "ExportTemplateSelectionEdit_view", null, neon.OPERATINGSTATE_VIEW, params);
+    let sysFilter = vars.get("$sys.filter");
+    ExportTemplateUtils.addParticipantsByCondition(JSON.stringify(sysFilter), vars.get("$sys.currentcontextname"));
 }
\ No newline at end of file
diff --git a/entity/Person_entity/entityfields/filterviewactiongroup/children/export/stateProcess.js b/entity/Person_entity/entityfields/filterviewactiongroup/children/export/stateProcess.js
new file mode 100644
index 0000000000..98d07ed943
--- /dev/null
+++ b/entity/Person_entity/entityfields/filterviewactiongroup/children/export/stateProcess.js
@@ -0,0 +1,7 @@
+import("FilterviewMenuAction_lib");
+import("system.vars");
+import("system.result");
+
+var contactCount = vars.get("$sys.datarowcount");
+
+FilterviewMenuActionUtils.getComponentStateByRowCount(contactCount);
\ No newline at end of file
diff --git a/entity/SerialLetterAddRecipients_entity/SerialLetterAddRecipients_entity.aod b/entity/SerialLetterAddRecipients_entity/SerialLetterAddRecipients_entity.aod
index cfcb2ee735..8cba893319 100644
--- a/entity/SerialLetterAddRecipients_entity/SerialLetterAddRecipients_entity.aod
+++ b/entity/SerialLetterAddRecipients_entity/SerialLetterAddRecipients_entity.aod
@@ -49,11 +49,27 @@
       <iconId>VAADIN:ENVELOPES</iconId>
       <stateProcess>%aditoprj%/entity/SerialLetterAddRecipients_entity/entityfields/addparticipants/stateProcess.js</stateProcess>
     </entityActionField>
+    <entityParameter>
+      <name>comingFrom_param</name>
+      <expose v="true" />
+    </entityParameter>
+    <entityField>
+      <name>currentRecipients</name>
+      <documentation>%aditoprj%/entity/SerialLetterAddRecipients_entity/entityfields/currentrecipients/documentation.adoc</documentation>
+      <title>Current Recipients</title>
+      <valueProcess>%aditoprj%/entity/SerialLetterAddRecipients_entity/entityfields/currentrecipients/valueProcess.js</valueProcess>
+    </entityField>
     <entityField>
       <name>recipientcount</name>
       <state>EDITABLE</state>
       <valueProcess>%aditoprj%/entity/SerialLetterAddRecipients_entity/entityfields/recipientcount/valueProcess.js</valueProcess>
     </entityField>
+    <entityField>
+      <name>futureRecipients</name>
+      <documentation>%aditoprj%/entity/SerialLetterAddRecipients_entity/entityfields/futurerecipients/documentation.adoc</documentation>
+      <title>Recipients after adding</title>
+      <valueProcess>%aditoprj%/entity/SerialLetterAddRecipients_entity/entityfields/futurerecipients/valueProcess.js</valueProcess>
+    </entityField>
   </entityFields>
   <recordContainers>
     <datalessRecordContainer>
diff --git a/entity/SerialLetterAddRecipients_entity/entityfields/currentrecipients/documentation.adoc b/entity/SerialLetterAddRecipients_entity/entityfields/currentrecipients/documentation.adoc
new file mode 100644
index 0000000000..74e2caafdf
--- /dev/null
+++ b/entity/SerialLetterAddRecipients_entity/entityfields/currentrecipients/documentation.adoc
@@ -0,0 +1,2 @@
+== currentRecipients;
+needed for the score card, to display extra information.
diff --git a/entity/SerialLetterAddRecipients_entity/entityfields/currentrecipients/valueProcess.js b/entity/SerialLetterAddRecipients_entity/entityfields/currentrecipients/valueProcess.js
new file mode 100644
index 0000000000..1554f48883
--- /dev/null
+++ b/entity/SerialLetterAddRecipients_entity/entityfields/currentrecipients/valueProcess.js
@@ -0,0 +1,13 @@
+import("system.logging");
+import("system.result");
+import("system.vars");
+import("Sql_lib");
+
+var currentCount = newSelect("count(CONTACT_ID)")
+                            .from("LETTERRECIPIENT")
+                            .where("LETTERRECIPIENT.SERIALLETTER_ID", vars.get("$field.SERIALLETTER_ID"))
+                            .cell();
+if(currentCount)
+    result.string(currentCount);
+else
+    result.string("0");
\ No newline at end of file
diff --git a/entity/SerialLetterAddRecipients_entity/entityfields/futurerecipients/documentation.adoc b/entity/SerialLetterAddRecipients_entity/entityfields/futurerecipients/documentation.adoc
new file mode 100644
index 0000000000..b3fd706b46
--- /dev/null
+++ b/entity/SerialLetterAddRecipients_entity/entityfields/futurerecipients/documentation.adoc
@@ -0,0 +1,2 @@
+== futureRecipients;
+needed for the score card, to display extra information.
diff --git a/entity/SerialLetterAddRecipients_entity/entityfields/futurerecipients/valueProcess.js b/entity/SerialLetterAddRecipients_entity/entityfields/futurerecipients/valueProcess.js
new file mode 100644
index 0000000000..138ce6ef23
--- /dev/null
+++ b/entity/SerialLetterAddRecipients_entity/entityfields/futurerecipients/valueProcess.js
@@ -0,0 +1,9 @@
+import("system.vars");
+import("system.result");
+import("system.eMath")
+
+var res = eMath.addInt(vars.get("$field.recipientcount"), vars.get("$field.currentRecipients"));
+if(res)
+    result.string(res);
+else
+    result.string(0);
\ No newline at end of file
diff --git a/entity/SerialLetterAddRecipients_entity/entityfields/recipientcontactids/valueProcess.js b/entity/SerialLetterAddRecipients_entity/entityfields/recipientcontactids/valueProcess.js
index 8a46791dce..385706891b 100644
--- a/entity/SerialLetterAddRecipients_entity/entityfields/recipientcontactids/valueProcess.js
+++ b/entity/SerialLetterAddRecipients_entity/entityfields/recipientcontactids/valueProcess.js
@@ -1,3 +1,4 @@
+import("FilterviewMenuAction_lib");
 import("Contact_lib");
 import("system.result");
 import("Bulkmail_lib");
@@ -7,7 +8,18 @@ import("system.db");
 import("Sql_lib");
 import("system.vars");
 
-var contactIds = JSON.parse(vars.getString("$param.ContactIds_param"));
+var selection = JSON.parse(vars.getString("$param.ContactIds_param"));
+var comingfrom = vars.getString("$param.comingFrom_param");
+var contactIds;
+
+if(!Array.isArray(selection)) //if selection is an array, data has been selected
+{
+    var condition = selection.condition;
+    if(comingfrom == "Organisation")
+        contactIds = FilterviewMenuActionUtils.organisationIdsFilter(condition);
+    else if (comingfrom == "Person")
+        contactIds = FilterviewMenuActionUtils.contactIdsFilter(condition);
+}
 var serialLetterId = vars.get("$field.SERIALLETTER_ID")
 
 var res;
@@ -16,5 +28,4 @@ if (serialLetterId)
 else
     res = null;
     
-result.string(res);
-
+result.string(res);
\ No newline at end of file
diff --git a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
index d3a8ed8ce3..b081966d43 100644
--- a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
+++ b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
@@ -6968,6 +6968,40 @@
     <entry>
       <key>workflow notification</key>
     </entry>
+    <entry>
+      <key>Workflow Model</key>
+    </entry>
+    <entry>
+      <key>Current Recipients</key>
+    </entry>
+    <entry>
+      <key>The workflow could not be deployed</key>
+    </entry>
+    <entry>
+      <key>Workflow deploy failed</key>
+    </entry>
+    <entry>
+      <key>%0 new recipients will be added to the bulk mail. \n\&#xD;
+                            %1 of the chosen records are already recipients or don't have an e-mail set</key>
+    </entry>
+    <entry>
+      <key>Recipients after adding</key>
+    </entry>
+    <entry>
+      <key>%0 of the chosen records are already recipients or don't have an e-mail set</key>
+    </entry>
+    <entry>
+      <key>Organisations will be exported</key>
+    </entry>
+    <entry>
+      <key>Contacts will be exported</key>
+    </entry>
+    <entry>
+      <key>%0 new participants will be added to the campaign.</key>
+    </entry>
+    <entry>
+      <key>%0 of the chosen records are already in the campaign</key>
+    </entry>
     <entry>
       <key>Permission received</key>
     </entry>
@@ -6986,21 +7020,12 @@
     <entry>
       <key>Total in euros</key>
     </entry>
-    <entry>
-      <key>Workflow Model</key>
-    </entry>
     <entry>
       <key>{SENT_MAIL}</key>
     </entry>
     <entry>
       <key>The Sales Project can only be filled when a company has been specified</key>
     </entry>
-    <entry>
-      <key>The workflow could not be deployed</key>
-    </entry>
-    <entry>
-      <key>Workflow deploy failed</key>
-    </entry>
     <entry>
       <key>Ø Probability</key>
     </entry>
diff --git a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
index 2e9dd22054..a105501a68 100644
--- a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
+++ b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
@@ -391,10 +391,6 @@
       <key>Salesproject phases</key>
       <value>Vertriebsprojektphasen</value>
     </entry>
-    <entry>
-      <key>%0 new recipients will be added to the bulk mail.</key>
-      <value>Der Serienmail werden %0 neue Empfänger hinzugefügt.</value>
-    </entry>
     <entry>
       <key>DSGVO Information</key>
       <value>DSGVO Informationen</value>
@@ -8897,6 +8893,7 @@ Bitte Datumseingabe prüfen</value>
     </entry>
     <entry>
       <key>No new recipients found that can be added to the serial letter.</key>
+      <value>Keine neuen Teilnehmer gefunden die zum Serienbrief hinzugefügt werden können.</value>
     </entry>
     <entry>
       <key>New</key>
@@ -8921,33 +8918,76 @@ Bitte Datumseingabe prüfen</value>
     </entry>
     <entry>
       <key>No new recipients found that can be added to the bulk mail.</key>
+      <value>Keine neuen Teilnehmer gefunden die zur Serienmail hinzugefügt werden können.</value>
     </entry>
     <entry>
-      <key>Total in euros</key>
+      <key>Current Recipients</key>
+      <value>Aktuelle Empfänger</value>
     </entry>
     <entry>
-      <key>export using the selected  template</key>
+      <key>The workflow could not be deployed</key>
     </entry>
     <entry>
-      <key>send mail</key>
+      <key>Workflow deploy failed</key>
     </entry>
     <entry>
-      <key>Download letter and create Activity</key>
+      <key>Create model</key>
     </entry>
     <entry>
-      <key>{SENT_MAIL}</key>
+      <key>Edit workflow</key>
     </entry>
     <entry>
-      <key>The workflow could not be deployed</key>
+      <key>Recipients after adding</key>
+      <value>Empfänger nach dem hinzufügen</value>
     </entry>
     <entry>
-      <key>Add Participants</key>
+      <key>%0 new recipients will be added to the bulk mail.</key>
+      <value>Der Serienmail werden %0 neue Empfänger hinzugefügt.</value>
     </entry>
     <entry>
-      <key>Workflow deploy failed</key>
+      <key>%0 new participants will be added to the campaign.</key>
+      <value>Der Kampagne werden %0 neue Empfänger hinzugefügt.</value>
     </entry>
     <entry>
-      <key>Create model</key>
+      <key>%0 of the chosen records are already recipients or don't have an e-mail set</key>
+      <value>%0 der ausgewählten Datensätze sind entweder schon Empfänger oder haben keine E-Mail Addresse angegeben.
+      </value>
+    </entry>
+    <entry>
+      <key>%0 of the chosen records are already in the campaign</key>
+      <value>%0 der ausgewählten Datensätze sind schon in der Kampagne.</value>
+    </entry>
+    <entry>
+      <key>Organisations will be exported</key>
+      <value>Firmen werden exportiert</value>
+    </entry>
+    <entry>
+      <key>Contacts will be exported</key>
+      <value>Kontakte werden exportiert</value>
+    </entry>
+    <entry>
+      <key>%0 new recipients will be added to the bulk mail. \n\&#xD;
+                            %1 of the chosen records are already recipients or don't have an e-mail set</key>
+    </entry>
+    <entry>
+      <key>download ready</key>
+    </entry>
+    <entry>
+      <key>export using the selected template</key>
+      <value>Mit der ausgewählten Vorlage Exportieren</value>
+    </entry>
+    <entry>
+      <key>send mail</key>
+    </entry>
+    <entry>
+      <key>Download letter and create Activity</key>
+    </entry>
+    <entry>
+      <key>{SENT_MAIL}</key>
+    </entry>
+    <entry>
+      <key>Add Participants</key>
+      <value>Teilnehmer hinzufügen</value>
     </entry>
     <entry>
       <key>Release</key>
@@ -8958,9 +8998,6 @@ Bitte Datumseingabe prüfen</value>
     <entry>
       <key>bulk mail sent</key>
     </entry>
-    <entry>
-      <key>Edit workflow</key>
-    </entry>
     <entry>
       <key>and open Report</key>
     </entry>
@@ -8969,13 +9006,11 @@ Bitte Datumseingabe prüfen</value>
     </entry>
     <entry>
       <key>Add Recipients</key>
+      <value>Teilnehmer hinzufügen</value>
     </entry>
     <entry>
       <key>{SEND_MAIL}</key>
     </entry>
-    <entry>
-      <key>download ready</key>
-    </entry>
     <entry>
       <key>Latitude</key>
     </entry>
@@ -9001,6 +9036,9 @@ Bitte Datumseingabe prüfen</value>
     <entry>
       <key>Probability AI</key>
     </entry>
+    <entry>
+      <key>Total in euros</key>
+    </entry>
   </keyValueMap>
   <font name="Dialog" style="0" size="11" />
 </language>
diff --git a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
index 77d0fd44c6..d020e1f635 100644
--- a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
+++ b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
@@ -6942,13 +6942,19 @@
       <key>send mail</key>
     </entry>
     <entry>
-      <key>Receive new Department Permission</key>
+      <key>and open modeler</key>
     </entry>
     <entry>
-      <key>Receive new User Permission</key>
+      <key>Workflow Model</key>
     </entry>
     <entry>
-      <key>and open modeler</key>
+      <key>Current Recipients</key>
+    </entry>
+    <entry>
+      <key>The workflow could not be deployed</key>
+    </entry>
+    <entry>
+      <key>Workflow deploy failed</key>
     </entry>
     <entry>
       <key>Create model</key>
@@ -6956,6 +6962,34 @@
     <entry>
       <key>Edit workflow</key>
     </entry>
+    <entry>
+      <key>%0 new recipients will be added to the bulk mail. \n\&#xD;
+                            %1 of the chosen records are already recipients or don't have an e-mail set</key>
+    </entry>
+    <entry>
+      <key>Recipients after adding</key>
+    </entry>
+    <entry>
+      <key>%0 of the chosen records are already recipients or don't have an e-mail set</key>
+    </entry>
+    <entry>
+      <key>Organisations will be exported</key>
+    </entry>
+    <entry>
+      <key>Contacts will be exported</key>
+    </entry>
+    <entry>
+      <key>%0 new participants will be added to the campaign.</key>
+    </entry>
+    <entry>
+      <key>%0 of the chosen records are already in the campaign</key>
+    </entry>
+    <entry>
+      <key>Receive new Department Permission</key>
+    </entry>
+    <entry>
+      <key>Receive new User Permission</key>
+    </entry>
     <entry>
       <key>workflow notification</key>
     </entry>
@@ -6977,9 +7011,6 @@
     <entry>
       <key>Total in euros</key>
     </entry>
-    <entry>
-      <key>Workflow Model</key>
-    </entry>
     <entry>
       <key>The Sales Project can only be filled when a company has been specified</key>
     </entry>
@@ -6987,12 +7018,6 @@
       <key>{SEND_MAIL}</key>
       <value>Send mail</value>
     </entry>
-    <entry>
-      <key>The workflow could not be deployed</key>
-    </entry>
-    <entry>
-      <key>Workflow deploy failed</key>
-    </entry>
     <entry>
       <key>{SENT_MAIL}</key>
     </entry>
diff --git a/neonContext/CampaignAddParticipants/CampaignAddParticipants.aod b/neonContext/CampaignAddParticipants/CampaignAddParticipants.aod
index 6e0db09316..11ff951e22 100644
--- a/neonContext/CampaignAddParticipants/CampaignAddParticipants.aod
+++ b/neonContext/CampaignAddParticipants/CampaignAddParticipants.aod
@@ -9,9 +9,5 @@
       <name>c4f11246-9c24-4c1c-8e53-96acabf04bab</name>
       <view>CampaignAddParticipantsEdit_view</view>
     </neonViewReference>
-    <neonViewReference>
-      <name>87d572bd-f2ce-4283-8db0-a7d9f9441fa0</name>
-      <view>campaignParticipantMessage_view</view>
-    </neonViewReference>
   </references>
 </neonContext>
diff --git a/neonView/BulkMailAddRecipientsEdit_view/BulkMailAddRecipientsEdit_view.aod b/neonView/BulkMailAddRecipientsEdit_view/BulkMailAddRecipientsEdit_view.aod
index b51a66ffd8..3e391de817 100644
--- a/neonView/BulkMailAddRecipientsEdit_view/BulkMailAddRecipientsEdit_view.aod
+++ b/neonView/BulkMailAddRecipientsEdit_view/BulkMailAddRecipientsEdit_view.aod
@@ -6,11 +6,26 @@
   <isOverlay v="false" />
   <overlayOrientation>PORTRAIT</overlayOrientation>
   <layout>
-    <boxLayout>
+    <headerFooterLayout>
       <name>layout</name>
-    </boxLayout>
+      <header>SelectedBulkMailInfosScore</header>
+    </headerFooterLayout>
   </layout>
   <children>
+    <scoreCardViewTemplate>
+      <name>SelectedBulkMailInfosScore</name>
+      <entityField>#ENTITY</entityField>
+      <fields>
+        <entityFieldLink>
+          <name>1b9e38a5-e921-48f7-ba04-71b758fa9ed3</name>
+          <entityField>currentRecipients</entityField>
+        </entityFieldLink>
+        <entityFieldLink>
+          <name>4578042c-9210-4dc4-870f-298a390aebd8</name>
+          <entityField>futureRecipients</entityField>
+        </entityFieldLink>
+      </fields>
+    </scoreCardViewTemplate>
     <genericViewTemplate>
       <name>Generic</name>
       <editMode v="true" />
diff --git a/neonView/CampaignAddParticipantsEdit_view/CampaignAddParticipantsEdit_view.aod b/neonView/CampaignAddParticipantsEdit_view/CampaignAddParticipantsEdit_view.aod
index 51e47fdf63..c5448b2e2f 100644
--- a/neonView/CampaignAddParticipantsEdit_view/CampaignAddParticipantsEdit_view.aod
+++ b/neonView/CampaignAddParticipantsEdit_view/CampaignAddParticipantsEdit_view.aod
@@ -30,22 +30,18 @@
       <name>campaignDetail</name>
       <editMode v="true" />
       <entityField>#ENTITY</entityField>
+      <informationField>campaignParticipantMessage</informationField>
       <fields>
         <entityFieldLink>
-          <name>4968ad35-3651-4654-a1b0-0e3d0fc6165d</name>
+          <name>e4fa5e06-cc8e-40c2-983c-371bd6b46958</name>
           <entityField>CAMPAIGN_ID</entityField>
         </entityFieldLink>
         <entityFieldLink>
-          <name>b9016725-1345-4526-88eb-2b05fb4089c8</name>
+          <name>f5cd3e7d-e2e3-401c-a314-6853ff269065</name>
           <entityField>CAMPAIGNSTEP_ID</entityField>
         </entityFieldLink>
       </fields>
     </genericViewTemplate>
-    <neonViewReference>
-      <name>1bfb0564-f81f-4c60-ae5b-1d9778a519ab</name>
-      <entityField>#ENTITY</entityField>
-      <view>campaignParticipantMessage_view</view>
-    </neonViewReference>
     <actionsViewTemplate>
       <name>ContinueActions</name>
       <actions>
diff --git a/neonView/ExportTemplateSelectionEdit_view/ExportTemplateSelectionEdit_view.aod b/neonView/ExportTemplateSelectionEdit_view/ExportTemplateSelectionEdit_view.aod
index 7a9b755b20..3886dffb7b 100644
--- a/neonView/ExportTemplateSelectionEdit_view/ExportTemplateSelectionEdit_view.aod
+++ b/neonView/ExportTemplateSelectionEdit_view/ExportTemplateSelectionEdit_view.aod
@@ -5,11 +5,22 @@
   <size>SMALL</size>
   <overlayOrientation>PORTRAIT</overlayOrientation>
   <layout>
-    <boxLayout>
+    <headerFooterLayout>
       <name>layout</name>
-    </boxLayout>
+      <header>ExportedDataInfoScore</header>
+    </headerFooterLayout>
   </layout>
   <children>
+    <scoreCardViewTemplate>
+      <name>ExportedDataInfoScore</name>
+      <entityField>#ENTITY</entityField>
+      <fields>
+        <entityFieldLink>
+          <name>731880ab-e7fd-462b-ae21-431673f232cc</name>
+          <entityField>exportCount</entityField>
+        </entityFieldLink>
+      </fields>
+    </scoreCardViewTemplate>
     <genericViewTemplate>
       <name>generic</name>
       <editMode v="true" />
diff --git a/neonView/SerialLetterAddRecipientsEdit_view/SerialLetterAddRecipientsEdit_view.aod b/neonView/SerialLetterAddRecipientsEdit_view/SerialLetterAddRecipientsEdit_view.aod
index b3b8d67e1b..cc896e3f34 100644
--- a/neonView/SerialLetterAddRecipientsEdit_view/SerialLetterAddRecipientsEdit_view.aod
+++ b/neonView/SerialLetterAddRecipientsEdit_view/SerialLetterAddRecipientsEdit_view.aod
@@ -6,11 +6,26 @@
   <isOverlay v="false" />
   <overlayOrientation>PORTRAIT</overlayOrientation>
   <layout>
-    <noneLayout>
+    <headerFooterLayout>
       <name>layout</name>
-    </noneLayout>
+      <header>SelectedSerialLetterInfosScore</header>
+    </headerFooterLayout>
   </layout>
   <children>
+    <scoreCardViewTemplate>
+      <name>SelectedSerialLetterInfosScore</name>
+      <entityField>#ENTITY</entityField>
+      <fields>
+        <entityFieldLink>
+          <name>02bc3eb7-4ceb-4a54-ab56-9980b7653152</name>
+          <entityField>currentRecipients</entityField>
+        </entityFieldLink>
+        <entityFieldLink>
+          <name>5e91781a-d640-4096-a084-259c23bea825</name>
+          <entityField>futureRecipients</entityField>
+        </entityFieldLink>
+      </fields>
+    </scoreCardViewTemplate>
     <genericViewTemplate>
       <name>Generic</name>
       <editMode v="true" />
@@ -24,17 +39,6 @@
         </entityFieldLink>
       </fields>
     </genericViewTemplate>
-    <genericViewTemplate>
-      <name>Message</name>
-      <hideLabels v="true" />
-      <entityField>#ENTITY</entityField>
-      <fields>
-        <entityFieldLink>
-          <name>ab256925-6375-4b7f-880d-039f6a68ccbc</name>
-          <entityField>recipientCountMessage</entityField>
-        </entityFieldLink>
-      </fields>
-    </genericViewTemplate>
     <actionsViewTemplate>
       <name>ContinueActions</name>
       <actions>
diff --git a/neonView/campaignParticipantMessage_view/campaignParticipantMessage_view.aod b/neonView/campaignParticipantMessage_view/campaignParticipantMessage_view.aod
deleted file mode 100644
index f11aa26b76..0000000000
--- a/neonView/campaignParticipantMessage_view/campaignParticipantMessage_view.aod
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.6">
-  <name>campaignParticipantMessage_view</name>
-  <majorModelMode>DISTRIBUTED</majorModelMode>
-  <layout>
-    <noneLayout>
-      <name>layout</name>
-    </noneLayout>
-  </layout>
-  <children>
-    <genericViewTemplate>
-      <name>Message_view</name>
-      <hideLabels v="true" />
-      <hideEmptyFields v="true" />
-      <entityField>#ENTITY</entityField>
-      <fields>
-        <entityFieldLink>
-          <name>bc1db862-a448-47f6-b534-2ce28dc993a8</name>
-          <entityField>campaignParticipantMessage</entityField>
-        </entityFieldLink>
-      </fields>
-    </genericViewTemplate>
-  </children>
-</neonView>
diff --git a/process/Bulkmail_lib/process.js b/process/Bulkmail_lib/process.js
index ede9be7097..0715bd9e1c 100644
--- a/process/Bulkmail_lib/process.js
+++ b/process/Bulkmail_lib/process.js
@@ -393,6 +393,38 @@ BulkMailUtils.copy = function(pBulkMailId)
     };
     neon.openContext("BulkMail", null, null, neon.OPERATINGSTATE_NEW, params);
 }
+/**
+ * Adds contacts or organistaions to a bulk mail by contactIds.<br>
+ * 
+ * @param {String} pContactIds              <p>
+ *                                      The contact ids as JSON array.<br>
+ */
+BulkMailUtils.addParticipantsByRowIds = function(pContactIds)
+{
+    var params = {
+        "ContactIds_param" : pContactIds
+    };
+    neon.openContext("BulkMailAddRecipients", "BulkMailAddRecipientsEdit_view", null, neon.OPERATINGSTATE_VIEW, params);
+}
+
+/**
+ * Adds contacts or organistaions to a bulk mail by condition (filter).<br>
+ * 
+ * @param {String} pCondition           <p>
+ *                                      Contact ids.
+ * @param {String} pSourceTableName     <p>
+ *                                      The source table.<br>
+ */
+BulkMailUtils.addParticipantsByCondition = function(pCondition, pSourceTableName)
+{
+    var params = {
+        "ContactIds_param" : pCondition,
+        "comingFrom_param" : pSourceTableName}
+    neon.openContext("BulkMailAddRecipients", "BulkMailAddRecipientsEdit_view", null, neon.OPERATINGSTATE_VIEW, params);
+}
+
+
+
 
 function SerialLetterUtils () {}
 
@@ -551,4 +583,34 @@ SerialLetterUtils.getSerialLetterTemplate = function (pLetterId, pDocumentTempla
     if (!template.type)
         template = DocumentTemplate.loadTemplate(pDocumentTemplateId);
     return template;
+}
+
+/**
+ * Adds contacts or organistaions to a serial letter by contactIds.<br>
+ * 
+ * @param {String} pContactIds              <p>
+ *                                      The contact ids as JSON array.<br>
+ */
+SerialLetterUtils.addParticipantsByRowIds = function(pContactIds)
+{
+    var params = {
+        "ContactIds_param" : pContactIds
+    };
+    neon.openContext("SerialLetterAddRecipients", "SerialLetterAddRecipientsEdit_view", null, neon.OPERATINGSTATE_VIEW, params);
+}
+
+/**
+ * Adds contacts or organistaions to a serial letter by condition (filter).<br>
+ * 
+ * @param {String} pCondition           <p>
+ *                                      Contact ids.
+ * @param {String} pSourceTableName     <p>
+ *                                      The source table.<br>
+ */
+SerialLetterUtils.addParticipantsByCondition = function(pCondition, pSourceTableName)
+{
+    var params = {
+        "ContactIds_param" : pCondition,
+        "comingFrom_param" : pSourceTableName}
+    neon.openContext("SerialLetterAddRecipients", "SerialLetterAddRecipientsEdit_view", null, neon.OPERATINGSTATE_VIEW, params);
 }
\ No newline at end of file
diff --git a/process/Campaign_lib/process.js b/process/Campaign_lib/process.js
index b38ab24f96..482f9c6b20 100644
--- a/process/Campaign_lib/process.js
+++ b/process/Campaign_lib/process.js
@@ -693,5 +693,5 @@ _CampaignUtils._openAddParticipantContext = function(pContext, pTargetDataExpres
     params["isUpdate_param"] = false;
     params["dataSourceTableName_param"] = pSourceTableName;
     
-    neon.openContext(pContext, "CampaignAddParticipantsEdit_view", null, neon.OPERATINGSTATE_VIEW, params);
+    neon.openContext(pContext, pView, null, neon.OPERATINGSTATE_VIEW, params);
 }
\ No newline at end of file
diff --git a/process/ExportTemplate_lib/process.js b/process/ExportTemplate_lib/process.js
index a8c0991155..6d92feab13 100644
--- a/process/ExportTemplate_lib/process.js
+++ b/process/ExportTemplate_lib/process.js
@@ -1,3 +1,5 @@
+import("system.neon");
+import("system.vars");
 import("Address_lib");
 import("Keyword_lib");
 import("KeywordRegistry_basic");
@@ -51,17 +53,7 @@ ExportTemplateUtils.buildExport = function (pExportTemplateId, pSelection, pComi
         selection = [];
         selection = JSON.parse(pSelection);      //makes an array of the ContactIds/OrganisationIds of the selected data
      }
-    else
-    {
-       filteredIdcondition = JSON.parse(selection).condition;
-       if(comingFrom == "Person")
-         selection = ExportTemplateUtils.contactIdsFilter(filteredIdcondition);               //selects all ContactIds of the filtered data
-       else if(comingFrom == "Organisation")
-           selection = ExportTemplateUtils.contactIdsOrganisationFilter(filteredIdcondition);        //selects all OrganisationIds of the filtered data
-       else
-           throw new Error(translate.text("pComingFrom is not defined. 'ExportTemplateUtils.buildExport:66'"));
-    }
-   
+     
     if(filename == null || filename == undefined || filename.trim() == "") //if the user didn't choose a filename => generate one automatically
         filename = ExportTemplateUtils.getExportFileName(templateTitle, "UTC");
    filename += ".csv";
@@ -94,7 +86,7 @@ ExportTemplateUtils.buildExport = function (pExportTemplateId, pSelection, pComi
     return {content : csvTable, 
             filename : filename
     };
-}
+};
 
 /**
  * Gets an Array of all the Fields of a ExportTemplate using it's unique exportTemplateId.
@@ -111,7 +103,7 @@ ExportTemplateUtils.getTemplateFields = function (pExportTemplateId)
                         .where("EXPORTTEMPLATEFIELD.EXPORTTEMPLATE_ID", pExportTemplateId)
                         .orderBy("EXPORTTEMPLATEFIELD.SORTING")
                         .arrayColumn();
-}
+};
 
 /**
  * Generates a practical filename, with the templateName, and the date + time of the download, using it's unique exportTemplateId.
@@ -128,45 +120,7 @@ ExportTemplateUtils.getExportFileName = function (pTemplateTitle, pTimeZone)
     var exportFileName = pTemplateTitle + "_" + datetime.toDate(datetime.date(), "dd.MM.yyyy.HH:mm:ss", pTimeZone);
     
     return exportFileName;
-}
-
-/**
- * Generates an Array of all the contactIds using the filtercondition
- * 
- * @param {String} pCondition the condition of the filter
- * 
- * @return {Array} all the contactids limited by the filtercondition
- */
-ExportTemplateUtils.contactIdsFilter = function (pCondition)
-{
-    let query = newSelect("CONTACT.CONTACTID").from("CONTACT");
-    
-    query.join("PERSON", "CONTACT.PERSON_ID = PERSON.PERSONID")
-        .leftJoin("ORGANISATION", "ORGANISATION.ORGANISATIONID = CONTACT.ORGANISATION_ID")
-        .leftJoin("ADDRESS", "ADDRESS.ADDRESSID = CONTACT.ADDRESS_ID")
-        .where(pCondition);
-
-    return query.arrayColumn();
-}
-
-/**
- * Generates an Array of all the organisationIds (=contactIds of the organisations) using the filtercondition
- * 
- * @param {String} pCondition the condition of the filter
- * 
- * @return {Array} all the organisationids (=contactIds of the organisations) limited by the filtercondition
- */
-ExportTemplateUtils.contactIdsOrganisationFilter = function (pCondition)
-{
-    let query = newSelect("ORGANISATION.ORGANISATIONID").from("ORGANISATION");
-    
-    query.leftJoin("CONTACT", "CONTACT.ORGANISATION_ID = ORGANISATION.ORGANISATIONID")
-        .leftJoin("PERSON", "PERSON.PERSONID = CONTACT.PERSON_ID")
-        .leftJoin("ADDRESS", "ADDRESS.ADDRESSID = CONTACT.ADDRESS_ID")
-        .where(pCondition);
-
-    return query.arrayColumn();
-}
+};
 
 /**
  * Gets the title, language, sentenceseparator, fieldseparator and fielddelimiter of an export template using it's unique Id
@@ -184,7 +138,7 @@ ExportTemplateUtils.getTemplateData = function (pExportTemplateId)
                         .arrayRow();
     data[1] = LanguageKeywordUtils.Iso2FromIso3(data[1]) //needed to get the language in the right format
     return data;
-}
+};
 
 /**
  * Converts the sentence separator in the correct character if one of the keys is being used
@@ -202,7 +156,7 @@ ExportTemplateUtils.getSentenceSeparator = function (pSentenceSeparator)
        return "\r\n";
    else
        return pSentenceSeparator;
-}
+};
 
 /**
  * Converts the field separator in the correct character if one of the keys is being used
@@ -224,7 +178,7 @@ ExportTemplateUtils.getFieldSeparator = function (pFieldSeparator)
         return ";";
    else
        return pFieldSeparator;
-}
+};
 
 /**
  * Converts the field delimiter in the correct character if one of the keys is being used
@@ -242,7 +196,7 @@ ExportTemplateUtils.getFieldDeLimiter = function (pFieldDeLimiter)
        return "\"";
    else
        return pFieldDeLimiter;
-}
+};
 
 /**
  * Gets the Title of a Template
@@ -257,4 +211,36 @@ ExportTemplateUtils.getExportTemplateTitle = function (pExportTemplateId)
                                 .from("EXPORTTEMPLATE")
                                 .where("EXPORTTEMPLATE.EXPORTTEMPLATEID", pExportTemplateId)
                                 .cell(true);
-}
\ No newline at end of file
+};
+
+/**
+ * Export contacts or organistaions by contactIds.<br>
+ * 
+ * @param {String} pRowIds              <p>
+ *                                      The contact ids as JSON array.<br>
+ * @param {String} pSourceTableName     <p>
+ *                                      The source table.<br>
+ */
+ExportTemplateUtils.addParticipantsByRowIds = function (pRowIds, pSourceTableName)
+{
+        var params = {
+                "selectedData_param" : pRowIds,
+                "comingFrom_param" : pSourceTableName}
+    neon.openContext("ExportTemplateSelection", "ExportTemplateSelectionEdit_view", null, neon.OPERATINGSTATE_VIEW, params);
+};
+
+/**
+ * Export contacts or organistaions by condition (filter).<br>
+ * 
+ * @param {String} pCondition           <p>
+ *                                      Contact ids.
+ * @param {String} pSourceTableName     <p>
+ *                                      The source table.<br>
+ */
+ExportTemplateUtils.addParticipantsByCondition = function (pCondition, pSourceTableName)
+{
+    var params = {
+                "selectedData_param" : pCondition,
+                "comingFrom_param" : pSourceTableName}
+    neon.openContext("ExportTemplateSelection", "ExportTemplateSelectionEdit_view", null, neon.OPERATINGSTATE_VIEW, params);
+};
\ No newline at end of file
diff --git a/process/FilterCondition_lib/process.js b/process/FilterCondition_lib/process.js
index c49e3c2374..abb1cee432 100644
--- a/process/FilterCondition_lib/process.js
+++ b/process/FilterCondition_lib/process.js
@@ -1,3 +1,5 @@
+import("system.neon");
+import("Sql_lib");
 /**
  * Methods to help build filterCondition statements.
  * Do not create an instance of this!
diff --git a/process/FilterviewMenuAction_lib/FilterviewMenuAction_lib.aod b/process/FilterviewMenuAction_lib/FilterviewMenuAction_lib.aod
new file mode 100644
index 0000000000..3162cdadf0
--- /dev/null
+++ b/process/FilterviewMenuAction_lib/FilterviewMenuAction_lib.aod
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.1">
+  <name>FilterviewMenuAction_lib</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <process>%aditoprj%/process/FilterviewMenuAction_lib/process.js</process>
+  <variants>
+    <element>LIBRARY</element>
+  </variants>
+</process>
diff --git a/process/FilterviewMenuAction_lib/process.js b/process/FilterviewMenuAction_lib/process.js
new file mode 100644
index 0000000000..9dbcc8e25b
--- /dev/null
+++ b/process/FilterviewMenuAction_lib/process.js
@@ -0,0 +1,63 @@
+import("system.neon");
+import("Sql_lib");
+/**
+ * Methods for the menu actions in the filterview.
+ * Do not create an instance of this!
+ * 
+ * @class
+ */
+function FilterviewMenuActionUtils() {}
+
+/**
+ * Generates an Array of all the contactIds using the filtercondition
+ * 
+ * @param {Condition} pCondition the condition of the filter
+ * 
+ * @return {Array} all the contactids limited by the filtercondition
+ */
+FilterviewMenuActionUtils.contactIdsFilter = function (pCondition)
+{
+    let query = newSelect("distinct CONTACT.CONTACTID").from("CONTACT");
+    
+    query.join("PERSON", "CONTACT.PERSON_ID = PERSON.PERSONID")
+        .leftJoin("ORGANISATION", "ORGANISATION.ORGANISATIONID = CONTACT.ORGANISATION_ID")
+        .leftJoin("ADDRESS", "ADDRESS.ADDRESSID = CONTACT.ADDRESS_ID")
+        .where(pCondition);
+
+    return query.arrayColumn();
+};
+
+/**
+ * Generates an Array of all the organisationIds using the filtercondition
+ * 
+ * @param {String} pCondition the condition of the filter
+ * 
+ * @return {Array} all the organisationids (=contactIds of the organisations) limited by the filtercondition
+ */
+FilterviewMenuActionUtils.organisationIdsFilter = function (pCondition)
+{
+    let query = newSelect("distinct ORGANISATION.ORGANISATIONID").from("ORGANISATION");
+    
+    query.leftJoin("CONTACT", "CONTACT.ORGANISATION_ID = ORGANISATION.ORGANISATIONID")
+        .leftJoin("PERSON", "PERSON.PERSONID = CONTACT.PERSON_ID")
+        .leftJoin("ADDRESS", "ADDRESS.ADDRESSID = CONTACT.ADDRESS_ID")
+        .where(pCondition);
+
+    return query.arrayColumn();
+};
+
+/**
+ * Retuns the componentstate using the rowcount.
+ * (used for the menu actions)
+ * 
+ * @param {pDataRowCount} pDataRowCount data row count (vars.get("$sys.datarowcount");)
+ * 
+ * @return {String} componentstate
+ */
+FilterviewMenuActionUtils.getComponentStateByRowCount = function(pDataRowCount)
+{
+    if(pDataRowCount > 0)
+        return neon.COMPONENTSTATE_EDITABLE;
+    else
+        return neon.COMPONENTSTATE_DISABLED;
+};
\ No newline at end of file
-- 
GitLab


From 49da361032152f0b3d98be81f31bb704abd18bb6 Mon Sep 17 00:00:00 2001
From: "S.Listl" <s.listl@adito.de>
Date: Tue, 25 Aug 2020 10:56:21 +0200
Subject: [PATCH 200/309] Util_lib changes

---
 .../recordcontainers/db/conditionProcess.js            |  3 ++-
 .../is_standard_icon/contentTypeProcess.js             | 10 +++-------
 .../entityfields/is_standard_icon/valueProcess.js      | 10 +++-------
 process/Util_lib/process.js                            |  7 ++++---
 4 files changed, 12 insertions(+), 18 deletions(-)

diff --git a/entity/Activity_entity/recordcontainers/db/conditionProcess.js b/entity/Activity_entity/recordcontainers/db/conditionProcess.js
index e090677518..2abb513731 100644
--- a/entity/Activity_entity/recordcontainers/db/conditionProcess.js
+++ b/entity/Activity_entity/recordcontainers/db/conditionProcess.js
@@ -1,3 +1,4 @@
+import("Util_lib");
 import("Employee_lib");
 import("system.vars");
 import("system.db");
@@ -46,7 +47,7 @@ if (vars.exists("$param.ActivityIDs_param") && vars.get("$param.ActivityIDs_para
         condition.and("ACTIVITY.ACTIVITYID", acticityIds, SqlBuilder.IN());
 }
 
-if (vars.getString("$param.OnlyInnate_param") == "true") 
+if (Utils.toBoolean(vars.get("$param.OnlyInnate_param"))) 
 {
     var ownContactId = EmployeeUtils.getCurrentContactId();
     if (ownContactId)
diff --git a/entity/Address_entity/entityfields/is_standard_icon/contentTypeProcess.js b/entity/Address_entity/entityfields/is_standard_icon/contentTypeProcess.js
index 2c348afa93..bd8a972530 100644
--- a/entity/Address_entity/entityfields/is_standard_icon/contentTypeProcess.js
+++ b/entity/Address_entity/entityfields/is_standard_icon/contentTypeProcess.js
@@ -1,10 +1,6 @@
 import("system.vars");
 import("system.result");
+import("Util_lib");
 
-var isStandard = vars.getString("$field.IS_STANDARD") == "true";
-var res;
-if (isStandard)
-    res = "IMAGE";
-else
-    res = "TEXT";
-result.string(res);
\ No newline at end of file
+var isStandard = Utils.toBoolean(vars.get("$field.IS_STANDARD"));
+result.string(isStandard ? "IMAGE" : "TEXT");
\ No newline at end of file
diff --git a/entity/Address_entity/entityfields/is_standard_icon/valueProcess.js b/entity/Address_entity/entityfields/is_standard_icon/valueProcess.js
index 7420487f08..e755ca5103 100644
--- a/entity/Address_entity/entityfields/is_standard_icon/valueProcess.js
+++ b/entity/Address_entity/entityfields/is_standard_icon/valueProcess.js
@@ -1,10 +1,6 @@
 import("system.result");
 import("system.vars");
+import("Util_lib");
 
-var isStandard = vars.getString("$field.IS_STANDARD") == "true";
-var res;
-if (isStandard)
-    res = "VAADIN:MAP_MARKER";
-else
-    res = "";
-result.string(res);
\ No newline at end of file
+var isStandard = Utils.toBoolean(vars.getString("$field.IS_STANDARD"));
+result.string(isStandard ? "VAADIN:MAP_MARKER" : "");
\ No newline at end of file
diff --git a/process/Util_lib/process.js b/process/Util_lib/process.js
index f7f70a01f2..d5ea4793bd 100644
--- a/process/Util_lib/process.js
+++ b/process/Util_lib/process.js
@@ -189,7 +189,8 @@ Utils.isBoolean = function (pValue)
 /**
  * Parses the given value to Boolean, this can be used to check for stringified Booleans. These rules apply:
  * <ul>
- *  <li>If the value is either falsy, the string "false" or the string "0", false is returned</li>
+ *  <li>If the value is falsy, false is returned</li>
+ *  <li>The strings "0", "false", "null" and "undefined" will result in false</li>
  *  <li>If the valueOf method of the value returns a falsy value, false is returned 
  *  (this is to make sure the function returns false for weird stuff like 'new Boolean(false)')</li>
  *  <li>Every other value results in true</li>
@@ -197,9 +198,9 @@ Utils.isBoolean = function (pValue)
  * @param {String|Object} pValue the value to parse
  * @return {Boolean} a real boolean
  */
-Utils.parseBoolean = function (pValue)
+Utils.toBoolean = function (pValue)
 {
-    return !(!pValue || pValue === "0" || pValue === "false" || !(pValue.valueOf()));
+    return !(!pValue || pValue === "0" || pValue === "false" || pValue === "null" || pValue === "undefined" || !(pValue.valueOf()));
 }
 
 /**
-- 
GitLab


From df28f09e4179dc508269d5158e077638bcd6813f Mon Sep 17 00:00:00 2001
From: "S.Listl" <s.listl@adito.de>
Date: Tue, 25 Aug 2020 11:13:11 +0200
Subject: [PATCH 201/309] #1063558: accidental global variable fixed

---
 process/Sql_lib/process.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/process/Sql_lib/process.js b/process/Sql_lib/process.js
index 93cf3bee05..7b28c6db4f 100644
--- a/process/Sql_lib/process.js
+++ b/process/Sql_lib/process.js
@@ -4068,7 +4068,7 @@ SqlUtils.replaceConditionTemplate = function(pCondition, pPlaceholder, pReplacem
     ---------------------
     */
     //use replaceAll because it's faster and supports negative lookbehinds
-    replacements = {};
+    var replacements = {};
     //manually readd the replaced backslashes by using a group reference, because they a part of the match and therefore replaced by "replaceAll"
     //since the field COULD contain already a group reference (I think this is extremely uncommon; 
     //probably that never happens but better stay save): escape that references within the fieldname
-- 
GitLab


From f6e2ffd0bb7cdd43dfd574d47663b35c8c5677ae Mon Sep 17 00:00:00 2001
From: "S.Listl" <s.listl@adito.de>
Date: Tue, 25 Aug 2020 09:13:11 +0000
Subject: [PATCH 202/309] #1063558: accidental global variable fixed

(cherry picked from commit df28f09e4179dc508269d5158e077638bcd6813f)
---
 process/Sql_lib/process.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/process/Sql_lib/process.js b/process/Sql_lib/process.js
index 3039c1cf1c..5fbe817ea4 100644
--- a/process/Sql_lib/process.js
+++ b/process/Sql_lib/process.js
@@ -4048,7 +4048,7 @@ SqlUtils.replaceConditionTemplate = function(pCondition, pPlaceholder, pReplacem
     ---------------------
     */
     //use replaceAll because it's faster and supports negative lookbehinds
-    replacements = {};
+    var replacements = {};
     //manually readd the replaced backslashes by using a group reference, because they a part of the match and therefore replaced by "replaceAll"
     //since the field COULD contain already a group reference (I think this is extremely uncommon; 
     //probably that never happens but better stay save): escape that references within the fieldname
-- 
GitLab


From 564926f53d5cbe0b1ee863c41e6af3c15285e700 Mon Sep 17 00:00:00 2001
From: "j.goderbauer" <j.goderbauer@adito.de>
Date: Tue, 25 Aug 2020 11:12:01 +0200
Subject: [PATCH 203/309] [Projekt: Entwicklung - Neon][TicketNr.:
 1064249][ExtractAddress wirft Exception bei leerstring ]

---
 process/EmailUtil_lib/process.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/process/EmailUtil_lib/process.js b/process/EmailUtil_lib/process.js
index 8e1269bf61..c0e72cad97 100644
--- a/process/EmailUtil_lib/process.js
+++ b/process/EmailUtil_lib/process.js
@@ -20,6 +20,8 @@ EmailUtils.extractAddress = function (pFullMailAddress)
 {
     //special treatment for crazy illegal addresses which can be sent in Outlook
     var mailAddress = pFullMailAddress.replace("<'", "<").replace("'>", ">").replace(/^'|'$/g, "");
-    mailAddress = mail.extractAddress(mailAddress);
+    //in some strange cases this address may be suddenly empty after the replaces => extractAddress would raise an exception in these cases
+    if (mailAddress != "")
+        mailAddress = mail.extractAddress(mailAddress);
     return mailAddress;
 };
\ No newline at end of file
-- 
GitLab


From da46407fa9ebdab487fe0b6960a4e8016fd2c0ea Mon Sep 17 00:00:00 2001
From: "j.goderbauer" <j.goderbauer@adito.de>
Date: Tue, 25 Aug 2020 14:07:28 +0200
Subject: [PATCH 204/309] [Projekt: Entwicklung - Neon][TicketNr.:
 1063338][Hinterlegen Standardprozess am RecordContainer im cacheKeyProzess]

---
 .../RecordContainerCache.aod                  |   6 +
 .../KeywordEntry_entity.aod                   |   2 +
 .../recordcontainers/db/cacheKeyProcess.js    |   6 +
 .../_____PREFERENCES_PROJECT.aod              |   5 +
 .../CachedRecordContainer_lib.aod             |   9 +
 process/CachedRecordContainer_lib/process.js  | 177 ++++++++++++++++++
 6 files changed, 205 insertions(+)
 create mode 100644 aliasDefinition/RecordContainerCache/RecordContainerCache.aod
 create mode 100644 entity/KeywordEntry_entity/recordcontainers/db/cacheKeyProcess.js
 create mode 100644 process/CachedRecordContainer_lib/CachedRecordContainer_lib.aod
 create mode 100644 process/CachedRecordContainer_lib/process.js

diff --git a/aliasDefinition/RecordContainerCache/RecordContainerCache.aod b/aliasDefinition/RecordContainerCache/RecordContainerCache.aod
new file mode 100644
index 0000000000..55a9e4afb3
--- /dev/null
+++ b/aliasDefinition/RecordContainerCache/RecordContainerCache.aod
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<aliasDefinition xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/aliasDefinition/1.2.0">
+  <name>RecordContainerCache</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <datasourceType v="16" />
+</aliasDefinition>
diff --git a/entity/KeywordEntry_entity/KeywordEntry_entity.aod b/entity/KeywordEntry_entity/KeywordEntry_entity.aod
index e956e5e79a..cdc235d4ff 100644
--- a/entity/KeywordEntry_entity/KeywordEntry_entity.aod
+++ b/entity/KeywordEntry_entity/KeywordEntry_entity.aod
@@ -659,6 +659,8 @@
       <conditionProcess>%aditoprj%/entity/KeywordEntry_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
       <orderClauseProcess>%aditoprj%/entity/KeywordEntry_entity/recordcontainers/db/orderClauseProcess.js</orderClauseProcess>
       <onDBDelete>%aditoprj%/entity/KeywordEntry_entity/recordcontainers/db/onDBDelete.js</onDBDelete>
+      <cacheType>GLOBAL</cacheType>
+      <cacheKeyProcess>%aditoprj%/entity/KeywordEntry_entity/recordcontainers/db/cacheKeyProcess.js</cacheKeyProcess>
       <linkInformation>
         <linkInformation>
           <name>52acbfe0-57f4-4614-83af-9882e168f431</name>
diff --git a/entity/KeywordEntry_entity/recordcontainers/db/cacheKeyProcess.js b/entity/KeywordEntry_entity/recordcontainers/db/cacheKeyProcess.js
new file mode 100644
index 0000000000..bd9e8c0135
--- /dev/null
+++ b/entity/KeywordEntry_entity/recordcontainers/db/cacheKeyProcess.js
@@ -0,0 +1,6 @@
+import("CachedRecordContainer_lib");
+import("system.result")
+
+var res = CachedRecordContainerUtils.getCommonKey("$param.ContainerName_param", "$param.ExcludedKeyIdsSubquery_param", "$param.OnlyActives_param"
+    , "$param.WhitelistIds_param");
+result.string(res);
diff --git a/preferences/_____PREFERENCES_PROJECT/_____PREFERENCES_PROJECT.aod b/preferences/_____PREFERENCES_PROJECT/_____PREFERENCES_PROJECT.aod
index 5a3ae3b71b..f4ab2a5cea 100644
--- a/preferences/_____PREFERENCES_PROJECT/_____PREFERENCES_PROJECT.aod
+++ b/preferences/_____PREFERENCES_PROJECT/_____PREFERENCES_PROJECT.aod
@@ -27,6 +27,7 @@
       <value></value>
     </entry>
   </calendarCategoriesEvent>
+  <recordContainerCachingAlias>RecordContainerCache</recordContainerCachingAlias>
   <clientSearchOptimizedForSpeed v="true" />
   <clientSearchExcludeForIgnorecase v="true" />
   <neonClientPermissionsEnabled v="true" />
@@ -133,5 +134,9 @@
       <name>sigparser.apiUrl</name>
       <description>The url to the mail signature webservice sigparser.</description>
     </customStringProperty>
+    <customBooleanProperty>
+      <name>dataCaching.client.forceDisable</name>
+      <description>Enabling this option will disable the per-client-context data-cache within the customzing (for exameple the caching of Keywords). This is usefull if you're testing and want to frequently add data like keywords, etc. which are cached which help of the "DataCaching_lib".</description>
+    </customBooleanProperty>
   </customConfigProperties>
 </preferences>
diff --git a/process/CachedRecordContainer_lib/CachedRecordContainer_lib.aod b/process/CachedRecordContainer_lib/CachedRecordContainer_lib.aod
new file mode 100644
index 0000000000..07b3e2150f
--- /dev/null
+++ b/process/CachedRecordContainer_lib/CachedRecordContainer_lib.aod
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.1">
+  <name>CachedRecordContainer_lib</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <process>%aditoprj%/process/CachedRecordContainer_lib/process.js</process>
+  <variants>
+    <element>LIBRARY</element>
+  </variants>
+</process>
diff --git a/process/CachedRecordContainer_lib/process.js b/process/CachedRecordContainer_lib/process.js
new file mode 100644
index 0000000000..0d2da5b581
--- /dev/null
+++ b/process/CachedRecordContainer_lib/process.js
@@ -0,0 +1,177 @@
+import("system.vars");
+
+/**
+ * provides field-preset-constants for cached data records
+ * Do not create an instance of this!
+ *
+ * @class
+ * @static
+ */
+function CachedRecordContainerFieldPresets(){}
+
+/*this is right now (2020-08-25) the only way to get something like a constant with 
+ - a prober name
+ - autocomplete support within the ADITO Designer
+ - and proper packageing all constants together
+This may change in the future, if there is something better feel free to improve this */
+
+/**
+ * Constant for field presets that represents no varaiblenames
+ */
+CachedRecordContainerFieldPresets.NONE = function(){
+    return [];
+};
+    
+/**
+ * Constant for field presets that represents some standard varaiblenames
+ * Does not include a locale, but includes:
+ * <ul>
+ *  <li>$local.idvalues</li>
+ *  <li>$local.filters</li>
+ *  <li>$local.order</li>
+ *  <li>$local.grouping</li>
+ * <ul>
+ */
+CachedRecordContainerFieldPresets.STANDARD = function(){
+    //grants are parts of the $local.filter-variable
+    return ["$local.idvalues", "$local.filters", "$local.order", "$local.grouping"];
+};
+/**
+ * Constant for field presets that represents some standard varaiblenames
+ * Does include a locale (if clientside) and:
+ * <ul>
+ *  <li>$local.idvalues</li>
+ *  <li>$local.filters</li>
+ *  <li>$local.order</li>
+ *  <li>$local.grouping</li>
+ * <ul>
+ */
+CachedRecordContainerFieldPresets.STANDARD_WITH_LOCALE = function(){
+    //grants are parts of the $local.filter-variable
+    var res = CachedRecordContainerFieldPresets.STANDARD();
+    if (vars.getString("$sys.isclient"))
+    {
+        res.unshift("$sys.clientlocale");
+    }
+    else
+    {
+        //there is no locale-variable for the server, so let's just store THAT it's the locale of the serverprocess
+        res.unshift("_____serverlocale");
+    }
+    res = res.concat(CachedRecordContainerFieldPresets.STANDARD());
+    return res;
+};
+
+
+/**
+ * provides utility functions to work with CachedRecordContainers
+ * Do not create an instance of this!
+ *
+ * @class
+ * @static
+ */
+function CachedRecordContainerUtils(){}
+
+/**
+ * Builds a key string that can be used in the cacheKeyProcess of a record container depending on the passed parameters. <br />
+ * This will use the most common preset by default (this is the preset STANDARD_WITH_LOCALE). <br />
+ * Therefor you will only need to pass the parameter names ("$param.") that are relevant for the data of your recordContainer.<br />
+ * The cacheKeyProcess is used to build up a key for retrieving the correct cached records from the cache.<br />
+ * Will check automatically if the variable exists or is null. You can pass an arbitrary amount of parameters to this functions, all of the parameters
+ * have to be a name of a varaible to be checked ("$local, $sys, $field, $param, etc.)<br />
+ * 
+ * @param {String} pExtendedVariable1               <p>Name of the first variable that is checked and 
+ *                                                     thats value is used to extend the most common variable names
+ * @param {String} pExtendedVariableN=undefined     <p>Name of the next variables that is checked and 
+ *                                                     thats value is used to extend the most common variable names.<br />
+ *                                                     You can pass an arbitrary amount of parameters (see more in the function description text)
+ *
+ * @return {String}                                 <p>The key ready to use for the cacheKeyProcess
+ * 
+ * @example
+ * var res = CachedRecordContainerUtils.getCommonKey("$param.ContainerName_param", "$param.ExcludedKeyIdsSubquery_param", "$param.OnlyActives_param"
+ *    , "$param.WhitelistIds_param");
+ * result.string(key);
+ */
+CachedRecordContainerUtils.getCommonKey = function(pExtendedVariable1, pExtendedVariableN) {
+    var functionParams = Array.from(arguments);//arguments is an array-like object so let's convert it to an array for further processing
+    var params = [CachedRecordContainerFieldPresets.STANDARD_WITH_LOCALE].concat(functionParams);
+    return CachedRecordContainerUtils.getKeyWithPreset.apply(null, params);
+};
+
+
+/**
+ * Builds a key string that can be used in the cacheKeyProcess of a record container depending on the passed parameters and a given preset.<br />
+ * The cacheKeyProcess is used to build up a key for retrieving the correct cached records from the cache.<br />
+ * Will check automatically if the variable exists or is null. You can pass an arbitrary amount of parameters to this functions, all of the parameters
+ * have to be a name of a varaible to be checked ("$local, $sys, $field, $param, etc.) <br />
+ * 
+ * @param {function|array} pPreset                  <p>The preset should be a value of CachedRecordContainerFieldPresets, e.g.
+ *                                                     CachedRecordContainerFieldPresets.STANDARD.<br />
+ *                                                     The following parameters will expand the list of the fields that are used in the preset.<br />
+ *                                                     The function type (e.g.CachedRecordContainerFieldPresets.STANDARD) is supported as well as
+ *                                                     the array type (e.g.CachedRecordContainerFieldPresets.STANDARD()) for better useability.
+ * @param {String} pExtendedVariable1               <p>Name of the first variable that is checked and thats value is used to extend the preset
+ * @param {String} pExtendedVariableN=undefined     <p>Name of the next variables that is checked and thats value is used to extend the preset.<br />
+ *                                                     You can pass an arbitrary amount of parameters (see more in the function description text)
+ *
+ * @return {String}                                 <p>The key ready to use for the cacheKeyProcess
+ * 
+ * @example
+ * var key = CachedRecordContainerUtils.getKeyWithPreset(CachedRecordContainerFieldPresets.STANDARD,"$sys.clientlocale", "$param.contactId"
+ *              , "$param.onlyActives");
+ * result.string(key);
+ */
+CachedRecordContainerUtils.getKeyWithPreset = function(pPreset, pExtendedVariable1, pExtendedVariableN) {
+    var varsToCheck;
+    if (typeof (pPreset) == "function")
+        varsToCheck = pPreset.call();
+    else if (Array.isArray(pPreset))
+        varsToCheck = pPreset;
+    else 
+        throw new Error();
+    
+    //skip pPreset with the call of .slice() because it is handled separately above
+    var functionParams = Array.from(arguments).slice(1); //arguments is an array-like object so let's convert it to an array for further processing
+    if (functionParams.length > 0)
+        varsToCheck = varsToCheck.concat(functionParams);
+    return CachedRecordContainerUtils.getKey.apply(null, varsToCheck);
+};
+
+/**
+ * Builds a key string that can be used in the cacheKeyProcess of a record container depending on the passed parameters. <br />
+ * The cacheKeyProcess is used to build up a key for retrieving the correct cached records from the cache.<br />
+ * Will check automatically if the variable exists or is null. You can pass an arbitrary amount of parameters to this functions, all of the parameters
+ * have to be a name of a varaible to be checked ("$local, $sys, $field, $param, etc.) <br />
+ * 
+ * @param {String} pVariable1               <p>Name of the first variable that is checked and thats value is used
+ * @param {String} pVariableN=undefined     <p>Name of the next variables that is checked and thats value is used.<br />
+ *                                             You can pass an arbitrary amount of parameters (see more in the function description text)
+ *
+ * @return {String}                         <p>The key ready to use for the cacheKeyProcess
+ * 
+ * @example
+ * var key = CachedRecordContainerUtils.getKey("$sys.clientlocale", "$local.filter", "$param.contactId");
+ * result.string(key);
+ */
+CachedRecordContainerUtils.getKey = function(pVariable1, pVariableN) {
+    var varsToCheck = Array.from(arguments);//arguments is an array-like object so let's convert it to an array for further processing
+
+    var key = [];
+    varsToCheck.forEach(function (varToCheck){
+        if (vars.exists(varToCheck))
+        {
+            var value = vars.getString(varToCheck);
+            if (value != null)
+                key.push(value);
+            else
+                key.push("_____" + varToCheck);
+        }
+        else
+        {
+            key.push("_____" + varToCheck);
+        }
+    });
+    
+    return key.join(".");
+};
\ No newline at end of file
-- 
GitLab


From d7dda789ce0b11c214591241d7e9eceb8644d7d1 Mon Sep 17 00:00:00 2001
From: "S.Listl" <s.listl@adito.de>
Date: Tue, 25 Aug 2020 11:54:53 +0200
Subject: [PATCH 205/309] Scan Service fixes

---
 .../AnyContact_entity/AnyContact_entity.aod   |  1 -
 entity/AnyContact_entity/afterUiInit.js       |  0
 entity/Contact_entity/Contact_entity.aod      |  1 -
 entity/Contact_entity/afterUiInit.js          |  0
 .../recordcontainers/index/query.js           |  1 +
 entity/Person_entity/Person_entity.aod        | 10 -----
 .../entityfields/newtask/iconIdProcess.js     |  0
 .../entityfields/opentaskview/stateProcess.js |  0
 .../WorkflowTask_entity.aod                   |  1 +
 entity/WorkflowTask_entity/afterSave.js       | 38 +++++++++++++++++++
 .../recordcontainers/jdito/onUpdate.js        | 34 -----------------
 neonContext/Social/Social.aod                 |  2 -
 .../PersonPreview_view/PersonPreview_view.aod |  3 --
 13 files changed, 40 insertions(+), 51 deletions(-)
 delete mode 100644 entity/AnyContact_entity/afterUiInit.js
 delete mode 100644 entity/Contact_entity/afterUiInit.js
 delete mode 100644 entity/Person_entity/entityfields/newtask/iconIdProcess.js
 delete mode 100644 entity/Person_entity/entityfields/opentaskview/stateProcess.js
 create mode 100644 entity/WorkflowTask_entity/afterSave.js

diff --git a/entity/AnyContact_entity/AnyContact_entity.aod b/entity/AnyContact_entity/AnyContact_entity.aod
index 1fa8e83a7e..5207437071 100644
--- a/entity/AnyContact_entity/AnyContact_entity.aod
+++ b/entity/AnyContact_entity/AnyContact_entity.aod
@@ -4,7 +4,6 @@
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/AnyContact_entity/documentation.adoc</documentation>
   <contentTitleProcess>%aditoprj%/entity/AnyContact_entity/contentTitleProcess.js</contentTitleProcess>
-  <afterUiInit>%aditoprj%/entity/AnyContact_entity/afterUiInit.js</afterUiInit>
   <initFilterProcess>%aditoprj%/entity/AnyContact_entity/initFilterProcess.js</initFilterProcess>
   <imageProcess>%aditoprj%/entity/AnyContact_entity/imageProcess.js</imageProcess>
   <recordContainer>db</recordContainer>
diff --git a/entity/AnyContact_entity/afterUiInit.js b/entity/AnyContact_entity/afterUiInit.js
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/entity/Contact_entity/Contact_entity.aod b/entity/Contact_entity/Contact_entity.aod
index 542030903e..ad05310a9d 100644
--- a/entity/Contact_entity/Contact_entity.aod
+++ b/entity/Contact_entity/Contact_entity.aod
@@ -8,7 +8,6 @@
   <grantUpdateProcess>%aditoprj%/entity/Contact_entity/grantUpdateProcess.js</grantUpdateProcess>
   <grantDeleteProcess>%aditoprj%/entity/Contact_entity/grantDeleteProcess.js</grantDeleteProcess>
   <contentTitleProcess>%aditoprj%/entity/Contact_entity/contentTitleProcess.js</contentTitleProcess>
-  <afterUiInit>%aditoprj%/entity/Contact_entity/afterUiInit.js</afterUiInit>
   <onValidation>%aditoprj%/entity/Contact_entity/onValidation.js</onValidation>
   <initFilterProcess>%aditoprj%/entity/Contact_entity/initFilterProcess.js</initFilterProcess>
   <iconId>VAADIN:USERS</iconId>
diff --git a/entity/Contact_entity/afterUiInit.js b/entity/Contact_entity/afterUiInit.js
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/entity/Organisation_entity/recordcontainers/index/query.js b/entity/Organisation_entity/recordcontainers/index/query.js
index 665f7ab71f..668b6b227f 100644
--- a/entity/Organisation_entity/recordcontainers/index/query.js
+++ b/entity/Organisation_entity/recordcontainers/index/query.js
@@ -1,3 +1,4 @@
+import("KeywordRegistry_basic");
 import("system.translate");
 import("system.result");
 import("system.vars");
diff --git a/entity/Person_entity/Person_entity.aod b/entity/Person_entity/Person_entity.aod
index a0fac3286f..7eb5a44a80 100644
--- a/entity/Person_entity/Person_entity.aod
+++ b/entity/Person_entity/Person_entity.aod
@@ -1012,7 +1012,6 @@
       <title>New task</title>
       <onActionProcess>%aditoprj%/entity/Person_entity/entityfields/newtask/onActionProcess.js</onActionProcess>
       <iconId>VAADIN:TASKS</iconId>
-      <iconIdProcess>%aditoprj%/entity/Person_entity/entityfields/newtask/iconIdProcess.js</iconIdProcess>
     </entityActionField>
     <entityActionField>
       <name>addToCampaign</name>
@@ -1141,12 +1140,6 @@
       <iconId>VAADIN:ENVELOPE</iconId>
       <stateProcess>%aditoprj%/entity/Person_entity/entityfields/newletter/stateProcess.js</stateProcess>
     </entityActionField>
-    <entityActionField>
-      <name>openTaskView</name>
-      <isMenuAction v="false" />
-      <isObjectAction v="false" />
-      <stateProcess>%aditoprj%/entity/Person_entity/entityfields/opentaskview/stateProcess.js</stateProcess>
-    </entityActionField>
     <entityActionField>
       <name>startWorkflow</name>
       <title>Start workflow</title>
@@ -1583,9 +1576,6 @@
           <recordfield>PERSON.PERSONID</recordfield>
           <aggregateType>COUNT</aggregateType>
         </aggregateFieldDbMapping>
-        <dbRecordFieldMapping>
-          <name>COUNT.value</name>
-        </dbRecordFieldMapping>
       </recordFieldMappings>
       <filterExtensions>
         <filterExtensionSet>
diff --git a/entity/Person_entity/entityfields/newtask/iconIdProcess.js b/entity/Person_entity/entityfields/newtask/iconIdProcess.js
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/entity/Person_entity/entityfields/opentaskview/stateProcess.js b/entity/Person_entity/entityfields/opentaskview/stateProcess.js
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/entity/WorkflowTask_entity/WorkflowTask_entity.aod b/entity/WorkflowTask_entity/WorkflowTask_entity.aod
index 938fbcdc99..ceb8ba0d2d 100644
--- a/entity/WorkflowTask_entity/WorkflowTask_entity.aod
+++ b/entity/WorkflowTask_entity/WorkflowTask_entity.aod
@@ -7,6 +7,7 @@
   <grantCreate v="false" />
   <grantUpdateProcess>%aditoprj%/entity/WorkflowTask_entity/grantUpdateProcess.js</grantUpdateProcess>
   <grantDelete v="false" />
+  <afterSave>%aditoprj%/entity/WorkflowTask_entity/afterSave.js</afterSave>
   <imageProcess>%aditoprj%/entity/WorkflowTask_entity/imageProcess.js</imageProcess>
   <titlePlural>Tasks</titlePlural>
   <recordContainer>jdito</recordContainer>
diff --git a/entity/WorkflowTask_entity/afterSave.js b/entity/WorkflowTask_entity/afterSave.js
new file mode 100644
index 0000000000..68fae8b0d2
--- /dev/null
+++ b/entity/WorkflowTask_entity/afterSave.js
@@ -0,0 +1,38 @@
+import("system.neon");
+import("system.workflow");
+import("system.vars");
+
+var entityData = vars.get("$local.entitydata");
+
+//open the next workflow task if one exists
+if (entityData["FORMRESULT"])
+{
+    var processInstanceId = entityData["PROCESSINSTANCE_ID"];
+    var createTime = entityData["CREATE_TIME"];
+
+    var loadConfig = workflow.createConfigForLoadingTasks()
+        .processInstanceId(processInstanceId);
+
+    var startVal = {
+        id : null, 
+        createTime : new Date(+createTime).toString()
+    };
+    var newestTask = JSON.parse(workflow.getTasks(loadConfig)).reduce(function (prev, curr)
+    {
+        var prevTime = Date.parse(prev.createTime);
+        var currTime = Date.parse(curr.createTime);
+
+        return prevTime > currTime ? prev : curr;
+    }, startVal);
+
+    if (newestTask.id !== null)
+        neon.openContext("WorkflowTask", "WorkflowTaskPreview_view", [newestTask.id], neon.OPERATINGSTATE_VIEW, null);
+    else
+    {
+        var params = {
+            "TaskTitle_param" : rowData["NAME.value"]
+        };
+        //if you try to open the task now, it will display "Task done"
+        neon.openContext("WorkflowTask", "WorkflowTaskPreview_view", [rowData["UID.value"]], neon.OPERATINGSTATE_VIEW, params);
+    }
+}
\ No newline at end of file
diff --git a/entity/WorkflowTask_entity/recordcontainers/jdito/onUpdate.js b/entity/WorkflowTask_entity/recordcontainers/jdito/onUpdate.js
index 9144b8ba06..911cd08a9f 100644
--- a/entity/WorkflowTask_entity/recordcontainers/jdito/onUpdate.js
+++ b/entity/WorkflowTask_entity/recordcontainers/jdito/onUpdate.js
@@ -18,39 +18,5 @@ vars.get("$local.changed").forEach(function (field)
             if (!rowData["ASSIGNEE.value"] && !vars.get("$field.ASSIGNEE"))
                 workflow.setTaskAssignee(taskId, EmployeeUtils.getCurrentUserId());
             workflow.completeTaskWithFormData(taskId, JSON.parse(value));
-            _openNextTaskIfExists(rowData["PROCESSINSTANCE_ID.value"], rowData["CREATE_TIME.value"]);
     }
 });
-
-/*
- * checks if a new task has been created for that process instance,
- * if that's the case the new task will be opened
- */
-function _openNextTaskIfExists (pProcessInstanceId, pCreateTime)
-{
-    var loadConfig = workflow.createConfigForLoadingTasks()
-        .processInstanceId(pProcessInstanceId);
-        
-    var startVal = {
-        id : null, 
-        createTime : new Date(+pCreateTime).toString()
-    };
-    var newestTask = JSON.parse(workflow.getTasks(loadConfig)).reduce(function (prev, curr)
-    {
-        var prevTime = Date.parse(prev.createTime);
-        var currTime = Date.parse(curr.createTime);
-        
-        return prevTime > currTime ? prev : curr;
-    }, startVal);
-    
-    if (newestTask.id !== null)
-        neon.openContext("WorkflowTask", "WorkflowTaskPreview_view", [newestTask.id], neon.OPERATINGSTATE_VIEW, null);
-    else
-    {
-        var params = {
-            "TaskTitle_param" : rowData["NAME.value"]
-        };
-        //if you try to open the task now, it will display "Task done"
-        neon.openContext("WorkflowTask", "WorkflowTaskPreview_view", [rowData["UID.value"]], neon.OPERATINGSTATE_VIEW, params);
-    }
-}
\ No newline at end of file
diff --git a/neonContext/Social/Social.aod b/neonContext/Social/Social.aod
index a2e96e0735..339a5a5470 100644
--- a/neonContext/Social/Social.aod
+++ b/neonContext/Social/Social.aod
@@ -3,8 +3,6 @@
   <name>Social</name>
   <title>Social</title>
   <majorModelMode>DISTRIBUTED</majorModelMode>
-  <mainView></mainView>
-  <filterView>&lt;null value&gt;</filterView>
   <entity>Social_entity</entity>
   <references>
     <neonViewReference>
diff --git a/neonView/PersonPreview_view/PersonPreview_view.aod b/neonView/PersonPreview_view/PersonPreview_view.aod
index f0f73a44de..b1717f65bc 100644
--- a/neonView/PersonPreview_view/PersonPreview_view.aod
+++ b/neonView/PersonPreview_view/PersonPreview_view.aod
@@ -91,9 +91,6 @@
     </genericViewTemplate>
     <scoreCardViewTemplate>
       <name>Scores</name>
-      <fieldActions>
-        <element>openTaskView</element>
-      </fieldActions>
       <entityField>#ENTITY</entityField>
       <fields>
         <entityFieldLink>
-- 
GitLab


From b303be4151d4440859301dcb0b5b0dac10e99302 Mon Sep 17 00:00:00 2001
From: "S.Listl" <s.listl@adito.de>
Date: Tue, 25 Aug 2020 12:01:19 +0200
Subject: [PATCH 206/309] Missing translations added

---
 .../_____LANGUAGE_de/_____LANGUAGE_de.aod     | 133 +++++++++++++++++-
 1 file changed, 129 insertions(+), 4 deletions(-)

diff --git a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
index 8bc60c5d31..de55d02a64 100644
--- a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
+++ b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
@@ -8912,7 +8912,6 @@ Bitte Datumseingabe prüfen</value>
     </entry>
     <entry>
       <key>export using the selected  template</key>
-      <value>Mit der ausgewählten Vorlage Exportieren</value>
     </entry>
     <entry>
       <key>No new recipients found that can be added to the serial letter.</key>
@@ -8944,13 +8943,139 @@ Bitte Datumseingabe prüfen</value>
     <entry>
       <key>Total in euros</key>
     </entry>
-    <entry>
-      <key>export using the selected  template</key>
-    </entry>
     <entry>
       <key>send mail</key>
       <value>E-Mail losschicken</value>
     </entry>
+    <entry>
+      <key>Receive new Department Permission</key>
+    </entry>
+    <entry>
+      <key>Borrow</key>
+    </entry>
+    <entry>
+      <key>Selection placeholder</key>
+    </entry>
+    <entry>
+      <key>Grant new Department Permission</key>
+    </entry>
+    <entry>
+      <key>Current password</key>
+      <value>Aktuelles Passwort</value>
+    </entry>
+    <entry>
+      <key>Calendar maintime start</key>
+      <value>Kalender-Kernzeit Beginn</value>
+    </entry>
+    <entry>
+      <key>favorties</key>
+    </entry>
+    <entry>
+      <key>Fantasy</key>
+    </entry>
+    <entry>
+      <key>Password must contain special characters</key>
+    </entry>
+    <entry>
+      <key>Longitude</key>
+    </entry>
+    <entry>
+      <key>Password must be at least %0 characters</key>
+    </entry>
+    <entry>
+      <key>Permission Procurer Department</key>
+    </entry>
+    <entry>
+      <key>favorite</key>
+    </entry>
+    <entry>
+      <key>Repeat password</key>
+      <value>Passwort wiederholen</value>
+    </entry>
+    <entry>
+      <key>{SENT_MAIL}</key>
+    </entry>
+    <entry>
+      <key>The workflow could not be deployed</key>
+    </entry>
+    <entry>
+      <key>SELECTION_NULL</key>
+    </entry>
+    <entry>
+      <key>Workflow deploy failed</key>
+    </entry>
+    <entry>
+      <key>Selection ignore case</key>
+    </entry>
+    <entry>
+      <key>Calendar maintime end</key>
+      <value>Kalender-Kernzeit Ende</value>
+    </entry>
+    <entry>
+      <key>Release</key>
+    </entry>
+    <entry>
+      <key>SELECTION_NEITHER</key>
+    </entry>
+    <entry>
+      <key>Password must contain numbers</key>
+    </entry>
+    <entry>
+      <key>granted permission</key>
+    </entry>
+    <entry>
+      <key>bulk mail sent</key>
+    </entry>
+    <entry>
+      <key>Permission Procurer User</key>
+    </entry>
+    <entry>
+      <key>New password</key>
+      <value>Neues Passwort</value>
+    </entry>
+    <entry>
+      <key>and open Report</key>
+    </entry>
+    <entry>
+      <key>The Sales Project can only be filled when a company has been specified</key>
+    </entry>
+    <entry>
+      <key>Calendar hour divider</key>
+      <value>Kalender-Stundenunterteilung</value>
+    </entry>
+    <entry>
+      <key>Grant new User Permission</key>
+    </entry>
+    <entry>
+      <key>SELECTION_BOTH</key>
+    </entry>
+    <entry>
+      <key>Latitude</key>
+    </entry>
+    <entry>
+      <key>{SEND_MAIL}</key>
+    </entry>
+    <entry>
+      <key>SELECTION_POSTFIX</key>
+    </entry>
+    <entry>
+      <key>download ready</key>
+    </entry>
+    <entry>
+      <key>Password must contain letters</key>
+    </entry>
+    <entry>
+      <key>SELECTION_PREFIX</key>
+    </entry>
+    <entry>
+      <key>Password must contain spaces</key>
+    </entry>
+    <entry>
+      <key>favorites</key>
+    </entry>
+    <entry>
+      <key>The use of any of your previous %0 passwords is prohibited</key>
+    </entry>
   </keyValueMap>
   <font name="Dialog" style="0" size="11" />
 </language>
-- 
GitLab


From 23b680404c70c3368b9a1350b5fd806f4794c185 Mon Sep 17 00:00:00 2001
From: "S.Listl" <s.listl@adito.de>
Date: Tue, 25 Aug 2020 14:37:48 +0200
Subject: [PATCH 207/309] AnyContact_entity missing provider re-added

---
 .../AnyContact_entity/AnyContact_entity.aod   | 22 +++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/entity/AnyContact_entity/AnyContact_entity.aod b/entity/AnyContact_entity/AnyContact_entity.aod
index 5207437071..49fb5e30fa 100644
--- a/entity/AnyContact_entity/AnyContact_entity.aod
+++ b/entity/AnyContact_entity/AnyContact_entity.aod
@@ -79,6 +79,28 @@
         </entityDependency>
       </dependencies>
     </entityProvider>
+    <entityProvider>
+      <name>ContactsByIds</name>
+      <documentation>%aditoprj%/entity/AnyContact_entity/entityfields/contactsbyids/documentation.adoc</documentation>
+      <dependencies>
+        <entityDependency>
+          <name>0206f7a8-fd58-47e8-8b7a-5ff4531e56fb</name>
+          <entityName>QuickEntry_entity</entityName>
+          <fieldName>OrgAndPersDuplicates</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+      </dependencies>
+      <children>
+        <entityParameter>
+          <name>ContactId_param</name>
+          <expose v="false" />
+        </entityParameter>
+      </children>
+    </entityProvider>
+    <entityParameter>
+      <name>ContactIds_param</name>
+      <expose v="true" />
+    </entityParameter>
     <entityField>
       <name>ADDRESS_ID</name>
       <title>standard address</title>
-- 
GitLab


From a967d9cf15ec32ff8745b459c314dced541d64a8 Mon Sep 17 00:00:00 2001
From: "j.goderbauer" <j.goderbauer@adito.de>
Date: Tue, 25 Aug 2020 15:18:26 +0200
Subject: [PATCH 208/309] Added default RecordContainerCache-alias

---
 .../data/defaultBlob/RecordContainerCache.xml |  9 +++++++
 .../init/data/insert_asys_aliasconfig.xml     | 27 +++++++++----------
 2 files changed, 21 insertions(+), 15 deletions(-)
 create mode 100644 .liquibase/_____SYSTEMALIAS/basic/init/data/defaultBlob/RecordContainerCache.xml

diff --git a/.liquibase/_____SYSTEMALIAS/basic/init/data/defaultBlob/RecordContainerCache.xml b/.liquibase/_____SYSTEMALIAS/basic/init/data/defaultBlob/RecordContainerCache.xml
new file mode 100644
index 0000000000..930cb4f1c9
--- /dev/null
+++ b/.liquibase/_____SYSTEMALIAS/basic/init/data/defaultBlob/RecordContainerCache.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<aliasConfig xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.4" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/aliasConfig/1.1.4">
+  <name>RecordContainerCache_default</name>
+  <serverId>default</serverId>
+  <definitionName>RecordContainerCache</definitionName>
+  <aliasConfigSub>
+    <aliasSubRecordContainerInMemoryCache />
+  </aliasConfigSub>
+</aliasConfig>
diff --git a/.liquibase/_____SYSTEMALIAS/basic/init/data/insert_asys_aliasconfig.xml b/.liquibase/_____SYSTEMALIAS/basic/init/data/insert_asys_aliasconfig.xml
index d2a5949275..6d12b9e01e 100644
--- a/.liquibase/_____SYSTEMALIAS/basic/init/data/insert_asys_aliasconfig.xml
+++ b/.liquibase/_____SYSTEMALIAS/basic/init/data/insert_asys_aliasconfig.xml
@@ -51,20 +51,17 @@
       <column name="USER_NEW" value="_____DESIGNERANONYM"/>
       <column name="XMLDATA" valueBlobFile="defaultBlob/defaultDbRepository.xml"/>
     </insert>
-
-    <rollback>
-        <delete tableName="ASYS_ALIASCONFIG">
-            <where>ID = ?</where>
-            <whereParams>
-                    <param value="f4a33c35-5033-4699-b55a-9520b465b4c5" />
-            </whereParams>
-        </delete>
-        <delete tableName="ASYS_ALIASCONFIG">
-            <where>ID = ?</where>
-            <whereParams>
-                    <param value="23cba7a4-e8dd-48a0-b61e-f5f0f789d02b" />
-            </whereParams>
-        </delete>
-    </rollback>
+    <insert tableName="ASYS_ALIASCONFIG">
+        <column name="ALIASID" value="RecordContainerCache"/>
+        <column name="DATE_EDIT" valueDate="2020-08-24 17:43:39"/>
+        <column name="DATE_NEW" valueDate="2020-08-24 17:43:38"/>
+        <column name="ID" value="dbe6d005-37ed-4fa0-b164-a3d4450932a2"/>
+        <column name="KIND" valueNumeric="105"/>
+        <column name="NAME" value="RecordContainerCache_default"/>
+        <column name="SERVERID" value="default"/>
+        <column name="USER_EDIT" value="_____DESIGNERANONYM"/>
+        <column name="USER_NEW" value="_____DESIGNERANONYM"/>
+        <column name="XMLDATA" valueBlobFile="defaultBlob/RecordContainerCache.xml"/>
+    </insert>
 </changeSet>
 </databaseChangeLog>
-- 
GitLab


From 6888866332c1e605b194226a8386c42f1c19e83a Mon Sep 17 00:00:00 2001
From: Sebastian Listl <s.listl@adito.de>
Date: Tue, 25 Aug 2020 15:20:22 +0200
Subject: [PATCH 209/309] Refactoring: accidental global variables fixed

---
 entity/BulkMail_entity/afterUiInit.js         |  2 +-
 .../addparticipants/onActionProcess.js        |  2 +-
 .../id_field_name/dropDownProcess.js          |  2 +-
 .../excluderoles_param/valueProcess.js        | 12 +++------
 .../leaddup_status/displayValueProcess.js     |  2 +-
 .../entityfields/load_data/onActionProcess.js |  4 +--
 .../entityfields/field/stateProcess.js        | 15 ++++++-----
 .../recordcontainers/jdito/contentProcess.js  | 10 ++++---
 .../recordcontainers/jdito/contentProcess.js  | 17 +++---------
 .../newappointment/onActionProcess.js         | 26 +++++++------------
 10 files changed, 37 insertions(+), 55 deletions(-)

diff --git a/entity/BulkMail_entity/afterUiInit.js b/entity/BulkMail_entity/afterUiInit.js
index 666ca1d3ed..bde0a224e8 100644
--- a/entity/BulkMail_entity/afterUiInit.js
+++ b/entity/BulkMail_entity/afterUiInit.js
@@ -28,7 +28,7 @@ if (!vars.exists("$context.dataCopied") && vars.get("$param.CopyBulkMailId_param
     {
         var data = entities.getRows(conf)[0];
         
-        for (field in data)
+        for (let field in data)
         {
             vars.set("$field." + field, data[field]);
         }
diff --git a/entity/CampaignAddParticipants_entity/entityfields/addparticipants/onActionProcess.js b/entity/CampaignAddParticipants_entity/entityfields/addparticipants/onActionProcess.js
index bbf377c5c3..d29e5abf0e 100644
--- a/entity/CampaignAddParticipants_entity/entityfields/addparticipants/onActionProcess.js
+++ b/entity/CampaignAddParticipants_entity/entityfields/addparticipants/onActionProcess.js
@@ -97,7 +97,7 @@ function _handleRowIds(pParticipantRowIds, pCampaignId)
     let statementArray = [];
     let logArray = [];
 
-    for (participant in pParticipantRowIds)
+    for (let participant in pParticipantRowIds)
     {
         let campaignParticipantLogId = util.getNewUUID();
 
diff --git a/entity/DuplicateScanner_entity/entityfields/id_field_name/dropDownProcess.js b/entity/DuplicateScanner_entity/entityfields/id_field_name/dropDownProcess.js
index 93506f3cf3..185ff7e95e 100644
--- a/entity/DuplicateScanner_entity/entityfields/id_field_name/dropDownProcess.js
+++ b/entity/DuplicateScanner_entity/entityfields/id_field_name/dropDownProcess.js
@@ -6,7 +6,7 @@ let currentEntity = vars.get("$field.ENTITY_TO_SCAN_NAME");
 var model = project.getEntityStructure(currentEntity);
 
 let entityFields = [];
-for (fieldname in model.fields) 
+for (let fieldname in model.fields) 
 { 
     let field = model.fields[fieldname]; 
     if(field.fieldType == project.ENTITYFIELDTYPE_FIELD)
diff --git a/entity/EmployeeRole_entity/entityfields/roles/children/excluderoles_param/valueProcess.js b/entity/EmployeeRole_entity/entityfields/roles/children/excluderoles_param/valueProcess.js
index c31bba2928..bbf5094fbc 100644
--- a/entity/EmployeeRole_entity/entityfields/roles/children/excluderoles_param/valueProcess.js
+++ b/entity/EmployeeRole_entity/entityfields/roles/children/excluderoles_param/valueProcess.js
@@ -6,13 +6,7 @@ import("system.result");
 var userTitle = vars.exists("$param.UserTitle_param") && vars.get("$param.UserTitle_param");
 var excludeRolesArray = ["INTERNAL_EVERYONE", "INTERNAL_GROUPWARE", "INTERNAL_SNMP", "INTERNAL_DESIGNER", "INTERNAL_TECHNICAL"];
 
-if(vars.get("$sys.recordstate") != neon.OPERATINGSTATE_NEW)
-{
-    if (userTitle != "") {
-        var userRoles = tools.getRoles(userTitle);
-        for (i = 0; i < userRoles.length; i++) {
-            excludeRolesArray.push(userRoles[i]);
-        }
-    }
-}
+if(vars.get("$sys.recordstate") != neon.OPERATINGSTATE_NEW && userTitle)
+    excludeRolesArray = excludeRolesArray.concat(tools.getRoles(userTitle));
+
 result.string(JSON.stringify(excludeRolesArray));
\ No newline at end of file
diff --git a/entity/Lead_entity/entityfields/leaddup_status/displayValueProcess.js b/entity/Lead_entity/entityfields/leaddup_status/displayValueProcess.js
index ef4e116013..031fb565ef 100644
--- a/entity/Lead_entity/entityfields/leaddup_status/displayValueProcess.js
+++ b/entity/Lead_entity/entityfields/leaddup_status/displayValueProcess.js
@@ -6,7 +6,7 @@ import("Keyword_lib");
 var dupStatus = vars.getString("$field.LEADDUP_STATUS");
 var values = KeywordUtils.getEntryNamesAndIdsByContainer($KeywordRegistry.dupStatus());
 
-for (i = 0; i < values.length; i++)
+for (let i = 0; i < values.length; i++)
 {
     if(dupStatus.trim() == values[i][0].trim())
     {
diff --git a/entity/Leadimport_entity/entityfields/load_data/onActionProcess.js b/entity/Leadimport_entity/entityfields/load_data/onActionProcess.js
index 578e9f6edf..14460a42e7 100644
--- a/entity/Leadimport_entity/entityfields/load_data/onActionProcess.js
+++ b/entity/Leadimport_entity/entityfields/load_data/onActionProcess.js
@@ -40,10 +40,10 @@ if (binMetadatas.length > 0)
 
     db.deleteData(insertTable, newWhere([insertTable, "ROW_ID"], assignmentRowId).build());//delete existing
 
-    for (i = 0; i < table.length; i++)//and load new
+    for (let i = 0; i < table.length; i++)//and load new
     {
         insertVals = [];
-        for (j = 0; j < 30; j++) //fill the 30 data-columns of the table
+        for (let j = 0; j < 30; j++) //fill the 30 data-columns of the table
         {
             if(table[i][j] == undefined)
                 table[i][j] = "";
diff --git a/entity/PermissionDetail_entity/entityfields/field/stateProcess.js b/entity/PermissionDetail_entity/entityfields/field/stateProcess.js
index d32cd4fbeb..fb566e8892 100644
--- a/entity/PermissionDetail_entity/entityfields/field/stateProcess.js
+++ b/entity/PermissionDetail_entity/entityfields/field/stateProcess.js
@@ -9,14 +9,17 @@ var entity = vars.get("$field.ENTITY");
 
 rootPermSet = PermissionUtil.getSetRoot(role, entity);
 
-if (rootPermSet == "") {
+if (rootPermSet == "") 
+{
     result.string(neon.COMPONENTSTATE_DISABLED);
-} else {
+} 
+else 
+{
     entityStructure = project.getEntityStructure(entity);
-    for (fieldname in entityStructure.fields) {
+    for (let fieldname in entityStructure.fields) 
+    {
         var field = entityStructure.fields[fieldname];
-        if (field.usePermissions == true) {
-            result.string(neon.COMPONENTSTATE_EDITABLE)
-        }
+        if (field.usePermissions == true)
+            result.string(neon.COMPONENTSTATE_EDITABLE);
     }
 }
\ No newline at end of file
diff --git a/entity/PermissionDetail_entity/recordcontainers/jdito/contentProcess.js b/entity/PermissionDetail_entity/recordcontainers/jdito/contentProcess.js
index 5d999c34f3..af8f904bf6 100644
--- a/entity/PermissionDetail_entity/recordcontainers/jdito/contentProcess.js
+++ b/entity/PermissionDetail_entity/recordcontainers/jdito/contentProcess.js
@@ -22,15 +22,17 @@ var entitiesUsePermFlagSet = [];
 var fieldsUsePermFlagSet = [];
 
 // gets all names of entites and fields which have the 'usePermission'-flag set (positive list)
-for each (let entityMetaData in entitiesMetaData) {
+for (let entityMetaDataId in entitiesMetaData) 
+{
+    let entityMetaData = entitiesMetaData[entityMetaDataId];
     if (entityMetaData[6] == "true") {
         entitiesUsePermFlagSet.push(entityMetaData[0])
         entityStructure = project.getEntityStructure(entityMetaData[0]);
-        for (fieldname in entityStructure.fields) {
+        for (let fieldname in entityStructure.fields) 
+        {
             field = entityStructure.fields[fieldname];
-            if (field.usePermissions == true) {
+            if (field.usePermissions == true) 
                 fieldsUsePermFlagSet.push(field.name);
-            }
         }
     }   
 }
diff --git a/entity/SalesprojectAnalyses_entity/recordcontainers/jdito/contentProcess.js b/entity/SalesprojectAnalyses_entity/recordcontainers/jdito/contentProcess.js
index afcd4eaacb..eee423852d 100644
--- a/entity/SalesprojectAnalyses_entity/recordcontainers/jdito/contentProcess.js
+++ b/entity/SalesprojectAnalyses_entity/recordcontainers/jdito/contentProcess.js
@@ -20,19 +20,10 @@ var phases = newSelect("KEYID, AB_KEYWORD_ENTRY.TITLE, count(PHASE), AB_KEYWORD_
     .orderBy("SORTING")
     .table();
 
-for(i = 0; i < phases.length; i++){
-    if(phases[i][1] == "${SALESPROJECT_OFFER}"){
+for(let i = 0; i < phases.length; i++)
+{
+    if(phases[i][1] == "${SALESPROJECT_OFFER}")
         phases[i][1] = "Offer";
-    }   
 }
  
-result.object(phases);
-
-
-
-
-
-
-
-
-
+result.object(phases);
\ No newline at end of file
diff --git a/entity/VisitPlanEntry_entity/entityfields/entityactiongroup/children/newappointment/onActionProcess.js b/entity/VisitPlanEntry_entity/entityfields/entityactiongroup/children/newappointment/onActionProcess.js
index bb1a4df11b..d5d0373503 100644
--- a/entity/VisitPlanEntry_entity/entityfields/entityactiongroup/children/newappointment/onActionProcess.js
+++ b/entity/VisitPlanEntry_entity/entityfields/entityactiongroup/children/newappointment/onActionProcess.js
@@ -20,16 +20,8 @@ import("system.util");
 import("system.eMath");
 import("system.text");
 
-
-var entry;
 var params = {};
-var pointOfContact;
 var mailAffectedUser = [];
-var uidAppointment;
-var values;
-var columns;
-var update;
-var i;
 
 var selectionRowData = vars.get("$sys.selectionRows");
 
@@ -63,7 +55,7 @@ var contactCommunication = newSelect("COMMUNICATION.MEDIUM_ID, COMMUNICATION.ADD
 if(contactCommunication.length > 0)
 {
     var communicationString;
-    for (i = 0; i < contactCommunication.length; i++) 
+    for (let i = 0; i < contactCommunication.length; i++) 
     {
             communicationString += KeywordUtils.getViewValue($KeywordRegistry.communicationMedium(), contactCommunication[i][0]) + ": " 
                                     + contactCommunication[i][1] + "</br>"
@@ -88,34 +80,34 @@ startdate = datetime.toLong(startdate, "dd-MM-yyyy HH:mm:ss.S");
 
 var duration = eMath.subInt(endTime, startTime);
     
-entry = CalendarUtil.createEntry("", calendars.VEVENT, summary, description, false, false, false,
+var entry = CalendarUtil.createEntry("", calendars.VEVENT, summary, description, false, false, false,
                 vars.get("$sys.user"), [vars.get("$sys.user")], startdate, duration, null, calendars.STATUS_TENTATIVE, null, null);
             
 params["Entry_param"] = JSON.stringify(entry);
-uidAppointment = calendars.insert([entry]);
+var uidAppointment = calendars.insert([entry]);
     
-columns = ["AB_APPOINTMENTLINK_ID",
+var columns = ["AB_APPOINTMENTLINK_ID",
             "APPOINTMENT_ID",
             "OBJECT_TYPE",
             "OBJECT_ROWID"]
     
-values = [util.getNewUUID(),
+var values = [util.getNewUUID(),
           uidAppointment[0],
           "Organisation",
           organisationContact_id]
-insert = db.insertData("AB_APPOINTMENTLINK", columns, null, values)
+db.insertData("AB_APPOINTMENTLINK", columns, null, values)
     
 values = [util.getNewUUID(),
           uidAppointment[0],
           "Person",
           contact_id]
-insert = db.insertData("AB_APPOINTMENTLINK", columns, null, values)
+db.insertData("AB_APPOINTMENTLINK", columns, null, values)
     
 values = [$KeywordRegistry.visitPlanEntryStatus$Appointmentarranged(), uidAppointment[0]];
 columns = ["STATUS", "APPOINTMENT_ID"];
     
-update = newWhere("VISITPLANENTRY.VISITPLANENTRYID", uid)
-                        .updateData(true, "VISITPLANENTRY", columns, null, values);
+newWhere("VISITPLANENTRY.VISITPLANENTRYID", uid)
+    .updateData(true, "VISITPLANENTRY", columns, null, values);
 
 neon.setFieldValue("$field.STATUS", $KeywordRegistry.visitPlanEntryStatus$Appointmentarranged());
 neon.refreshAll();
\ No newline at end of file
-- 
GitLab


From efe5a81d7a36f5d55159150892cd7cb02fb629f0 Mon Sep 17 00:00:00 2001
From: Sebastian Listl <s.listl@adito.de>
Date: Tue, 25 Aug 2020 15:21:00 +0200
Subject: [PATCH 210/309] Accidental global variables in for-loops corrected

---
 process/Calendar_lib/process.js             |  2 +-
 process/Classification_lib/process.js       |  5 ++---
 process/Context_lib/process.js              |  2 +-
 process/DataPrivacy_lib/process.js          |  4 ++--
 process/DocumentTemplate_lib/process.js     |  2 +-
 process/DuplicateScanner_lib/process.js     | 12 ++++++------
 process/ExportTemplate_lib/process.js       |  4 ++--
 process/Leadimport_lib/process.js           | 15 +++++++--------
 process/Loghistory_lib/process.js           |  8 ++++----
 process/Sql_lib/process.js                  |  8 ++++----
 process/WsValidation_lib/process.js         |  2 +-
 process/importLead_serverProcess/process.js |  2 +-
 12 files changed, 32 insertions(+), 34 deletions(-)

diff --git a/process/Calendar_lib/process.js b/process/Calendar_lib/process.js
index 7cc5df8675..551b030800 100644
--- a/process/Calendar_lib/process.js
+++ b/process/Calendar_lib/process.js
@@ -165,7 +165,7 @@ CalendarUtil.newEvent = function( pSummary, pDescription, pWithLink, pUser, pAff
     prompts["comp4refresh"] = [];
     if (pComps4Refresh == undefined)
         pComps4Refresh = ["$comp.Aufgabe", "$comp.tbl_Termine"];
-    for (i = 0; i < pComps4Refresh.length; i++)
+    for (let i = 0; i < pComps4Refresh.length; i++)
     {
         if ( vars.exists(pComps4Refresh[i]))    prompts["comp4refresh"].push(pComps4Refresh[i]);
     }
diff --git a/process/Classification_lib/process.js b/process/Classification_lib/process.js
index 3b85135681..0970b047c9 100644
--- a/process/Classification_lib/process.js
+++ b/process/Classification_lib/process.js
@@ -85,7 +85,7 @@ ClassificationUtils.getScore = function(pClassificationType, pObjectType, pObjec
         .orderBy("CLASSIFICATIONGROUP")
         .table();
         
-    for (i = 0; i < score.length; i++)
+    for (let i = 0; i < score.length; i++)
     {
         if(score[i][0] == "")
             score[i][0] = 0;
@@ -178,7 +178,6 @@ ClassificationUtils.getClassificationGrading = function(pClassificationGroup)
  */
 ClassificationUtils.getMaxScore = function(pClassificationGroup)
 {
-    var classificationGroup = pClassificationGroup;
     var maxScore = 0;
     scores = newSelect("max(CLASSIFICATIONSCORE.SCORE)")
                             .from("CLASSIFICATIONTYPE")
@@ -187,7 +186,7 @@ ClassificationUtils.getMaxScore = function(pClassificationGroup)
                             .groupBy("CLASSIFICATIONTYPE.CLASSIFICATIONTYPEID")
                             .arrayColumn();
                             
-    for (i = 0; i < scores.length; i++)
+    for (let i = 0; i < scores.length; i++)
         maxScore = eMath.addInt(maxScore, parseInt(scores[i]));
     
     return maxScore;
diff --git a/process/Context_lib/process.js b/process/Context_lib/process.js
index 953330e3b3..2c8d2229d6 100644
--- a/process/Context_lib/process.js
+++ b/process/Context_lib/process.js
@@ -401,7 +401,7 @@ ContextSelector.prototype.getSubContexts = function(pParentRowId)
     if (this.subContexts)
     {
         var sqls = {};
-        for (contextId in this.subContexts)
+        for (let contextId in this.subContexts)
         {
             // Copy the builder to prevent modifying the builder in this.subContexts
             var select = this.subContexts[contextId][0].copy();
diff --git a/process/DataPrivacy_lib/process.js b/process/DataPrivacy_lib/process.js
index 2072800d57..3ed75b1706 100644
--- a/process/DataPrivacy_lib/process.js
+++ b/process/DataPrivacy_lib/process.js
@@ -357,7 +357,7 @@ DataPrivacyUtils.collectAll = function(pContactId, pFilterCond)
     var currentUser = vars.getString("$sys.user");
     var now = vars.getString("$sys.date");
     
-    for (dsgvotype in DataPrivacyType.get())
+    for (let dsgvotype in DataPrivacyType.get())
     {
         // get dsgvotype object for current dsgvotype
         var dsgvotype = DataPrivacyType.get(dsgvotype);
@@ -373,7 +373,7 @@ DataPrivacyUtils.collectAll = function(pContactId, pFilterCond)
                 return;
             // search if it is already in DSGVO table
             var found = false;
-            for (dat in contactDSGVO)
+            for (let dat in contactDSGVO)
             {
                 if (contactDSGVO[dat][2].trim() == dsgvotype.key && contactDSGVO[dat][3] == pRow.id)
                 {
diff --git a/process/DocumentTemplate_lib/process.js b/process/DocumentTemplate_lib/process.js
index 4ced5f9f03..9d6c7fd07c 100644
--- a/process/DocumentTemplate_lib/process.js
+++ b/process/DocumentTemplate_lib/process.js
@@ -550,7 +550,7 @@ DocumentTemplate.prototype.getReplacedEmailsByContactIds = function (pContactIds
     this.setOptions({base64 : isEML});
     var emailContents = this.getReplacedContentByContactIds(pContactIds, pAdditionalPlaceholders);
     
-    for (contactId in emailContents)
+    for (let contactId in emailContents)
     {
         if (isEML)
         {
diff --git a/process/DuplicateScanner_lib/process.js b/process/DuplicateScanner_lib/process.js
index 80b79ca716..4c24fdb550 100644
--- a/process/DuplicateScanner_lib/process.js
+++ b/process/DuplicateScanner_lib/process.js
@@ -349,7 +349,7 @@ DuplicateScannerUtils.ScanRecords = function(pTargetEntity, pTargetRecordsData,
     //First it gets checked if the current id has already been identified. If that's the case it'll continue with the next.
     //Otherwise an object gets build in the form of ["FilterFieldName" = "FilterFieldValueFromQuery"] with which a scan for possible duplicates get's started
     var duplicatesToInsertQueries = [];
-    for (b = 0; b < pTargetRecordsData.length; b++)
+    for (let b = 0; b < pTargetRecordsData.length; b++)
     {
         let entityFieldValuesRay = DuplicateScannerUtils.BuildEntityFieldConfigValueRays(pEntityFieldConfigs, pTargetRecordsData[b]);
 
@@ -748,9 +748,9 @@ DuplicateScannerUtils.BuildEntityFieldConfigValueRays = function(pDuplicateField
     * an array which contains records in the style of ["FilterFieldName", "FilterFieldValueFromQuery"] gets created.
     * This is mandatory to run the scan for this record.
     */
-    for (a = 0; a < pDuplicateFieldsConfig.length; a++)
+    for (let i = 0; i < pDuplicateFieldsConfig.length; i++)
     {
-        let fieldConfig = JSON.parse("{" + pDuplicateFieldsConfig[a] + "}");
+        let fieldConfig = JSON.parse("{" + pDuplicateFieldsConfig[i] + "}");
         let entityField = fieldConfig.entityfield;
         let entityFieldValue = pTargetRecordData[entityField];
         if(entityFieldValue == null)
@@ -777,7 +777,7 @@ DuplicateScannerUtils.BuildEntityFieldConfigValueRays = function(pDuplicateField
             entityFieldValue = "*";
        
         entityFieldValue = entityFieldValue.trim();
-        entityFieldConfigValuesRay.push([pDuplicateFieldsConfig[a], entityFieldValue]);
+        entityFieldConfigValuesRay.push([pDuplicateFieldsConfig[i], entityFieldValue]);
     }
     return entityFieldConfigValuesRay.length > 0 ? entityFieldConfigValuesRay : [["", ""]];
 }
@@ -859,7 +859,7 @@ function _DuplicateScannerUtils() {}
 _DuplicateScannerUtils._loadEntityFieldsFromFieldConfigs = function(pEntityFieldConfigs)
 {
     let fieldNames = [];
-    for (i = 0; i < pEntityFieldConfigs.length; i++) 
+    for (let i = 0; i < pEntityFieldConfigs.length; i++) 
     {
         let fieldConfig = JSON.parse("{" + pEntityFieldConfigs[i] + "}");
         let entityField = fieldConfig.entityfield;
@@ -1098,7 +1098,7 @@ _DuplicateScannerUtils._createInsertDuplicatesClusterQuery = function (pDuplicat
     if(pClusterId == undefined || pClusterId == null || pClusterId == "")
         pClusterId = util.getNewUUID();
             
-    for (i = 0; i < pDuplicatesRay.length; i++)
+    for (let i = 0; i < pDuplicatesRay.length; i++)
     {
         let newId = util.getNewUUID();
         let valuesToInsert = [newId, pClusterId, pDuplicatesRay[i], pTargetEntity];
diff --git a/process/ExportTemplate_lib/process.js b/process/ExportTemplate_lib/process.js
index a8c0991155..06e41118e7 100644
--- a/process/ExportTemplate_lib/process.js
+++ b/process/ExportTemplate_lib/process.js
@@ -69,7 +69,7 @@ ExportTemplateUtils.buildExport = function (pExportTemplateId, pSelection, pComi
     //selects all the placeholders needed in the correct order
     var placeholders = PlaceholderUtils.getPlaceholders(language); //selects all placeholders
     var affectedPlaceholders = [];
-    for (var i = 0; i < fields.length; i++) {
+    for (let i = 0; i < fields.length; i++) {
             var placeholderField = placeholders.find(function(placeholder){
                 return placeholder.getFormattedName() == fields[i];
             })
@@ -81,7 +81,7 @@ ExportTemplateUtils.buildExport = function (pExportTemplateId, pSelection, pComi
     var replaced = getAddressesData(selection, affectedPlaceholders, null, null);   //replaces all the placeholders with values 
     replaced =  replaced.slice(1,replaced.length);                      //needed in order to remove the weird first line of the Array
     
-    for (i = 0; i < affectedPlaceholders.length; i++) 
+    for (let i = 0; i < affectedPlaceholders.length; i++) 
     {
         fieldtitles[i] = affectedPlaceholders[i].title;                 //gets the translations for the Labelling
     }
diff --git a/process/Leadimport_lib/process.js b/process/Leadimport_lib/process.js
index c8dffe26f5..9258ca92a7 100644
--- a/process/Leadimport_lib/process.js
+++ b/process/Leadimport_lib/process.js
@@ -113,7 +113,7 @@ LeadImportUtils.loadImportFile = function(pBinId, pFieldSep, pFieldLimit, pRecor
                     db.deleteData("IMPORTFIELD", newWhere("IMPORTFIELD.LEADIMPORT_ID", pLeadImportId).build());
                 }
                 //insert the importfields
-                for (i = 0; i < table[0].length; i++)
+                for (let i = 0; i < table[0].length; i++)
                 {
                     insertVals =  [util.getNewUUID(), table[0][i], pLeadImportId, vars.getString("$sys.date"), vars.getString("$sys.user"), i.toString()];
                     toInsert.push([insertTable, insertCols, null, insertVals]);
@@ -315,15 +315,14 @@ LeadImportUtils.getDataTypes = function(pDataFields, pDataTables)
  */
 LeadImportUtils.setValues  = function(pFields, pFieldDef, pFieldValues)
 {
-    var DataValues = new Object();
-    var i;
+    var dataValues = {};
     //  preset values
-    for (i = 0; i <  pFields.length; i++)
+    for (let i = 0; i <  pFields.length; i++)
     {
-        DataValues[pFields[i]] = "";
+        dataValues[pFields[i]] = "";
     }
     // set values
-    for (i = 0; i < pFieldDef.length; i++)
+    for (let i = 0; i < pFieldDef.length; i++)
     {
         try
         {
@@ -337,7 +336,7 @@ LeadImportUtils.setValues  = function(pFields, pFieldDef, pFieldValues)
                     pFieldValues[pFieldDef[i][0]] = LeadImportUtils.mapping[pFieldDef[i][1]][pFieldValues[pFieldDef[i][0]]];
                 }
                     
-                DataValues[pFieldDef[i][1]] = pFieldValues[pFieldDef[i][0]];
+                dataValues[pFieldDef[i][1]] = pFieldValues[pFieldDef[i][0]];
             }
         }
         catch(ex)
@@ -345,7 +344,7 @@ LeadImportUtils.setValues  = function(pFields, pFieldDef, pFieldValues)
             logging.log(ex, logging.WARNING);
         }
     }
-    return DataValues;
+    return dataValues;
 }
 
 /**
diff --git a/process/Loghistory_lib/process.js b/process/Loghistory_lib/process.js
index 0f88ed09da..93375b4ee7 100644
--- a/process/Loghistory_lib/process.js
+++ b/process/Loghistory_lib/process.js
@@ -117,7 +117,7 @@ LogHistoryExecutor.prototype.execute = function ()
     {
         var conf = extra[this.affectedTable];
 
-        for(i = 0; i < this.columns.length; i++ )
+        for(let i = 0; i < this.columns.length; i++ )
         {
             if (this.sqlAction == 'D' || this.sqlAction == 'U')  oldvalues[this.columns[i]] =  this.oldValues[i];
             if (this.sqlAction == 'I' || this.sqlAction == 'U')  newvalues[this.columns[i]] =  this.newValues[i];
@@ -165,7 +165,7 @@ LogHistoryExecutor.prototype.execute = function ()
                 return null;
         }
 
-        for (var i = 0; i < this.columns.length; i++)
+        for (let i = 0; i < this.columns.length; i++)
         {
             if (this.affectedTable == "ASYS_CALENDARBACKEND" && this.columns[i] == "VCOMPONENT") 
                 this._getCalendarDescription(i);
@@ -205,7 +205,7 @@ LogHistoryExecutor.prototype.execute = function ()
         }
         if (this.sqlAction == "U")
         {
-            for (var index in references) references[index].id = newSelect(index).from(this.affectedTable).where([this.affectedTable, primaryKey], this.idValue).cell();
+            for (let index in references) references[index].id = newSelect(index).from(this.affectedTable).where([this.affectedTable, primaryKey], this.idValue).cell();
         }
     }
 
@@ -214,7 +214,7 @@ LogHistoryExecutor.prototype.execute = function ()
         if (this.sqlAction == 'I') description = translate.withArguments("%0 added.", [description.join(",\n")], this.translationLanguage);
         else if (this.sqlAction == 'U') description = translate.withArguments("%0 modified.", [description.join(",\n")], this.translationLanguage);
         else if (this.sqlAction == 'D') description = translate.withArguments("%0 deleted.", [description.join(",\n")], this.translationLanguage);
-        for (index in references)
+        for (let index in references)
         {
             if (references[index].id != "")
             {
diff --git a/process/Sql_lib/process.js b/process/Sql_lib/process.js
index 7b28c6db4f..dda96f2019 100644
--- a/process/Sql_lib/process.js
+++ b/process/Sql_lib/process.js
@@ -818,7 +818,7 @@ SqlBuilder.prototype.copy = function()
         
         // set the props of the new object to the deepCopied ones.
         // without this all functions would be lost
-        for (prop in deepCopied)
+        for (let prop in deepCopied)
         {
             pNewObject[prop] = deepCopied[prop]
         }
@@ -3357,7 +3357,7 @@ SqlMaskingUtils.prototype.substring = function(field, start, length) {
 * @return {String} part of SQL-querey
 */
 SqlMaskingUtils.prototype.concat = function(fields, separatorCharacter, autoTrimFields) {
-    var i, concatSql, retSql, isNotEmptyStrSql, isNotNullSql, separatorSql, _isNotEmpty, _trimIfAutoTrimEnabled;
+    var concatSql, retSql, isNotEmptyStrSql, isNotNullSql, separatorSql, _isNotEmpty, _trimIfAutoTrimEnabled;
     if (fields.length == 0)
         return "''";
     else if (fields.length == 1)
@@ -3376,7 +3376,7 @@ SqlMaskingUtils.prototype.concat = function(fields, separatorCharacter, autoTrim
         case db.DBTYPE_MARIADB10:
         case db.DBTYPE_POSTGRESQL8:
             retSql = " concat_ws( '" + separatorSql + "'";
-            for (i = 0; i < fields.length; i++) {
+            for (let i = 0; i < fields.length; i++) {
                 retSql += ", " + fields[i];
             }
             return retSql + ") ";
@@ -3408,7 +3408,7 @@ SqlMaskingUtils.prototype.concat = function(fields, separatorCharacter, autoTrim
     }
     _isNotEmpty = _isNotEmpty.bind(this);
     
-    for (i = 0; i < fields.length; i++) {
+    for (let i = 0; i < fields.length; i++) {
         if (retSql != "")  
             retSql += concatSql;
         retSql += "case when " + _isNotEmpty(fields[i]) + " then ";
diff --git a/process/WsValidation_lib/process.js b/process/WsValidation_lib/process.js
index 7a0e9b7e49..8d7b821ee0 100644
--- a/process/WsValidation_lib/process.js
+++ b/process/WsValidation_lib/process.js
@@ -358,7 +358,7 @@ WsValidationUtils.setAddressFields = function(pJSON)
         "$field.LON": data.lon
     }
     
-    for (field in toSet) 
+    for (let field in toSet) 
     {
         let value = toSet[field];
         if (!value)
diff --git a/process/importLead_serverProcess/process.js b/process/importLead_serverProcess/process.js
index b32a49225e..c572bd5191 100644
--- a/process/importLead_serverProcess/process.js
+++ b/process/importLead_serverProcess/process.js
@@ -181,7 +181,7 @@ function getFieldPos (pFieldDef, pFieldName)
 {
     var multi = false;
     var pos = new Array();
-    for (i = 0; i < pFieldDef.length; i++)
+    for (let i = 0; i < pFieldDef.length; i++)
     {
         if (pFieldDef[i][1] == pFieldName)
         {
-- 
GitLab


From 5154453f508f7de81a197f9cb8e4e40c716907fa Mon Sep 17 00:00:00 2001
From: Sebastian Listl <s.listl@adito.de>
Date: Tue, 25 Aug 2020 17:25:13 +0200
Subject: [PATCH 211/309] Language files

---
 .../_____LANGUAGE_EXTRA.aod                   |  3 ++
 .../_____LANGUAGE_de/_____LANGUAGE_de.aod     | 35 +++++++++++--------
 .../_____LANGUAGE_en/_____LANGUAGE_en.aod     |  3 ++
 3 files changed, 27 insertions(+), 14 deletions(-)

diff --git a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
index ecdc03ee94..a70bdc4dad 100644
--- a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
+++ b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
@@ -7146,6 +7146,9 @@
     <entry>
       <key>The use of any of your previous %0 passwords is prohibited</key>
     </entry>
+    <entry>
+      <key>export using the selected template</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 71b56b676a..ce7257504d 100644
--- a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
+++ b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
@@ -8992,14 +8992,12 @@ Bitte Datumseingabe prüfen</value>
     <entry>
       <key>Receive new Department Permission</key>
     </entry>
-    <entry>
-      <key>Borrow</key>
-    </entry>
     <entry>
       <key>Selection placeholder</key>
     </entry>
     <entry>
       <key>Grant new Department Permission</key>
+      <value>Neue Abteilungs-Berechtigung vergeben</value>
     </entry>
     <entry>
       <key>Current password</key>
@@ -9026,6 +9024,7 @@ Bitte Datumseingabe prüfen</value>
     </entry>
     <entry>
       <key>Permission Procurer Department</key>
+      <value>Rechteempfänger Abteilung</value>
     </entry>
     <entry>
       <key>favorite</key>
@@ -9037,23 +9036,15 @@ Bitte Datumseingabe prüfen</value>
     <entry>
       <key>{SENT_MAIL}</key>
     </entry>
-    <entry>
-      <key>The workflow could not be deployed</key>
-    </entry>
     <entry>
       <key>SELECTION_NULL</key>
     </entry>
-    <entry>
-      <key>Workflow deploy failed</key>
-    </entry>
     <entry>
       <key>Selection ignore case</key>
     </entry>
     <entry>
       <key>Calendar maintime end</key>
       <value>Kalender-Kernzeit Ende</value>
-      <key>Add Participants</key>
-      <value>Teilnehmer hinzufügen</value>
     </entry>
     <entry>
       <key>Release</key>
@@ -9072,6 +9063,7 @@ Bitte Datumseingabe prüfen</value>
     </entry>
     <entry>
       <key>Permission Procurer User</key>
+      <value>Rechteempfänger Benutzer</value>
     </entry>
     <entry>
       <key>New password</key>
@@ -9090,9 +9082,6 @@ Bitte Datumseingabe prüfen</value>
     <entry>
       <key>{SEND_MAIL}</key>
     </entry>
-    <entry>
-      <key>download ready</key>
-    </entry>
     <entry>
       <key>Latitude</key>
     </entry>
@@ -9127,6 +9116,24 @@ Bitte Datumseingabe prüfen</value>
     <entry>
       <key>Total in euros</key>
     </entry>
+    <entry>
+      <key>Add Participants</key>
+    </entry>
+    <entry>
+      <key>Calendar hour divider</key>
+    </entry>
+    <entry>
+      <key>SELECTION_BOTH</key>
+    </entry>
+    <entry>
+      <key>SELECTION_POSTFIX</key>
+    </entry>
+    <entry>
+      <key>Password must contain letters</key>
+    </entry>
+    <entry>
+      <key>SELECTION_PREFIX</key>
+    </entry>
   </keyValueMap>
   <font name="Dialog" style="0" size="11" />
 </language>
diff --git a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
index a76b7cb29f..e9ae9aabca 100644
--- a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
+++ b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
@@ -7213,6 +7213,9 @@
     <entry>
       <key>The use of any of your previous %0 passwords is prohibited</key>
     </entry>
+    <entry>
+      <key>export using the selected template</key>
+    </entry>
   </keyValueMap>
   <font name="Dialog" style="0" size="11" />
 </language>
-- 
GitLab


From 428d5b02bb24980aed5844340a0f3f029f02820e Mon Sep 17 00:00:00 2001
From: Tom Lutzenberger <t.lutzenberger@adito.de>
Date: Wed, 26 Aug 2020 07:05:41 +0200
Subject: [PATCH 212/309] #1064056: Implement classification sorting

---
 .../ClassificationScore_entity/ClassificationScore_entity.aod | 1 +
 .../ClassificationScoreMultipleEdit_view.aod                  | 4 ----
 .../ClassificationScoreMultiplePreview_view.aod               | 4 ----
 3 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/entity/ClassificationScore_entity/ClassificationScore_entity.aod b/entity/ClassificationScore_entity/ClassificationScore_entity.aod
index 79b3abfd9a..ce38295bce 100644
--- a/entity/ClassificationScore_entity/ClassificationScore_entity.aod
+++ b/entity/ClassificationScore_entity/ClassificationScore_entity.aod
@@ -41,6 +41,7 @@
     </entityField>
     <entityProvider>
       <name>ClassificationScores</name>
+      <sortingField>SORT</sortingField>
       <documentation>%aditoprj%/entity/ClassificationScore_entity/entityfields/classificationscores/documentation.adoc</documentation>
       <children>
         <entityParameter>
diff --git a/neonView/ClassificationScoreMultipleEdit_view/ClassificationScoreMultipleEdit_view.aod b/neonView/ClassificationScoreMultipleEdit_view/ClassificationScoreMultipleEdit_view.aod
index 806bac6774..80c1c9c1d2 100644
--- a/neonView/ClassificationScoreMultipleEdit_view/ClassificationScoreMultipleEdit_view.aod
+++ b/neonView/ClassificationScoreMultipleEdit_view/ClassificationScoreMultipleEdit_view.aod
@@ -21,10 +21,6 @@
           <name>db21eec0-16c6-4267-a785-cb63f15e43b3</name>
           <entityField>SCORE</entityField>
         </neonGenericMultipleTableColumn>
-        <neonGenericMultipleTableColumn>
-          <name>38641e7a-a8fe-4ad4-af63-efde73d66a9a</name>
-          <entityField>SORT</entityField>
-        </neonGenericMultipleTableColumn>
       </columns>
     </genericMultipleViewTemplate>
   </children>
diff --git a/neonView/ClassificationScoreMultiplePreview_view/ClassificationScoreMultiplePreview_view.aod b/neonView/ClassificationScoreMultiplePreview_view/ClassificationScoreMultiplePreview_view.aod
index 2d3926c09f..2bd84028e0 100644
--- a/neonView/ClassificationScoreMultiplePreview_view/ClassificationScoreMultiplePreview_view.aod
+++ b/neonView/ClassificationScoreMultiplePreview_view/ClassificationScoreMultiplePreview_view.aod
@@ -18,10 +18,6 @@
           <name>d56f97c1-a634-4b12-8dd3-c2c32a9e16f1</name>
           <entityField>SCORE</entityField>
         </neonTitledListTableColumn>
-        <neonTitledListTableColumn>
-          <name>9fb3ba45-55e6-44f0-a612-7ddd54dacce0</name>
-          <entityField>SORT</entityField>
-        </neonTitledListTableColumn>
       </columns>
     </titledListViewTemplate>
   </children>
-- 
GitLab


From 883f5074b544aa951fa95e45b751edc10580e429 Mon Sep 17 00:00:00 2001
From: "j.goderbauer" <j.goderbauer@adito.de>
Date: Tue, 25 Aug 2020 16:03:02 +0200
Subject: [PATCH 213/309] Countries_entity: added record container caching

---
 entity/Countries_Entity/Countries_Entity.aod  |  2 +
 .../recordcontainers/db/cacheKeyProcess.js    |  5 ++
 process/CountryInfoData_lib/process.js        | 62 ++++++++++---------
 process/CountryInfo_lib/process.js            |  2 -
 4 files changed, 40 insertions(+), 31 deletions(-)
 create mode 100644 entity/Countries_Entity/recordcontainers/db/cacheKeyProcess.js

diff --git a/entity/Countries_Entity/Countries_Entity.aod b/entity/Countries_Entity/Countries_Entity.aod
index 41d1741997..35e3e6c3c5 100644
--- a/entity/Countries_Entity/Countries_Entity.aod
+++ b/entity/Countries_Entity/Countries_Entity.aod
@@ -98,6 +98,8 @@
       <alias>Data_alias</alias>
       <isPageable v="false" />
       <orderClauseProcess>%aditoprj%/entity/Countries_Entity/recordcontainers/db/orderClauseProcess.js</orderClauseProcess>
+      <cacheType>GLOBAL</cacheType>
+      <cacheKeyProcess>%aditoprj%/entity/Countries_Entity/recordcontainers/db/cacheKeyProcess.js</cacheKeyProcess>
       <linkInformation>
         <linkInformation>
           <name>cc219004-43fd-4a3f-bee0-be5e732c61f1</name>
diff --git a/entity/Countries_Entity/recordcontainers/db/cacheKeyProcess.js b/entity/Countries_Entity/recordcontainers/db/cacheKeyProcess.js
new file mode 100644
index 0000000000..a332cb19c8
--- /dev/null
+++ b/entity/Countries_Entity/recordcontainers/db/cacheKeyProcess.js
@@ -0,0 +1,5 @@
+import("CachedRecordContainer_lib");
+import("system.result")
+
+var res = CachedRecordContainerUtils.getCommonKey();
+result.string(res);
\ No newline at end of file
diff --git a/process/CountryInfoData_lib/process.js b/process/CountryInfoData_lib/process.js
index dbd7ab94a6..d071f7d601 100644
--- a/process/CountryInfoData_lib/process.js
+++ b/process/CountryInfoData_lib/process.js
@@ -1,38 +1,42 @@
 import("system.entities");
 import("system.translate");
-import("system.db");
-import("DataCaching_lib");
-import("Sql_lib");
-
-/*
-This is a experimental library. 
-The code will definetly change in the future while not keeping the same functionparameters and calls. You should not use this except you excatly know what you're doing.
-Since the functions will change, comments are written for the future functions.
-
-The idea behind this is to maintain data in cached form (client-context-side)) for various keyword-constructs.
-*/
 
+/**
+ * provides functions for retrieving common forms of countrydata
+ * Do not create an instance of this!
+ *
+ * @class
+ * @static
+ */
 function CountryInfoData(){}
 
-CountryInfoData.getMainData = function (pLocale)
-{
-    var cache = new CachedData("CountryInfoData.getMainData", true, pLocale);
-    return cache.load(function (pTranslationNecessary, pLocale){
-        var loadingConfig = entities.createConfigForLoadingRows().entity("Countries_Entity").fields(["ISO2", "NAME_TRANSLATED"]);//TODO: into cachedDatalib
-        var countryData = entities.getRows(loadingConfig);//TODO: ignore grants?
-        return countryData;
-    });
-};
-
+/**
+* loads the ISO2 code and name of the countries_entity
+*
+* @param {String} [pLocale=current language]    <p/>specifies the locale for translating the name, if not given the locale of the current image-context 
+*                                                     (server or client) is used
+*
+* @return {Array} 2D array where each row is an array of: [<<iso2-code>>, <<country-name>>]
+*
+*/
 CountryInfoData.getIso2NameData = function (pLocale)
 {
-    var cache = new CachedData("CountryInfoData.getIso2NameData", true, pLocale);
-    return cache.load(function (pTranslationNecessary, pLocale){
-        var countryData = CountryInfoData.getMainData(pLocale);
-        countryData = countryData.map(function (row){
-                return [row["ISO2"], row["NAME_TRANSLATED"]];
-            });
-        return countryData;
+    var fieldsToLoad = ["ISO2"];
+    if (pLocale)
+        fieldsToLoad.push("NAME");
+    else
+        fieldsToLoad.push("NAME_TRANSLATED");
+
+    var loadingConfig = entities.createConfigForLoadingRows()
+        .ignorePermissions(true)
+        .entity("Countries_Entity")//default record container is cached
+        .fields(fieldsToLoad);
+    var countryData = entities.getRows(loadingConfig);
+    
+    var res = countryData.map(function (entityRow){
+        var name = pLocale ? translate.text(entityRow["NAME"], pLocale) : entityRow["NAME_TRANSLATED"];
+        return [entityRow["ISO2"], name];
     });
+    return res;
 };
-    
+    
\ No newline at end of file
diff --git a/process/CountryInfo_lib/process.js b/process/CountryInfo_lib/process.js
index 999d00d5d2..2db23f676c 100644
--- a/process/CountryInfo_lib/process.js
+++ b/process/CountryInfo_lib/process.js
@@ -34,8 +34,6 @@ CountryUtils.getLatinNameByIso2 = function(pIso2, pLocale)
     return countryName;
 };
 
-//SqlUtils.getResolvingCaseWhen(keywordData, pDbFieldName, pLocale);
-
 /**
 * resolves ISO2 codes of countries to the translated name
 * 
-- 
GitLab


From d49a3aa446606bf92d7a3b64ea4ad54fd553c36a Mon Sep 17 00:00:00 2001
From: "j.goderbauer" <j.goderbauer@adito.de>
Date: Wed, 26 Aug 2020 08:53:10 +0200
Subject: [PATCH 214/309] upgraded Datamodels 1.3.14 -> 1.3.15

---
 entity/360Degree_entity/360Degree_entity.aod  |  2 +-
 .../ActivityLink_entity.aod                   |  2 +-
 entity/Activity_entity/Activity_entity.aod    |  2 +-
 .../AddressType_entity/AddressType_entity.aod |  2 +-
 .../AddressValidation_entity.aod              |  2 +-
 entity/Address_entity/Address_entity.aod      |  2 +-
 .../AdminViewRow_entity.aod                   |  2 +-
 entity/Analyses_entity/Analyses_entity.aod    |  2 +-
 .../AnyContact_entity/AnyContact_entity.aod   |  2 +-
 .../AppointmentLink_entity.aod                |  2 +-
 .../Appointment_entity/Appointment_entity.aod |  2 +-
 .../AttributeRelation_entity.aod              |  2 +-
 .../AttributeUsage_entity.aod                 |  2 +-
 entity/Attribute_entity/Attribute_entity.aod  |  2 +-
 .../BulkMailAddRecipients_entity.aod          |  2 +-
 .../BulkMailRecipient_entity.aod              |  2 +-
 .../BulkMailStatusChart_entity.aod            |  2 +-
 .../BulkMailTesting_entity.aod                |  2 +-
 entity/BulkMail_entity/BulkMail_entity.aod    |  2 +-
 .../CampaignAddParticipants_entity.aod        |  2 +-
 .../CampaignAnalysis_entity.aod               |  2 +-
 .../CampaignCostChart_entity.aod              |  2 +-
 .../CampaignCost_entity.aod                   |  2 +-
 .../CampaignParticipantChart_entity.aod       |  2 +-
 .../CampaignParticipant_entity.aod            |  2 +-
 .../CampaignPlanning_entity.aod               |  2 +-
 .../CampaignStep_entity.aod                   |  2 +-
 entity/Campaign_entity/Campaign_entity.aod    |  2 +-
 .../ClassificationAdmin_entity.aod            |  2 +-
 .../ClassificationGrading_entity.aod          |  2 +-
 .../ClassificationGroupAnalyses_entity.aod    |  2 +-
 .../ClassificationScore_entity.aod            |  2 +-
 .../ClassificationType_entity.aod             |  2 +-
 .../Classification_entity.aod                 |  2 +-
 .../CommRestriction_Entity.aod                |  2 +-
 .../Communication_entity.aod                  |  2 +-
 .../Competition_entity/Competition_entity.aod |  2 +-
 entity/Contact_entity/Contact_entity.aod      |  2 +-
 entity/Context_entity/Context_entity.aod      |  2 +-
 entity/Contract_entity/Contract_entity.aod    | 11 +++++++++-
 entity/Countries_Entity/Countries_Entity.aod  |  2 +-
 entity/DSGVOInfo_entity/DSGVOInfo_entity.aod  |  2 +-
 .../DSGVOReport_entity/DSGVOReport_entity.aod |  2 +-
 entity/DSGVO_entity/DSGVO_entity.aod          |  2 +-
 .../DefaultAdminView_entity.aod               |  2 +-
 .../DescriptionTranslation_entity.aod         |  2 +-
 .../DocumentTemplateLink_entity.aod           |  2 +-
 .../DocumentTemplatePlaceOfUse_entity.aod     |  2 +-
 .../DocumentTemplateTypeCategory_entity.aod   |  2 +-
 .../DocumentTemplate_entity.aod               |  2 +-
 entity/Document_entity/Document_entity.aod    |  2 +-
 ...plicateScannerResultFieldConfig_entity.aod |  2 +-
 .../DuplicateScanner_entity.aod               |  2 +-
 .../DuplicatesUnrelated_entity.aod            |  2 +-
 .../Duplicates_entity/Duplicates_entity.aod   |  4 ++--
 entity/Email_entity/Email_entity.aod          |  2 +-
 .../EmployeeRole_entity.aod                   |  2 +-
 entity/Employee_entity/Employee_entity.aod    |  2 +-
 .../ExportTemplateField_entity.aod            |  2 +-
 .../ExportTemplatePlaceOfUse_entity.aod       |  2 +-
 .../ExportTemplateSelection_entity.aod        |  2 +-
 .../ExportTemplate_entity.aod                 |  2 +-
 entity/Favorite_entity/Favorite_entity.aod    |  2 +-
 entity/Forecast_entity/Forecast_entity.aod    |  2 +-
 entity/Gender_keyword/Gender_keyword.aod      |  2 +-
 .../ImportField_Entity/ImportField_Entity.aod |  2 +-
 .../IndexSearchEntity/IndexSearchEntity.aod   |  2 +-
 .../KeywordAttributeRelation_entity.aod       |  2 +-
 .../KeywordAttribute_entity.aod               |  2 +-
 .../KeywordEntry_entity.aod                   |  2 +-
 entity/Language_entity/Language_entity.aod    |  2 +-
 entity/LeadLog_entity/LeadLog_entity.aod      |  2 +-
 entity/LeadTemp_entity/LeadTemp_entity.aod    |  2 +-
 entity/Lead_entity/Lead_entity.aod            |  2 +-
 .../LeadimportMappingAssistant_entity.aod     |  2 +-
 .../Leadimport_entity/Leadimport_entity.aod   |  2 +-
 .../LetterRecipient_entity.aod                |  2 +-
 entity/Letter_entity/Letter_entity.aod        |  2 +-
 .../LogHistory_entity/LogHistory_entity.aod   |  2 +-
 .../MemberRoles_entity/MemberRoles_entity.aod |  2 +-
 entity/Member_entity/Member_entity.aod        |  2 +-
 .../ModuleTree_entity/ModuleTree_entity.aod   |  2 +-
 .../Notification_entity.aod                   |  2 +-
 .../ObjectProxy_entity/ObjectProxy_entity.aod |  2 +-
 .../ObjectRelationType_entity.aod             |  2 +-
 .../ObjectTree_entity/ObjectTree_entity.aod   |  2 +-
 entity/Object_entity/Object_entity.aod        |  2 +-
 entity/Offer_entity/Offer_entity.aod          | 11 +++++++++-
 entity/Offeritem_entity/Offeritem_entity.aod  |  2 +-
 entity/Order_entity/Order_entity.aod          | 11 +++++++++-
 entity/Orderitem_entity/Orderitem_entity.aod  |  2 +-
 .../Organisation_entity.aod                   | 22 ++++++++++---------
 .../PermissionAction_entity.aod               |  2 +-
 .../PermissionCalendar_entity.aod             |  2 +-
 .../PermissionDetail_entity.aod               |  2 +-
 .../PermissionMetaData_entity.aod             |  2 +-
 .../PermissionOverview_entity.aod             |  2 +-
 entity/Person_entity/Person_entity.aod        | 11 +++++++++-
 .../PrivatePerson_entity.aod                  |  2 +-
 entity/Prod2prod_entity/Prod2prod_entity.aod  |  2 +-
 entity/Product_entity/Product_entity.aod      | 11 +++++++++-
 .../Productprice_entity.aod                   |  2 +-
 .../QuickEntry_entity/QuickEntry_entity.aod   |  2 +-
 .../RoleChildren_entity.aod                   |  2 +-
 .../RoleParent_entity/RoleParent_entity.aod   |  2 +-
 entity/Role_entity/Role_entity.aod            |  2 +-
 .../SalesprojectAnalyses_entity.aod           |  2 +-
 .../SalesprojectMilestone_entity.aod          |  2 +-
 .../SalesprojectPhase_entity.aod              |  2 +-
 .../SalesprojectSource_entity.aod             |  2 +-
 .../Salesproject_entity.aod                   | 11 +++++++++-
 .../SalutationDistinct_entity.aod             |  2 +-
 .../SalutationTitleDistinct_entity.aod        |  2 +-
 .../Salutation_entity/Salutation_entity.aod   |  2 +-
 .../SerialLetterAddRecipients_entity.aod      |  2 +-
 .../SerialLetter_entity.aod                   |  2 +-
 entity/Social_entity/Social_entity.aod        |  2 +-
 entity/Stock_entity/Stock_entity.aod          |  2 +-
 .../SupportTicket_entity.aod                  |  2 +-
 entity/TaskLink_entity/TaskLink_entity.aod    |  2 +-
 entity/Task_entity/Task_entity.aod            |  2 +-
 .../Timetracking_entity.aod                   |  2 +-
 .../TurnoverTree_entity.aod                   |  2 +-
 entity/Turnover_entity/Turnover_entity.aod    |  2 +-
 .../UniversalFileProcessor_entity.aod         |  2 +-
 .../UnlinkedMailMappingLink_entity.aod        |  2 +-
 .../UnlinkedMailMappingWrapper_entity.aod     |  2 +-
 .../UnlinkedMail_entity.aod                   |  2 +-
 .../Usersettings_entity.aod                   |  2 +-
 .../VisitPlanEmployeeWeek_entity.aod          |  2 +-
 .../VisitPlanEntry_entity.aod                 |  2 +-
 .../VisitRecommendation_entity.aod            |  2 +-
 .../WorkflowDefinition_entity.aod             |  2 +-
 .../WorkflowInstanceHistory_entity.aod        |  2 +-
 .../WorkflowInstance_entity.aod               |  2 +-
 .../WorkflowModel_entity.aod                  |  2 +-
 .../WorkflowSignal_entity.aod                 |  2 +-
 .../WorkflowStartConfig_entity.aod            |  2 +-
 .../WorkflowTask_entity.aod                   |  2 +-
 .../WorkflowVariableValue_entity.aod          |  2 +-
 140 files changed, 206 insertions(+), 150 deletions(-)

diff --git a/entity/360Degree_entity/360Degree_entity.aod b/entity/360Degree_entity/360Degree_entity.aod
index 3ca98a082b..f7c9f86c70 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.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.15" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.15">
   <name>360Degree_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/360Degree_entity/documentation.adoc</documentation>
diff --git a/entity/ActivityLink_entity/ActivityLink_entity.aod b/entity/ActivityLink_entity/ActivityLink_entity.aod
index 160401972f..fb1b4e6928 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.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.15" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.15">
   <name>ActivityLink_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/ActivityLink_entity/documentation.adoc</documentation>
diff --git a/entity/Activity_entity/Activity_entity.aod b/entity/Activity_entity/Activity_entity.aod
index 3f89523fd9..489f6d818e 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.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.15" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.15">
   <name>Activity_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/Activity_entity/documentation.adoc</documentation>
diff --git a/entity/AddressType_entity/AddressType_entity.aod b/entity/AddressType_entity/AddressType_entity.aod
index 57c846d008..f6b38cf594 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.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.15" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.15">
   <name>AddressType_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/AddressType_entity/documentation.adoc</documentation>
diff --git a/entity/AddressValidation_entity/AddressValidation_entity.aod b/entity/AddressValidation_entity/AddressValidation_entity.aod
index 6a58a3dc69..19c0dbd986 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.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.15" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.15">
   <name>AddressValidation_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/AddressValidation_entity/documentation.adoc</documentation>
diff --git a/entity/Address_entity/Address_entity.aod b/entity/Address_entity/Address_entity.aod
index 9e5b31e8d1..d8e21b870c 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.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.15" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.15">
   <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 8a4e552f14..f08be730cb 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.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.15" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.15">
   <name>AdminViewRow_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/AdminViewRow_entity/documentation.adoc</documentation>
diff --git a/entity/Analyses_entity/Analyses_entity.aod b/entity/Analyses_entity/Analyses_entity.aod
index 4dae1e91fc..b9f42ad25c 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.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.15" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.15">
   <name>Analyses_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/Analyses_entity/documentation.adoc</documentation>
diff --git a/entity/AnyContact_entity/AnyContact_entity.aod b/entity/AnyContact_entity/AnyContact_entity.aod
index 49fb5e30fa..0225b4306b 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.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.15" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.15">
   <name>AnyContact_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/AnyContact_entity/documentation.adoc</documentation>
diff --git a/entity/AppointmentLink_entity/AppointmentLink_entity.aod b/entity/AppointmentLink_entity/AppointmentLink_entity.aod
index 58aaa1c134..8bff3e7ea2 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.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.15" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.15">
   <name>AppointmentLink_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/AppointmentLink_entity/documentation.adoc</documentation>
diff --git a/entity/Appointment_entity/Appointment_entity.aod b/entity/Appointment_entity/Appointment_entity.aod
index c68158fb33..2263bc41f9 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.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.15" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.15">
   <name>Appointment_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/Appointment_entity/documentation.adoc</documentation>
diff --git a/entity/AttributeRelation_entity/AttributeRelation_entity.aod b/entity/AttributeRelation_entity/AttributeRelation_entity.aod
index 2065c6199b..86a065ceb2 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.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.15" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.15">
   <name>AttributeRelation_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/AttributeRelation_entity/documentation.adoc</documentation>
diff --git a/entity/AttributeUsage_entity/AttributeUsage_entity.aod b/entity/AttributeUsage_entity/AttributeUsage_entity.aod
index 325447f14b..28ff0133d6 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.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.15" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.15">
   <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 81ed998586..735588f943 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.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.15" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.15">
   <name>Attribute_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/Attribute_entity/documentation.adoc</documentation>
diff --git a/entity/BulkMailAddRecipients_entity/BulkMailAddRecipients_entity.aod b/entity/BulkMailAddRecipients_entity/BulkMailAddRecipients_entity.aod
index 31597bcc5d..7aba636df5 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.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.15" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.15">
   <name>BulkMailAddRecipients_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/BulkMailAddRecipients_entity/documentation.adoc</documentation>
diff --git a/entity/BulkMailRecipient_entity/BulkMailRecipient_entity.aod b/entity/BulkMailRecipient_entity/BulkMailRecipient_entity.aod
index e8de32709b..748f9ca988 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.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.15" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.15">
   <name>BulkMailRecipient_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/BulkMailRecipient_entity/documentation.adoc</documentation>
diff --git a/entity/BulkMailStatusChart_entity/BulkMailStatusChart_entity.aod b/entity/BulkMailStatusChart_entity/BulkMailStatusChart_entity.aod
index 981bffc047..d8ce6fee17 100644
--- a/entity/BulkMailStatusChart_entity/BulkMailStatusChart_entity.aod
+++ b/entity/BulkMailStatusChart_entity/BulkMailStatusChart_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.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.15" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.15">
   <name>BulkMailStatusChart_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/BulkMailStatusChart_entity/documentation.adoc</documentation>
diff --git a/entity/BulkMailTesting_entity/BulkMailTesting_entity.aod b/entity/BulkMailTesting_entity/BulkMailTesting_entity.aod
index 70e8a0f262..57f615909d 100644
--- a/entity/BulkMailTesting_entity/BulkMailTesting_entity.aod
+++ b/entity/BulkMailTesting_entity/BulkMailTesting_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.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.15" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.15">
   <name>BulkMailTesting_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/BulkMailTesting_entity/documentation.adoc</documentation>
diff --git a/entity/BulkMail_entity/BulkMail_entity.aod b/entity/BulkMail_entity/BulkMail_entity.aod
index e2e46ded6f..89ad323385 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.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.15" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.15">
   <name>BulkMail_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/BulkMail_entity/documentation.adoc</documentation>
diff --git a/entity/CampaignAddParticipants_entity/CampaignAddParticipants_entity.aod b/entity/CampaignAddParticipants_entity/CampaignAddParticipants_entity.aod
index 00f620a965..9b0db2740d 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.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.15" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.15">
   <name>CampaignAddParticipants_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/CampaignAddParticipants_entity/documentation.adoc</documentation>
diff --git a/entity/CampaignAnalysis_entity/CampaignAnalysis_entity.aod b/entity/CampaignAnalysis_entity/CampaignAnalysis_entity.aod
index 5a8389da5c..e995143977 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.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.15" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.15">
   <name>CampaignAnalysis_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/CampaignAnalysis_entity/documentation.adoc</documentation>
diff --git a/entity/CampaignCostChart_entity/CampaignCostChart_entity.aod b/entity/CampaignCostChart_entity/CampaignCostChart_entity.aod
index 7ee286a6e7..02e9452bf7 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.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.15" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.15">
   <name>CampaignCostChart_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/CampaignCostChart_entity/documentation.adoc</documentation>
diff --git a/entity/CampaignCost_entity/CampaignCost_entity.aod b/entity/CampaignCost_entity/CampaignCost_entity.aod
index b60d566160..c7c6782e37 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.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.15" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.15">
   <name>CampaignCost_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/CampaignCost_entity/documentation.adoc</documentation>
diff --git a/entity/CampaignParticipantChart_entity/CampaignParticipantChart_entity.aod b/entity/CampaignParticipantChart_entity/CampaignParticipantChart_entity.aod
index 4ce08409c1..8ba9003088 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.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.15" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.15">
   <name>CampaignParticipantChart_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/CampaignParticipantChart_entity/documentation.adoc</documentation>
diff --git a/entity/CampaignParticipant_entity/CampaignParticipant_entity.aod b/entity/CampaignParticipant_entity/CampaignParticipant_entity.aod
index 97aaaa0c2e..7795938f17 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.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.15" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.15">
   <name>CampaignParticipant_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/CampaignParticipant_entity/documentation.adoc</documentation>
diff --git a/entity/CampaignPlanning_entity/CampaignPlanning_entity.aod b/entity/CampaignPlanning_entity/CampaignPlanning_entity.aod
index 051deb0cee..c30958c7b4 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.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.15" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.15">
   <name>CampaignPlanning_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/CampaignPlanning_entity/documentation.adoc</documentation>
diff --git a/entity/CampaignStep_entity/CampaignStep_entity.aod b/entity/CampaignStep_entity/CampaignStep_entity.aod
index 4b36e31d21..f3ee222a32 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.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.15" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.15">
   <name>CampaignStep_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/CampaignStep_entity/documentation.adoc</documentation>
diff --git a/entity/Campaign_entity/Campaign_entity.aod b/entity/Campaign_entity/Campaign_entity.aod
index e3c07b68ab..10ad144066 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.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.15" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.15">
   <name>Campaign_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/Campaign_entity/documentation.adoc</documentation>
diff --git a/entity/ClassificationAdmin_entity/ClassificationAdmin_entity.aod b/entity/ClassificationAdmin_entity/ClassificationAdmin_entity.aod
index f77ccf9048..101cb7a09c 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.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.15" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.15">
   <name>ClassificationAdmin_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/ClassificationAdmin_entity/documentation.adoc</documentation>
diff --git a/entity/ClassificationGrading_entity/ClassificationGrading_entity.aod b/entity/ClassificationGrading_entity/ClassificationGrading_entity.aod
index f53efcebd9..667e289c61 100644
--- a/entity/ClassificationGrading_entity/ClassificationGrading_entity.aod
+++ b/entity/ClassificationGrading_entity/ClassificationGrading_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.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.15" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.15">
   <name>ClassificationGrading_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/ClassificationGrading_entity/documentation.adoc</documentation>
diff --git a/entity/ClassificationGroupAnalyses_entity/ClassificationGroupAnalyses_entity.aod b/entity/ClassificationGroupAnalyses_entity/ClassificationGroupAnalyses_entity.aod
index 81219e0739..d1f0dbe53b 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.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.15" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.15">
   <name>ClassificationGroupAnalyses_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/ClassificationGroupAnalyses_entity/documentation.adoc</documentation>
diff --git a/entity/ClassificationScore_entity/ClassificationScore_entity.aod b/entity/ClassificationScore_entity/ClassificationScore_entity.aod
index 79b3abfd9a..ac3cee911c 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.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.15" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.15">
   <name>ClassificationScore_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/ClassificationScore_entity/documentation.adoc</documentation>
diff --git a/entity/ClassificationType_entity/ClassificationType_entity.aod b/entity/ClassificationType_entity/ClassificationType_entity.aod
index c7a88ccec2..e6e4b0e4d5 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.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.15" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.15">
   <name>ClassificationType_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/ClassificationType_entity/documentation.adoc</documentation>
diff --git a/entity/Classification_entity/Classification_entity.aod b/entity/Classification_entity/Classification_entity.aod
index 3378487b57..2cc4f103f2 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.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.15" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.15">
   <name>Classification_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/Classification_entity/documentation.adoc</documentation>
diff --git a/entity/CommRestriction_Entity/CommRestriction_Entity.aod b/entity/CommRestriction_Entity/CommRestriction_Entity.aod
index 44a8c93600..70b8e574b7 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.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.15" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.15">
   <name>CommRestriction_Entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/CommRestriction_Entity/documentation.adoc</documentation>
diff --git a/entity/Communication_entity/Communication_entity.aod b/entity/Communication_entity/Communication_entity.aod
index c9b220e519..ced9d009b8 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.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.15" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.15">
   <name>Communication_entity</name>
   <description>former Comm</description>
   <majorModelMode>DISTRIBUTED</majorModelMode>
diff --git a/entity/Competition_entity/Competition_entity.aod b/entity/Competition_entity/Competition_entity.aod
index 467036825e..369bee2644 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.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.15" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.15">
   <name>Competition_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/Competition_entity/documentation.adoc</documentation>
diff --git a/entity/Contact_entity/Contact_entity.aod b/entity/Contact_entity/Contact_entity.aod
index ad05310a9d..b0a1ff99f2 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.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.15" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.15">
   <name>Contact_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/Contact_entity/documentation.adoc</documentation>
diff --git a/entity/Context_entity/Context_entity.aod b/entity/Context_entity/Context_entity.aod
index 9a34027e64..b4469426e1 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.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.15" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.15">
   <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 0f0e27036e..5f71ffbe76 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.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.15" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.15">
   <name>Contract_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/Contract_entity/documentation.adoc</documentation>
@@ -564,6 +564,15 @@
       </affectedTables>
       <affectedIds>%aditoprj%/entity/Contract_entity/recordcontainers/index/affectedIds.js</affectedIds>
       <indexFieldMappings>
+        <indexRecordSystemFieldMapping>
+          <name>#UID</name>
+        </indexRecordSystemFieldMapping>
+        <indexRecordMultilingualSystemFieldMapping>
+          <name>#TITLE</name>
+        </indexRecordMultilingualSystemFieldMapping>
+        <indexRecordMultilingualSystemFieldMapping>
+          <name>#DESCRIPTION</name>
+        </indexRecordMultilingualSystemFieldMapping>
         <indexRecordFieldMapping>
           <name>CONTRACTCODE</name>
           <indexFieldType>TEXT_PLAIN</indexFieldType>
diff --git a/entity/Countries_Entity/Countries_Entity.aod b/entity/Countries_Entity/Countries_Entity.aod
index 35e3e6c3c5..5860d9333d 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.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.15" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.15">
   <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 27f052a4f6..0e7d614342 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.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.15" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.15">
   <name>DSGVOInfo_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/DSGVOInfo_entity/documentation.adoc</documentation>
diff --git a/entity/DSGVOReport_entity/DSGVOReport_entity.aod b/entity/DSGVOReport_entity/DSGVOReport_entity.aod
index d490017710..b9c99e14ea 100644
--- a/entity/DSGVOReport_entity/DSGVOReport_entity.aod
+++ b/entity/DSGVOReport_entity/DSGVOReport_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.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.15" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.15">
   <name>DSGVOReport_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/DSGVOReport_entity/documentation.adoc</documentation>
diff --git a/entity/DSGVO_entity/DSGVO_entity.aod b/entity/DSGVO_entity/DSGVO_entity.aod
index c0bbf1f743..a091f09f40 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.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.15" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.15">
   <name>DSGVO_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/DSGVO_entity/documentation.adoc</documentation>
diff --git a/entity/DefaultAdminView_entity/DefaultAdminView_entity.aod b/entity/DefaultAdminView_entity/DefaultAdminView_entity.aod
index f4ba46a122..adbaeeacd2 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.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.15" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.15">
   <name>DefaultAdminView_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/DefaultAdminView_entity/documentation.adoc</documentation>
diff --git a/entity/DescriptionTranslation_entity/DescriptionTranslation_entity.aod b/entity/DescriptionTranslation_entity/DescriptionTranslation_entity.aod
index 497e675448..4bd4adb0d2 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.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.15" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.15">
   <name>DescriptionTranslation_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/DescriptionTranslation_entity/documentation.adoc</documentation>
diff --git a/entity/DocumentTemplateLink_entity/DocumentTemplateLink_entity.aod b/entity/DocumentTemplateLink_entity/DocumentTemplateLink_entity.aod
index b7b2802dbe..1aa96ed2fe 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.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.15" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.15">
   <name>DocumentTemplateLink_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/DocumentTemplateLink_entity/documentation.adoc</documentation>
diff --git a/entity/DocumentTemplatePlaceOfUse_entity/DocumentTemplatePlaceOfUse_entity.aod b/entity/DocumentTemplatePlaceOfUse_entity/DocumentTemplatePlaceOfUse_entity.aod
index 4dfe000072..5ac456c0ad 100644
--- a/entity/DocumentTemplatePlaceOfUse_entity/DocumentTemplatePlaceOfUse_entity.aod
+++ b/entity/DocumentTemplatePlaceOfUse_entity/DocumentTemplatePlaceOfUse_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.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.15" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.15">
   <name>DocumentTemplatePlaceOfUse_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/DocumentTemplatePlaceOfUse_entity/documentation.adoc</documentation>
diff --git a/entity/DocumentTemplateTypeCategory_entity/DocumentTemplateTypeCategory_entity.aod b/entity/DocumentTemplateTypeCategory_entity/DocumentTemplateTypeCategory_entity.aod
index 69654f30a9..d7ea428cd8 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.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.15" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.15">
   <name>DocumentTemplateTypeCategory_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/DocumentTemplateTypeCategory_entity/documentation.adoc</documentation>
diff --git a/entity/DocumentTemplate_entity/DocumentTemplate_entity.aod b/entity/DocumentTemplate_entity/DocumentTemplate_entity.aod
index f24ed1ecb4..603c1beb15 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.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.15" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.15">
   <name>DocumentTemplate_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/DocumentTemplate_entity/documentation.adoc</documentation>
diff --git a/entity/Document_entity/Document_entity.aod b/entity/Document_entity/Document_entity.aod
index 9e489aa2dd..1975ae7ba9 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.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.15" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.15">
   <name>Document_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/Document_entity/documentation.adoc</documentation>
diff --git a/entity/DuplicateScannerResultFieldConfig_entity/DuplicateScannerResultFieldConfig_entity.aod b/entity/DuplicateScannerResultFieldConfig_entity/DuplicateScannerResultFieldConfig_entity.aod
index 27b1fa6d07..ef38406cb6 100644
--- a/entity/DuplicateScannerResultFieldConfig_entity/DuplicateScannerResultFieldConfig_entity.aod
+++ b/entity/DuplicateScannerResultFieldConfig_entity/DuplicateScannerResultFieldConfig_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.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.15" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.15">
   <name>DuplicateScannerResultFieldConfig_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/DuplicateScannerResultFieldConfig_entity/documentation.adoc</documentation>
diff --git a/entity/DuplicateScanner_entity/DuplicateScanner_entity.aod b/entity/DuplicateScanner_entity/DuplicateScanner_entity.aod
index 655421fb7b..00973fb96c 100644
--- a/entity/DuplicateScanner_entity/DuplicateScanner_entity.aod
+++ b/entity/DuplicateScanner_entity/DuplicateScanner_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.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.15" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.15">
   <name>DuplicateScanner_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/DuplicateScanner_entity/documentation.adoc</documentation>
diff --git a/entity/DuplicatesUnrelated_entity/DuplicatesUnrelated_entity.aod b/entity/DuplicatesUnrelated_entity/DuplicatesUnrelated_entity.aod
index 38cce034b4..b26d259182 100644
--- a/entity/DuplicatesUnrelated_entity/DuplicatesUnrelated_entity.aod
+++ b/entity/DuplicatesUnrelated_entity/DuplicatesUnrelated_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.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.15" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.15">
   <name>DuplicatesUnrelated_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/DuplicatesUnrelated_entity/documentation.adoc</documentation>
diff --git a/entity/Duplicates_entity/Duplicates_entity.aod b/entity/Duplicates_entity/Duplicates_entity.aod
index 8b4c751722..8742dca128 100644
--- a/entity/Duplicates_entity/Duplicates_entity.aod
+++ b/entity/Duplicates_entity/Duplicates_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.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.15" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.15">
   <name>Duplicates_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/Duplicates_entity/documentation.adoc</documentation>
@@ -30,8 +30,8 @@
     </entityField>
     <entityProvider>
       <name>SelfPersonDuplicatesProvider</name>
-      <titlePlural>Person duplicates</titlePlural>
       <titlePluralProcess>%aditoprj%/entity/Duplicates_entity/entityfields/selfpersonduplicatesprovider/titlePluralProcess.js</titlePluralProcess>
+      <titlePlural>Person duplicates</titlePlural>
       <children>
         <entityParameter>
           <name>TargetEntity</name>
diff --git a/entity/Email_entity/Email_entity.aod b/entity/Email_entity/Email_entity.aod
index b14e753e4e..917925c388 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.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.15" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.15">
   <name>Email_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/Email_entity/documentation.adoc</documentation>
diff --git a/entity/EmployeeRole_entity/EmployeeRole_entity.aod b/entity/EmployeeRole_entity/EmployeeRole_entity.aod
index 70d886c3bf..25f8670520 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.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.15" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.15">
   <name>EmployeeRole_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/EmployeeRole_entity/documentation.adoc</documentation>
diff --git a/entity/Employee_entity/Employee_entity.aod b/entity/Employee_entity/Employee_entity.aod
index 42ef7b25b5..84123ae4cb 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.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.15" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.15">
   <name>Employee_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/Employee_entity/documentation.adoc</documentation>
diff --git a/entity/ExportTemplateField_entity/ExportTemplateField_entity.aod b/entity/ExportTemplateField_entity/ExportTemplateField_entity.aod
index 8a781b6807..68418931d2 100644
--- a/entity/ExportTemplateField_entity/ExportTemplateField_entity.aod
+++ b/entity/ExportTemplateField_entity/ExportTemplateField_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.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.15" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.15">
   <name>ExportTemplateField_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/ExportTemplateField_entity/documentation.adoc</documentation>
diff --git a/entity/ExportTemplatePlaceOfUse_entity/ExportTemplatePlaceOfUse_entity.aod b/entity/ExportTemplatePlaceOfUse_entity/ExportTemplatePlaceOfUse_entity.aod
index 90fdce90c4..d56b4f471a 100644
--- a/entity/ExportTemplatePlaceOfUse_entity/ExportTemplatePlaceOfUse_entity.aod
+++ b/entity/ExportTemplatePlaceOfUse_entity/ExportTemplatePlaceOfUse_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.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.15" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.15">
   <name>ExportTemplatePlaceOfUse_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/ExportTemplatePlaceOfUse_entity/documentation.adoc</documentation>
diff --git a/entity/ExportTemplateSelection_entity/ExportTemplateSelection_entity.aod b/entity/ExportTemplateSelection_entity/ExportTemplateSelection_entity.aod
index 657143da0e..4230c44105 100644
--- a/entity/ExportTemplateSelection_entity/ExportTemplateSelection_entity.aod
+++ b/entity/ExportTemplateSelection_entity/ExportTemplateSelection_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.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.15" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.15">
   <name>ExportTemplateSelection_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/ExportTemplateSelection_entity/documentation.adoc</documentation>
diff --git a/entity/ExportTemplate_entity/ExportTemplate_entity.aod b/entity/ExportTemplate_entity/ExportTemplate_entity.aod
index e1b4d851dc..55c0bd86ba 100644
--- a/entity/ExportTemplate_entity/ExportTemplate_entity.aod
+++ b/entity/ExportTemplate_entity/ExportTemplate_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.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.15" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.15">
   <name>ExportTemplate_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/ExportTemplate_entity/documentation.adoc</documentation>
diff --git a/entity/Favorite_entity/Favorite_entity.aod b/entity/Favorite_entity/Favorite_entity.aod
index 22740ecddf..9710922d9a 100644
--- a/entity/Favorite_entity/Favorite_entity.aod
+++ b/entity/Favorite_entity/Favorite_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.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.15" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.15">
   <name>Favorite_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/Favorite_entity/documentation.adoc</documentation>
diff --git a/entity/Forecast_entity/Forecast_entity.aod b/entity/Forecast_entity/Forecast_entity.aod
index ddbbc5bc09..5cbbb88131 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.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.15" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.15">
   <name>Forecast_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/Forecast_entity/documentation.adoc</documentation>
diff --git a/entity/Gender_keyword/Gender_keyword.aod b/entity/Gender_keyword/Gender_keyword.aod
index 85e1ffb23e..fabf8e27da 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.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.15" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.15">
   <name>Gender_keyword</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/Gender_keyword/documentation.adoc</documentation>
diff --git a/entity/ImportField_Entity/ImportField_Entity.aod b/entity/ImportField_Entity/ImportField_Entity.aod
index 683f3503f8..bb437ea6d9 100644
--- a/entity/ImportField_Entity/ImportField_Entity.aod
+++ b/entity/ImportField_Entity/ImportField_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.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.15" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.15">
   <name>ImportField_Entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/ImportField_Entity/documentation.adoc</documentation>
diff --git a/entity/IndexSearchEntity/IndexSearchEntity.aod b/entity/IndexSearchEntity/IndexSearchEntity.aod
index 4a49661a05..4b960e34ce 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.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.15" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.15">
   <name>IndexSearchEntity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/IndexSearchEntity/documentation.adoc</documentation>
diff --git a/entity/KeywordAttributeRelation_entity/KeywordAttributeRelation_entity.aod b/entity/KeywordAttributeRelation_entity/KeywordAttributeRelation_entity.aod
index 0b5f45af64..c96b0fd65f 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.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.15" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.15">
   <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 ac1185cf4b..427c15d137 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.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.15" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.15">
   <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 cdc235d4ff..f738e22c53 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.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.15" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.15">
   <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 a103f19dab..b5a5c1ef19 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.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.15" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.15">
   <name>Language_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/Language_entity/documentation.adoc</documentation>
diff --git a/entity/LeadLog_entity/LeadLog_entity.aod b/entity/LeadLog_entity/LeadLog_entity.aod
index 3134413b01..2f22d18572 100644
--- a/entity/LeadLog_entity/LeadLog_entity.aod
+++ b/entity/LeadLog_entity/LeadLog_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.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.15" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.15">
   <name>LeadLog_entity</name>
   <description></description>
   <majorModelMode>DISTRIBUTED</majorModelMode>
diff --git a/entity/LeadTemp_entity/LeadTemp_entity.aod b/entity/LeadTemp_entity/LeadTemp_entity.aod
index d0b7ccb542..fb75e9b397 100644
--- a/entity/LeadTemp_entity/LeadTemp_entity.aod
+++ b/entity/LeadTemp_entity/LeadTemp_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.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.15" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.15">
   <name>LeadTemp_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/LeadTemp_entity/documentation.adoc</documentation>
diff --git a/entity/Lead_entity/Lead_entity.aod b/entity/Lead_entity/Lead_entity.aod
index 61d94589fe..0932cf1ecf 100644
--- a/entity/Lead_entity/Lead_entity.aod
+++ b/entity/Lead_entity/Lead_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.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.15" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.15">
   <name>Lead_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/Lead_entity/documentation.adoc</documentation>
diff --git a/entity/LeadimportMappingAssistant_entity/LeadimportMappingAssistant_entity.aod b/entity/LeadimportMappingAssistant_entity/LeadimportMappingAssistant_entity.aod
index 6a1f6c7311..42f7de6766 100644
--- a/entity/LeadimportMappingAssistant_entity/LeadimportMappingAssistant_entity.aod
+++ b/entity/LeadimportMappingAssistant_entity/LeadimportMappingAssistant_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.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.15" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.15">
   <name>LeadimportMappingAssistant_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/LeadimportMappingAssistant_entity/documentation.adoc</documentation>
diff --git a/entity/Leadimport_entity/Leadimport_entity.aod b/entity/Leadimport_entity/Leadimport_entity.aod
index 7901e71a23..2a7f3c136e 100644
--- a/entity/Leadimport_entity/Leadimport_entity.aod
+++ b/entity/Leadimport_entity/Leadimport_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.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.15" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.15">
   <name>Leadimport_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/Leadimport_entity/documentation.adoc</documentation>
diff --git a/entity/LetterRecipient_entity/LetterRecipient_entity.aod b/entity/LetterRecipient_entity/LetterRecipient_entity.aod
index 0aada1984f..21746fce85 100644
--- a/entity/LetterRecipient_entity/LetterRecipient_entity.aod
+++ b/entity/LetterRecipient_entity/LetterRecipient_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.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.15" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.15">
   <name>LetterRecipient_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/LetterRecipient_entity/documentation.adoc</documentation>
diff --git a/entity/Letter_entity/Letter_entity.aod b/entity/Letter_entity/Letter_entity.aod
index 42b787aba5..cb5cf6a8db 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.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.15" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.15">
   <name>Letter_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/Letter_entity/documentation.adoc</documentation>
diff --git a/entity/LogHistory_entity/LogHistory_entity.aod b/entity/LogHistory_entity/LogHistory_entity.aod
index d1aaa4cf38..aa71d5c5fa 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.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.15" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.15">
   <name>LogHistory_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/LogHistory_entity/documentation.adoc</documentation>
diff --git a/entity/MemberRoles_entity/MemberRoles_entity.aod b/entity/MemberRoles_entity/MemberRoles_entity.aod
index 0438f69501..e41db4aff7 100644
--- a/entity/MemberRoles_entity/MemberRoles_entity.aod
+++ b/entity/MemberRoles_entity/MemberRoles_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.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.15" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.15">
   <name>MemberRoles_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/MemberRoles_entity/documentation.adoc</documentation>
diff --git a/entity/Member_entity/Member_entity.aod b/entity/Member_entity/Member_entity.aod
index 8dbfb116d0..751a92a242 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.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.15" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.15">
   <name>Member_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/Member_entity/documentation.adoc</documentation>
diff --git a/entity/ModuleTree_entity/ModuleTree_entity.aod b/entity/ModuleTree_entity/ModuleTree_entity.aod
index 33f8210372..ab9da7cdc1 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.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.15" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.15">
   <name>ModuleTree_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/ModuleTree_entity/documentation.adoc</documentation>
diff --git a/entity/Notification_entity/Notification_entity.aod b/entity/Notification_entity/Notification_entity.aod
index d1f13073d9..39f08f4e5d 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.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.15" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.15">
   <name>Notification_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/Notification_entity/documentation.adoc</documentation>
diff --git a/entity/ObjectProxy_entity/ObjectProxy_entity.aod b/entity/ObjectProxy_entity/ObjectProxy_entity.aod
index 079478f4ff..6becac0e01 100644
--- a/entity/ObjectProxy_entity/ObjectProxy_entity.aod
+++ b/entity/ObjectProxy_entity/ObjectProxy_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.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.15" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.15">
   <name>ObjectProxy_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/ObjectProxy_entity/documentation.adoc</documentation>
diff --git a/entity/ObjectRelationType_entity/ObjectRelationType_entity.aod b/entity/ObjectRelationType_entity/ObjectRelationType_entity.aod
index 8172bd7ae2..d3cbf9b89a 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.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.15" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.15">
   <name>ObjectRelationType_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/ObjectRelationType_entity/documentation.adoc</documentation>
diff --git a/entity/ObjectTree_entity/ObjectTree_entity.aod b/entity/ObjectTree_entity/ObjectTree_entity.aod
index b925489827..5dcdc0b62a 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.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.15" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.15">
   <name>ObjectTree_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/ObjectTree_entity/documentation.adoc</documentation>
diff --git a/entity/Object_entity/Object_entity.aod b/entity/Object_entity/Object_entity.aod
index 2d1e2ff409..4853279b5a 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.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.15" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.15">
   <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 a40ebeb081..503b15b6fc 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.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.15" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.15">
   <name>Offer_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/Offer_entity/documentation.adoc</documentation>
@@ -1318,6 +1318,15 @@
       </affectedTables>
       <affectedIds>%aditoprj%/entity/Offer_entity/recordcontainers/index/affectedIds.js</affectedIds>
       <indexFieldMappings>
+        <indexRecordSystemFieldMapping>
+          <name>#UID</name>
+        </indexRecordSystemFieldMapping>
+        <indexRecordMultilingualSystemFieldMapping>
+          <name>#TITLE</name>
+        </indexRecordMultilingualSystemFieldMapping>
+        <indexRecordMultilingualSystemFieldMapping>
+          <name>#DESCRIPTION</name>
+        </indexRecordMultilingualSystemFieldMapping>
         <indexRecordFieldMapping>
           <name>OFFERCODE.value</name>
           <indexFieldType>STRING</indexFieldType>
diff --git a/entity/Offeritem_entity/Offeritem_entity.aod b/entity/Offeritem_entity/Offeritem_entity.aod
index 30cf07a391..d5ee2f4844 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.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.15" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.15">
   <name>Offeritem_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/Offeritem_entity/documentation.adoc</documentation>
diff --git a/entity/Order_entity/Order_entity.aod b/entity/Order_entity/Order_entity.aod
index b574170bdc..a926acda00 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.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.15" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.15">
   <name>Order_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/Order_entity/documentation.adoc</documentation>
@@ -1123,6 +1123,15 @@
       </affectedTables>
       <affectedIds>%aditoprj%/entity/Order_entity/recordcontainers/index/affectedIds.js</affectedIds>
       <indexFieldMappings>
+        <indexRecordSystemFieldMapping>
+          <name>#UID</name>
+        </indexRecordSystemFieldMapping>
+        <indexRecordMultilingualSystemFieldMapping>
+          <name>#TITLE</name>
+        </indexRecordMultilingualSystemFieldMapping>
+        <indexRecordMultilingualSystemFieldMapping>
+          <name>#DESCRIPTION</name>
+        </indexRecordMultilingualSystemFieldMapping>
         <indexRecordFieldMapping>
           <name>SALESORDERCODE.value</name>
           <indexFieldType>STRING</indexFieldType>
diff --git a/entity/Orderitem_entity/Orderitem_entity.aod b/entity/Orderitem_entity/Orderitem_entity.aod
index 930a2fe071..5571f1ed5c 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.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.15" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.15">
   <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 3ab9d21f42..3cbaa43f58 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.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.15" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.15">
   <name>Organisation_entity</name>
   <description>former Org</description>
   <majorModelMode>DISTRIBUTED</majorModelMode>
@@ -1413,16 +1413,18 @@
       </affectedTables>
       <affectedIds>%aditoprj%/entity/Organisation_entity/recordcontainers/index/affectedIds.js</affectedIds>
       <indexFieldMappings>
-        <indexRecordFieldMapping>
+        <indexRecordSystemFieldMapping>
+          <name>#UID</name>
+        </indexRecordSystemFieldMapping>
+        <indexRecordMultilingualSystemFieldMapping>
+          <name>#TITLE</name>
+        </indexRecordMultilingualSystemFieldMapping>
+        <indexRecordMultilingualSystemFieldMapping>
+          <name>#DESCRIPTION</name>
+        </indexRecordMultilingualSystemFieldMapping>
+        <indexRecordSystemFieldMapping>
           <name>#LOCATION</name>
-          <indexFieldType>LOCATION</indexFieldType>
-          <additionalFieldNameAliases>
-            <element>location</element>
-          </additionalFieldNameAliases>
-          <isGlobalSearchField v="false" />
-          <isFilterable v="false" />
-          <isLookupFilter v="false" />
-        </indexRecordFieldMapping>
+        </indexRecordSystemFieldMapping>
         <indexRecordFieldMapping>
           <name>NAME.value</name>
           <indexFieldType>PROPER_NAME</indexFieldType>
diff --git a/entity/PermissionAction_entity/PermissionAction_entity.aod b/entity/PermissionAction_entity/PermissionAction_entity.aod
index 1822c16fc8..0313847145 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.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.15" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.15">
   <name>PermissionAction_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/PermissionAction_entity/documentation.adoc</documentation>
diff --git a/entity/PermissionCalendar_entity/PermissionCalendar_entity.aod b/entity/PermissionCalendar_entity/PermissionCalendar_entity.aod
index fe722de95b..f7262ea6ca 100644
--- a/entity/PermissionCalendar_entity/PermissionCalendar_entity.aod
+++ b/entity/PermissionCalendar_entity/PermissionCalendar_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.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.15" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.15">
   <name>PermissionCalendar_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/PermissionCalendar_entity/documentation.adoc</documentation>
diff --git a/entity/PermissionDetail_entity/PermissionDetail_entity.aod b/entity/PermissionDetail_entity/PermissionDetail_entity.aod
index d6e9a449d7..c9e7ee2443 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.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.15" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.15">
   <name>PermissionDetail_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/PermissionDetail_entity/documentation.adoc</documentation>
diff --git a/entity/PermissionMetaData_entity/PermissionMetaData_entity.aod b/entity/PermissionMetaData_entity/PermissionMetaData_entity.aod
index 1d94b71a3d..1f11e54b00 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.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.15" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.15">
   <name>PermissionMetaData_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/PermissionMetaData_entity/documentation.adoc</documentation>
diff --git a/entity/PermissionOverview_entity/PermissionOverview_entity.aod b/entity/PermissionOverview_entity/PermissionOverview_entity.aod
index e3dcca0f8a..f6745f7b18 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.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.15" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.15">
   <name>PermissionOverview_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/PermissionOverview_entity/documentation.adoc</documentation>
diff --git a/entity/Person_entity/Person_entity.aod b/entity/Person_entity/Person_entity.aod
index f81be57c14..7a36776d4e 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.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.15" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.15">
   <name>Person_entity</name>
   <description>former Pers</description>
   <majorModelMode>DISTRIBUTED</majorModelMode>
@@ -1601,6 +1601,15 @@
       </affectedTables>
       <affectedIds>%aditoprj%/entity/Person_entity/recordcontainers/index/affectedIds.js</affectedIds>
       <indexFieldMappings>
+        <indexRecordSystemFieldMapping>
+          <name>#UID</name>
+        </indexRecordSystemFieldMapping>
+        <indexRecordMultilingualSystemFieldMapping>
+          <name>#TITLE</name>
+        </indexRecordMultilingualSystemFieldMapping>
+        <indexRecordMultilingualSystemFieldMapping>
+          <name>#DESCRIPTION</name>
+        </indexRecordMultilingualSystemFieldMapping>
         <indexRecordFieldMapping>
           <name>CONTACTID.value</name>
           <indexFieldType>STRING</indexFieldType>
diff --git a/entity/PrivatePerson_entity/PrivatePerson_entity.aod b/entity/PrivatePerson_entity/PrivatePerson_entity.aod
index 4d351a6db3..70e0cad16e 100644
--- a/entity/PrivatePerson_entity/PrivatePerson_entity.aod
+++ b/entity/PrivatePerson_entity/PrivatePerson_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.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.15" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.15">
   <name>PrivatePerson_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/PrivatePerson_entity/documentation.adoc</documentation>
diff --git a/entity/Prod2prod_entity/Prod2prod_entity.aod b/entity/Prod2prod_entity/Prod2prod_entity.aod
index c8e7762433..cf5f31d966 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.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.15" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.15">
   <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 6213090a38..4ed9e1192f 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.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.15" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.15">
   <name>Product_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/Product_entity/documentation.adoc</documentation>
@@ -625,6 +625,15 @@
       </affectedTables>
       <affectedIds>%aditoprj%/entity/Product_entity/recordcontainers/index/affectedIds.js</affectedIds>
       <indexFieldMappings>
+        <indexRecordSystemFieldMapping>
+          <name>#UID</name>
+        </indexRecordSystemFieldMapping>
+        <indexRecordMultilingualSystemFieldMapping>
+          <name>#TITLE</name>
+        </indexRecordMultilingualSystemFieldMapping>
+        <indexRecordMultilingualSystemFieldMapping>
+          <name>#DESCRIPTION</name>
+        </indexRecordMultilingualSystemFieldMapping>
         <indexRecordFieldMapping>
           <name>PRODUCTCODE.value</name>
           <indexFieldType>TEXT_PLAIN</indexFieldType>
diff --git a/entity/Productprice_entity/Productprice_entity.aod b/entity/Productprice_entity/Productprice_entity.aod
index aa0b3db458..29677932f2 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.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.15" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.15">
   <name>Productprice_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/Productprice_entity/documentation.adoc</documentation>
diff --git a/entity/QuickEntry_entity/QuickEntry_entity.aod b/entity/QuickEntry_entity/QuickEntry_entity.aod
index 4885bf9a0d..06ccebb5bc 100644
--- a/entity/QuickEntry_entity/QuickEntry_entity.aod
+++ b/entity/QuickEntry_entity/QuickEntry_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.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.15" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.15">
   <name>QuickEntry_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/QuickEntry_entity/documentation.adoc</documentation>
diff --git a/entity/RoleChildren_entity/RoleChildren_entity.aod b/entity/RoleChildren_entity/RoleChildren_entity.aod
index 2bcb0f99e0..3606195884 100644
--- a/entity/RoleChildren_entity/RoleChildren_entity.aod
+++ b/entity/RoleChildren_entity/RoleChildren_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.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.15" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.15">
   <name>RoleChildren_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/RoleChildren_entity/documentation.adoc</documentation>
diff --git a/entity/RoleParent_entity/RoleParent_entity.aod b/entity/RoleParent_entity/RoleParent_entity.aod
index 0ba6053919..6ed5c0dacb 100644
--- a/entity/RoleParent_entity/RoleParent_entity.aod
+++ b/entity/RoleParent_entity/RoleParent_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.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.15" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.15">
   <name>RoleParent_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/RoleParent_entity/documentation.adoc</documentation>
diff --git a/entity/Role_entity/Role_entity.aod b/entity/Role_entity/Role_entity.aod
index 9ad193b1ba..aa9948fa24 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.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.15" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.15">
   <name>Role_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/Role_entity/documentation.adoc</documentation>
diff --git a/entity/SalesprojectAnalyses_entity/SalesprojectAnalyses_entity.aod b/entity/SalesprojectAnalyses_entity/SalesprojectAnalyses_entity.aod
index 69760cd6ee..fd2b5cb5a7 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.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.15" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.15">
   <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 9c1a6676b9..3df66f14bf 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.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.15" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.15">
   <name>SalesprojectMilestone_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/SalesprojectMilestone_entity/documentation.adoc</documentation>
diff --git a/entity/SalesprojectPhase_entity/SalesprojectPhase_entity.aod b/entity/SalesprojectPhase_entity/SalesprojectPhase_entity.aod
index 91d7ec5674..f013b9eee2 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.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.15" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.15">
   <name>SalesprojectPhase_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/SalesprojectPhase_entity/documentation.adoc</documentation>
diff --git a/entity/SalesprojectSource_entity/SalesprojectSource_entity.aod b/entity/SalesprojectSource_entity/SalesprojectSource_entity.aod
index 7480acbbff..af2d9a4857 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.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.15" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.15">
   <name>SalesprojectSource_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/SalesprojectSource_entity/documentation.adoc</documentation>
diff --git a/entity/Salesproject_entity/Salesproject_entity.aod b/entity/Salesproject_entity/Salesproject_entity.aod
index 6497e4d792..ae48685a44 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.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.15" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.15">
   <name>Salesproject_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/Salesproject_entity/documentation.adoc</documentation>
@@ -937,6 +937,15 @@
       </affectedTables>
       <affectedIds>%aditoprj%/entity/Salesproject_entity/recordcontainers/index/affectedIds.js</affectedIds>
       <indexFieldMappings>
+        <indexRecordSystemFieldMapping>
+          <name>#UID</name>
+        </indexRecordSystemFieldMapping>
+        <indexRecordMultilingualSystemFieldMapping>
+          <name>#TITLE</name>
+        </indexRecordMultilingualSystemFieldMapping>
+        <indexRecordMultilingualSystemFieldMapping>
+          <name>#DESCRIPTION</name>
+        </indexRecordMultilingualSystemFieldMapping>
         <indexRecordFieldMapping>
           <name>PROJECTCODE.value</name>
           <indexFieldType>STRING</indexFieldType>
diff --git a/entity/SalutationDistinct_entity/SalutationDistinct_entity.aod b/entity/SalutationDistinct_entity/SalutationDistinct_entity.aod
index 5b137905a2..e0e78f0479 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.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.15" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.15">
   <name>SalutationDistinct_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/SalutationDistinct_entity/documentation.adoc</documentation>
diff --git a/entity/SalutationTitleDistinct_entity/SalutationTitleDistinct_entity.aod b/entity/SalutationTitleDistinct_entity/SalutationTitleDistinct_entity.aod
index 152cb887a0..d6d3a5445a 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.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.15" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.15">
   <name>SalutationTitleDistinct_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/SalutationTitleDistinct_entity/documentation.adoc</documentation>
diff --git a/entity/Salutation_entity/Salutation_entity.aod b/entity/Salutation_entity/Salutation_entity.aod
index f7f79d1f01..eebf0b3158 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.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.15" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.15">
   <name>Salutation_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/Salutation_entity/documentation.adoc</documentation>
diff --git a/entity/SerialLetterAddRecipients_entity/SerialLetterAddRecipients_entity.aod b/entity/SerialLetterAddRecipients_entity/SerialLetterAddRecipients_entity.aod
index 8cba893319..a31e661098 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.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.15" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.15">
   <name>SerialLetterAddRecipients_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/SerialLetterAddRecipients_entity/documentation.adoc</documentation>
diff --git a/entity/SerialLetter_entity/SerialLetter_entity.aod b/entity/SerialLetter_entity/SerialLetter_entity.aod
index fbc49981d8..6c62fbeab3 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.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.15" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.15">
   <name>SerialLetter_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/SerialLetter_entity/documentation.adoc</documentation>
diff --git a/entity/Social_entity/Social_entity.aod b/entity/Social_entity/Social_entity.aod
index 18c1480e22..99ef22cc3f 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.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.15" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.15">
   <name>Social_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/Social_entity/documentation.adoc</documentation>
diff --git a/entity/Stock_entity/Stock_entity.aod b/entity/Stock_entity/Stock_entity.aod
index 5aeda5c119..18f0a3e927 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.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.15" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.15">
   <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 19c4d39b1f..48992a26ea 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.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.15" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.15">
   <name>SupportTicket_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/SupportTicket_entity/documentation.adoc</documentation>
diff --git a/entity/TaskLink_entity/TaskLink_entity.aod b/entity/TaskLink_entity/TaskLink_entity.aod
index 5c8923df4d..3c4ce63568 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.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.15" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.15">
   <name>TaskLink_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/TaskLink_entity/documentation.adoc</documentation>
diff --git a/entity/Task_entity/Task_entity.aod b/entity/Task_entity/Task_entity.aod
index 483c8123f7..d424144a01 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.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.15" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.15">
   <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 8c62a0b51b..ee06301870 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.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.15" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.15">
   <name>Timetracking_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/Timetracking_entity/documentation.adoc</documentation>
diff --git a/entity/TurnoverTree_entity/TurnoverTree_entity.aod b/entity/TurnoverTree_entity/TurnoverTree_entity.aod
index 412433f095..6ee4a3f469 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.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.15" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.15">
   <name>TurnoverTree_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/TurnoverTree_entity/documentation.adoc</documentation>
diff --git a/entity/Turnover_entity/Turnover_entity.aod b/entity/Turnover_entity/Turnover_entity.aod
index 667240d577..0bde4ebd32 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.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.15" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.15">
   <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 b46af9a58f..13f59948c1 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.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.15" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.15">
   <name>UniversalFileProcessor_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/UniversalFileProcessor_entity/documentation.adoc</documentation>
diff --git a/entity/UnlinkedMailMappingLink_entity/UnlinkedMailMappingLink_entity.aod b/entity/UnlinkedMailMappingLink_entity/UnlinkedMailMappingLink_entity.aod
index 38d93fe74e..f441c51887 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.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.15" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.15">
   <name>UnlinkedMailMappingLink_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/UnlinkedMailMappingLink_entity/documentation.adoc</documentation>
diff --git a/entity/UnlinkedMailMappingWrapper_entity/UnlinkedMailMappingWrapper_entity.aod b/entity/UnlinkedMailMappingWrapper_entity/UnlinkedMailMappingWrapper_entity.aod
index 6459c62cbf..5abbfda6dc 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.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.15" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.15">
   <name>UnlinkedMailMappingWrapper_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/UnlinkedMailMappingWrapper_entity/documentation.adoc</documentation>
diff --git a/entity/UnlinkedMail_entity/UnlinkedMail_entity.aod b/entity/UnlinkedMail_entity/UnlinkedMail_entity.aod
index d47ae7b80f..773b7094e4 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.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.15" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.15">
   <name>UnlinkedMail_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/UnlinkedMail_entity/documentation.adoc</documentation>
diff --git a/entity/Usersettings_entity/Usersettings_entity.aod b/entity/Usersettings_entity/Usersettings_entity.aod
index 50b2150922..fd32d56552 100644
--- a/entity/Usersettings_entity/Usersettings_entity.aod
+++ b/entity/Usersettings_entity/Usersettings_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.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.15" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.15">
   <name>Usersettings_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/Usersettings_entity/documentation.adoc</documentation>
diff --git a/entity/VisitPlanEmployeeWeek_entity/VisitPlanEmployeeWeek_entity.aod b/entity/VisitPlanEmployeeWeek_entity/VisitPlanEmployeeWeek_entity.aod
index 07aec7a835..c5fb6de313 100644
--- a/entity/VisitPlanEmployeeWeek_entity/VisitPlanEmployeeWeek_entity.aod
+++ b/entity/VisitPlanEmployeeWeek_entity/VisitPlanEmployeeWeek_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.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.15" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.15">
   <name>VisitPlanEmployeeWeek_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/VisitPlanEmployeeWeek_entity/documentation.adoc</documentation>
diff --git a/entity/VisitPlanEntry_entity/VisitPlanEntry_entity.aod b/entity/VisitPlanEntry_entity/VisitPlanEntry_entity.aod
index f30a57c186..b5dd275af6 100644
--- a/entity/VisitPlanEntry_entity/VisitPlanEntry_entity.aod
+++ b/entity/VisitPlanEntry_entity/VisitPlanEntry_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.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.15" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.15">
   <name>VisitPlanEntry_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/VisitPlanEntry_entity/documentation.adoc</documentation>
diff --git a/entity/VisitRecommendation_entity/VisitRecommendation_entity.aod b/entity/VisitRecommendation_entity/VisitRecommendation_entity.aod
index 12ff61c90d..badd3249ee 100644
--- a/entity/VisitRecommendation_entity/VisitRecommendation_entity.aod
+++ b/entity/VisitRecommendation_entity/VisitRecommendation_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.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.15" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.15">
   <name>VisitRecommendation_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/VisitRecommendation_entity/documentation.adoc</documentation>
diff --git a/entity/WorkflowDefinition_entity/WorkflowDefinition_entity.aod b/entity/WorkflowDefinition_entity/WorkflowDefinition_entity.aod
index a8f87b3549..59485536f7 100644
--- a/entity/WorkflowDefinition_entity/WorkflowDefinition_entity.aod
+++ b/entity/WorkflowDefinition_entity/WorkflowDefinition_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.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.15" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.15">
   <name>WorkflowDefinition_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/WorkflowDefinition_entity/documentation.adoc</documentation>
diff --git a/entity/WorkflowInstanceHistory_entity/WorkflowInstanceHistory_entity.aod b/entity/WorkflowInstanceHistory_entity/WorkflowInstanceHistory_entity.aod
index ae42bbb03a..9b317f184b 100644
--- a/entity/WorkflowInstanceHistory_entity/WorkflowInstanceHistory_entity.aod
+++ b/entity/WorkflowInstanceHistory_entity/WorkflowInstanceHistory_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.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.15" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.15">
   <name>WorkflowInstanceHistory_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/WorkflowInstanceHistory_entity/documentation.adoc</documentation>
diff --git a/entity/WorkflowInstance_entity/WorkflowInstance_entity.aod b/entity/WorkflowInstance_entity/WorkflowInstance_entity.aod
index 765793b9f3..3045b6ab7a 100644
--- a/entity/WorkflowInstance_entity/WorkflowInstance_entity.aod
+++ b/entity/WorkflowInstance_entity/WorkflowInstance_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.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.15" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.15">
   <name>WorkflowInstance_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/WorkflowInstance_entity/documentation.adoc</documentation>
diff --git a/entity/WorkflowModel_entity/WorkflowModel_entity.aod b/entity/WorkflowModel_entity/WorkflowModel_entity.aod
index 6ffc3e4bc9..588d70a717 100644
--- a/entity/WorkflowModel_entity/WorkflowModel_entity.aod
+++ b/entity/WorkflowModel_entity/WorkflowModel_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.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.15" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.15">
   <name>WorkflowModel_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/WorkflowModel_entity/documentation.adoc</documentation>
diff --git a/entity/WorkflowSignal_entity/WorkflowSignal_entity.aod b/entity/WorkflowSignal_entity/WorkflowSignal_entity.aod
index 05b77e9fea..e4d5c8ece3 100644
--- a/entity/WorkflowSignal_entity/WorkflowSignal_entity.aod
+++ b/entity/WorkflowSignal_entity/WorkflowSignal_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.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.15" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.15">
   <name>WorkflowSignal_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/WorkflowSignal_entity/documentation.adoc</documentation>
diff --git a/entity/WorkflowStartConfig_entity/WorkflowStartConfig_entity.aod b/entity/WorkflowStartConfig_entity/WorkflowStartConfig_entity.aod
index 52186117b0..b97442fead 100644
--- a/entity/WorkflowStartConfig_entity/WorkflowStartConfig_entity.aod
+++ b/entity/WorkflowStartConfig_entity/WorkflowStartConfig_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.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.15" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.15">
   <name>WorkflowStartConfig_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/WorkflowStartConfig_entity/documentation.adoc</documentation>
diff --git a/entity/WorkflowTask_entity/WorkflowTask_entity.aod b/entity/WorkflowTask_entity/WorkflowTask_entity.aod
index ceb8ba0d2d..2cebcbe251 100644
--- a/entity/WorkflowTask_entity/WorkflowTask_entity.aod
+++ b/entity/WorkflowTask_entity/WorkflowTask_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.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.15" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.15">
   <name>WorkflowTask_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/WorkflowTask_entity/documentation.adoc</documentation>
diff --git a/entity/WorkflowVariableValue_entity/WorkflowVariableValue_entity.aod b/entity/WorkflowVariableValue_entity/WorkflowVariableValue_entity.aod
index ce29046a14..670a78afa9 100644
--- a/entity/WorkflowVariableValue_entity/WorkflowVariableValue_entity.aod
+++ b/entity/WorkflowVariableValue_entity/WorkflowVariableValue_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.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.15" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.15">
   <name>WorkflowVariableValue_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/WorkflowVariableValue_entity/documentation.adoc</documentation>
-- 
GitLab


From 71979aae905d17611a63c01cfdfc987f333ba54c Mon Sep 17 00:00:00 2001
From: Sebastian Listl <s.listl@adito.de>
Date: Wed, 26 Aug 2020 09:18:16 +0200
Subject: [PATCH 215/309] JditoFilter_lib bugfix for field-mappings

---
 process/JditoFilter_lib/process.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/process/JditoFilter_lib/process.js b/process/JditoFilter_lib/process.js
index d24d07552a..4df4da2819 100644
--- a/process/JditoFilter_lib/process.js
+++ b/process/JditoFilter_lib/process.js
@@ -397,7 +397,7 @@ FilterSqlTranslator.prototype.getSqlCondition = function ()
             
             if (pFilter.name in sqlFieldMappings)
             {
-                sqlField = sqlFieldMappings[sqlField];
+                sqlField = sqlFieldMappings[pFilter.name];
                 
                 //possibility to explicitly set the value to null/false so that the field is ignored
                 if (sqlField === null || sqlField === false)
-- 
GitLab


From 1f7a6b5e7ea894fe196cb773f471719ffb177863 Mon Sep 17 00:00:00 2001
From: Sebastian Listl <s.listl@adito.de>
Date: Wed, 26 Aug 2020 11:47:55 +0200
Subject: [PATCH 216/309] Scan Services dead references fixed

---
 entity/AnyContact_entity/AnyContact_entity.aod     | 14 +++-----------
 entity/Appointment_entity/Appointment_entity.aod   |  2 +-
 .../CampaignAddParticipants_entity.aod             |  3 +--
 .../entityfields/campaignstep_id/valueProcess.js   |  0
 .../ClassificationGroupAnalyses_entity.aod         |  6 ------
 entity/Contract_entity/Contract_entity.aod         |  3 +--
 .../DocumentTemplate_entity.aod                    |  6 ------
 entity/Leadimport_entity/Leadimport_entity.aod     |  8 --------
 entity/ModuleTree_entity/ModuleTree_entity.aod     |  1 +
 entity/Offer_entity/Offer_entity.aod               |  4 ----
 .../PermissionCalendar_entity.aod                  |  1 -
 .../PermissionDetail_entity.aod                    |  2 +-
 entity/Person_entity/Person_entity.aod             | 12 ------------
 13 files changed, 8 insertions(+), 54 deletions(-)
 delete mode 100644 entity/CampaignAddParticipants_entity/entityfields/campaignstep_id/valueProcess.js

diff --git a/entity/AnyContact_entity/AnyContact_entity.aod b/entity/AnyContact_entity/AnyContact_entity.aod
index 0225b4306b..6c81f8f298 100644
--- a/entity/AnyContact_entity/AnyContact_entity.aod
+++ b/entity/AnyContact_entity/AnyContact_entity.aod
@@ -14,19 +14,19 @@
         <entityDependency>
           <name>5d8b421e-a234-4d03-bfec-ed01f464a54c</name>
           <entityName>Contract_entity</entityName>
-          <fieldName>Relations</fieldName>
+          <fieldName>AnyContacts</fieldName>
           <isConsumer v="false" />
         </entityDependency>
         <entityDependency>
           <name>94e4fa2c-7525-49f9-b933-353d200b829c</name>
           <entityName>Offer_entity</entityName>
-          <fieldName>Relations</fieldName>
+          <fieldName>AnyContacts</fieldName>
           <isConsumer v="false" />
         </entityDependency>
         <entityDependency>
           <name>f1f7d959-ecb5-4438-9762-fc11f1bc5334</name>
           <entityName>Order_entity</entityName>
-          <fieldName>Relations</fieldName>
+          <fieldName>AnyContacts</fieldName>
           <isConsumer v="false" />
         </entityDependency>
         <entityDependency>
@@ -126,7 +126,6 @@
       <description>Relation type. Value is based on the existance or non-existance of ORGANISATION_ID and PERSON_ID.
 See ContactUtils.getRelationTypeByPersOrg for possible values</description>
       <contentType>NUMBER</contentType>
-      <valueProcess>%aditoprj%/entity/AnyContact_entity/entityfields/contactType/valueProcess.js</valueProcess>
     </entityField>
     <entityField>
       <name>ORGANISATION_NAME</name>
@@ -144,7 +143,6 @@ See ContactUtils.getRelationTypeByPersOrg for possible values</description>
       <name>PERSON_PICTURE</name>
       <contentType>IMAGE</contentType>
       <valueProcess>%aditoprj%/entity/AnyContact_entity/entityfields/person_picture/valueProcess.js</valueProcess>
-      <displayValueProcess>%aditoprj%/entity/AnyContact_entity/entityfields/person_picture/displayValueProcess.js</displayValueProcess>
     </entityField>
     <entityField>
       <name>STANDARD_EMAIL_COMMUNICATION</name>
@@ -182,12 +180,6 @@ See ContactUtils.getRelationTypeByPersOrg for possible values</description>
           <fieldName>AnyContacts</fieldName>
           <isConsumer v="false" />
         </entityDependency>
-        <entityDependency>
-          <name>91db53ad-3748-4a24-8dba-11dc707c2d6b</name>
-          <entityName>VisitPlanEntry_entity</entityName>
-          <fieldName>AnyContacts</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
       </dependencies>
       <children>
         <entityParameter>
diff --git a/entity/Appointment_entity/Appointment_entity.aod b/entity/Appointment_entity/Appointment_entity.aod
index 2263bc41f9..c3ecd02d3b 100644
--- a/entity/Appointment_entity/Appointment_entity.aod
+++ b/entity/Appointment_entity/Appointment_entity.aod
@@ -208,7 +208,7 @@
         <entityDependency>
           <name>74dea3cd-a528-4616-b468-cd27f3f1a795</name>
           <entityName>Activity_entity</entityName>
-          <fieldName>Appointments</fieldName>
+          <fieldName>LinkedAppointments</fieldName>
           <isConsumer v="false" />
         </entityDependency>
         <entityDependency>
diff --git a/entity/CampaignAddParticipants_entity/CampaignAddParticipants_entity.aod b/entity/CampaignAddParticipants_entity/CampaignAddParticipants_entity.aod
index 9b0db2740d..f444655a0d 100644
--- a/entity/CampaignAddParticipants_entity/CampaignAddParticipants_entity.aod
+++ b/entity/CampaignAddParticipants_entity/CampaignAddParticipants_entity.aod
@@ -35,7 +35,6 @@
       <consumer>CampaignStepConsumer</consumer>
       <mandatory v="true" />
       <state>EDITABLE</state>
-      <valueProcess>%aditoprj%/entity/CampaignAddParticipants_entity/entityfields/campaignstep_id/valueProcess.js</valueProcess>
       <displayValueProcess>%aditoprj%/entity/CampaignAddParticipants_entity/entityfields/campaignstep_id/displayValueProcess.js</displayValueProcess>
     </entityField>
     <entityField>
@@ -114,6 +113,7 @@
       <title>Max participants</title>
       <state>EDITABLE</state>
       <valueProcess>%aditoprj%/entity/CampaignAddParticipants_entity/entityfields/campaignstepmaxparticipantcount/valueProcess.js</valueProcess>
+      <displayValueProcess>%aditoprj%/entity/CampaignAddParticipants_entity/entityfields/campaignstepmaxparticipantcount/displayValueProcess.js</displayValueProcess>
     </entityField>
     <entityField>
       <name>isUpdate</name>
@@ -156,7 +156,6 @@
     <jDitoRecordContainer>
       <name>jdito</name>
       <jDitoRecordAlias>Data_alias</jDitoRecordAlias>
-      <contentProcess>%aditoprj%/entity/CampaignAddParticipants_entity/recordcontainers/jdito/contentProcess.js</contentProcess>
       <recordFieldMappings>
         <jDitoRecordFieldMapping>
           <name>UID.value</name>
diff --git a/entity/CampaignAddParticipants_entity/entityfields/campaignstep_id/valueProcess.js b/entity/CampaignAddParticipants_entity/entityfields/campaignstep_id/valueProcess.js
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/entity/ClassificationGroupAnalyses_entity/ClassificationGroupAnalyses_entity.aod b/entity/ClassificationGroupAnalyses_entity/ClassificationGroupAnalyses_entity.aod
index d1f0dbe53b..9adcf7e620 100644
--- a/entity/ClassificationGroupAnalyses_entity/ClassificationGroupAnalyses_entity.aod
+++ b/entity/ClassificationGroupAnalyses_entity/ClassificationGroupAnalyses_entity.aod
@@ -34,12 +34,6 @@
       <name>GroupAnalyses</name>
       <documentation>%aditoprj%/entity/ClassificationGroupAnalyses_entity/entityfields/groupanalyses/documentation.adoc</documentation>
       <dependencies>
-        <entityDependency>
-          <name>c20a7d8b-00ab-4edf-adf5-89fc94385e65</name>
-          <entityName>Salesproject_entity</entityName>
-          <fieldName>ClassificationGroupChart</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
         <entityDependency>
           <name>8dfbe502-aa7a-4514-aaed-a1decf2b4344</name>
           <entityName>Salesproject_entity</entityName>
diff --git a/entity/Contract_entity/Contract_entity.aod b/entity/Contract_entity/Contract_entity.aod
index 5f71ffbe76..761368c1b2 100644
--- a/entity/Contract_entity/Contract_entity.aod
+++ b/entity/Contract_entity/Contract_entity.aod
@@ -574,8 +574,7 @@
           <name>#DESCRIPTION</name>
         </indexRecordMultilingualSystemFieldMapping>
         <indexRecordFieldMapping>
-          <name>CONTRACTCODE</name>
-          <indexFieldType>TEXT_PLAIN</indexFieldType>
+          <name>CONTRACTCODE.value</name>
         </indexRecordFieldMapping>
         <indexRecordFieldMapping>
           <name>CONTACT_ORG_ID.value</name>
diff --git a/entity/DocumentTemplate_entity/DocumentTemplate_entity.aod b/entity/DocumentTemplate_entity/DocumentTemplate_entity.aod
index 603c1beb15..3036401525 100644
--- a/entity/DocumentTemplate_entity/DocumentTemplate_entity.aod
+++ b/entity/DocumentTemplate_entity/DocumentTemplate_entity.aod
@@ -233,12 +233,6 @@
     <entityProvider>
       <name>DocumentTemplateProvider</name>
       <dependencies>
-        <entityDependency>
-          <name>e1c555c3-9e53-4ccf-962c-4bdd3c14bb16</name>
-          <entityName>Offer_entity</entityName>
-          <fieldName>DocumentTemplateText</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
         <entityDependency>
           <name>9c10883d-eb73-4587-b758-693a66367a4c</name>
           <entityName>Offer_entity</entityName>
diff --git a/entity/Leadimport_entity/Leadimport_entity.aod b/entity/Leadimport_entity/Leadimport_entity.aod
index 2a7f3c136e..1c31506735 100644
--- a/entity/Leadimport_entity/Leadimport_entity.aod
+++ b/entity/Leadimport_entity/Leadimport_entity.aod
@@ -17,14 +17,6 @@
   <entityFields>
     <entityProvider>
       <name>#PROVIDER</name>
-      <dependencies>
-        <entityDependency>
-          <name>9433bb88-2330-4487-9e3a-fd864da9b8a9</name>
-          <entityName>Object_entity</entityName>
-          <fieldName>Leadimports</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
-      </dependencies>
     </entityProvider>
     <entityField>
       <name>NAME</name>
diff --git a/entity/ModuleTree_entity/ModuleTree_entity.aod b/entity/ModuleTree_entity/ModuleTree_entity.aod
index ab9da7cdc1..e5153d2b70 100644
--- a/entity/ModuleTree_entity/ModuleTree_entity.aod
+++ b/entity/ModuleTree_entity/ModuleTree_entity.aod
@@ -4,6 +4,7 @@
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/ModuleTree_entity/documentation.adoc</documentation>
   <title>History</title>
+  <recordContainer>jdito</recordContainer>
   <entityFields>
     <entityProvider>
       <name>#PROVIDER</name>
diff --git a/entity/Offer_entity/Offer_entity.aod b/entity/Offer_entity/Offer_entity.aod
index 503b15b6fc..4ad1ad9d84 100644
--- a/entity/Offer_entity/Offer_entity.aod
+++ b/entity/Offer_entity/Offer_entity.aod
@@ -826,7 +826,6 @@
     </entityParameter>
     <entityField>
       <name>chooseTEXHeader</name>
-      <consumer>DocumentTemplateTex</consumer>
       <stateProcess>%aditoprj%/entity/Offer_entity/entityfields/choosetexheader/stateProcess.js</stateProcess>
     </entityField>
     <entityConsumer>
@@ -1285,9 +1284,6 @@
           <recordfield>OFFER.NET</recordfield>
           <aggregateType>SUM</aggregateType>
         </aggregateFieldDbMapping>
-        <dbRecordFieldMapping>
-          <name>COUNT.value</name>
-        </dbRecordFieldMapping>
         <aggregateFieldDbMapping>
           <name>COUNT_aggregate.value</name>
           <recordfield>OFFER.OFFER_ID</recordfield>
diff --git a/entity/PermissionCalendar_entity/PermissionCalendar_entity.aod b/entity/PermissionCalendar_entity/PermissionCalendar_entity.aod
index f7262ea6ca..621f1148b5 100644
--- a/entity/PermissionCalendar_entity/PermissionCalendar_entity.aod
+++ b/entity/PermissionCalendar_entity/PermissionCalendar_entity.aod
@@ -56,7 +56,6 @@
       <mandatoryProcess>%aditoprj%/entity/PermissionCalendar_entity/entityfields/permissiondealer_user_rowid/mandatoryProcess.js</mandatoryProcess>
       <textInputAllowed v="false" />
       <stateProcess>%aditoprj%/entity/PermissionCalendar_entity/entityfields/permissiondealer_user_rowid/stateProcess.js</stateProcess>
-      <valueProcess>%aditoprj%/entity/PermissionCalendar_entity/entityfields/permissiondealer_user_rowid/valueProcess.js</valueProcess>
       <displayValueProcess>%aditoprj%/entity/PermissionCalendar_entity/entityfields/permissiondealer_user_rowid/displayValueProcess.js</displayValueProcess>
       <onValueChange>%aditoprj%/entity/PermissionCalendar_entity/entityfields/permissiondealer_user_rowid/onValueChange.js</onValueChange>
     </entityField>
diff --git a/entity/PermissionDetail_entity/PermissionDetail_entity.aod b/entity/PermissionDetail_entity/PermissionDetail_entity.aod
index c9e7ee2443..2a0b68e854 100644
--- a/entity/PermissionDetail_entity/PermissionDetail_entity.aod
+++ b/entity/PermissionDetail_entity/PermissionDetail_entity.aod
@@ -92,7 +92,7 @@
         <entityDependency>
           <name>b1a6483c-e7b1-4eb7-aa22-d0e9d0ef0b49</name>
           <entityName>Role_entity</entityName>
-          <fieldName>Permissions</fieldName>
+          <fieldName>TheirPermissions</fieldName>
           <isConsumer v="false" />
         </entityDependency>
         <entityDependency>
diff --git a/entity/Person_entity/Person_entity.aod b/entity/Person_entity/Person_entity.aod
index 7a36776d4e..fee96dfc8b 100644
--- a/entity/Person_entity/Person_entity.aod
+++ b/entity/Person_entity/Person_entity.aod
@@ -688,18 +688,6 @@
     <entityProvider>
       <name>Contacts</name>
       <dependencies>
-        <entityDependency>
-          <name>e46dcd73-64a8-4b3e-b976-1b4643c54ebb</name>
-          <entityName>CampaignStep_entity</entityName>
-          <fieldName>ContactsConsumer</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
-        <entityDependency>
-          <name>0b7a3dc8-854f-4a0b-9e1c-e6f7cd12d8f1</name>
-          <entityName>DuplicatesDetails_entity</entityName>
-          <fieldName>PersonsConsumer</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
         <entityDependency>
           <name>c98da62f-d6b2-4ddb-9101-92e9a60abdfb</name>
           <entityName>VisitPlanEmployeeWeek_entity</entityName>
-- 
GitLab


From 0cd562000d8f849948a3283c0523be9fec18808b Mon Sep 17 00:00:00 2001
From: Sebastian Listl <s.listl@adito.de>
Date: Wed, 26 Aug 2020 16:25:19 +0200
Subject: [PATCH 217/309] #1064056 Sorting implementation for Attributes

---
 entity/Attribute_entity/Attribute_entity.aod  | 103 ++++++++++--
 .../attribute_parent_id/valueProcess.js       |   4 +-
 .../attribute_type/stateProcess.js            |   3 +-
 .../attribute_type/valueProcess.js            |   4 +-
 .../newchildattribute/onActionProcess.js      |   4 +-
 .../valueProcess.js                           |   3 +
 .../displaysimplename_param/valueProcess.js   |   3 +
 .../children/parentid_param/valueProcess.js   |   4 +
 .../children/parenttype_param/valueProcess.js |   4 +
 .../childattributes/stateProcess.js           |   6 +
 .../whitelistids_param/valueProcess.js        |   4 +-
 .../recordcontainers/jdito/contentProcess.js  | 146 +++++++++---------
 .../recordcontainers/jdito/onInsert.js        |  21 ++-
 .../entityfields/date_new/valueProcess.js     |   7 +-
 neonContext/Attribute/Attribute.aod           |   8 +
 .../AttributeEdit_view/AttributeEdit_view.aod |   5 +
 .../AttributeList_view/AttributeList_view.aod |  30 ++++
 .../AttributeMultiEdit_view.aod               |  30 ++++
 .../AttributePreview_view.aod                 |   5 +
 19 files changed, 295 insertions(+), 99 deletions(-)
 create mode 100644 entity/Attribute_entity/entityfields/attributechildren/children/getonlyfirstlevelchildren_param/valueProcess.js
 create mode 100644 entity/Attribute_entity/entityfields/childattributes/children/displaysimplename_param/valueProcess.js
 create mode 100644 entity/Attribute_entity/entityfields/childattributes/children/parentid_param/valueProcess.js
 create mode 100644 entity/Attribute_entity/entityfields/childattributes/children/parenttype_param/valueProcess.js
 create mode 100644 entity/Attribute_entity/entityfields/childattributes/stateProcess.js
 create mode 100644 neonView/AttributeList_view/AttributeList_view.aod
 create mode 100644 neonView/AttributeMultiEdit_view/AttributeMultiEdit_view.aod

diff --git a/entity/Attribute_entity/Attribute_entity.aod b/entity/Attribute_entity/Attribute_entity.aod
index 735588f943..d6f3d3eec9 100644
--- a/entity/Attribute_entity/Attribute_entity.aod
+++ b/entity/Attribute_entity/Attribute_entity.aod
@@ -180,10 +180,6 @@
           <name>ChildType_param</name>
           <expose v="false" />
         </entityParameter>
-        <entityParameter>
-          <name>ParentIdPreset_param</name>
-          <expose v="false" />
-        </entityParameter>
       </children>
     </entityProvider>
     <entityField>
@@ -218,6 +214,18 @@
           <name>ParentId_param</name>
           <expose v="false" />
         </entityParameter>
+        <entityParameter>
+          <name>AttributeCount_param</name>
+          <expose v="false" />
+        </entityParameter>
+        <entityParameter>
+          <name>IncludeParentRecord_param</name>
+          <expose v="false" />
+        </entityParameter>
+        <entityParameter>
+          <name>ObjectType_param</name>
+          <expose v="false" />
+        </entityParameter>
       </children>
     </entityProvider>
     <entityConsumer>
@@ -367,10 +375,6 @@
           <name>ParentId_param</name>
           <expose v="false" />
         </entityParameter>
-        <entityParameter>
-          <name>ParentIdPreset_param</name>
-          <expose v="false" />
-        </entityParameter>
       </children>
     </entityProvider>
     <entityParameter>
@@ -379,14 +383,89 @@
       <description>parent id, this is used for filtering by the parent in the content process</description>
     </entityParameter>
     <entityParameter>
-      <name>ParentIdPreset_param</name>
+      <name>IncludeParentRecord_param</name>
+      <expose v="true" />
+      <documentation>%aditoprj%/entity/Attribute_entity/entityfields/includeparentrecord_param/documentation.adoc</documentation>
+    </entityParameter>
+    <entityProvider>
+      <name>AttributeChildren</name>
+      <sortingField>SORTING</sortingField>
+      <titlePlural>Child Attributes</titlePlural>
+      <dependencies>
+        <entityDependency>
+          <name>80023321-1954-483f-a4be-b7207557c068</name>
+          <entityName>Attribute_entity</entityName>
+          <fieldName>ChildAttributes</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+      </dependencies>
+      <children>
+        <entityParameter>
+          <name>ChildId_param</name>
+          <expose v="false" />
+        </entityParameter>
+        <entityParameter>
+          <name>AttributeCount_param</name>
+          <expose v="false" />
+        </entityParameter>
+        <entityParameter>
+          <name>ChildType_param</name>
+          <expose v="false" />
+        </entityParameter>
+        <entityParameter>
+          <name>FilteredAttributeIds_param</name>
+          <expose v="false" />
+        </entityParameter>
+        <entityParameter>
+          <name>IncludeParentRecord_param</name>
+          <expose v="false" />
+        </entityParameter>
+        <entityParameter>
+          <name>ObjectType_param</name>
+          <expose v="false" />
+        </entityParameter>
+        <entityParameter>
+          <name>ThemeObjectRowId_param</name>
+          <expose v="false" />
+        </entityParameter>
+        <entityParameter>
+          <name>GetOnlyFirstLevelChildren_param</name>
+          <valueProcess>%aditoprj%/entity/Attribute_entity/entityfields/attributechildren/children/getonlyfirstlevelchildren_param/valueProcess.js</valueProcess>
+          <expose v="false" />
+        </entityParameter>
+      </children>
+    </entityProvider>
+    <entityConsumer>
+      <name>ChildAttributes</name>
+      <refreshParent v="true" />
+      <stateProcess>%aditoprj%/entity/Attribute_entity/entityfields/childattributes/stateProcess.js</stateProcess>
+      <dependency>
+        <name>dependency</name>
+        <entityName>Attribute_entity</entityName>
+        <fieldName>AttributeChildren</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>DisplaySimpleName_param</name>
+          <valueProcess>%aditoprj%/entity/Attribute_entity/entityfields/childattributes/children/displaysimplename_param/valueProcess.js</valueProcess>
+        </entityParameter>
+        <entityParameter>
+          <name>ParentId_param</name>
+          <valueProcess>%aditoprj%/entity/Attribute_entity/entityfields/childattributes/children/parentid_param/valueProcess.js</valueProcess>
+        </entityParameter>
+        <entityParameter>
+          <name>ParentType_param</name>
+          <valueProcess>%aditoprj%/entity/Attribute_entity/entityfields/childattributes/children/parenttype_param/valueProcess.js</valueProcess>
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityParameter>
+      <name>GetOnlyFirstLevelChildren_param</name>
       <expose v="true" />
-      <description>parent id that is used to preset the parent when the action newChildAttribute is used</description>
     </entityParameter>
     <entityParameter>
-      <name>IncludeParentRecord_param</name>
+      <name>ParentType_param</name>
       <expose v="true" />
-      <documentation>%aditoprj%/entity/Attribute_entity/entityfields/includeparentrecord_param/documentation.adoc</documentation>
     </entityParameter>
   </entityFields>
   <recordContainers>
diff --git a/entity/Attribute_entity/entityfields/attribute_parent_id/valueProcess.js b/entity/Attribute_entity/entityfields/attribute_parent_id/valueProcess.js
index 75b9d2d76b..33e1114869 100644
--- a/entity/Attribute_entity/entityfields/attribute_parent_id/valueProcess.js
+++ b/entity/Attribute_entity/entityfields/attribute_parent_id/valueProcess.js
@@ -2,5 +2,5 @@ import("system.neon");
 import("system.result");
 import("system.vars");
 
-if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.get("$param.ParentIdPreset_param") && vars.get("$this.value") == null)
-    result.string(vars.get("$param.ParentIdPreset_param"));
\ No newline at end of file
+if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.get("$param.ParentId_param") && vars.get("$this.value") == null)
+    result.string(vars.get("$param.ParentId_param"));
\ No newline at end of file
diff --git a/entity/Attribute_entity/entityfields/attribute_type/stateProcess.js b/entity/Attribute_entity/entityfields/attribute_type/stateProcess.js
index 930a7e565b..dc1197f692 100644
--- a/entity/Attribute_entity/entityfields/attribute_type/stateProcess.js
+++ b/entity/Attribute_entity/entityfields/attribute_type/stateProcess.js
@@ -11,7 +11,6 @@ var state = neon.COMPONENTSTATE_EDITABLE;
 if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT || vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
 {
     var type = vars.get("$field.ATTRIBUTE_TYPE");
-    var parentType = AttributeUtil.getAttributeType(vars.get("$field.ATTRIBUTE_PARENT_ID"));
     if (AttributeTypeUtil.isGroupType(type))
     {
         var hasSubordinate = newSelect("count(*)")
@@ -24,4 +23,4 @@ if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT || vars.get("$sys.r
     else if (AttributeUtil.hasRelations(vars.get("$field.UID")))
         state = neon.COMPONENTSTATE_READONLY;
 }
-result.string(state)
\ No newline at end of file
+result.string(state);
\ No newline at end of file
diff --git a/entity/Attribute_entity/entityfields/attribute_type/valueProcess.js b/entity/Attribute_entity/entityfields/attribute_type/valueProcess.js
index 20745951e9..c33f753be3 100644
--- a/entity/Attribute_entity/entityfields/attribute_type/valueProcess.js
+++ b/entity/Attribute_entity/entityfields/attribute_type/valueProcess.js
@@ -4,9 +4,9 @@ import("system.result");
 import("system.vars");
 import("Attribute_lib");
 
-if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.get("$field.ATTRIBUTE_PARENT_ID"))
+if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && (vars.get("$param.ParentType_param") || vars.get("$field.ATTRIBUTE_PARENT_ID")))
 {
-    var parentType = AttributeUtil.getAttributeType(vars.get("$field.ATTRIBUTE_PARENT_ID"));
+    var parentType = vars.get("$param.ParentType_param") || AttributeUtil.getAttributeType(vars.get("$field.ATTRIBUTE_PARENT_ID"));
     var type = vars.get("$this.value");
     var possibleTypes = AttributeTypeUtil.getPossibleChildren(parentType);
     
diff --git a/entity/Attribute_entity/entityfields/attributeactions/children/newchildattribute/onActionProcess.js b/entity/Attribute_entity/entityfields/attributeactions/children/newchildattribute/onActionProcess.js
index f78e4a1844..20effae6f9 100644
--- a/entity/Attribute_entity/entityfields/attributeactions/children/newchildattribute/onActionProcess.js
+++ b/entity/Attribute_entity/entityfields/attributeactions/children/newchildattribute/onActionProcess.js
@@ -8,8 +8,8 @@ if (vars.exists("$local.rows"))
     var row = vars.get("$local.rows");
     var type = row[0].ATTRIBUTE_TYPE.trim();
     if (AttributeTypeUtil.isGroupType(type))
-        params["ParentIdPreset_param"] = row[0].UID;
+        params["ParentId_param"] = row[0].UID;
     else if (row[0].ATTRIBUTE_PARENT_ID)
-        params["ParentIdPreset_param"] = row[0].ATTRIBUTE_PARENT_ID;
+        params["ParentId_param"] = row[0].ATTRIBUTE_PARENT_ID;
 }
 neon.openContext("Attribute", null, null, neon.OPERATINGSTATE_NEW, params);
\ No newline at end of file
diff --git a/entity/Attribute_entity/entityfields/attributechildren/children/getonlyfirstlevelchildren_param/valueProcess.js b/entity/Attribute_entity/entityfields/attributechildren/children/getonlyfirstlevelchildren_param/valueProcess.js
new file mode 100644
index 0000000000..40effa0178
--- /dev/null
+++ b/entity/Attribute_entity/entityfields/attributechildren/children/getonlyfirstlevelchildren_param/valueProcess.js
@@ -0,0 +1,3 @@
+import("system.result");
+
+result.string(true);
\ No newline at end of file
diff --git a/entity/Attribute_entity/entityfields/childattributes/children/displaysimplename_param/valueProcess.js b/entity/Attribute_entity/entityfields/childattributes/children/displaysimplename_param/valueProcess.js
new file mode 100644
index 0000000000..40effa0178
--- /dev/null
+++ b/entity/Attribute_entity/entityfields/childattributes/children/displaysimplename_param/valueProcess.js
@@ -0,0 +1,3 @@
+import("system.result");
+
+result.string(true);
\ No newline at end of file
diff --git a/entity/Attribute_entity/entityfields/childattributes/children/parentid_param/valueProcess.js b/entity/Attribute_entity/entityfields/childattributes/children/parentid_param/valueProcess.js
new file mode 100644
index 0000000000..16c85500b5
--- /dev/null
+++ b/entity/Attribute_entity/entityfields/childattributes/children/parentid_param/valueProcess.js
@@ -0,0 +1,4 @@
+import("system.vars");
+import("system.result");
+
+result.string(vars.get("$field.UID"));
\ No newline at end of file
diff --git a/entity/Attribute_entity/entityfields/childattributes/children/parenttype_param/valueProcess.js b/entity/Attribute_entity/entityfields/childattributes/children/parenttype_param/valueProcess.js
new file mode 100644
index 0000000000..f3f6d65905
--- /dev/null
+++ b/entity/Attribute_entity/entityfields/childattributes/children/parenttype_param/valueProcess.js
@@ -0,0 +1,4 @@
+import("system.result");
+import("system.vars");
+
+result.string(vars.get("$field.ATTRIBUTE_TYPE"));
\ No newline at end of file
diff --git a/entity/Attribute_entity/entityfields/childattributes/stateProcess.js b/entity/Attribute_entity/entityfields/childattributes/stateProcess.js
new file mode 100644
index 0000000000..cf9174819c
--- /dev/null
+++ b/entity/Attribute_entity/entityfields/childattributes/stateProcess.js
@@ -0,0 +1,6 @@
+import("system.result");
+import("system.neon");
+import("system.vars");
+import("Attribute_lib");
+
+result.string(AttributeTypeUtil.isGroupType(vars.get("$field.ATTRIBUTE_TYPE")) ? neon.COMPONENTSTATE_EDITABLE : neon.COMPONENTSTATE_INVISIBLE);
\ No newline at end of file
diff --git a/entity/Attribute_entity/entityfields/keywordattributetypes/children/whitelistids_param/valueProcess.js b/entity/Attribute_entity/entityfields/keywordattributetypes/children/whitelistids_param/valueProcess.js
index e6e7f7340b..847edb2907 100644
--- a/entity/Attribute_entity/entityfields/keywordattributetypes/children/whitelistids_param/valueProcess.js
+++ b/entity/Attribute_entity/entityfields/keywordattributetypes/children/whitelistids_param/valueProcess.js
@@ -7,7 +7,9 @@ import("Attribute_lib");
 if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW || vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT)
 {
     var type;
-    if (vars.get("$field.ATTRIBUTE_PARENT_ID"))
+    if (vars.get("$param.ParentType_param"))
+        type = vars.get("$param.ParentType_param");
+    else if (vars.get("$field.ATTRIBUTE_PARENT_ID"))
         type = AttributeUtil.getAttributeType(vars.get("$field.ATTRIBUTE_PARENT_ID"));
     else
         type = $AttributeTypes.GROUP.toString(); //GROUP can have everything except COMBOVALUE as child
diff --git a/entity/Attribute_entity/recordcontainers/jdito/contentProcess.js b/entity/Attribute_entity/recordcontainers/jdito/contentProcess.js
index 9d50cc58b4..c5b4ef81cd 100644
--- a/entity/Attribute_entity/recordcontainers/jdito/contentProcess.js
+++ b/entity/Attribute_entity/recordcontainers/jdito/contentProcess.js
@@ -14,98 +14,90 @@ var childId = vars.get("$param.ChildId_param");
 var childType = vars.get("$param.ChildType_param");
 
 var objectType = vars.get("$param.ObjectType_param");
-var filteredIds = vars.getString("$param.FilteredAttributeIds_param") ? JSON.parse(vars.getString("$param.FilteredAttributeIds_param")) : null
+var filteredIds = vars.get("$param.FilteredAttributeIds_param") ? JSON.parse(vars.getString("$param.FilteredAttributeIds_param")) : null
 var attributeCountObj = vars.get("$param.AttributeCount_param") ? JSON.parse(vars.getString("$param.AttributeCount_param")) : null;
-var displaySimpleName = vars.getString("$param.DisplaySimpleName_param") == "true" ? true : false;
+var displaySimpleName = Utils.toBoolean(vars.get("$param.DisplaySimpleName_param"));
 
 var themeObjectRowId = vars.get("$param.ThemeObjectRowId_param");
 
 var parentId = vars.get("$param.ParentId_param");
-var includeParentRecord = vars.get("$param.IncludeParentRecord_param");
+var includeParentRecord = Utils.toBoolean(vars.get("$param.IncludeParentRecord_param"));
+var onlyFirstLevelChildren = Utils.toBoolean(vars.get("$param.GetOnlyFirstLevelChildren_param"));
 
 var fetchUsages = false;
 var translateName = false;
 
 var condition = newWhere();
 
-var emptyResult = function ()
+if (vars.exists("$local.idvalues") && vars.get("$local.idvalues"))
 {
-    if (vars.exists("$local.idvalues") && vars.get("$local.idvalues"))
-    {
-        condition.andIfSet("AB_ATTRIBUTE.AB_ATTRIBUTEID", vars.get("$local.idvalues"), SqlBuilder.IN()); 
-        fetchUsages = true;
-        return false;
-    }
-    
-    if (childId) //if a childId is given, it is the lookup for selecting the superordinate attribute
-    {
-        condition.and("AB_ATTRIBUTE.ATTRIBUTE_TYPE", AttributeTypeUtil.getGroupTypes(childType), SqlBuilder.IN());
-        
-        //filter out the child and all children of the child, because an attribute can't have itself or a subordinate attribute as parent
-        condition.andIfSet("AB_ATTRIBUTE.AB_ATTRIBUTEID", [childId].concat(AttributeUtil.getAllChildren(childId)), SqlBuilder.NOT_IN());
-    }
-    else if (objectType)  //if there's an objectType, it comes from the AttributeRelation entity (lookup for the attribute selection)
-    {
-        translateName = true;
-        
-        var ids = AttributeUtil.getPossibleAttributes(objectType, true, filteredIds, attributeCountObj);
-        
-        if (ids.length === 0)
-            return true;
-        
-        condition.and("AB_ATTRIBUTE.AB_ATTRIBUTEID", ids, SqlBuilder.IN());
-        
-        condition.and("AB_ATTRIBUTE.ATTRIBUTE_TYPE", $AttributeTypes.THEME, !themeObjectRowId ? SqlBuilder.NOT_EQUAL() : undefined);
-    }
-    else if (parentId)
+    condition.andIfSet("AB_ATTRIBUTE.AB_ATTRIBUTEID", vars.get("$local.idvalues"), SqlBuilder.IN()); 
+    fetchUsages = true;
+}
+else if (childId) //if a childId is given, it is the lookup for selecting the superordinate attribute
+{
+    condition.and("AB_ATTRIBUTE.ATTRIBUTE_TYPE", AttributeTypeUtil.getGroupTypes(childType), SqlBuilder.IN());
+
+    //filter out the child and all children of the child, because an attribute can't have itself or a subordinate attribute as parent
+    condition.andIfSet("AB_ATTRIBUTE.AB_ATTRIBUTEID", [childId].concat(AttributeUtil.getAllChildren(childId)), SqlBuilder.NOT_IN());
+}
+else if (objectType)  //if there's an objectType, it comes from the AttributeRelation entity (lookup for the attribute selection)
+{
+    translateName = true;
+
+    var ids = AttributeUtil.getPossibleAttributes(objectType, true, filteredIds, attributeCountObj);
+
+    if (Utils.isEmpty(ids))
+        condition.noResult();
+
+    condition.and("AB_ATTRIBUTE.AB_ATTRIBUTEID", ids, SqlBuilder.IN());
+    condition.and("AB_ATTRIBUTE.ATTRIBUTE_TYPE", $AttributeTypes.THEME, !themeObjectRowId ? SqlBuilder.NOT_EQUAL() : undefined);
+}
+else if (parentId)
+{
+    if (onlyFirstLevelChildren)
+        condition.and("AB_ATTRIBUTE.ATTRIBUTE_PARENT_ID", parentId);
+    else
     {
         condition.and("AB_ATTRIBUTE.AB_ATTRIBUTEID", AttributeUtil.getAllChildren(parentId), SqlBuilder.IN());
         translateName = true;
-        if(includeParentRecord == "true")
+        if(includeParentRecord)
             condition.or("AB_ATTRIBUTE.AB_ATTRIBUTEID", parentId);
     }
-    else
-    {
-        fetchUsages = true;
-    }
+}
+else
+{
+    fetchUsages = true;
+}
 
-    //when there are filters selected, add them to the conditon
-    if (vars.exists("$local.filter") && vars.get("$local.filter"))
-    {
-        var filter = vars.get("$local.filter");
-        if (filter.filter)
-            condition.andIfSet(JditoFilterUtils.getSqlCondition(filter.filter, "AB_ATTRIBUTE", undefined, {
-                // special filter for usage
-                USAGE_FILTER : function (pValue, pOperator)
-                {
-                    var cond = newWhere();
-                    var subSelect = newSelect("1").from("AB_ATTRIBUTEUSAGE", "attrUse").where("attrUse.AB_ATTRIBUTE_ID = AB_ATTRIBUTE.AB_ATTRIBUTEID");
-
-                    switch (pOperator)
-                    {
-                        case "EQUAL":
-                        case "NOT_EQUAL":
-                            subSelect.and(["AB_ATTRIBUTEUSAGE", "AB_ATTRIBUTE_ID", "attrUse"], pValue);
-                        case "ISNULL":
-                        case "ISNOTNULL":
-                            return cond.and(null, subSelect, pOperator == "NOT_EQUAL" || pOperator == "ISNULL" ? SqlBuilder.NOT_EXISTS() : SqlBuilder.EXISTS());
-                    }
-                    return cond;
-                }
-            }));
-    }
-    
-    return false;
-}();
+var filterCondition = new FilterSqlTranslator(vars.get("$local.filter"), "AB_ATTRIBUTE")    
+    .addSpecialFieldConditionFn("USAGE_FILTER", function (pValue, pOperator)
+        {
+            var cond = newWhere();
+            var subSelect = newSelect("1").from("AB_ATTRIBUTEUSAGE", "attrUse").where("attrUse.AB_ATTRIBUTE_ID = AB_ATTRIBUTE.AB_ATTRIBUTEID");
+
+            switch (pOperator)
+            {
+                case "EQUAL":
+                case "NOT_EQUAL":
+                    subSelect.and(["AB_ATTRIBUTEUSAGE", "AB_ATTRIBUTE_ID", "attrUse"], pValue);
+                case "ISNULL":
+                case "ISNOTNULL":
+                    return cond.and(null, subSelect, pOperator == "NOT_EQUAL" || pOperator == "ISNULL" ? SqlBuilder.NOT_EXISTS() : SqlBuilder.EXISTS());
+            }
+            return cond;
+        })
+    .getSqlCondition();
+condition.andIfSet(filterCondition);
 
 var usages;
 if (fetchUsages) //this query is only necessary in Attribute, not in AttributeRelation
 {                        
     var usageTbl = newSelect("AB_ATTRIBUTE_ID, OBJECT_TYPE")
-             .from("AB_ATTRIBUTEUSAGE")
-             .join("AB_ATTRIBUTE", newWhere("AB_ATTRIBUTEUSAGE.AB_ATTRIBUTE_ID = AB_ATTRIBUTE.AB_ATTRIBUTEID"))
-             .whereIfSet(condition)
-             .table();
+        .from("AB_ATTRIBUTEUSAGE")
+        .join("AB_ATTRIBUTE", "AB_ATTRIBUTEUSAGE.AB_ATTRIBUTE_ID = AB_ATTRIBUTE.AB_ATTRIBUTEID")
+        .whereIfSet(condition)
+        .table();
     usages = {};
     for (let i = 0, l = usageTbl.length; i < l; i++)
     {
@@ -117,16 +109,18 @@ if (fetchUsages) //this query is only necessary in Attribute, not in AttributeRe
     }
 }
 
-var attributes = newSelect("AB_ATTRIBUTEID, ATTRIBUTE_PARENT_ID, ATTRIBUTE_NAME, ATTRIBUTE_ACTIVE, DROPDOWNDEFINITION, DROPDOWNFILTER, SORTING, ATTRIBUTE_TYPE, " 
-                            + KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.attributeType(), "ATTRIBUTE_TYPE") //3
-                            + ", '', '', ''")
+var attributes = newSelect(["AB_ATTRIBUTEID, ATTRIBUTE_PARENT_ID, ATTRIBUTE_NAME, ATTRIBUTE_ACTIVE, DROPDOWNDEFINITION, DROPDOWNFILTER, SORTING, ATTRIBUTE_TYPE",
+                            KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.attributeType(), "ATTRIBUTE_TYPE"), //3
+                            "'', '', ''"])
                     .from("AB_ATTRIBUTE")
                     .whereIfSet(condition)
-                    .orderBy("ATTRIBUTE_PARENT_ID asc, SORTING asc")
-                    .table(emptyResult);
+                    .orderBy("ATTRIBUTE_PARENT_ID, SORTING, ATTRIBUTE_NAME")
+                    .table();
 
-//TODO: attribute name caching like keywords
-var allNames = !emptyResult ? newSelect("AB_ATTRIBUTEID, ATTRIBUTE_PARENT_ID, ATTRIBUTE_NAME").from("AB_ATTRIBUTE").table() : [];
+var allNames = newSelect("AB_ATTRIBUTEID, ATTRIBUTE_PARENT_ID, ATTRIBUTE_NAME")
+    .from("AB_ATTRIBUTE")
+    .table(Utils.isEmpty(attributes));
+    
 var attrNameData = {};
 for (let i = 0, l = allNames.length; i < l; i++)
 {
diff --git a/entity/Attribute_entity/recordcontainers/jdito/onInsert.js b/entity/Attribute_entity/recordcontainers/jdito/onInsert.js
index 45e6ba816f..7e2f545778 100644
--- a/entity/Attribute_entity/recordcontainers/jdito/onInsert.js
+++ b/entity/Attribute_entity/recordcontainers/jdito/onInsert.js
@@ -1,5 +1,6 @@
 import("system.vars");
 import("Sql_lib");
+import("Attribute_lib");
 
 var rowdata = vars.get("$local.rowdata");
 
@@ -12,4 +13,22 @@ new SqlBuilder().insertFields({
     "ATTRIBUTE_TYPE" : rowdata["ATTRIBUTE_TYPE.value"],
     "DROPDOWNFILTER" : rowdata["DROPDOWNFILTER.value"],
     "SORTING" : rowdata["SORTING.value"]
-}, "AB_ATTRIBUTE");
\ No newline at end of file
+}, "AB_ATTRIBUTE");
+
+if (rowdata["ATTRIBUTE_PARENT_ID.value"] && rowdata["ATTRIBUTE_TYPE.value"] !== $AttributeTypes.COMBOVALUE.toString() && vars.get("$param.GetOnlyFirstLevelChildren_param"))
+{
+    var parentUsages = newSelect("OBJECT_TYPE")
+        .from("AB_ATTRIBUTEUSAGE")
+        .where("AB_ATTRIBUTEUSAGE.AB_ATTRIBUTE_ID", rowdata["ATTRIBUTE_PARENT_ID.value"])
+        .arrayColumn();
+        
+    var usageValues = {};
+    if (AttributeTypeUtil.isSingleSelection(rowdata["ATTRIBUTE_TYPE.value"]))
+        usageValues["MAX_COUNT"] = 1;
+    
+    parentUsages.forEach(function (usageContext)
+    {
+        usageValues["OBJECT_TYPE"] = usageContext;
+        new SqlBuilder().insertFields(usageValues, "AB_ATTRIBUTEUSAGE", "AB_ATTRIBUTEUSAGEID");
+    });
+}
\ No newline at end of file
diff --git a/entity/Person_entity/entityfields/date_new/valueProcess.js b/entity/Person_entity/entityfields/date_new/valueProcess.js
index a72892783b..9cf1e32dd7 100644
--- a/entity/Person_entity/entityfields/date_new/valueProcess.js
+++ b/entity/Person_entity/entityfields/date_new/valueProcess.js
@@ -1,7 +1,12 @@
+import("Entity_lib");
 import("system.util");
 import("system.result");
 import("system.neon");
 import("system.vars");
 
 if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
-    result.string(vars.get("$sys.date"));
\ No newline at end of file
+    result.string(vars.get("$sys.date"));
+    
+    "$field.Attributes.deletedRows";
+    
+    EntityConsumerRowsHelper.getCurrentConsumerRows("Attributes", ["VALUE"])
\ No newline at end of file
diff --git a/neonContext/Attribute/Attribute.aod b/neonContext/Attribute/Attribute.aod
index cc3899d5c0..749cae00fe 100644
--- a/neonContext/Attribute/Attribute.aod
+++ b/neonContext/Attribute/Attribute.aod
@@ -30,5 +30,13 @@
       <name>a380915a-6946-4923-9b13-7a981606ce60</name>
       <view>AttributeLookup_view</view>
     </neonViewReference>
+    <neonViewReference>
+      <name>db1f22e8-46f8-40aa-a5eb-00c606666c96</name>
+      <view>AttributeMultiEdit_view</view>
+    </neonViewReference>
+    <neonViewReference>
+      <name>1cf7d11d-d593-4518-b7aa-aca1a9a2fb8a</name>
+      <view>AttributeList_view</view>
+    </neonViewReference>
   </references>
 </neonContext>
diff --git a/neonView/AttributeEdit_view/AttributeEdit_view.aod b/neonView/AttributeEdit_view/AttributeEdit_view.aod
index 5668d586c0..f9a869de8f 100644
--- a/neonView/AttributeEdit_view/AttributeEdit_view.aod
+++ b/neonView/AttributeEdit_view/AttributeEdit_view.aod
@@ -50,5 +50,10 @@
       <entityField>AttributeUsages</entityField>
       <view>AttributeUsageMultiEdit_view</view>
     </neonViewReference>
+    <neonViewReference>
+      <name>90d4edc1-699d-413f-bbcd-d14a90cd8cf9</name>
+      <entityField>ChildAttributes</entityField>
+      <view>AttributeMultiEdit_view</view>
+    </neonViewReference>
   </children>
 </neonView>
diff --git a/neonView/AttributeList_view/AttributeList_view.aod b/neonView/AttributeList_view/AttributeList_view.aod
new file mode 100644
index 0000000000..774de73db9
--- /dev/null
+++ b/neonView/AttributeList_view/AttributeList_view.aod
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.6">
+  <name>AttributeList_view</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <layout>
+    <noneLayout>
+      <name>layout</name>
+    </noneLayout>
+  </layout>
+  <children>
+    <titledListViewTemplate>
+      <name>AttributeList</name>
+      <entityField>#ENTITY</entityField>
+      <columns>
+        <neonTitledListTableColumn>
+          <name>96544713-a302-4e2f-ab7f-6c02d44d9908</name>
+          <entityField>ATTRIBUTE_NAME</entityField>
+        </neonTitledListTableColumn>
+        <neonTitledListTableColumn>
+          <name>5c536673-78f5-482c-aa98-f027f08659e1</name>
+          <entityField>ATTRIBUTE_TYPE</entityField>
+        </neonTitledListTableColumn>
+        <neonTitledListTableColumn>
+          <name>fcd31169-8b19-4165-bb85-200ab6045cdd</name>
+          <entityField>DROPDOWNDEFINITION</entityField>
+        </neonTitledListTableColumn>
+      </columns>
+    </titledListViewTemplate>
+  </children>
+</neonView>
diff --git a/neonView/AttributeMultiEdit_view/AttributeMultiEdit_view.aod b/neonView/AttributeMultiEdit_view/AttributeMultiEdit_view.aod
new file mode 100644
index 0000000000..21e86a1d4d
--- /dev/null
+++ b/neonView/AttributeMultiEdit_view/AttributeMultiEdit_view.aod
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.6">
+  <name>AttributeMultiEdit_view</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <layout>
+    <noneLayout>
+      <name>layout</name>
+    </noneLayout>
+  </layout>
+  <children>
+    <genericMultipleViewTemplate>
+      <name>GenericMultiple</name>
+      <entityField>#ENTITY</entityField>
+      <columns>
+        <neonGenericMultipleTableColumn>
+          <name>59d4b058-675b-4124-a510-a576e2222815</name>
+          <entityField>ATTRIBUTE_NAME</entityField>
+        </neonGenericMultipleTableColumn>
+        <neonGenericMultipleTableColumn>
+          <name>e6660015-3e4a-47d3-aee5-0458e8e8b8e3</name>
+          <entityField>ATTRIBUTE_TYPE</entityField>
+        </neonGenericMultipleTableColumn>
+        <neonGenericMultipleTableColumn>
+          <name>67d03576-b62e-42ab-a17e-220b2468a315</name>
+          <entityField>DROPDOWNDEFINITION</entityField>
+        </neonGenericMultipleTableColumn>
+      </columns>
+    </genericMultipleViewTemplate>
+  </children>
+</neonView>
diff --git a/neonView/AttributePreview_view/AttributePreview_view.aod b/neonView/AttributePreview_view/AttributePreview_view.aod
index bdcc189835..88b71eba21 100644
--- a/neonView/AttributePreview_view/AttributePreview_view.aod
+++ b/neonView/AttributePreview_view/AttributePreview_view.aod
@@ -45,5 +45,10 @@
       <entityField>AttributeUsages</entityField>
       <view>AttributeUsageList_view</view>
     </neonViewReference>
+    <neonViewReference>
+      <name>87719160-f477-49c7-b8de-5386d4c03a45</name>
+      <entityField>ChildAttributes</entityField>
+      <view>AttributeList_view</view>
+    </neonViewReference>
   </children>
 </neonView>
-- 
GitLab


From 4aa38b08af09ba6ef1ca87b2dabf0dd2a212e9e3 Mon Sep 17 00:00:00 2001
From: "S.Listl" <s.listl@adito.de>
Date: Tue, 25 Aug 2020 12:37:48 +0000
Subject: [PATCH 218/309] AnyContact_entity missing provider re-added

(cherry picked from commit 23b680404c70c3368b9a1350b5fd806f4794c185)
---
 .../AnyContact_entity/AnyContact_entity.aod   | 22 +++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/entity/AnyContact_entity/AnyContact_entity.aod b/entity/AnyContact_entity/AnyContact_entity.aod
index 1fa8e83a7e..65c0aee150 100644
--- a/entity/AnyContact_entity/AnyContact_entity.aod
+++ b/entity/AnyContact_entity/AnyContact_entity.aod
@@ -80,6 +80,28 @@
         </entityDependency>
       </dependencies>
     </entityProvider>
+    <entityProvider>
+      <name>ContactsByIds</name>
+      <documentation>%aditoprj%/entity/AnyContact_entity/entityfields/contactsbyids/documentation.adoc</documentation>
+      <dependencies>
+        <entityDependency>
+          <name>0206f7a8-fd58-47e8-8b7a-5ff4531e56fb</name>
+          <entityName>QuickEntry_entity</entityName>
+          <fieldName>OrgAndPersDuplicates</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+      </dependencies>
+      <children>
+        <entityParameter>
+          <name>ContactId_param</name>
+          <expose v="false" />
+        </entityParameter>
+      </children>
+    </entityProvider>
+    <entityParameter>
+      <name>ContactIds_param</name>
+      <expose v="true" />
+    </entityParameter>
     <entityField>
       <name>ADDRESS_ID</name>
       <title>standard address</title>
-- 
GitLab


From ace7d86c85d1d00bcd1ec766cda93a9f89872324 Mon Sep 17 00:00:00 2001
From: Sebastian Listl <s.listl@adito.de>
Date: Thu, 27 Aug 2020 09:56:19 +0200
Subject: [PATCH 219/309] Scan Service fixes

---
 .../entityfields/date_new/valueProcess.js     |  7 +------
 .../ActivityDetail_view.aod                   |  2 +-
 .../TurnoverChart_view/TurnoverChart_view.aod | 19 +++++++++++++++++++
 process/AI_lib/process.js                     | 16 ++++++++--------
 process/Placeholder_lib/process.js            |  2 --
 process/Sql_lib/process.js                    |  8 ++++++--
 6 files changed, 35 insertions(+), 19 deletions(-)

diff --git a/entity/Person_entity/entityfields/date_new/valueProcess.js b/entity/Person_entity/entityfields/date_new/valueProcess.js
index 9cf1e32dd7..a72892783b 100644
--- a/entity/Person_entity/entityfields/date_new/valueProcess.js
+++ b/entity/Person_entity/entityfields/date_new/valueProcess.js
@@ -1,12 +1,7 @@
-import("Entity_lib");
 import("system.util");
 import("system.result");
 import("system.neon");
 import("system.vars");
 
 if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
-    result.string(vars.get("$sys.date"));
-    
-    "$field.Attributes.deletedRows";
-    
-    EntityConsumerRowsHelper.getCurrentConsumerRows("Attributes", ["VALUE"])
\ No newline at end of file
+    result.string(vars.get("$sys.date"));
\ No newline at end of file
diff --git a/neonView/ActivityDetail_view/ActivityDetail_view.aod b/neonView/ActivityDetail_view/ActivityDetail_view.aod
index 2d9626e9c3..870b77975c 100644
--- a/neonView/ActivityDetail_view/ActivityDetail_view.aod
+++ b/neonView/ActivityDetail_view/ActivityDetail_view.aod
@@ -19,7 +19,7 @@
       <entityField>#ENTITY</entityField>
       <fields>
         <entityFieldLink>
-          <name>ca781b9b-9e93-41c3-9373-cb559c347194</name>
+          <name>041a6ded-06b3-4d84-be29-d89d01df6dec</name>
           <entityField>INFO</entityField>
         </entityFieldLink>
       </fields>
diff --git a/neonView/TurnoverChart_view/TurnoverChart_view.aod b/neonView/TurnoverChart_view/TurnoverChart_view.aod
index 48b21c537b..09c915ae24 100644
--- a/neonView/TurnoverChart_view/TurnoverChart_view.aod
+++ b/neonView/TurnoverChart_view/TurnoverChart_view.aod
@@ -3,6 +3,25 @@
   <name>TurnoverChart_view</name>
   <title></title>
   <majorModelMode>DISTRIBUTED</majorModelMode>
+  <dashletConfigurations>
+    <neonDashletConfiguration>
+      <name>TurnoverDashlet</name>
+      <title>Turnover</title>
+      <fragment>Turnover/full</fragment>
+      <singleton v="true" />
+      <storeRoles>
+        <element>INTERNAL_ADMINISTRATOR</element>
+        <element>INTERNAL_DASHBOARDSTOREADMIN</element>
+      </storeRoles>
+      <icon>VAADIN:CHART</icon>
+      <categories>
+        <neonDashletCategory>
+          <name>turnover</name>
+          <title>Turnover</title>
+        </neonDashletCategory>
+      </categories>
+    </neonDashletConfiguration>
+  </dashletConfigurations>
   <layout>
     <groupLayout>
       <name>layout</name>
diff --git a/process/AI_lib/process.js b/process/AI_lib/process.js
index b0f8c0f063..0709d3aeef 100644
--- a/process/AI_lib/process.js
+++ b/process/AI_lib/process.js
@@ -11,14 +11,14 @@ import("AI_lib");
 function AIUtil(){}
 
 
-function NBClassifier(options) {
-  options = options || {};
-  this.applyInverse = options.applyInverse || false;
-  this.probabilityThreshold = options.probabilityThreshold || 0.5;
-  this.defaultCategory = options.defaultCategory || null;
-  this.tokens = options.tokens || {};
-  this.categoryCounts = options.categoryCounts || {};
-  this.probabilities = options.probabilities || {};
+function NBClassifier(pOptions) {
+  pOptions = pOptions || {};
+  this.applyInverse = pOptions.applyInverse || false;
+  this.probabilityThreshold = pOptions.probabilityThreshold || 0.5;
+  this.defaultCategory = pOptions.defaultCategory || null;
+  this.tokens = pOptions.tokens || {};
+  this.categoryCounts = pOptions.categoryCounts || {};
+  this.probabilities = pOptions.probabilities || {};
 }
 
 
diff --git a/process/Placeholder_lib/process.js b/process/Placeholder_lib/process.js
index 4f271fa114..2c1cb9d821 100644
--- a/process/Placeholder_lib/process.js
+++ b/process/Placeholder_lib/process.js
@@ -106,8 +106,6 @@ PlaceholderUtils.getPlaceholders = function (pLocale, pIsExportTemplateField)
 
 /**
  * Returns the placeholder with the required prefix and postfix added.
- * 
- * @deprecated
  */
 PlaceholderUtils.formatPlaceholder = function (pPlaceholder)
 {
diff --git a/process/Sql_lib/process.js b/process/Sql_lib/process.js
index dda96f2019..16f855efb7 100644
--- a/process/Sql_lib/process.js
+++ b/process/Sql_lib/process.js
@@ -621,9 +621,11 @@ SqlCondition.prototype._init = function() {
  * @param {String} [pAlias=the current alias] the database alias where the condition shall be executed later (important for column types of preparedStatements)
  * 
  * @return {Array[][][]} Prepared condition with [condition, [[field, type]]]
+ * 
+ * @deprecated
  */
 SqlCondition.equals = function(pField, pValue, pAlternativeCond, pAlias) {
-    return SqlCondition.begin(pAlias).andPrepare(pField, pValue).build(pAlternativeCond);
+    return SqlCondition["begin"](pAlias).andPrepare(pField, pValue).build(pAlternativeCond);
 }
 
 /**
@@ -634,9 +636,11 @@ SqlCondition.equals = function(pField, pValue, pAlternativeCond, pAlias) {
  * @param {String} [pAlias=the current alias] the database alias where the condition shall be executed later (important for column types of preparedStatements)
  * 
  * @return {Array[][][]} Prepared condition with [condition, [[field, type]]]
+ * 
+ * @deprecated
  */
 SqlCondition.equalsNot = function(pField, pValue, pAlternativeCond, pAlias) {
-    return SqlCondition.begin(pAlias).andPrepare(pField, pValue, "# <> ?").build(pAlternativeCond);
+    return SqlCondition["begin"](pAlias).andPrepare(pField, pValue, "# <> ?").build(pAlternativeCond);
 }
 
 // see Documentation property of this lib for further explanation
-- 
GitLab


From 0f0a1719f426203f12be8b0363bcde61c6bb3a54 Mon Sep 17 00:00:00 2001
From: Sebastian Listl <s.listl@adito.de>
Date: Thu, 27 Aug 2020 14:55:00 +0200
Subject: [PATCH 220/309] Attribute sorting fixed

---
 entity/Attribute_entity/Attribute_entity.aod  |  6 ++++-
 .../attributechildren/documentation.adoc      |  4 +++
 entity/Attribute_entity/onValidation.js       | 25 -------------------
 .../recordcontainers/jdito/onInsert.js        | 14 +++++++++--
 .../AttributeList_view/AttributeList_view.aod |  3 +++
 5 files changed, 24 insertions(+), 28 deletions(-)
 create mode 100644 entity/Attribute_entity/entityfields/attributechildren/documentation.adoc
 delete mode 100644 entity/Attribute_entity/onValidation.js

diff --git a/entity/Attribute_entity/Attribute_entity.aod b/entity/Attribute_entity/Attribute_entity.aod
index d6f3d3eec9..07f9d8460e 100644
--- a/entity/Attribute_entity/Attribute_entity.aod
+++ b/entity/Attribute_entity/Attribute_entity.aod
@@ -7,7 +7,6 @@
   <grantDeleteProcess>%aditoprj%/entity/Attribute_entity/grantDeleteProcess.js</grantDeleteProcess>
   <contentTitleProcess>%aditoprj%/entity/Attribute_entity/contentTitleProcess.js</contentTitleProcess>
   <afterUiInit>%aditoprj%/entity/Attribute_entity/afterUiInit.js</afterUiInit>
-  <onValidation>%aditoprj%/entity/Attribute_entity/onValidation.js</onValidation>
   <iconId>VAADIN:TAG</iconId>
   <titlePlural>Attributes</titlePlural>
   <recordContainer>jdito</recordContainer>
@@ -390,6 +389,7 @@
     <entityProvider>
       <name>AttributeChildren</name>
       <sortingField>SORTING</sortingField>
+      <documentation>%aditoprj%/entity/Attribute_entity/entityfields/attributechildren/documentation.adoc</documentation>
       <titlePlural>Child Attributes</titlePlural>
       <dependencies>
         <entityDependency>
@@ -433,6 +433,10 @@
           <valueProcess>%aditoprj%/entity/Attribute_entity/entityfields/attributechildren/children/getonlyfirstlevelchildren_param/valueProcess.js</valueProcess>
           <expose v="false" />
         </entityParameter>
+        <entityParameter>
+          <name>ParentId_param</name>
+          <mandatory v="true" />
+        </entityParameter>
       </children>
     </entityProvider>
     <entityConsumer>
diff --git a/entity/Attribute_entity/entityfields/attributechildren/documentation.adoc b/entity/Attribute_entity/entityfields/attributechildren/documentation.adoc
new file mode 100644
index 0000000000..f9ca1e5e22
--- /dev/null
+++ b/entity/Attribute_entity/entityfields/attributechildren/documentation.adoc
@@ -0,0 +1,4 @@
+= AttributeChildren
+
+This provider can be used to get all child Attributes of a given parent. It is intended for displaying and editing the childs of an Attribute in the 
+Attribute context and allows to sort them. Only the direct children are returned.
\ No newline at end of file
diff --git a/entity/Attribute_entity/onValidation.js b/entity/Attribute_entity/onValidation.js
deleted file mode 100644
index f1b6c7fc1f..0000000000
--- a/entity/Attribute_entity/onValidation.js
+++ /dev/null
@@ -1,25 +0,0 @@
-import("system.translate");
-import("system.db");
-import("system.vars");
-import("system.text");
-import("system.neon");
-import("Sql_lib");
-
-//TODO: this should no happen in onValidation; waiting for #1032668
-if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
-{
-    var parentId = vars.get("$field.ATTRIBUTE_PARENT_ID");
-    if (parentId)
-    {
-        var maskingHelper = new SqlMaskingUtils();
-        var newCodeNumber = newSelect(maskingHelper.max("AB_ATTRIBUTE.SORTING"))
-                        .from("AB_ATTRIBUTE")
-                        .where("AB_ATTRIBUTE.ATTRIBUTE_PARENT_ID", parentId)
-                        .cell();
-                        
-        newCodeNumber = Number(newCodeNumber);//if no number exists till no, start value will be 1 (due to: ++0)
-        if (isNaN(newCodeNumber))
-            throw new TypeError(translate.text("The code number is not a valid number."));
-        neon.setFieldValue("$field.SORTING", ++newCodeNumber);
-    }
-}
\ No newline at end of file
diff --git a/entity/Attribute_entity/recordcontainers/jdito/onInsert.js b/entity/Attribute_entity/recordcontainers/jdito/onInsert.js
index 7e2f545778..9678a3d086 100644
--- a/entity/Attribute_entity/recordcontainers/jdito/onInsert.js
+++ b/entity/Attribute_entity/recordcontainers/jdito/onInsert.js
@@ -4,15 +4,25 @@ import("Attribute_lib");
 
 var rowdata = vars.get("$local.rowdata");
 
+var sorting = rowdata["SORTING.value"];
+var parentId = rowdata["ATTRIBUTE_PARENT_ID.value"];
+if (!sorting && parentId)
+{
+    sorting = newSelect("max(SORTING) + 1")
+        .from("AB_ATTRIBUTE")
+        .where("AB_ATTRIBUTE.ATTRIBUTE_PARENT_ID", parentId)
+        .cell() || 0;
+}
+
 new SqlBuilder().insertFields({
     "AB_ATTRIBUTEID" : rowdata["UID.value"],
-    "ATTRIBUTE_PARENT_ID" : rowdata["ATTRIBUTE_PARENT_ID.value"],
+    "ATTRIBUTE_PARENT_ID" : parentId,
     "DROPDOWNDEFINITION" : rowdata["DROPDOWNDEFINITION.value"],
     "ATTRIBUTE_ACTIVE" : rowdata["ATTRIBUTE_ACTIVE.value"],
     "ATTRIBUTE_NAME" : rowdata["ATTRIBUTE_NAME.value"],
     "ATTRIBUTE_TYPE" : rowdata["ATTRIBUTE_TYPE.value"],
     "DROPDOWNFILTER" : rowdata["DROPDOWNFILTER.value"],
-    "SORTING" : rowdata["SORTING.value"]
+    "SORTING" : sorting
 }, "AB_ATTRIBUTE");
 
 if (rowdata["ATTRIBUTE_PARENT_ID.value"] && rowdata["ATTRIBUTE_TYPE.value"] !== $AttributeTypes.COMBOVALUE.toString() && vars.get("$param.GetOnlyFirstLevelChildren_param"))
diff --git a/neonView/AttributeList_view/AttributeList_view.aod b/neonView/AttributeList_view/AttributeList_view.aod
index 774de73db9..167cf43d52 100644
--- a/neonView/AttributeList_view/AttributeList_view.aod
+++ b/neonView/AttributeList_view/AttributeList_view.aod
@@ -11,6 +11,9 @@
     <titledListViewTemplate>
       <name>AttributeList</name>
       <entityField>#ENTITY</entityField>
+      <isDeletable v="false" />
+      <isEditable v="false" />
+      <isCreatable v="false" />
       <columns>
         <neonTitledListTableColumn>
           <name>96544713-a302-4e2f-ab7f-6c02d44d9908</name>
-- 
GitLab


From 55a86a6df1e2c974a56740619610b9cf9c3b5a3c Mon Sep 17 00:00:00 2001
From: "j.goderbauer" <j.goderbauer@adito.de>
Date: Thu, 27 Aug 2020 15:40:06 +0200
Subject: [PATCH 221/309] Address_lib: added small documentation with
 FAQ-section.

---
 process/Address_lib/Address_lib.aod    |  1 +
 process/Address_lib/documentation.adoc | 29 ++++++++++++++++++++++++++
 2 files changed, 30 insertions(+)
 create mode 100644 process/Address_lib/documentation.adoc

diff --git a/process/Address_lib/Address_lib.aod b/process/Address_lib/Address_lib.aod
index 5e7cbd6ac0..dc170bb2e0 100644
--- a/process/Address_lib/Address_lib.aod
+++ b/process/Address_lib/Address_lib.aod
@@ -2,6 +2,7 @@
 <process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.1">
   <name>Address_lib</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
+  <documentation>%aditoprj%/process/Address_lib/documentation.adoc</documentation>
   <process>%aditoprj%/process/Address_lib/process.js</process>
   <variants>
     <element>LIBRARY</element>
diff --git a/process/Address_lib/documentation.adoc b/process/Address_lib/documentation.adoc
new file mode 100644
index 0000000000..427c006157
--- /dev/null
+++ b/process/Address_lib/documentation.adoc
@@ -0,0 +1,29 @@
+= Address_lib
+
+This is a library for working with big amounts of the combination of the following data:
+
+* addresses
+* person-contacts
+* organisation-contacts
+
+as well as related data like the standard communication data.
+
+This is mainly done via the `AddressObject` which uses database access for loading the data and 
+placeholder-definitions for preparing and formatting the data.
+
+== FAQ
+
+[qanda]
+How to get the correct formatted standard address for a single contact, depending on the country?::
+  This can be easily done via the following code-snippet where the variable `contactId` is 
+  the `CONTACT.CONTACTID` of the address where you want to load the data: 
+
+  new AddressObject(contactId).getFormattedAddress();
+
+
+How to get the correct formatted standard address for several contacts, depending on their country?::
+  This can be easily done via the following code-snippet where the variable `contactIds` is 
+  an array of `CONTACT.CONTACTID` where you want to load the address data from and `config` the 
+  placeholder configuration: 
+
+  getAddressesData([contactIds], config);
\ No newline at end of file
-- 
GitLab


From 28d43a38c6c2c8a2a34852da15c575b4574af274 Mon Sep 17 00:00:00 2001
From: "j.goderbauer" <j.goderbauer@adito.de>
Date: Thu, 27 Aug 2020 15:54:35 +0200
Subject: [PATCH 222/309] Sql_lib: SqlBuilder accepts conditions constants
 like: SqlBuilder.EQUAL (the whole function)

---
 .../recordcontainers/db/conditionProcess.js                 | 2 +-
 process/Sql_lib/process.js                                  | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/entity/ActivityLink_entity/recordcontainers/db/conditionProcess.js b/entity/ActivityLink_entity/recordcontainers/db/conditionProcess.js
index 174ad7f6d1..5cb1b40d4c 100644
--- a/entity/ActivityLink_entity/recordcontainers/db/conditionProcess.js
+++ b/entity/ActivityLink_entity/recordcontainers/db/conditionProcess.js
@@ -3,7 +3,7 @@ import("system.db");
 import("system.result");
 import("Sql_lib");
 
-var cond = newWhereIfSet("ACTIVITYLINK.ACTIVITY_ID", "$param.ActivityId_param");
+var cond = newWhereIfSet("ACTIVITYLINK.ACTIVITY_ID", "$param.ActivityId_param", SqlBuilder.EQUAL);
 
 //TODO: use a preparedCondition (.build instead of .toString) when available #1030812 #1034026
 result.string(cond.toString());
\ No newline at end of file
diff --git a/process/Sql_lib/process.js b/process/Sql_lib/process.js
index 16f855efb7..b998ddb47f 100644
--- a/process/Sql_lib/process.js
+++ b/process/Sql_lib/process.js
@@ -1445,6 +1445,8 @@ SqlBuilder.prototype._addWhere = function(pFieldOrCond, pValue, pMandatory, pCon
 {
     //In a special case, pCondition can be a function. It will be called with the alias as argument and
     //must return an array of the condition string and (optionally) the required sql field type.
+    //alternatively the function may return a string only to make the usage more bulletproof and convenient, so both SqlBuilder.EQUAL() 
+    //and SqlBuilder.EQUAL work equally 
     if (pCondition && typeof pCondition === "function")
     {
         var resCond = pCondition(this.alias);
@@ -1453,6 +1455,10 @@ SqlBuilder.prototype._addWhere = function(pFieldOrCond, pValue, pMandatory, pCon
             pCondition = resCond[0];
             pFieldType = pFieldType || resCond[1];
         }
+        else if(typeof(resCond) == "string")
+        {
+            pCondition = resCond;
+        }
     }
     
     if (pCondition && !SqlUtils.checkConditionFormat(pCondition)) 
-- 
GitLab


From 89bddeea10dfb1305fd314b22b148b73734ddba9 Mon Sep 17 00:00:00 2001
From: "j.goderbauer" <j.goderbauer@adito.de>
Date: Thu, 27 Aug 2020 15:56:48 +0200
Subject: [PATCH 223/309] Sql_lib: SqlBuilder accepts conditions constants
 like: SqlBuilder.EQUAL (the whole function) Reverted test code

---
 .../ActivityLink_entity/recordcontainers/db/conditionProcess.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/entity/ActivityLink_entity/recordcontainers/db/conditionProcess.js b/entity/ActivityLink_entity/recordcontainers/db/conditionProcess.js
index 5cb1b40d4c..8c0ab0e94b 100644
--- a/entity/ActivityLink_entity/recordcontainers/db/conditionProcess.js
+++ b/entity/ActivityLink_entity/recordcontainers/db/conditionProcess.js
@@ -3,7 +3,7 @@ import("system.db");
 import("system.result");
 import("Sql_lib");
 
-var cond = newWhereIfSet("ACTIVITYLINK.ACTIVITY_ID", "$param.ActivityId_param", SqlBuilder.EQUAL);
+var cond = newWhereIfSet("ACTIVITYLINK.ACTIVITY_ID", "$param.ActivityId_param", SqlBuilder.EQUAL());
 
 //TODO: use a preparedCondition (.build instead of .toString) when available #1030812 #1034026
 result.string(cond.toString());
\ No newline at end of file
-- 
GitLab


From 72c7ce085e16684b602059aab938171c18b90ce5 Mon Sep 17 00:00:00 2001
From: "j.goderbauer" <j.goderbauer@adito.de>
Date: Thu, 27 Aug 2020 17:02:58 +0200
Subject: [PATCH 224/309] Sql_lib: SqlBuilder accepts conditions constants
 like: SqlBuilder.EQUAL (the whole function) using Util_lib for typecheck now

---
 process/Sql_lib/process.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/process/Sql_lib/process.js b/process/Sql_lib/process.js
index b998ddb47f..9e9dfd908b 100644
--- a/process/Sql_lib/process.js
+++ b/process/Sql_lib/process.js
@@ -1455,7 +1455,7 @@ SqlBuilder.prototype._addWhere = function(pFieldOrCond, pValue, pMandatory, pCon
             pCondition = resCond[0];
             pFieldType = pFieldType || resCond[1];
         }
-        else if(typeof(resCond) == "string")
+        else if(Utils.isString(pCondition))
         {
             pCondition = resCond;
         }
-- 
GitLab


From dd0c4ae7c80f7c8c98ba5be704d692ee744803b2 Mon Sep 17 00:00:00 2001
From: "j.goderbauer" <j.goderbauer@adito.de>
Date: Thu, 27 Aug 2020 17:03:18 +0200
Subject: [PATCH 225/309] Nominatim: change password property to type Password

---
 .../_____PREFERENCES_PROJECT.aod                         | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/preferences/_____PREFERENCES_PROJECT/_____PREFERENCES_PROJECT.aod b/preferences/_____PREFERENCES_PROJECT/_____PREFERENCES_PROJECT.aod
index f4ab2a5cea..4294784e02 100644
--- a/preferences/_____PREFERENCES_PROJECT/_____PREFERENCES_PROJECT.aod
+++ b/preferences/_____PREFERENCES_PROJECT/_____PREFERENCES_PROJECT.aod
@@ -85,10 +85,6 @@
       <name>nominatim.user</name>
       <property>aditouser</property>
     </customStringProperty>
-    <customStringProperty>
-      <name>nominatim.pw</name>
-      <property>useradito</property>
-    </customStringProperty>
     <customIntegerProperty>
       <name>duplicates.dataBlockSize</name>
       <property v="5000" />
@@ -108,6 +104,11 @@
       <description></description>
       <property v="false" />
     </customBooleanProperty>
+    <customPasswordProperty>
+      <name>nominatim.pw</name>
+      <description></description>
+      <property>useradito</property>
+    </customPasswordProperty>
   </customProperties>
   <customConfigProperties>
     <customBooleanProperty>
-- 
GitLab


From 30739bc5f44c77a2399dd3d23783b6125c01a918 Mon Sep 17 00:00:00 2001
From: "j.goderbauer" <j.goderbauer@adito.de>
Date: Thu, 27 Aug 2020 17:40:58 +0200
Subject: [PATCH 226/309] [Projekt: Entwicklung - Neon][TicketNr.:
 1063338][Hinterlegen Standardprozess am RecordContainer im cacheKeyProzess]

---
 process/CachedRecordContainer_lib/process.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/process/CachedRecordContainer_lib/process.js b/process/CachedRecordContainer_lib/process.js
index 0d2da5b581..e44f4dfa90 100644
--- a/process/CachedRecordContainer_lib/process.js
+++ b/process/CachedRecordContainer_lib/process.js
@@ -1,4 +1,5 @@
 import("system.vars");
+import("Util_lib");
 
 /**
  * provides field-preset-constants for cached data records
@@ -58,7 +59,6 @@ CachedRecordContainerFieldPresets.STANDARD_WITH_LOCALE = function(){
         //there is no locale-variable for the server, so let's just store THAT it's the locale of the serverprocess
         res.unshift("_____serverlocale");
     }
-    res = res.concat(CachedRecordContainerFieldPresets.STANDARD());
     return res;
 };
 
@@ -124,7 +124,7 @@ CachedRecordContainerUtils.getCommonKey = function(pExtendedVariable1, pExtended
  */
 CachedRecordContainerUtils.getKeyWithPreset = function(pPreset, pExtendedVariable1, pExtendedVariableN) {
     var varsToCheck;
-    if (typeof (pPreset) == "function")
+    if (Utils.isFunction(pPreset))
         varsToCheck = pPreset.call();
     else if (Array.isArray(pPreset))
         varsToCheck = pPreset;
-- 
GitLab


From 36af0f88a4adbe697f20f8f65d0dff2837b96b74 Mon Sep 17 00:00:00 2001
From: Sebastian Listl <s.listl@adito.de>
Date: Fri, 28 Aug 2020 11:43:54 +0200
Subject: [PATCH 227/309] Attribute onUpdate and onDelete used wrong uid

---
 entity/Attribute_entity/recordcontainers/jdito/onDelete.js | 4 ++--
 entity/Attribute_entity/recordcontainers/jdito/onUpdate.js | 2 +-
 neonView/AttributePreview_view/AttributePreview_view.aod   | 4 ----
 process/Entity_lib/process.js                              | 2 +-
 4 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/entity/Attribute_entity/recordcontainers/jdito/onDelete.js b/entity/Attribute_entity/recordcontainers/jdito/onDelete.js
index e4969d923b..fc8ed47c69 100644
--- a/entity/Attribute_entity/recordcontainers/jdito/onDelete.js
+++ b/entity/Attribute_entity/recordcontainers/jdito/onDelete.js
@@ -2,10 +2,10 @@ import("Sql_lib");
 import("system.vars");
 import("Attribute_lib");
 
-newWhere("AB_ATTRIBUTE.AB_ATTRIBUTEID", "$field.UID")
+newWhere("AB_ATTRIBUTE.AB_ATTRIBUTEID", "$local.uid")
     .deleteData();
 
-var attributeId = vars.get("$field.UID");
+var attributeId = vars.get("$local.uid");
 
 var childIds = AttributeUtil.getAllChildren(attributeId).concat(attributeId);
 
diff --git a/entity/Attribute_entity/recordcontainers/jdito/onUpdate.js b/entity/Attribute_entity/recordcontainers/jdito/onUpdate.js
index f12f4d4491..b3012b5a5b 100644
--- a/entity/Attribute_entity/recordcontainers/jdito/onUpdate.js
+++ b/entity/Attribute_entity/recordcontainers/jdito/onUpdate.js
@@ -20,5 +20,5 @@ vars.get("$local.changed").forEach(function (field)
         fieldValues[dbField] = rowdata[field] || "";
 });
 
-newWhere("AB_ATTRIBUTE.AB_ATTRIBUTEID", "$field.UID")
+newWhere("AB_ATTRIBUTE.AB_ATTRIBUTEID", "$local.uid")
     .updateFields(fieldValues);
diff --git a/neonView/AttributePreview_view/AttributePreview_view.aod b/neonView/AttributePreview_view/AttributePreview_view.aod
index 88b71eba21..f7164ab694 100644
--- a/neonView/AttributePreview_view/AttributePreview_view.aod
+++ b/neonView/AttributePreview_view/AttributePreview_view.aod
@@ -34,10 +34,6 @@
           <name>70953962-9472-484b-ac95-567d2249f42e</name>
           <entityField>ATTRIBUTE_ACTIVE</entityField>
         </entityFieldLink>
-        <entityFieldLink>
-          <name>1b1cfdcb-fcab-4ca9-b0e0-b69fe88b65f0</name>
-          <entityField>SORTING</entityField>
-        </entityFieldLink>
       </fields>
     </genericViewTemplate>
     <neonViewReference>
diff --git a/process/Entity_lib/process.js b/process/Entity_lib/process.js
index 93360446bc..126ef4f9e1 100644
--- a/process/Entity_lib/process.js
+++ b/process/Entity_lib/process.js
@@ -233,7 +233,7 @@ HasLinkedObjectTester._testForConsumer = function ()
  */
 HasLinkedObjectTester._testForCallback = function ()
 {
-    fnResult = this.callbackFn();
+    var fnResult = this.callbackFn();
     return this.failValue
         ? fnResult != this.failValue
         : fnResult;
-- 
GitLab


From 9e7de9512cc6af6ac7e89a06de6786c9f5a2af81 Mon Sep 17 00:00:00 2001
From: Tom Lutzenberger <t.lutzenberger@adito.de>
Date: Mon, 24 Aug 2020 15:36:39 +0200
Subject: [PATCH 228/309] #1058862: Adjust user settings layout

---
 .../UsersettingsEdit_view.aod                 | 43 ++++++++++++++++---
 1 file changed, 37 insertions(+), 6 deletions(-)

diff --git a/neonView/UsersettingsEdit_view/UsersettingsEdit_view.aod b/neonView/UsersettingsEdit_view/UsersettingsEdit_view.aod
index 663f3fc283..6d5d9d8057 100644
--- a/neonView/UsersettingsEdit_view/UsersettingsEdit_view.aod
+++ b/neonView/UsersettingsEdit_view/UsersettingsEdit_view.aod
@@ -10,8 +10,11 @@
   </layout>
   <children>
     <genericViewTemplate>
-      <name>Edit</name>
+      <name>PasswordEdit</name>
       <editMode v="true" />
+      <showDrawer v="true" />
+      <drawerCaption>Password</drawerCaption>
+      <fixedDrawer v="true" />
       <hideEmptyFields v="false" />
       <entityField>#ENTITY</entityField>
       <isEditable v="true" />
@@ -29,27 +32,55 @@
           <name>d4f20a8d-edf8-468b-870e-43dec3fb6d3b</name>
           <entityField>jPasswordRepeat</entityField>
         </entityFieldLink>
+      </fields>
+    </genericViewTemplate>
+    <genericViewTemplate>
+      <name>SearchEdit</name>
+      <editMode v="true" />
+      <showDrawer v="true" />
+      <drawerCaption>Search</drawerCaption>
+      <fixedDrawer v="true" />
+      <entityField>#ENTITY</entityField>
+      <fields>
         <entityFieldLink>
-          <name>d9a71143-449a-4b39-8e21-c68024fb1d5b</name>
+          <name>d028eaa3-7250-4b9f-be94-4c097b426506</name>
           <entityField>selectionIgnoreCase</entityField>
         </entityFieldLink>
         <entityFieldLink>
-          <name>70a95008-7ecc-4ffb-bcce-cbc4c80e0fb5</name>
+          <name>e632f409-891a-4c02-b077-962d40b657f9</name>
           <entityField>selectionPlaceholder</entityField>
         </entityFieldLink>
+      </fields>
+    </genericViewTemplate>
+    <genericViewTemplate>
+      <name>CalendarEdit</name>
+      <editMode v="true" />
+      <showDrawer v="true" />
+      <drawerCaption>Calendar</drawerCaption>
+      <fixedDrawer v="true" />
+      <entityField>#ENTITY</entityField>
+      <fields>
         <entityFieldLink>
-          <name>5f7214d7-4ccd-4e7e-98e1-f5f9fe362d6e</name>
+          <name>6c58b326-3fe6-4b1d-a6d4-1735861c419a</name>
           <entityField>calMaintimeStart</entityField>
         </entityFieldLink>
         <entityFieldLink>
-          <name>1fb97320-fddf-4ed1-a4f8-428a6a162b36</name>
+          <name>1463dddd-efa6-4fff-bb7e-ee1bc190f077</name>
           <entityField>calMaintimeEnd</entityField>
         </entityFieldLink>
         <entityFieldLink>
-          <name>aecba9f5-0d12-455b-806c-a3a93589ffc1</name>
+          <name>4bb63da1-6a83-4f68-8605-11dd43501b7b</name>
           <entityField>calHourdivider</entityField>
         </entityFieldLink>
       </fields>
     </genericViewTemplate>
+    <genericViewTemplate>
+      <name>OtherSettings</name>
+      <editMode v="true" />
+      <showDrawer v="true" />
+      <drawerCaption>Others</drawerCaption>
+      <fixedDrawer v="true" />
+      <entityField>#ENTITY</entityField>
+    </genericViewTemplate>
   </children>
 </neonView>
-- 
GitLab


From 13f9f4e7c1d743e583b4f11fb93a212eb18ff3ed Mon Sep 17 00:00:00 2001
From: Tom Lutzenberger <t.lutzenberger@adito.de>
Date: Fri, 28 Aug 2020 10:03:14 +0200
Subject: [PATCH 229/309] #1058862: Improve validation and template after
 review

---
 .../Usersettings_entity.aod                   |   6 +
 .../currentpassword/onValidation.js           |   8 +-
 .../currentpassword/stateProcess.js           |  11 ++
 .../entityfields/jpassword/onValidation.js    |  14 ++-
 .../jpasswordrepeat/onValidation.js           |   6 +-
 .../_____LANGUAGE_EXTRA.aod                   |  48 +++++++
 .../_____LANGUAGE_de/_____LANGUAGE_de.aod     | 118 ++++++++++++------
 .../_____LANGUAGE_en/_____LANGUAGE_en.aod     |  48 +++++++
 .../UsersettingsEdit_view.aod                 |  48 -------
 process/UserSettings_lib/process.js           |   2 +
 10 files changed, 215 insertions(+), 94 deletions(-)
 create mode 100644 entity/Usersettings_entity/entityfields/currentpassword/stateProcess.js

diff --git a/entity/Usersettings_entity/Usersettings_entity.aod b/entity/Usersettings_entity/Usersettings_entity.aod
index fd32d56552..cf2a798f71 100644
--- a/entity/Usersettings_entity/Usersettings_entity.aod
+++ b/entity/Usersettings_entity/Usersettings_entity.aod
@@ -60,6 +60,11 @@
       <name>jPasswordRepeat</name>
       <title>Repeat password</title>
       <contentType>PASSWORD</contentType>
+      <onValueChangeTypes>
+        <element>MASK</element>
+        <element>PROCESS</element>
+        <element>PROCESS_SETVALUE</element>
+      </onValueChangeTypes>
       <onValidation>%aditoprj%/entity/Usersettings_entity/entityfields/jpasswordrepeat/onValidation.js</onValidation>
     </entityField>
     <entityField>
@@ -69,6 +74,7 @@
       <name>currentPassword</name>
       <title>Current password</title>
       <contentType>PASSWORD</contentType>
+      <stateProcess>%aditoprj%/entity/Usersettings_entity/entityfields/currentpassword/stateProcess.js</stateProcess>
       <onValidation>%aditoprj%/entity/Usersettings_entity/entityfields/currentpassword/onValidation.js</onValidation>
     </entityField>
   </entityFields>
diff --git a/entity/Usersettings_entity/entityfields/currentpassword/onValidation.js b/entity/Usersettings_entity/entityfields/currentpassword/onValidation.js
index 2aff40611b..b297a811ec 100644
--- a/entity/Usersettings_entity/entityfields/currentpassword/onValidation.js
+++ b/entity/Usersettings_entity/entityfields/currentpassword/onValidation.js
@@ -1,4 +1,5 @@
 import("system.result");
+import("system.neon");
 import("system.translate");
 import("system.tools");
 import("system.vars");
@@ -8,6 +9,9 @@ import("UserSettings_lib");
 let login = UserSettingUtil.getValue("title");
 let password = vars.get("$local.value");
 
-if(password && !tools.verifyPassword(login, password)) {
-    result.string(translate.text("Wrong password"));
+
+if(vars.get("$property.currentPassword.state") !== neon.COMPONENTSTATE_INVISIBLE) {
+    if(password && !tools.verifyPassword(login, password)) {
+        result.string(translate.text("Wrong password"));
+    }
 }
diff --git a/entity/Usersettings_entity/entityfields/currentpassword/stateProcess.js b/entity/Usersettings_entity/entityfields/currentpassword/stateProcess.js
new file mode 100644
index 0000000000..c2a5cd75d9
--- /dev/null
+++ b/entity/Usersettings_entity/entityfields/currentpassword/stateProcess.js
@@ -0,0 +1,11 @@
+import("system.neon");
+import("system.result");
+import("system.tools");
+import("UserSettings_lib");
+
+
+let login = UserSettingUtil.getValue("title");
+
+if(tools.verifyPassword(login, "")) {
+    result.string(neon.COMPONENTSTATE_INVISIBLE);
+}
diff --git a/entity/Usersettings_entity/entityfields/jpassword/onValidation.js b/entity/Usersettings_entity/entityfields/jpassword/onValidation.js
index ee0296a725..a2d5661928 100644
--- a/entity/Usersettings_entity/entityfields/jpassword/onValidation.js
+++ b/entity/Usersettings_entity/entityfields/jpassword/onValidation.js
@@ -1,3 +1,4 @@
+import("system.neon");
 import("system.result");
 import("system.translate");
 import("system.tools");
@@ -10,14 +11,19 @@ let policyMessages = tools.validatePasswordPolicies(newPassword, vars.get("$sys.
 let messages = [];
 
 if(newPassword) {
-    if(newPassword === currentPassword) {
-        result.string(translate.text("New password must not be the same as the current password"));
+    if(vars.get("$property.currentPassword.state") !== neon.COMPONENTSTATE_INVISIBLE) {
+        if(!currentPassword) {
+            messages.push(translate.text("Enter current password to verify"));
+        } else if(newPassword === currentPassword) {
+            messages.push(translate.text("New password must not be the same as the current password"));
+        }
     }
-    
+
     if(policyMessages.length > 0) {
         for(let msg in policyMessages) {
             messages.push(policyMessages[msg]);
         }
-        result.string(messages.join("\n", messages));
     }
+    
+    result.string(messages.join("\n", messages));
 }
diff --git a/entity/Usersettings_entity/entityfields/jpasswordrepeat/onValidation.js b/entity/Usersettings_entity/entityfields/jpasswordrepeat/onValidation.js
index 9fa42ffff6..5ec99b485f 100644
--- a/entity/Usersettings_entity/entityfields/jpasswordrepeat/onValidation.js
+++ b/entity/Usersettings_entity/entityfields/jpasswordrepeat/onValidation.js
@@ -6,8 +6,6 @@ import("system.vars");
 let passwordRepeat = vars.get("$local.value");
 let newPassword = vars.get("$field.jPassword");
 
-if(passwordRepeat) {
-    if(newPassword !== passwordRepeat) {
-        result.string(translate.text("Passwords do not match"));
-    }
+if(newPassword !== passwordRepeat) {
+    result.string(translate.text("Passwords do not match"));
 }
diff --git a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
index a70bdc4dad..d09abcb5d7 100644
--- a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
+++ b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
@@ -7149,6 +7149,54 @@
     <entry>
       <key>export using the selected template</key>
     </entry>
+    <entry>
+      <key>Input value</key>
+    </entry>
+    <entry>
+      <key>Output value</key>
+    </entry>
+    <entry>
+      <key>Enddatum</key>
+    </entry>
+    <entry>
+      <key>Startdatum</key>
+    </entry>
+    <entry>
+      <key>Mapping</key>
+    </entry>
+    <entry>
+      <key>Typ</key>
+    </entry>
+    <entry>
+      <key>Mappings</key>
+    </entry>
+    <entry>
+      <key>Sort up</key>
+    </entry>
+    <entry>
+      <key>Titel</key>
+    </entry>
+    <entry>
+      <key>Set missing address locations</key>
+    </entry>
+    <entry>
+      <key>Sort down</key>
+    </entry>
+    <entry>
+      <key>FavoriteFilter_view</key>
+    </entry>
+    <entry>
+      <key>Set all address locations</key>
+    </entry>
+    <entry>
+      <key>Members</key>
+    </entry>
+    <entry>
+      <key>Gruppenname</key>
+    </entry>
+    <entry>
+      <key>Enter current password to verify</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 ce7257504d..784b00d216 100644
--- a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
+++ b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
@@ -707,6 +707,9 @@
       <key>None</key>
       <value>Keine</value>
     </entry>
+    <entry>
+      <key>Edit workflow</key>
+    </entry>
     <entry>
       <key>Date of request</key>
       <value>Datum der Anforderung</value>
@@ -8992,9 +8995,6 @@ Bitte Datumseingabe prüfen</value>
     <entry>
       <key>Receive new Department Permission</key>
     </entry>
-    <entry>
-      <key>Selection placeholder</key>
-    </entry>
     <entry>
       <key>Grant new Department Permission</key>
       <value>Neue Abteilungs-Berechtigung vergeben</value>
@@ -9004,56 +9004,76 @@ Bitte Datumseingabe prüfen</value>
       <value>Aktuelles Passwort</value>
     </entry>
     <entry>
-      <key>Calendar maintime start</key>
-      <value>Kalender-Kernzeit Beginn</value>
+      <key>New password</key>
+      <value>Neues Passwort</value>
     </entry>
     <entry>
-      <key>favorties</key>
+      <key>Repeat password</key>
+      <value>Passwort wiederholen</value>
     </entry>
     <entry>
-      <key>Fantasy</key>
+      <key>Enter current password to verify</key>
+      <value>Aktuelles Passwort zur Verifizierung eingeben</value>
     </entry>
     <entry>
-      <key>Password must contain special characters</key>
+      <key>Selection placeholder</key>
+      <value>Suche Platzhalter</value>
     </entry>
     <entry>
-      <key>Longitude</key>
+      <key>SELECTION_POSTFIX</key>
+      <value>Hinten</value>
     </entry>
     <entry>
-      <key>Password must be at least %0 characters</key>
+      <key>SELECTION_PREFIX</key>
+      <value>Vorne</value>
     </entry>
     <entry>
-      <key>Permission Procurer Department</key>
-      <value>Rechteempfänger Abteilung</value>
+      <key>SELECTION_BOTH</key>
+      <value>Vorne und hinten</value>
     </entry>
     <entry>
-      <key>favorite</key>
+      <key>SELECTION_NEITHER</key>
+      <value>Berücksichtigen</value>
     </entry>
     <entry>
-      <key>Repeat password</key>
-      <value>Passwort wiederholen</value>
+      <key>SELECTION_NULL</key>
+      <value>Ignorieren</value>
     </entry>
     <entry>
-      <key>{SENT_MAIL}</key>
+      <key>Selection ignore case</key>
+      <value>Groß-/Kleinschreibung ignorieren</value>
     </entry>
     <entry>
-      <key>SELECTION_NULL</key>
+      <key>Calendar hour divider</key>
+      <value>Stundenunterteilung</value>
     </entry>
     <entry>
-      <key>Selection ignore case</key>
+      <key>Calendar maintime start</key>
+      <value>Kernzeit Beginn</value>
     </entry>
     <entry>
       <key>Calendar maintime end</key>
-      <value>Kalender-Kernzeit Ende</value>
+      <value>Kernzeit Ende</value>
     </entry>
     <entry>
-      <key>Release</key>
+      <key>{SENT_MAIL}</key>
     </entry>
     <entry>
-      <key>SELECTION_NEITHER</key>
+      <key>favorties</key>
+    </entry>
+    <entry>
+      <key>Fantasy</key>
     </entry>
     <entry>
-      <key>Password must contain numbers</key>
+      <key>Permission Procurer Department</key>
+      <value>Rechteempfänger Abteilung</value>
+    </entry>
+    <entry>
+    <entry>
+      <key>favorite</key>
+    </entry>
+    <entry>
+      <key>Release</key>
     </entry>
     <entry>
       <key>granted permission</key>
@@ -9065,10 +9085,6 @@ Bitte Datumseingabe prüfen</value>
       <key>Permission Procurer User</key>
       <value>Rechteempfänger Benutzer</value>
     </entry>
-    <entry>
-      <key>New password</key>
-      <value>Neues Passwort</value>
-    </entry>
     <entry>
       <key>and open Report</key>
     </entry>
@@ -9079,6 +9095,9 @@ Bitte Datumseingabe prüfen</value>
       <key>Add Recipients</key>
       <value>Teilnehmer hinzufügen</value>
     </entry>
+    <entry>
+      <key>Grant new User Permission</key>
+    </entry>
     <entry>
       <key>{SEND_MAIL}</key>
     </entry>
@@ -9105,34 +9124,61 @@ Bitte Datumseingabe prüfen</value>
       <value>Neue Abteilungs-Berechtigung vergeben</value>
     </entry>
     <entry>
-      <key>Password must contain spaces</key>
+      <key>favorites</key>
     </entry>
     <entry>
-      <key>favorites</key>
+      <key>Input value</key>
     </entry>
     <entry>
-      <key>The use of any of your previous %0 passwords is prohibited</key>
+      <key>Output value</key>
     </entry>
     <entry>
-      <key>Total in euros</key>
+      <key>Enddatum</key>
     </entry>
     <entry>
-      <key>Add Participants</key>
+      <key>Startdatum</key>
     </entry>
     <entry>
-      <key>Calendar hour divider</key>
+      <key>Mapping</key>
     </entry>
     <entry>
-      <key>SELECTION_BOTH</key>
+      <key>Typ</key>
     </entry>
     <entry>
-      <key>SELECTION_POSTFIX</key>
+      <key>Mappings</key>
     </entry>
     <entry>
-      <key>Password must contain letters</key>
+      <key>Sort up</key>
     </entry>
     <entry>
-      <key>SELECTION_PREFIX</key>
+      <key>Titel</key>
+    </entry>
+    <entry>
+      <key>Set missing address locations</key>
+    </entry>
+    <entry>
+      <key>Sort down</key>
+    </entry>
+    <entry>
+      <key>FavoriteFilter_view</key>
+    </entry>
+    <entry>
+      <key>Set all address locations</key>
+    </entry>
+    <entry>
+      <key>Members</key>
+    </entry>
+    <entry>
+      <key>Gruppenname</key>
+    </entry>
+    <entry>
+      <key>Total in euros</key>
+    </entry>
+    <entry>
+      <key>Add Participants</key>
+    </entry>
+    <entry>
+      <key>Add Recipients</key>
     </entry>
   </keyValueMap>
   <font name="Dialog" style="0" size="11" />
diff --git a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
index e9ae9aabca..a92be903f8 100644
--- a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
+++ b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
@@ -7216,6 +7216,54 @@
     <entry>
       <key>export using the selected template</key>
     </entry>
+    <entry>
+      <key>Input value</key>
+    </entry>
+    <entry>
+      <key>Output value</key>
+    </entry>
+    <entry>
+      <key>Enddatum</key>
+    </entry>
+    <entry>
+      <key>Startdatum</key>
+    </entry>
+    <entry>
+      <key>Mapping</key>
+    </entry>
+    <entry>
+      <key>Typ</key>
+    </entry>
+    <entry>
+      <key>Mappings</key>
+    </entry>
+    <entry>
+      <key>Sort up</key>
+    </entry>
+    <entry>
+      <key>Titel</key>
+    </entry>
+    <entry>
+      <key>Set missing address locations</key>
+    </entry>
+    <entry>
+      <key>Sort down</key>
+    </entry>
+    <entry>
+      <key>FavoriteFilter_view</key>
+    </entry>
+    <entry>
+      <key>Set all address locations</key>
+    </entry>
+    <entry>
+      <key>Members</key>
+    </entry>
+    <entry>
+      <key>Gruppenname</key>
+    </entry>
+    <entry>
+      <key>Enter current password to verify</key>
+    </entry>
   </keyValueMap>
   <font name="Dialog" style="0" size="11" />
 </language>
diff --git a/neonView/UsersettingsEdit_view/UsersettingsEdit_view.aod b/neonView/UsersettingsEdit_view/UsersettingsEdit_view.aod
index 6d5d9d8057..4a500fdf72 100644
--- a/neonView/UsersettingsEdit_view/UsersettingsEdit_view.aod
+++ b/neonView/UsersettingsEdit_view/UsersettingsEdit_view.aod
@@ -34,53 +34,5 @@
         </entityFieldLink>
       </fields>
     </genericViewTemplate>
-    <genericViewTemplate>
-      <name>SearchEdit</name>
-      <editMode v="true" />
-      <showDrawer v="true" />
-      <drawerCaption>Search</drawerCaption>
-      <fixedDrawer v="true" />
-      <entityField>#ENTITY</entityField>
-      <fields>
-        <entityFieldLink>
-          <name>d028eaa3-7250-4b9f-be94-4c097b426506</name>
-          <entityField>selectionIgnoreCase</entityField>
-        </entityFieldLink>
-        <entityFieldLink>
-          <name>e632f409-891a-4c02-b077-962d40b657f9</name>
-          <entityField>selectionPlaceholder</entityField>
-        </entityFieldLink>
-      </fields>
-    </genericViewTemplate>
-    <genericViewTemplate>
-      <name>CalendarEdit</name>
-      <editMode v="true" />
-      <showDrawer v="true" />
-      <drawerCaption>Calendar</drawerCaption>
-      <fixedDrawer v="true" />
-      <entityField>#ENTITY</entityField>
-      <fields>
-        <entityFieldLink>
-          <name>6c58b326-3fe6-4b1d-a6d4-1735861c419a</name>
-          <entityField>calMaintimeStart</entityField>
-        </entityFieldLink>
-        <entityFieldLink>
-          <name>1463dddd-efa6-4fff-bb7e-ee1bc190f077</name>
-          <entityField>calMaintimeEnd</entityField>
-        </entityFieldLink>
-        <entityFieldLink>
-          <name>4bb63da1-6a83-4f68-8605-11dd43501b7b</name>
-          <entityField>calHourdivider</entityField>
-        </entityFieldLink>
-      </fields>
-    </genericViewTemplate>
-    <genericViewTemplate>
-      <name>OtherSettings</name>
-      <editMode v="true" />
-      <showDrawer v="true" />
-      <drawerCaption>Others</drawerCaption>
-      <fixedDrawer v="true" />
-      <entityField>#ENTITY</entityField>
-    </genericViewTemplate>
   </children>
 </neonView>
diff --git a/process/UserSettings_lib/process.js b/process/UserSettings_lib/process.js
index 02bf19629a..69c4108c4d 100644
--- a/process/UserSettings_lib/process.js
+++ b/process/UserSettings_lib/process.js
@@ -19,11 +19,13 @@ function UserSettingUtil () {}
         tools.PASSWORD,
     ];
     let paramSettings = [
+        /*
         "calHourdivider",
         "calMaintimeEnd",
         "calMaintimeStart",
         "selectionIgnoreCase",
         "selectionPlaceholder",
+        */
     ];
 
 
-- 
GitLab


From 7414ebb94c09cbf815656788a9c65f7d719e30df Mon Sep 17 00:00:00 2001
From: "d.buechler" <d.buechler@adito.de>
Date: Fri, 28 Aug 2020 15:14:16 +0200
Subject: [PATCH 230/309] #1048305 New context for "Userhelp" created; Uses
 context "documents" do handle image management; New filter view which
 displays the id of uploaded file added to documents, used in userhelp.

---
 entity/Document_entity/Document_entity.aod    |  7 +++
 .../UserhelpResources/UserhelpResources.aod   | 31 ++++++++++++
 .../assignmentrowid_param/valueProcess.js     |  5 ++
 .../assignmenttable_param/valueProcess.js     |  3 ++
 neonContext/Document/Document.aod             |  4 ++
 neonContext/Userhelp/Userhelp.aod             | 18 +++++++
 .../DocumentWithIdFilter_view.aod             | 47 +++++++++++++++++++
 .../Userhelp_FilterView.aod                   | 19 ++++++++
 8 files changed, 134 insertions(+)
 create mode 100644 entity/UserhelpResources/UserhelpResources.aod
 create mode 100644 entity/UserhelpResources/entityfields/documents/children/assignmentrowid_param/valueProcess.js
 create mode 100644 entity/UserhelpResources/entityfields/documents/children/assignmenttable_param/valueProcess.js
 create mode 100644 neonContext/Userhelp/Userhelp.aod
 create mode 100644 neonView/DocumentWithIdFilter_view/DocumentWithIdFilter_view.aod
 create mode 100644 neonView/Userhelp_FilterView/Userhelp_FilterView.aod

diff --git a/entity/Document_entity/Document_entity.aod b/entity/Document_entity/Document_entity.aod
index 1975ae7ba9..00112c6036 100644
--- a/entity/Document_entity/Document_entity.aod
+++ b/entity/Document_entity/Document_entity.aod
@@ -95,6 +95,7 @@
     </entityParameter>
     <entityField>
       <name>UID</name>
+      <title>Id</title>
     </entityField>
     <entityField>
       <name>DESCRIPTION</name>
@@ -220,6 +221,12 @@
           <fieldName>LogDocuments</fieldName>
           <isConsumer v="false" />
         </entityDependency>
+        <entityDependency>
+          <name>2e6fcf27-ee98-4f7d-a99d-7ce02774076b</name>
+          <entityName>UserhelpResources</entityName>
+          <fieldName>Documents</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
       </dependencies>
       <children>
         <entityParameter>
diff --git a/entity/UserhelpResources/UserhelpResources.aod b/entity/UserhelpResources/UserhelpResources.aod
new file mode 100644
index 0000000000..84eed213c7
--- /dev/null
+++ b/entity/UserhelpResources/UserhelpResources.aod
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
+  <name>UserhelpResources</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <entityFields>
+    <entityProvider>
+      <name>#PROVIDER</name>
+    </entityProvider>
+    <entityField>
+      <name>image</name>
+    </entityField>
+    <entityConsumer>
+      <name>Documents</name>
+      <dependency>
+        <name>dependency</name>
+        <entityName>Document_entity</entityName>
+        <fieldName>Documents</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>AssignmentTable_param</name>
+          <valueProcess>%aditoprj%/entity/UserhelpResources/entityfields/documents/children/assignmenttable_param/valueProcess.js</valueProcess>
+        </entityParameter>
+        <entityParameter>
+          <name>AssignmentRowId_param</name>
+          <valueProcess>%aditoprj%/entity/UserhelpResources/entityfields/documents/children/assignmentrowid_param/valueProcess.js</valueProcess>
+        </entityParameter>
+      </children>
+    </entityConsumer>
+  </entityFields>
+</entity>
diff --git a/entity/UserhelpResources/entityfields/documents/children/assignmentrowid_param/valueProcess.js b/entity/UserhelpResources/entityfields/documents/children/assignmentrowid_param/valueProcess.js
new file mode 100644
index 0000000000..2031e39685
--- /dev/null
+++ b/entity/UserhelpResources/entityfields/documents/children/assignmentrowid_param/valueProcess.js
@@ -0,0 +1,5 @@
+import("system.result");
+import("system.vars");
+
+//result.string(vars.get("$field.CONTACTID"));
+result.string("meinetestid");
\ No newline at end of file
diff --git a/entity/UserhelpResources/entityfields/documents/children/assignmenttable_param/valueProcess.js b/entity/UserhelpResources/entityfields/documents/children/assignmenttable_param/valueProcess.js
new file mode 100644
index 0000000000..886237ba81
--- /dev/null
+++ b/entity/UserhelpResources/entityfields/documents/children/assignmenttable_param/valueProcess.js
@@ -0,0 +1,3 @@
+import("system.result");
+
+result.string("USERHELP");
\ No newline at end of file
diff --git a/neonContext/Document/Document.aod b/neonContext/Document/Document.aod
index 23df7610e8..cfb02a7f2b 100644
--- a/neonContext/Document/Document.aod
+++ b/neonContext/Document/Document.aod
@@ -33,5 +33,9 @@
       <name>cd17be33-73ae-4e8d-a852-65152a772926</name>
       <view>DocumentMultipleEdit_view</view>
     </neonViewReference>
+    <neonViewReference>
+      <name>434ed60c-8219-4ef5-b795-6d72b9ae48c9</name>
+      <view>DocumentWithIdFilter_view</view>
+    </neonViewReference>
   </references>
 </neonContext>
diff --git a/neonContext/Userhelp/Userhelp.aod b/neonContext/Userhelp/Userhelp.aod
new file mode 100644
index 0000000000..bcacbf186d
--- /dev/null
+++ b/neonContext/Userhelp/Userhelp.aod
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<neonContext xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonContext/1.1.1">
+  <name>Userhelp</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <filterView>Userhelp_FilterView</filterView>
+  <editView>Userhelp_EditView</editView>
+  <entity>UserhelpResources</entity>
+  <references>
+    <neonViewReference>
+      <name>44005781-a90b-468f-a970-7833d170f671</name>
+      <view>Userhelp_EditView</view>
+    </neonViewReference>
+    <neonViewReference>
+      <name>2a1dd62b-0f30-442b-aa1d-969b46312d2a</name>
+      <view>Userhelp_FilterView</view>
+    </neonViewReference>
+  </references>
+</neonContext>
diff --git a/neonView/DocumentWithIdFilter_view/DocumentWithIdFilter_view.aod b/neonView/DocumentWithIdFilter_view/DocumentWithIdFilter_view.aod
new file mode 100644
index 0000000000..3cafd27757
--- /dev/null
+++ b/neonView/DocumentWithIdFilter_view/DocumentWithIdFilter_view.aod
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.6">
+  <name>DocumentWithIdFilter_view</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <layout>
+    <boxLayout>
+      <name>layout</name>
+    </boxLayout>
+  </layout>
+  <children>
+    <tableViewTemplate>
+      <name>documentsTable</name>
+      <favoriteActionGroup1>Document_actions</favoriteActionGroup1>
+      <iconField>PREVIEW_IMAGE</iconField>
+      <titleField>NAME</titleField>
+      <subtitleField>TYPE</subtitleField>
+      <descriptionField>SIZE</descriptionField>
+      <entityField>#ENTITY</entityField>
+      <columns>
+        <neonTableColumn>
+          <name>3c8f789e-f62f-4756-8ee4-347e77712ebe</name>
+          <entityField>UID</entityField>
+        </neonTableColumn>
+        <neonTableColumn>
+          <name>9138d75e-c7d1-4b49-8fd3-c67ef53d0e8b</name>
+          <entityField>NAME</entityField>
+        </neonTableColumn>
+        <neonTableColumn>
+          <name>3c8d2e5e-9db9-4a76-844e-85e84ea73078</name>
+          <entityField>TYPE</entityField>
+        </neonTableColumn>
+        <neonTableColumn>
+          <name>1709dcf6-33ea-46ec-a2bc-e488289389bc</name>
+          <entityField>SIZE</entityField>
+        </neonTableColumn>
+        <neonTableColumn>
+          <name>86ef02d8-ca90-44c8-9dc4-b8527016f3a5</name>
+          <entityField>DATE_EDIT</entityField>
+        </neonTableColumn>
+        <neonTableColumn>
+          <name>9b140660-1918-48dd-852b-d9802fef872e</name>
+          <entityField>IS_MAIN_DOCUMENT</entityField>
+        </neonTableColumn>
+      </columns>
+    </tableViewTemplate>
+  </children>
+</neonView>
diff --git a/neonView/Userhelp_FilterView/Userhelp_FilterView.aod b/neonView/Userhelp_FilterView/Userhelp_FilterView.aod
new file mode 100644
index 0000000000..88b815cc8a
--- /dev/null
+++ b/neonView/Userhelp_FilterView/Userhelp_FilterView.aod
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.6">
+  <name>Userhelp_FilterView</name>
+  <title>Userhelp Ressources</title>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <filterable v="true" />
+  <layout>
+    <groupLayout>
+      <name>layout</name>
+    </groupLayout>
+  </layout>
+  <children>
+    <neonViewReference>
+      <name>baf3ef50-4798-47b6-bb1a-f311cf4b3307</name>
+      <entityField>Documents</entityField>
+      <view>DocumentWithIdFilter_view</view>
+    </neonViewReference>
+  </children>
+</neonView>
-- 
GitLab


From f1f0a8138b5d90ee779fe3bd2512d78dd637c7f6 Mon Sep 17 00:00:00 2001
From: Sebastian Listl <s.listl@adito.de>
Date: Fri, 28 Aug 2020 16:38:26 +0200
Subject: [PATCH 231/309] #1064320 Address search fix for street

---
 .../AddressValidation_entity.aod                       |  8 ++++++++
 .../recordcontainers/jdito/contentProcess.js           |  3 ++-
 .../entityfields/address_ws/valueProcess.js            |  3 +--
 .../AddressValidationLookup_view.aod                   | 10 +---------
 .../EmployeeRoleEdit_view/EmployeeRoleEdit_view.aod    |  4 ----
 process/WsValidation_lib/process.js                    |  8 ++------
 6 files changed, 14 insertions(+), 22 deletions(-)

diff --git a/entity/AddressValidation_entity/AddressValidation_entity.aod b/entity/AddressValidation_entity/AddressValidation_entity.aod
index 19c0dbd986..a744c59ffc 100644
--- a/entity/AddressValidation_entity/AddressValidation_entity.aod
+++ b/entity/AddressValidation_entity/AddressValidation_entity.aod
@@ -130,6 +130,7 @@
     </entityField>
     <entityField>
       <name>BUILDINGNO</name>
+      <title>Nr</title>
     </entityField>
     <entityProvider>
       <name>StreetValidation</name>
@@ -154,6 +155,10 @@
       <name>City_param</name>
       <expose v="true" />
     </entityParameter>
+    <entityField>
+      <name>STREET_AND_BUILDINGNO</name>
+      <title>Street</title>
+    </entityField>
   </entityFields>
   <recordContainers>
     <jDitoRecordContainer>
@@ -206,6 +211,9 @@
         <jDitoRecordFieldMapping>
           <name>VALUE.value</name>
         </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>STREET_AND_BUILDINGNO.value</name>
+        </jDitoRecordFieldMapping>
       </recordFieldMappings>
     </jDitoRecordContainer>
   </recordContainers>
diff --git a/entity/AddressValidation_entity/recordcontainers/jdito/contentProcess.js b/entity/AddressValidation_entity/recordcontainers/jdito/contentProcess.js
index 2f5f62eea0..e92fed1fd8 100644
--- a/entity/AddressValidation_entity/recordcontainers/jdito/contentProcess.js
+++ b/entity/AddressValidation_entity/recordcontainers/jdito/contentProcess.js
@@ -55,7 +55,8 @@ else
             row.buildingNo,
             row.lat,
             row.lon,
-            row.value
+            row.value,
+            row.road && row.buildingNo ? row.road + " " + row.buildingNo : row.road
         ];
     }));
 }
diff --git a/entity/Address_entity/entityfields/address_ws/valueProcess.js b/entity/Address_entity/entityfields/address_ws/valueProcess.js
index 2c7449d49d..ef17405a27 100644
--- a/entity/Address_entity/entityfields/address_ws/valueProcess.js
+++ b/entity/Address_entity/entityfields/address_ws/valueProcess.js
@@ -1,5 +1,4 @@
 import("system.vars");
 import("WsValidation_lib");
 
-if(!vars.get("$this.value"))
-    WsValidationFieldUtils.wsValueProcess(WsValidationType.get().TYPE_STREET_NOMINATIM, "$field.ADDRESS");
\ No newline at end of file
+WsValidationFieldUtils.wsValueProcess(WsValidationType.get().TYPE_STREET_NOMINATIM, "$field.ADDRESS");
\ No newline at end of file
diff --git a/neonView/AddressValidationLookup_view/AddressValidationLookup_view.aod b/neonView/AddressValidationLookup_view/AddressValidationLookup_view.aod
index 5c41ff868f..7372c60c7a 100644
--- a/neonView/AddressValidationLookup_view/AddressValidationLookup_view.aod
+++ b/neonView/AddressValidationLookup_view/AddressValidationLookup_view.aod
@@ -30,15 +30,7 @@
         </neonTableColumn>
         <neonTableColumn>
           <name>a272c3cb-7bbf-41a4-9490-884c2f449b40</name>
-          <entityField>STREET</entityField>
-        </neonTableColumn>
-        <neonTableColumn>
-          <name>e842bb68-96c6-4d1f-bf44-70a29c7c7d72</name>
-          <entityField>FROM_BN</entityField>
-        </neonTableColumn>
-        <neonTableColumn>
-          <name>59162b47-ec96-4076-8e57-929fccbf133d</name>
-          <entityField>TO_BN</entityField>
+          <entityField>STREET_AND_BUILDINGNO</entityField>
         </neonTableColumn>
         <neonTableColumn>
           <name>d32d92bf-db7d-443f-b911-6731ea89cf3b</name>
diff --git a/neonView/EmployeeRoleEdit_view/EmployeeRoleEdit_view.aod b/neonView/EmployeeRoleEdit_view/EmployeeRoleEdit_view.aod
index 2255ea4658..c3b40d1ec2 100644
--- a/neonView/EmployeeRoleEdit_view/EmployeeRoleEdit_view.aod
+++ b/neonView/EmployeeRoleEdit_view/EmployeeRoleEdit_view.aod
@@ -17,10 +17,6 @@
           <entityField>ROLE</entityField>
           <fullWidth v="true" />
         </neonGenericMultipleTableColumn>
-        <neonGenericMultipleTableColumn>
-          <name>a67f3020-1438-483a-9897-647336002618</name>
-          <entityField>UID</entityField>
-        </neonGenericMultipleTableColumn>
       </columns>
     </genericMultipleViewTemplate>
   </children>
diff --git a/process/WsValidation_lib/process.js b/process/WsValidation_lib/process.js
index 8d7b821ee0..5829c69588 100644
--- a/process/WsValidation_lib/process.js
+++ b/process/WsValidation_lib/process.js
@@ -354,16 +354,12 @@ WsValidationUtils.setAddressFields = function(pJSON)
         "$field.REGION": data.region,
         "$field.STATE": data.state,
         "$field.ADDRESS": data.road,
-        "$field.LAT": data.lat,
-        "$field.LON": data.lon
+        "$field.BUILDINGNO": data.buildingNo
     }
     
     for (let field in toSet) 
     {
-        let value = toSet[field];
-        if (!value)
-            value = "";
-
+        let value = toSet[field] || "";
         neon.setFieldValue(field, value);
     }
     
-- 
GitLab


From 913ef0ddc33b255e3931a718612347303c58cc89 Mon Sep 17 00:00:00 2001
From: Sebastian Listl <s.listl@adito.de>
Date: Fri, 28 Aug 2020 17:06:18 +0200
Subject: [PATCH 232/309] Nominatim enabled in preferences

---
 .../_____PREFERENCES_PROJECT/_____PREFERENCES_PROJECT.aod   | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/preferences/_____PREFERENCES_PROJECT/_____PREFERENCES_PROJECT.aod b/preferences/_____PREFERENCES_PROJECT/_____PREFERENCES_PROJECT.aod
index 4294784e02..a44cefc227 100644
--- a/preferences/_____PREFERENCES_PROJECT/_____PREFERENCES_PROJECT.aod
+++ b/preferences/_____PREFERENCES_PROJECT/_____PREFERENCES_PROJECT.aod
@@ -75,7 +75,7 @@
     </customDurationProperty>
     <customBooleanProperty>
       <name>nominatim.enable</name>
-      <property v="false" />
+      <property v="true" />
     </customBooleanProperty>
     <customStringProperty>
       <name>nominatim.url</name>
@@ -109,6 +109,10 @@
       <description></description>
       <property>useradito</property>
     </customPasswordProperty>
+    <customIntegerProperty>
+      <name>nominatim.resultLimit</name>
+      <description>Amount of rows returned by the address search. Default is 10, maximum is 50.</description>
+    </customIntegerProperty>
   </customProperties>
   <customConfigProperties>
     <customBooleanProperty>
-- 
GitLab


From 125e06e4ea0c91b4f25a0dcc67fc4b28140fc43e Mon Sep 17 00:00:00 2001
From: Sebastian Listl <s.listl@adito.de>
Date: Fri, 28 Aug 2020 17:06:38 +0200
Subject: [PATCH 233/309] NominatimRequest documented

---
 process/WsValidation_lib/process.js | 38 +++++++++++++++++++++++++++++
 1 file changed, 38 insertions(+)

diff --git a/process/WsValidation_lib/process.js b/process/WsValidation_lib/process.js
index 5829c69588..7028a04ba7 100644
--- a/process/WsValidation_lib/process.js
+++ b/process/WsValidation_lib/process.js
@@ -215,6 +215,8 @@ WsValidationType.get = function(pKey)
                     this.additionalInfo.user = project.getPreferenceValue("custom." + this.webserviceName + ".user");
                 if (!this.additionalInfo.password)
                     this.additionalInfo.password = project.getPreferenceValue("custom." + this.webserviceName + ".pw");
+                if (this.additionalInfo.resultLimit === undefined) //can be explicitly null
+                    this.additionalInfo.resultLimit = project.getPreferenceValue("custom." + this.webserviceName + ".resultLimit");
 
                 if (!this.additionalInfo.url)
                     throw new Error("if the webservice '" + this.key + "' is enabled, you have to provide the url");
@@ -227,6 +229,9 @@ WsValidationType.get = function(pKey)
                         
                     if (this.additionalInfo.user && this.additionalInfo.password)
                         nominatimRequest.setUser(this.additionalInfo.user, this.additionalInfo.password);
+                    
+                    if (this.additionalInfo.resultLimit)
+                        nominatimRequest.setResultLimit(this.additionalInfo.resultLimit);
 
                     // call webservice
                     var ret = nominatimRequest.get();
@@ -506,6 +511,9 @@ WsValidationFieldUtils.wsOnValueChangeProcess = function(pWsType, pMainField)
     }
 }
 
+/**
+ * Object for handling nominatim requests
+ */
 function NominatimRequest (pUrl)
 {
     this.url = pUrl;
@@ -516,6 +524,12 @@ function NominatimRequest (pUrl)
     };
 }
 
+/**
+ * Changes if additional address details should be loaded.
+ * 
+ * @param {boolean} [pInclude=true] if the details should be included
+ * @return {NominatimRequest} current object
+ */
 NominatimRequest.prototype.includeAddressDetails = function (pInclude)
 {
     if (pInclude === false)
@@ -525,6 +539,13 @@ NominatimRequest.prototype.includeAddressDetails = function (pInclude)
     return this;
 }
 
+/**
+ * Changes the user for the webservice auth.
+ * 
+ * @param {String} pUser the username
+ * @param {String} pPassword the password of the user
+ * @return {NominatimRequest} current object
+ */
 NominatimRequest.prototype.setUser = function (pUser, pPassword)
 {
     this.user = pUser;
@@ -532,18 +553,35 @@ NominatimRequest.prototype.setUser = function (pUser, pPassword)
     return this;
 }
 
+/**
+ * Adds parameters to the request.
+ * 
+ * @param {Object} pParameters object containing the parameters that should be set
+ * @return {NominatimRequest} current object
+ */
 NominatimRequest.prototype.setParameters = function (pParameters)
 {
     Object.assign(this.parameters, pParameters);
     return this;
 }
 
+/**
+ * Sets the result limit of the request.
+ * 
+ * @param {Number} pLimit the max amount of rows the webservice should return (default is 10, max is 50)
+ * @return {NominatimRequest} current object
+ */
 NominatimRequest.prototype.setResultLimit = function (pLimit)
 {
     this.parameters.limit = pLimit.toString();
     return this;
 }
 
+/**
+ * Calls the webservice and returns the result.
+ * 
+ * @return {Object} webservice result
+ */
 NominatimRequest.prototype.get = function ()
 {
     var restConf = net.createConfigForRestWebserviceCall()
-- 
GitLab


From f8823b26d8e2a8f4f040ae712636cfa732365456 Mon Sep 17 00:00:00 2001
From: Sebastian Listl <s.listl@adito.de>
Date: Mon, 31 Aug 2020 10:53:04 +0200
Subject: [PATCH 234/309] Entity models upgraded to 1.3.16

---
 entity/360Degree_entity/360Degree_entity.aod                | 6 +++++-
 entity/ActivityLink_entity/ActivityLink_entity.aod          | 6 +++++-
 entity/Activity_entity/Activity_entity.aod                  | 6 +++++-
 entity/AddressType_entity/AddressType_entity.aod            | 6 +++++-
 .../AddressValidation_entity/AddressValidation_entity.aod   | 6 +++++-
 entity/Address_entity/Address_entity.aod                    | 6 +++++-
 entity/AdminViewRow_entity/AdminViewRow_entity.aod          | 6 +++++-
 entity/Analyses_entity/Analyses_entity.aod                  | 6 +++++-
 entity/AnyContact_entity/AnyContact_entity.aod              | 6 +++++-
 entity/AppointmentLink_entity/AppointmentLink_entity.aod    | 6 +++++-
 entity/Appointment_entity/Appointment_entity.aod            | 6 +++++-
 .../AttributeRelation_entity/AttributeRelation_entity.aod   | 6 +++++-
 entity/AttributeUsage_entity/AttributeUsage_entity.aod      | 6 +++++-
 entity/Attribute_entity/Attribute_entity.aod                | 6 +++++-
 .../BulkMailAddRecipients_entity.aod                        | 6 +++++-
 .../BulkMailRecipient_entity/BulkMailRecipient_entity.aod   | 6 +++++-
 .../BulkMailStatusChart_entity.aod                          | 6 +++++-
 entity/BulkMailTesting_entity/BulkMailTesting_entity.aod    | 6 +++++-
 entity/BulkMail_entity/BulkMail_entity.aod                  | 6 +++++-
 .../CampaignAddParticipants_entity.aod                      | 6 +++++-
 entity/CampaignAnalysis_entity/CampaignAnalysis_entity.aod  | 6 +++++-
 .../CampaignCostChart_entity/CampaignCostChart_entity.aod   | 6 +++++-
 entity/CampaignCost_entity/CampaignCost_entity.aod          | 6 +++++-
 .../CampaignParticipantChart_entity.aod                     | 6 +++++-
 .../CampaignParticipant_entity.aod                          | 6 +++++-
 entity/CampaignPlanning_entity/CampaignPlanning_entity.aod  | 6 +++++-
 entity/CampaignStep_entity/CampaignStep_entity.aod          | 6 +++++-
 entity/Campaign_entity/Campaign_entity.aod                  | 6 +++++-
 .../ClassificationAdmin_entity.aod                          | 6 +++++-
 .../ClassificationGrading_entity.aod                        | 6 +++++-
 .../ClassificationGroupAnalyses_entity.aod                  | 6 +++++-
 .../ClassificationScore_entity.aod                          | 6 +++++-
 .../ClassificationType_entity/ClassificationType_entity.aod | 6 +++++-
 entity/Classification_entity/Classification_entity.aod      | 6 +++++-
 entity/CommRestriction_Entity/CommRestriction_Entity.aod    | 6 +++++-
 entity/Communication_entity/Communication_entity.aod        | 6 +++++-
 entity/Competition_entity/Competition_entity.aod            | 6 +++++-
 entity/Contact_entity/Contact_entity.aod                    | 6 +++++-
 entity/Context_entity/Context_entity.aod                    | 6 +++++-
 entity/Contract_entity/Contract_entity.aod                  | 6 +++++-
 entity/Countries_Entity/Countries_Entity.aod                | 6 +++++-
 entity/DSGVOInfo_entity/DSGVOInfo_entity.aod                | 6 +++++-
 entity/DSGVOReport_entity/DSGVOReport_entity.aod            | 6 +++++-
 entity/DSGVO_entity/DSGVO_entity.aod                        | 6 +++++-
 entity/DefaultAdminView_entity/DefaultAdminView_entity.aod  | 6 +++++-
 .../DescriptionTranslation_entity.aod                       | 6 +++++-
 .../DocumentTemplateLink_entity.aod                         | 6 +++++-
 .../DocumentTemplatePlaceOfUse_entity.aod                   | 6 +++++-
 .../DocumentTemplateTypeCategory_entity.aod                 | 6 +++++-
 entity/DocumentTemplate_entity/DocumentTemplate_entity.aod  | 6 +++++-
 entity/Document_entity/Document_entity.aod                  | 6 +++++-
 .../DuplicateScannerResultFieldConfig_entity.aod            | 6 +++++-
 entity/DuplicateScanner_entity/DuplicateScanner_entity.aod  | 6 +++++-
 .../DuplicatesUnrelated_entity.aod                          | 6 +++++-
 entity/Duplicates_entity/Duplicates_entity.aod              | 6 +++++-
 entity/Email_entity/Email_entity.aod                        | 6 +++++-
 entity/EmployeeRole_entity/EmployeeRole_entity.aod          | 6 +++++-
 entity/Employee_entity/Employee_entity.aod                  | 6 +++++-
 .../ExportTemplateField_entity.aod                          | 6 +++++-
 .../ExportTemplatePlaceOfUse_entity.aod                     | 6 +++++-
 .../ExportTemplateSelection_entity.aod                      | 6 +++++-
 entity/ExportTemplate_entity/ExportTemplate_entity.aod      | 6 +++++-
 entity/Favorite_entity/Favorite_entity.aod                  | 6 +++++-
 entity/Forecast_entity/Forecast_entity.aod                  | 6 +++++-
 entity/Gender_keyword/Gender_keyword.aod                    | 6 +++++-
 entity/ImportField_Entity/ImportField_Entity.aod            | 6 +++++-
 entity/IndexSearchEntity/IndexSearchEntity.aod              | 6 +++++-
 .../KeywordAttributeRelation_entity.aod                     | 6 +++++-
 entity/KeywordAttribute_entity/KeywordAttribute_entity.aod  | 6 +++++-
 entity/KeywordEntry_entity/KeywordEntry_entity.aod          | 6 +++++-
 entity/Language_entity/Language_entity.aod                  | 6 +++++-
 entity/LeadLog_entity/LeadLog_entity.aod                    | 6 +++++-
 entity/LeadTemp_entity/LeadTemp_entity.aod                  | 6 +++++-
 entity/Lead_entity/Lead_entity.aod                          | 6 +++++-
 .../LeadimportMappingAssistant_entity.aod                   | 6 +++++-
 entity/Leadimport_entity/Leadimport_entity.aod              | 6 +++++-
 entity/LetterRecipient_entity/LetterRecipient_entity.aod    | 6 +++++-
 entity/Letter_entity/Letter_entity.aod                      | 6 +++++-
 entity/LogHistory_entity/LogHistory_entity.aod              | 6 +++++-
 entity/MemberRoles_entity/MemberRoles_entity.aod            | 6 +++++-
 entity/Member_entity/Member_entity.aod                      | 6 +++++-
 entity/ModuleTree_entity/ModuleTree_entity.aod              | 6 +++++-
 entity/Notification_entity/Notification_entity.aod          | 6 +++++-
 entity/ObjectProxy_entity/ObjectProxy_entity.aod            | 6 +++++-
 .../ObjectRelationType_entity/ObjectRelationType_entity.aod | 6 +++++-
 entity/ObjectTree_entity/ObjectTree_entity.aod              | 6 +++++-
 entity/Object_entity/Object_entity.aod                      | 6 +++++-
 entity/Offer_entity/Offer_entity.aod                        | 6 +++++-
 entity/Offeritem_entity/Offeritem_entity.aod                | 6 +++++-
 entity/Order_entity/Order_entity.aod                        | 6 +++++-
 entity/Orderitem_entity/Orderitem_entity.aod                | 6 +++++-
 entity/Organisation_entity/Organisation_entity.aod          | 6 +++++-
 entity/PermissionAction_entity/PermissionAction_entity.aod  | 6 +++++-
 .../PermissionCalendar_entity/PermissionCalendar_entity.aod | 6 +++++-
 entity/PermissionDetail_entity/PermissionDetail_entity.aod  | 6 +++++-
 .../PermissionMetaData_entity/PermissionMetaData_entity.aod | 6 +++++-
 .../PermissionOverview_entity/PermissionOverview_entity.aod | 6 +++++-
 entity/Person_entity/Person_entity.aod                      | 6 +++++-
 entity/PrivatePerson_entity/PrivatePerson_entity.aod        | 6 +++++-
 entity/Prod2prod_entity/Prod2prod_entity.aod                | 6 +++++-
 entity/Product_entity/Product_entity.aod                    | 6 +++++-
 entity/Productprice_entity/Productprice_entity.aod          | 6 +++++-
 entity/QuickEntry_entity/QuickEntry_entity.aod              | 6 +++++-
 entity/RoleChildren_entity/RoleChildren_entity.aod          | 6 +++++-
 entity/RoleParent_entity/RoleParent_entity.aod              | 6 +++++-
 entity/Role_entity/Role_entity.aod                          | 6 +++++-
 .../SalesprojectAnalyses_entity.aod                         | 6 +++++-
 .../SalesprojectMilestone_entity.aod                        | 6 +++++-
 .../SalesprojectPhase_entity/SalesprojectPhase_entity.aod   | 6 +++++-
 .../SalesprojectSource_entity/SalesprojectSource_entity.aod | 6 +++++-
 entity/Salesproject_entity/Salesproject_entity.aod          | 6 +++++-
 .../SalutationDistinct_entity/SalutationDistinct_entity.aod | 6 +++++-
 .../SalutationTitleDistinct_entity.aod                      | 6 +++++-
 entity/Salutation_entity/Salutation_entity.aod              | 6 +++++-
 .../SerialLetterAddRecipients_entity.aod                    | 6 +++++-
 entity/SerialLetter_entity/SerialLetter_entity.aod          | 6 +++++-
 entity/Social_entity/Social_entity.aod                      | 6 +++++-
 entity/Stock_entity/Stock_entity.aod                        | 6 +++++-
 entity/SupportTicket_entity/SupportTicket_entity.aod        | 6 +++++-
 entity/TaskLink_entity/TaskLink_entity.aod                  | 6 +++++-
 entity/Task_entity/Task_entity.aod                          | 6 +++++-
 entity/Timetracking_entity/Timetracking_entity.aod          | 6 +++++-
 entity/TurnoverTree_entity/TurnoverTree_entity.aod          | 6 +++++-
 entity/Turnover_entity/Turnover_entity.aod                  | 6 +++++-
 .../UniversalFileProcessor_entity.aod                       | 6 +++++-
 .../UnlinkedMailMappingLink_entity.aod                      | 6 +++++-
 .../UnlinkedMailMappingWrapper_entity.aod                   | 6 +++++-
 entity/UnlinkedMail_entity/UnlinkedMail_entity.aod          | 6 +++++-
 entity/Usersettings_entity/Usersettings_entity.aod          | 6 +++++-
 .../VisitPlanEmployeeWeek_entity.aod                        | 6 +++++-
 entity/VisitPlanEntry_entity/VisitPlanEntry_entity.aod      | 6 +++++-
 .../VisitRecommendation_entity.aod                          | 6 +++++-
 .../WorkflowDefinition_entity/WorkflowDefinition_entity.aod | 6 +++++-
 .../WorkflowInstanceHistory_entity.aod                      | 6 +++++-
 entity/WorkflowInstance_entity/WorkflowInstance_entity.aod  | 6 +++++-
 entity/WorkflowModel_entity/WorkflowModel_entity.aod        | 6 +++++-
 entity/WorkflowSignal_entity/WorkflowSignal_entity.aod      | 6 +++++-
 .../WorkflowStartConfig_entity.aod                          | 6 +++++-
 entity/WorkflowTask_entity/WorkflowTask_entity.aod          | 6 +++++-
 .../WorkflowVariableValue_entity.aod                        | 6 +++++-
 140 files changed, 700 insertions(+), 140 deletions(-)

diff --git a/entity/360Degree_entity/360Degree_entity.aod b/entity/360Degree_entity/360Degree_entity.aod
index f7c9f86c70..d2f03aa8a8 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.15" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.15">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.16" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.16">
   <name>360Degree_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/360Degree_entity/documentation.adoc</documentation>
@@ -172,6 +172,10 @@
       <name>ObjectStatus_param</name>
       <expose v="true" />
     </entityParameter>
+    <entityProvider>
+      <name>#PROVIDER_AGGREGATES</name>
+      <useAggregates v="true" />
+    </entityProvider>
   </entityFields>
   <recordContainers>
     <jDitoRecordContainer>
diff --git a/entity/ActivityLink_entity/ActivityLink_entity.aod b/entity/ActivityLink_entity/ActivityLink_entity.aod
index fb1b4e6928..2a5d5c0466 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.15" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.15">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.16" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.16">
   <name>ActivityLink_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/ActivityLink_entity/documentation.adoc</documentation>
@@ -98,6 +98,10 @@
       <name>DATE_EDIT</name>
       <valueProcess>%aditoprj%/entity/ActivityLink_entity/entityfields/date_edit/valueProcess.js</valueProcess>
     </entityField>
+    <entityProvider>
+      <name>#PROVIDER_AGGREGATES</name>
+      <useAggregates v="true" />
+    </entityProvider>
   </entityFields>
   <recordContainers>
     <dbRecordContainer>
diff --git a/entity/Activity_entity/Activity_entity.aod b/entity/Activity_entity/Activity_entity.aod
index 489f6d818e..745ae0974a 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.15" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.15">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.16" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.16">
   <name>Activity_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/Activity_entity/documentation.adoc</documentation>
@@ -624,6 +624,10 @@
       <parentField>COUNT</parentField>
       <title>Count</title>
     </entityAggregateField>
+    <entityProvider>
+      <name>#PROVIDER_AGGREGATES</name>
+      <useAggregates v="true" />
+    </entityProvider>
   </entityFields>
   <recordContainers>
     <dbRecordContainer>
diff --git a/entity/AddressType_entity/AddressType_entity.aod b/entity/AddressType_entity/AddressType_entity.aod
index f6b38cf594..dfd4b24b31 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.15" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.15">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.16" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.16">
   <name>AddressType_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/AddressType_entity/documentation.adoc</documentation>
@@ -44,6 +44,10 @@
       <expose v="true" />
       <description>PARAMETER</description>
     </entityParameter>
+    <entityProvider>
+      <name>#PROVIDER_AGGREGATES</name>
+      <useAggregates v="true" />
+    </entityProvider>
   </entityFields>
   <recordContainers>
     <dbRecordContainer>
diff --git a/entity/AddressValidation_entity/AddressValidation_entity.aod b/entity/AddressValidation_entity/AddressValidation_entity.aod
index a744c59ffc..023665ad51 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.15" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.15">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.16" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.16">
   <name>AddressValidation_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/AddressValidation_entity/documentation.adoc</documentation>
@@ -159,6 +159,10 @@
       <name>STREET_AND_BUILDINGNO</name>
       <title>Street</title>
     </entityField>
+    <entityProvider>
+      <name>#PROVIDER_AGGREGATES</name>
+      <useAggregates v="true" />
+    </entityProvider>
   </entityFields>
   <recordContainers>
     <jDitoRecordContainer>
diff --git a/entity/Address_entity/Address_entity.aod b/entity/Address_entity/Address_entity.aod
index d8e21b870c..e8db267517 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.15" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.15">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.16" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.16">
   <name>Address_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/Address_entity/documentation.adoc</documentation>
@@ -483,6 +483,10 @@
       <contentType>NUMBER</contentType>
       <state>INVISIBLE</state>
     </entityField>
+    <entityProvider>
+      <name>#PROVIDER_AGGREGATES</name>
+      <useAggregates v="true" />
+    </entityProvider>
   </entityFields>
   <recordContainers>
     <dbRecordContainer>
diff --git a/entity/AdminViewRow_entity/AdminViewRow_entity.aod b/entity/AdminViewRow_entity/AdminViewRow_entity.aod
index f08be730cb..773edbf21a 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.15" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.15">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.16" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.16">
   <name>AdminViewRow_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/AdminViewRow_entity/documentation.adoc</documentation>
@@ -38,6 +38,10 @@
     <entityField>
       <name>CONTENTTYPE</name>
     </entityField>
+    <entityProvider>
+      <name>#PROVIDER_AGGREGATES</name>
+      <useAggregates v="true" />
+    </entityProvider>
   </entityFields>
   <recordContainers>
     <jDitoRecordContainer>
diff --git a/entity/Analyses_entity/Analyses_entity.aod b/entity/Analyses_entity/Analyses_entity.aod
index b9f42ad25c..be3d4533c3 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.15" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.15">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.16" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.16">
   <name>Analyses_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/Analyses_entity/documentation.adoc</documentation>
@@ -50,6 +50,10 @@
       <title>My Turnover</title>
       <valueProcess>%aditoprj%/entity/Analyses_entity/entityfields/myturnover/valueProcess.js</valueProcess>
     </entityField>
+    <entityProvider>
+      <name>#PROVIDER_AGGREGATES</name>
+      <useAggregates v="true" />
+    </entityProvider>
   </entityFields>
   <recordContainers>
     <jDitoRecordContainer>
diff --git a/entity/AnyContact_entity/AnyContact_entity.aod b/entity/AnyContact_entity/AnyContact_entity.aod
index 6c81f8f298..2b9d7a04ab 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.15" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.15">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.16" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.16">
   <name>AnyContact_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/AnyContact_entity/documentation.adoc</documentation>
@@ -198,6 +198,10 @@ See ContactUtils.getRelationTypeByPersOrg for possible values</description>
       <name>AvatarText_param</name>
       <valueProcess>%aditoprj%/entity/AnyContact_entity/entityfields/avatartext_param/valueProcess.js</valueProcess>
     </entityParameter>
+    <entityProvider>
+      <name>#PROVIDER_AGGREGATES</name>
+      <useAggregates v="true" />
+    </entityProvider>
   </entityFields>
   <recordContainers>
     <dbRecordContainer>
diff --git a/entity/AppointmentLink_entity/AppointmentLink_entity.aod b/entity/AppointmentLink_entity/AppointmentLink_entity.aod
index 8bff3e7ea2..d4faa7a10f 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.15" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.15">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.16" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.16">
   <name>AppointmentLink_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/AppointmentLink_entity/documentation.adoc</documentation>
@@ -102,6 +102,10 @@
       <expose v="true" />
       <description>PARAMETER</description>
     </entityParameter>
+    <entityProvider>
+      <name>#PROVIDER_AGGREGATES</name>
+      <useAggregates v="true" />
+    </entityProvider>
   </entityFields>
   <recordContainers>
     <dbRecordContainer>
diff --git a/entity/Appointment_entity/Appointment_entity.aod b/entity/Appointment_entity/Appointment_entity.aod
index c3ecd02d3b..3316cccc9d 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.15" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.15">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.16" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.16">
   <name>Appointment_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/Appointment_entity/documentation.adoc</documentation>
@@ -249,6 +249,10 @@
     <entityField>
       <name>OWNER</name>
     </entityField>
+    <entityProvider>
+      <name>#PROVIDER_AGGREGATES</name>
+      <useAggregates v="true" />
+    </entityProvider>
   </entityFields>
   <recordContainers>
     <jDitoRecordContainer>
diff --git a/entity/AttributeRelation_entity/AttributeRelation_entity.aod b/entity/AttributeRelation_entity/AttributeRelation_entity.aod
index 86a065ceb2..bc159dfa37 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.15" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.15">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.16" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.16">
   <name>AttributeRelation_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/AttributeRelation_entity/documentation.adoc</documentation>
@@ -342,6 +342,10 @@
     <entityField>
       <name>AB_ATTRIBUTERELATIONID</name>
     </entityField>
+    <entityProvider>
+      <name>#PROVIDER_AGGREGATES</name>
+      <useAggregates v="true" />
+    </entityProvider>
   </entityFields>
   <recordContainers>
     <jDitoRecordContainer>
diff --git a/entity/AttributeUsage_entity/AttributeUsage_entity.aod b/entity/AttributeUsage_entity/AttributeUsage_entity.aod
index 28ff0133d6..0e70bbc0f8 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.15" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.15">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.16" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.16">
   <name>AttributeUsage_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/AttributeUsage_entity/documentation.adoc</documentation>
@@ -102,6 +102,10 @@
       <expose v="true" />
       <description>PARAMETER</description>
     </entityParameter>
+    <entityProvider>
+      <name>#PROVIDER_AGGREGATES</name>
+      <useAggregates v="true" />
+    </entityProvider>
   </entityFields>
   <recordContainers>
     <dbRecordContainer>
diff --git a/entity/Attribute_entity/Attribute_entity.aod b/entity/Attribute_entity/Attribute_entity.aod
index 07f9d8460e..7534f43f31 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.15" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.15">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.16" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.16">
   <name>Attribute_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/Attribute_entity/documentation.adoc</documentation>
@@ -471,6 +471,10 @@
       <name>ParentType_param</name>
       <expose v="true" />
     </entityParameter>
+    <entityProvider>
+      <name>#PROVIDER_AGGREGATES</name>
+      <useAggregates v="true" />
+    </entityProvider>
   </entityFields>
   <recordContainers>
     <jDitoRecordContainer>
diff --git a/entity/BulkMailAddRecipients_entity/BulkMailAddRecipients_entity.aod b/entity/BulkMailAddRecipients_entity/BulkMailAddRecipients_entity.aod
index 7aba636df5..7dbe041633 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.15" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.15">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.16" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.16">
   <name>BulkMailAddRecipients_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/BulkMailAddRecipients_entity/documentation.adoc</documentation>
@@ -77,6 +77,10 @@
       <title>Recipients after adding</title>
       <valueProcess>%aditoprj%/entity/BulkMailAddRecipients_entity/entityfields/futurerecipients/valueProcess.js</valueProcess>
     </entityField>
+    <entityProvider>
+      <name>#PROVIDER_AGGREGATES</name>
+      <useAggregates v="true" />
+    </entityProvider>
   </entityFields>
   <recordContainers>
     <datalessRecordContainer>
diff --git a/entity/BulkMailRecipient_entity/BulkMailRecipient_entity.aod b/entity/BulkMailRecipient_entity/BulkMailRecipient_entity.aod
index 748f9ca988..daed78c4eb 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.15" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.15">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.16" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.16">
   <name>BulkMailRecipient_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/BulkMailRecipient_entity/documentation.adoc</documentation>
@@ -141,6 +141,10 @@
         </entityParameter>
       </children>
     </entityConsumer>
+    <entityProvider>
+      <name>#PROVIDER_AGGREGATES</name>
+      <useAggregates v="true" />
+    </entityProvider>
   </entityFields>
   <recordContainers>
     <dbRecordContainer>
diff --git a/entity/BulkMailStatusChart_entity/BulkMailStatusChart_entity.aod b/entity/BulkMailStatusChart_entity/BulkMailStatusChart_entity.aod
index d8ce6fee17..35d083358b 100644
--- a/entity/BulkMailStatusChart_entity/BulkMailStatusChart_entity.aod
+++ b/entity/BulkMailStatusChart_entity/BulkMailStatusChart_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.15" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.15">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.16" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.16">
   <name>BulkMailStatusChart_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/BulkMailStatusChart_entity/documentation.adoc</documentation>
@@ -40,6 +40,10 @@
         </entityDependency>
       </dependencies>
     </entityProvider>
+    <entityProvider>
+      <name>#PROVIDER_AGGREGATES</name>
+      <useAggregates v="true" />
+    </entityProvider>
   </entityFields>
   <recordContainers>
     <jDitoRecordContainer>
diff --git a/entity/BulkMailTesting_entity/BulkMailTesting_entity.aod b/entity/BulkMailTesting_entity/BulkMailTesting_entity.aod
index 57f615909d..92169c61b5 100644
--- a/entity/BulkMailTesting_entity/BulkMailTesting_entity.aod
+++ b/entity/BulkMailTesting_entity/BulkMailTesting_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.15" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.15">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.16" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.16">
   <name>BulkMailTesting_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/BulkMailTesting_entity/documentation.adoc</documentation>
@@ -56,6 +56,10 @@
       <onActionProcess>%aditoprj%/entity/BulkMailTesting_entity/entityfields/testmail/onActionProcess.js</onActionProcess>
       <iconId>VAADIN:CLIPBOARD_CHECK</iconId>
     </entityActionField>
+    <entityProvider>
+      <name>#PROVIDER_AGGREGATES</name>
+      <useAggregates v="true" />
+    </entityProvider>
   </entityFields>
   <recordContainers>
     <datalessRecordContainer>
diff --git a/entity/BulkMail_entity/BulkMail_entity.aod b/entity/BulkMail_entity/BulkMail_entity.aod
index 89ad323385..c10a2894aa 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.15" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.15">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.16" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.16">
   <name>BulkMail_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/BulkMail_entity/documentation.adoc</documentation>
@@ -314,6 +314,10 @@
       <name>templateType</name>
       <valueProcess>%aditoprj%/entity/BulkMail_entity/entityfields/templatetype/valueProcess.js</valueProcess>
     </entityField>
+    <entityProvider>
+      <name>#PROVIDER_AGGREGATES</name>
+      <useAggregates v="true" />
+    </entityProvider>
   </entityFields>
   <recordContainers>
     <dbRecordContainer>
diff --git a/entity/CampaignAddParticipants_entity/CampaignAddParticipants_entity.aod b/entity/CampaignAddParticipants_entity/CampaignAddParticipants_entity.aod
index f444655a0d..589de0a109 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.15" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.15">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.16" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.16">
   <name>CampaignAddParticipants_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/CampaignAddParticipants_entity/documentation.adoc</documentation>
@@ -151,6 +151,10 @@
       <name>comingFrom_param</name>
       <expose v="true" />
     </entityParameter>
+    <entityProvider>
+      <name>#PROVIDER_AGGREGATES</name>
+      <useAggregates v="true" />
+    </entityProvider>
   </entityFields>
   <recordContainers>
     <jDitoRecordContainer>
diff --git a/entity/CampaignAnalysis_entity/CampaignAnalysis_entity.aod b/entity/CampaignAnalysis_entity/CampaignAnalysis_entity.aod
index e995143977..8bb0b2e138 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.15" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.15">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.16" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.16">
   <name>CampaignAnalysis_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/CampaignAnalysis_entity/documentation.adoc</documentation>
@@ -109,6 +109,10 @@
       <name>Currency</name>
       <valueProcess>%aditoprj%/entity/CampaignAnalysis_entity/entityfields/currency/valueProcess.js</valueProcess>
     </entityField>
+    <entityProvider>
+      <name>#PROVIDER_AGGREGATES</name>
+      <useAggregates v="true" />
+    </entityProvider>
   </entityFields>
   <recordContainers>
     <jDitoRecordContainer>
diff --git a/entity/CampaignCostChart_entity/CampaignCostChart_entity.aod b/entity/CampaignCostChart_entity/CampaignCostChart_entity.aod
index 02e9452bf7..3d95369e5d 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.15" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.15">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.16" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.16">
   <name>CampaignCostChart_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/CampaignCostChart_entity/documentation.adoc</documentation>
@@ -42,6 +42,10 @@
         </entityDependency>
       </dependencies>
     </entityProvider>
+    <entityProvider>
+      <name>#PROVIDER_AGGREGATES</name>
+      <useAggregates v="true" />
+    </entityProvider>
   </entityFields>
   <recordContainers>
     <jDitoRecordContainer>
diff --git a/entity/CampaignCost_entity/CampaignCost_entity.aod b/entity/CampaignCost_entity/CampaignCost_entity.aod
index c7c6782e37..40ec25abd3 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.15" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.15">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.16" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.16">
   <name>CampaignCost_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/CampaignCost_entity/documentation.adoc</documentation>
@@ -243,6 +243,10 @@
       <state>READONLY</state>
       <valueProcess>%aditoprj%/entity/CampaignCost_entity/entityfields/currency/valueProcess.js</valueProcess>
     </entityField>
+    <entityProvider>
+      <name>#PROVIDER_AGGREGATES</name>
+      <useAggregates v="true" />
+    </entityProvider>
   </entityFields>
   <recordContainers>
     <dbRecordContainer>
diff --git a/entity/CampaignParticipantChart_entity/CampaignParticipantChart_entity.aod b/entity/CampaignParticipantChart_entity/CampaignParticipantChart_entity.aod
index 8ba9003088..e8f33ac822 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.15" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.15">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.16" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.16">
   <name>CampaignParticipantChart_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/CampaignParticipantChart_entity/documentation.adoc</documentation>
@@ -44,6 +44,10 @@
       <mandatory v="true" />
       <description>PARAMETER</description>
     </entityParameter>
+    <entityProvider>
+      <name>#PROVIDER_AGGREGATES</name>
+      <useAggregates v="true" />
+    </entityProvider>
   </entityFields>
   <recordContainers>
     <jDitoRecordContainer>
diff --git a/entity/CampaignParticipant_entity/CampaignParticipant_entity.aod b/entity/CampaignParticipant_entity/CampaignParticipant_entity.aod
index 7795938f17..393cf1f209 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.15" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.15">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.16" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.16">
   <name>CampaignParticipant_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/CampaignParticipant_entity/documentation.adoc</documentation>
@@ -226,6 +226,10 @@
       <title>Phone</title>
       <state>READONLY</state>
     </entityField>
+    <entityProvider>
+      <name>#PROVIDER_AGGREGATES</name>
+      <useAggregates v="true" />
+    </entityProvider>
   </entityFields>
   <recordContainers>
     <dbRecordContainer>
diff --git a/entity/CampaignPlanning_entity/CampaignPlanning_entity.aod b/entity/CampaignPlanning_entity/CampaignPlanning_entity.aod
index c30958c7b4..0d70b0df45 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.15" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.15">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.16" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.16">
   <name>CampaignPlanning_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/CampaignPlanning_entity/documentation.adoc</documentation>
@@ -92,6 +92,10 @@
         </entityParameter>
       </children>
     </entityConsumer>
+    <entityProvider>
+      <name>#PROVIDER_AGGREGATES</name>
+      <useAggregates v="true" />
+    </entityProvider>
   </entityFields>
   <recordContainers>
     <dbRecordContainer>
diff --git a/entity/CampaignStep_entity/CampaignStep_entity.aod b/entity/CampaignStep_entity/CampaignStep_entity.aod
index f3ee222a32..aa6b433400 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.15" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.15">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.16" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.16">
   <name>CampaignStep_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/CampaignStep_entity/documentation.adoc</documentation>
@@ -414,6 +414,10 @@
       <expose v="true" />
       <documentation>%aditoprj%/entity/CampaignStep_entity/entityfields/predecessorstepid_param/documentation.adoc</documentation>
     </entityParameter>
+    <entityProvider>
+      <name>#PROVIDER_AGGREGATES</name>
+      <useAggregates v="true" />
+    </entityProvider>
   </entityFields>
   <recordContainers>
     <dbRecordContainer>
diff --git a/entity/Campaign_entity/Campaign_entity.aod b/entity/Campaign_entity/Campaign_entity.aod
index 10ad144066..8498f8347f 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.15" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.15">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.16" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.16">
   <name>Campaign_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/Campaign_entity/documentation.adoc</documentation>
@@ -547,6 +547,10 @@
       <parentField>COUNT</parentField>
       <title>Count</title>
     </entityAggregateField>
+    <entityProvider>
+      <name>#PROVIDER_AGGREGATES</name>
+      <useAggregates v="true" />
+    </entityProvider>
   </entityFields>
   <recordContainers>
     <dbRecordContainer>
diff --git a/entity/ClassificationAdmin_entity/ClassificationAdmin_entity.aod b/entity/ClassificationAdmin_entity/ClassificationAdmin_entity.aod
index 101cb7a09c..74bcf9b2ed 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.15" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.15">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.16" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.16">
   <name>ClassificationAdmin_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/ClassificationAdmin_entity/documentation.adoc</documentation>
@@ -119,6 +119,10 @@
       <name>group_param</name>
       <expose v="true" />
     </entityParameter>
+    <entityProvider>
+      <name>#PROVIDER_AGGREGATES</name>
+      <useAggregates v="true" />
+    </entityProvider>
   </entityFields>
   <recordContainers>
     <dbRecordContainer>
diff --git a/entity/ClassificationGrading_entity/ClassificationGrading_entity.aod b/entity/ClassificationGrading_entity/ClassificationGrading_entity.aod
index 667e289c61..ab19ae0f43 100644
--- a/entity/ClassificationGrading_entity/ClassificationGrading_entity.aod
+++ b/entity/ClassificationGrading_entity/ClassificationGrading_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.15" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.15">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.16" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.16">
   <name>ClassificationGrading_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/ClassificationGrading_entity/documentation.adoc</documentation>
@@ -56,6 +56,10 @@
         </entityParameter>
       </children>
     </entityProvider>
+    <entityProvider>
+      <name>#PROVIDER_AGGREGATES</name>
+      <useAggregates v="true" />
+    </entityProvider>
   </entityFields>
   <recordContainers>
     <dbRecordContainer>
diff --git a/entity/ClassificationGroupAnalyses_entity/ClassificationGroupAnalyses_entity.aod b/entity/ClassificationGroupAnalyses_entity/ClassificationGroupAnalyses_entity.aod
index 9adcf7e620..0eb60b08c4 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.15" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.15">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.16" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.16">
   <name>ClassificationGroupAnalyses_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/ClassificationGroupAnalyses_entity/documentation.adoc</documentation>
@@ -54,6 +54,10 @@
     <entityField>
       <name>GROUP</name>
     </entityField>
+    <entityProvider>
+      <name>#PROVIDER_AGGREGATES</name>
+      <useAggregates v="true" />
+    </entityProvider>
   </entityFields>
   <recordContainers>
     <jDitoRecordContainer>
diff --git a/entity/ClassificationScore_entity/ClassificationScore_entity.aod b/entity/ClassificationScore_entity/ClassificationScore_entity.aod
index 194db95957..0e066fefa0 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.15" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.15">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.16" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.16">
   <name>ClassificationScore_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/ClassificationScore_entity/documentation.adoc</documentation>
@@ -80,6 +80,10 @@
       <expose v="true" />
       <description>PARAMETER</description>
     </entityParameter>
+    <entityProvider>
+      <name>#PROVIDER_AGGREGATES</name>
+      <useAggregates v="true" />
+    </entityProvider>
   </entityFields>
   <recordContainers>
     <dbRecordContainer>
diff --git a/entity/ClassificationType_entity/ClassificationType_entity.aod b/entity/ClassificationType_entity/ClassificationType_entity.aod
index e6e4b0e4d5..8b99efe8bf 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.15" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.15">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.16" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.16">
   <name>ClassificationType_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/ClassificationType_entity/documentation.adoc</documentation>
@@ -21,6 +21,10 @@
       <name>ClassificationTypeIds_param</name>
       <expose v="true" />
     </entityParameter>
+    <entityProvider>
+      <name>#PROVIDER_AGGREGATES</name>
+      <useAggregates v="true" />
+    </entityProvider>
   </entityFields>
   <recordContainers>
     <dbRecordContainer>
diff --git a/entity/Classification_entity/Classification_entity.aod b/entity/Classification_entity/Classification_entity.aod
index 2cc4f103f2..4bdb408f3d 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.15" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.15">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.16" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.16">
   <name>Classification_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/Classification_entity/documentation.adoc</documentation>
@@ -155,6 +155,10 @@
     <entityField>
       <name>GRADINGVALUE</name>
     </entityField>
+    <entityProvider>
+      <name>#PROVIDER_AGGREGATES</name>
+      <useAggregates v="true" />
+    </entityProvider>
   </entityFields>
   <recordContainers>
     <jDitoRecordContainer>
diff --git a/entity/CommRestriction_Entity/CommRestriction_Entity.aod b/entity/CommRestriction_Entity/CommRestriction_Entity.aod
index 70b8e574b7..338815c674 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.15" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.15">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.16" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.16">
   <name>CommRestriction_Entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/CommRestriction_Entity/documentation.adoc</documentation>
@@ -115,6 +115,10 @@
         </entityParameter>
       </children>
     </entityConsumer>
+    <entityProvider>
+      <name>#PROVIDER_AGGREGATES</name>
+      <useAggregates v="true" />
+    </entityProvider>
   </entityFields>
   <recordContainers>
     <dbRecordContainer>
diff --git a/entity/Communication_entity/Communication_entity.aod b/entity/Communication_entity/Communication_entity.aod
index ced9d009b8..90f75ac86c 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.15" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.15">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.16" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.16">
   <name>Communication_entity</name>
   <description>former Comm</description>
   <majorModelMode>DISTRIBUTED</majorModelMode>
@@ -280,6 +280,10 @@ Usually this is used for filtering COMMUNICATION-entries by a specified contact
       <name>CountryForValidation_param</name>
       <valueProcess>%aditoprj%/entity/Communication_entity/entityfields/countryforvalidation_param/valueProcess.js</valueProcess>
     </entityParameter>
+    <entityProvider>
+      <name>#PROVIDER_AGGREGATES</name>
+      <useAggregates v="true" />
+    </entityProvider>
   </entityFields>
   <recordContainers>
     <dbRecordContainer>
diff --git a/entity/Competition_entity/Competition_entity.aod b/entity/Competition_entity/Competition_entity.aod
index 369bee2644..56ed87886c 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.15" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.15">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.16" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.16">
   <name>Competition_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/Competition_entity/documentation.adoc</documentation>
@@ -290,6 +290,10 @@
         </entityParameter>
       </children>
     </entityProvider>
+    <entityProvider>
+      <name>#PROVIDER_AGGREGATES</name>
+      <useAggregates v="true" />
+    </entityProvider>
   </entityFields>
   <recordContainers>
     <dbRecordContainer>
diff --git a/entity/Contact_entity/Contact_entity.aod b/entity/Contact_entity/Contact_entity.aod
index b0a1ff99f2..9128e79877 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.15" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.15">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.16" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.16">
   <name>Contact_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/Contact_entity/documentation.adoc</documentation>
@@ -251,6 +251,10 @@
       <name>Readonly_param</name>
       <expose v="true" />
     </entityParameter>
+    <entityProvider>
+      <name>#PROVIDER_AGGREGATES</name>
+      <useAggregates v="true" />
+    </entityProvider>
   </entityFields>
   <recordContainers>
     <dbRecordContainer>
diff --git a/entity/Context_entity/Context_entity.aod b/entity/Context_entity/Context_entity.aod
index b4469426e1..e9f6563ef3 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.15" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.15">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.16" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.16">
   <name>Context_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/Context_entity/documentation.adoc</documentation>
@@ -188,6 +188,10 @@
         </entityParameter>
       </children>
     </entityProvider>
+    <entityProvider>
+      <name>#PROVIDER_AGGREGATES</name>
+      <useAggregates v="true" />
+    </entityProvider>
   </entityFields>
   <recordContainers>
     <jDitoRecordContainer>
diff --git a/entity/Contract_entity/Contract_entity.aod b/entity/Contract_entity/Contract_entity.aod
index 761368c1b2..03a1c5e37d 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.15" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.15">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.16" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.16">
   <name>Contract_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/Contract_entity/documentation.adoc</documentation>
@@ -398,6 +398,10 @@
       <parentField>COUNT</parentField>
       <title>Count</title>
     </entityAggregateField>
+    <entityProvider>
+      <name>#PROVIDER_AGGREGATES</name>
+      <useAggregates v="true" />
+    </entityProvider>
   </entityFields>
   <recordContainers>
     <dbRecordContainer>
diff --git a/entity/Countries_Entity/Countries_Entity.aod b/entity/Countries_Entity/Countries_Entity.aod
index 5860d9333d..5a679b23f5 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.15" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.15">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.16" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.16">
   <name>Countries_Entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/Countries_Entity/documentation.adoc</documentation>
@@ -91,6 +91,10 @@
       <name>NAME_ORIGIN</name>
       <title>Native Name</title>
     </entityField>
+    <entityProvider>
+      <name>#PROVIDER_AGGREGATES</name>
+      <useAggregates v="true" />
+    </entityProvider>
   </entityFields>
   <recordContainers>
     <dbRecordContainer>
diff --git a/entity/DSGVOInfo_entity/DSGVOInfo_entity.aod b/entity/DSGVOInfo_entity/DSGVOInfo_entity.aod
index 0e7d614342..bd849bc157 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.15" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.15">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.16" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.16">
   <name>DSGVOInfo_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/DSGVOInfo_entity/documentation.adoc</documentation>
@@ -152,6 +152,10 @@
         </entityParameter>
       </children>
     </entityConsumer>
+    <entityProvider>
+      <name>#PROVIDER_AGGREGATES</name>
+      <useAggregates v="true" />
+    </entityProvider>
   </entityFields>
   <recordContainers>
     <dbRecordContainer>
diff --git a/entity/DSGVOReport_entity/DSGVOReport_entity.aod b/entity/DSGVOReport_entity/DSGVOReport_entity.aod
index b9c99e14ea..e3dcfa867b 100644
--- a/entity/DSGVOReport_entity/DSGVOReport_entity.aod
+++ b/entity/DSGVOReport_entity/DSGVOReport_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.15" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.15">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.16" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.16">
   <name>DSGVOReport_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/DSGVOReport_entity/documentation.adoc</documentation>
@@ -32,6 +32,10 @@
     <entityField>
       <name>UID</name>
     </entityField>
+    <entityProvider>
+      <name>#PROVIDER_AGGREGATES</name>
+      <useAggregates v="true" />
+    </entityProvider>
   </entityFields>
   <recordContainers>
     <jDitoRecordContainer>
diff --git a/entity/DSGVO_entity/DSGVO_entity.aod b/entity/DSGVO_entity/DSGVO_entity.aod
index a091f09f40..8f8e1c40cc 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.15" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.15">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.16" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.16">
   <name>DSGVO_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/DSGVO_entity/documentation.adoc</documentation>
@@ -202,6 +202,10 @@
       <contentType>BOOLEAN</contentType>
       <stateProcess>%aditoprj%/entity/DSGVO_entity/entityfields/apply_change_for_all_control/stateProcess.js</stateProcess>
     </entityField>
+    <entityProvider>
+      <name>#PROVIDER_AGGREGATES</name>
+      <useAggregates v="true" />
+    </entityProvider>
   </entityFields>
   <recordContainers>
     <jDitoRecordContainer>
diff --git a/entity/DefaultAdminView_entity/DefaultAdminView_entity.aod b/entity/DefaultAdminView_entity/DefaultAdminView_entity.aod
index adbaeeacd2..8c22684782 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.15" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.15">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.16" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.16">
   <name>DefaultAdminView_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/DefaultAdminView_entity/documentation.adoc</documentation>
@@ -36,6 +36,10 @@
       <expose v="true" />
       <mandatory v="true" />
     </entityParameter>
+    <entityProvider>
+      <name>#PROVIDER_AGGREGATES</name>
+      <useAggregates v="true" />
+    </entityProvider>
   </entityFields>
   <recordContainers>
     <jDitoRecordContainer>
diff --git a/entity/DescriptionTranslation_entity/DescriptionTranslation_entity.aod b/entity/DescriptionTranslation_entity/DescriptionTranslation_entity.aod
index 4bd4adb0d2..d42f6616e8 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.15" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.15">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.16" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.16">
   <name>DescriptionTranslation_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/DescriptionTranslation_entity/documentation.adoc</documentation>
@@ -73,6 +73,10 @@
         </entityDependency>
       </dependencies>
     </entityProvider>
+    <entityProvider>
+      <name>#PROVIDER_AGGREGATES</name>
+      <useAggregates v="true" />
+    </entityProvider>
   </entityFields>
   <recordContainers>
     <dbRecordContainer>
diff --git a/entity/DocumentTemplateLink_entity/DocumentTemplateLink_entity.aod b/entity/DocumentTemplateLink_entity/DocumentTemplateLink_entity.aod
index 1aa96ed2fe..0d5940fc0c 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.15" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.15">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.16" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.16">
   <name>DocumentTemplateLink_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/DocumentTemplateLink_entity/documentation.adoc</documentation>
@@ -102,6 +102,10 @@
       <contentType>TEXT</contentType>
       <valueProcess>%aditoprj%/entity/DocumentTemplateLink_entity/entityfields/icon/valueProcess.js</valueProcess>
     </entityField>
+    <entityProvider>
+      <name>#PROVIDER_AGGREGATES</name>
+      <useAggregates v="true" />
+    </entityProvider>
   </entityFields>
   <recordContainers>
     <dbRecordContainer>
diff --git a/entity/DocumentTemplatePlaceOfUse_entity/DocumentTemplatePlaceOfUse_entity.aod b/entity/DocumentTemplatePlaceOfUse_entity/DocumentTemplatePlaceOfUse_entity.aod
index 5ac456c0ad..cac308ab7d 100644
--- a/entity/DocumentTemplatePlaceOfUse_entity/DocumentTemplatePlaceOfUse_entity.aod
+++ b/entity/DocumentTemplatePlaceOfUse_entity/DocumentTemplatePlaceOfUse_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.15" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.15">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.16" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.16">
   <name>DocumentTemplatePlaceOfUse_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/DocumentTemplatePlaceOfUse_entity/documentation.adoc</documentation>
@@ -67,6 +67,10 @@
       <valueProcess>%aditoprj%/entity/DocumentTemplatePlaceOfUse_entity/entityfields/documenttemplateplaceofuse_param/valueProcess.js</valueProcess>
       <expose v="true" />
     </entityParameter>
+    <entityProvider>
+      <name>#PROVIDER_AGGREGATES</name>
+      <useAggregates v="true" />
+    </entityProvider>
   </entityFields>
   <recordContainers>
     <dbRecordContainer>
diff --git a/entity/DocumentTemplateTypeCategory_entity/DocumentTemplateTypeCategory_entity.aod b/entity/DocumentTemplateTypeCategory_entity/DocumentTemplateTypeCategory_entity.aod
index d7ea428cd8..41df983c3f 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.15" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.15">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.16" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.16">
   <name>DocumentTemplateTypeCategory_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/DocumentTemplateTypeCategory_entity/documentation.adoc</documentation>
@@ -46,6 +46,10 @@
         </entityParameter>
       </children>
     </entityProvider>
+    <entityProvider>
+      <name>#PROVIDER_AGGREGATES</name>
+      <useAggregates v="true" />
+    </entityProvider>
   </entityFields>
   <recordContainers>
     <dbRecordContainer>
diff --git a/entity/DocumentTemplate_entity/DocumentTemplate_entity.aod b/entity/DocumentTemplate_entity/DocumentTemplate_entity.aod
index 3036401525..f63ffca46b 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.15" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.15">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.16" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.16">
   <name>DocumentTemplate_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/DocumentTemplate_entity/documentation.adoc</documentation>
@@ -339,6 +339,10 @@
       <name>DOCUMENTTEMPLATE_OBJECTTYPE</name>
       <valueProcess>%aditoprj%/entity/DocumentTemplate_entity/entityfields/documenttemplate_objecttype/valueProcess.js</valueProcess>
     </entityField>
+    <entityProvider>
+      <name>#PROVIDER_AGGREGATES</name>
+      <useAggregates v="true" />
+    </entityProvider>
   </entityFields>
   <recordContainers>
     <dbRecordContainer>
diff --git a/entity/Document_entity/Document_entity.aod b/entity/Document_entity/Document_entity.aod
index 1975ae7ba9..6c20477563 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.15" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.15">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.16" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.16">
   <name>Document_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/Document_entity/documentation.adoc</documentation>
@@ -344,6 +344,10 @@
         </entityParameter>
       </children>
     </entityProvider>
+    <entityProvider>
+      <name>#PROVIDER_AGGREGATES</name>
+      <useAggregates v="true" />
+    </entityProvider>
   </entityFields>
   <recordContainers>
     <jDitoRecordContainer>
diff --git a/entity/DuplicateScannerResultFieldConfig_entity/DuplicateScannerResultFieldConfig_entity.aod b/entity/DuplicateScannerResultFieldConfig_entity/DuplicateScannerResultFieldConfig_entity.aod
index ef38406cb6..ab64bf597b 100644
--- a/entity/DuplicateScannerResultFieldConfig_entity/DuplicateScannerResultFieldConfig_entity.aod
+++ b/entity/DuplicateScannerResultFieldConfig_entity/DuplicateScannerResultFieldConfig_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.15" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.15">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.16" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.16">
   <name>DuplicateScannerResultFieldConfig_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/DuplicateScannerResultFieldConfig_entity/documentation.adoc</documentation>
@@ -51,6 +51,10 @@
       <name>DUPLICATESCANNER_ID</name>
       <valueProcess>%aditoprj%/entity/DuplicateScannerResultFieldConfig_entity/entityfields/duplicatescanner_id/valueProcess.js</valueProcess>
     </entityField>
+    <entityProvider>
+      <name>#PROVIDER_AGGREGATES</name>
+      <useAggregates v="true" />
+    </entityProvider>
   </entityFields>
   <recordContainers>
     <dbRecordContainer>
diff --git a/entity/DuplicateScanner_entity/DuplicateScanner_entity.aod b/entity/DuplicateScanner_entity/DuplicateScanner_entity.aod
index 00973fb96c..51904f5e4e 100644
--- a/entity/DuplicateScanner_entity/DuplicateScanner_entity.aod
+++ b/entity/DuplicateScanner_entity/DuplicateScanner_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.15" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.15">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.16" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.16">
   <name>DuplicateScanner_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/DuplicateScanner_entity/documentation.adoc</documentation>
@@ -98,6 +98,10 @@
         </entityActionField>
       </children>
     </entityActionGroup>
+    <entityProvider>
+      <name>#PROVIDER_AGGREGATES</name>
+      <useAggregates v="true" />
+    </entityProvider>
   </entityFields>
   <recordContainers>
     <dbRecordContainer>
diff --git a/entity/DuplicatesUnrelated_entity/DuplicatesUnrelated_entity.aod b/entity/DuplicatesUnrelated_entity/DuplicatesUnrelated_entity.aod
index b26d259182..5d507d6309 100644
--- a/entity/DuplicatesUnrelated_entity/DuplicatesUnrelated_entity.aod
+++ b/entity/DuplicatesUnrelated_entity/DuplicatesUnrelated_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.15" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.15">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.16" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.16">
   <name>DuplicatesUnrelated_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/DuplicatesUnrelated_entity/documentation.adoc</documentation>
@@ -64,6 +64,10 @@
       <expose v="true" />
       <mandatory v="true" />
     </entityParameter>
+    <entityProvider>
+      <name>#PROVIDER_AGGREGATES</name>
+      <useAggregates v="true" />
+    </entityProvider>
   </entityFields>
   <recordContainers>
     <jDitoRecordContainer>
diff --git a/entity/Duplicates_entity/Duplicates_entity.aod b/entity/Duplicates_entity/Duplicates_entity.aod
index 8742dca128..37a97f1b30 100644
--- a/entity/Duplicates_entity/Duplicates_entity.aod
+++ b/entity/Duplicates_entity/Duplicates_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.15" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.15">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.16" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.16">
   <name>Duplicates_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/Duplicates_entity/documentation.adoc</documentation>
@@ -202,6 +202,10 @@
         </entityParameter>
       </children>
     </entityConsumer>
+    <entityProvider>
+      <name>#PROVIDER_AGGREGATES</name>
+      <useAggregates v="true" />
+    </entityProvider>
   </entityFields>
   <recordContainers>
     <jDitoRecordContainer>
diff --git a/entity/Email_entity/Email_entity.aod b/entity/Email_entity/Email_entity.aod
index 917925c388..9306b8443b 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.15" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.15">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.16" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.16">
   <name>Email_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/Email_entity/documentation.adoc</documentation>
@@ -134,6 +134,10 @@
       <mandatory v="true" />
       <documentation>%aditoprj%/entity/Email_entity/entityfields/offerid_param/documentation.adoc</documentation>
     </entityParameter>
+    <entityProvider>
+      <name>#PROVIDER_AGGREGATES</name>
+      <useAggregates v="true" />
+    </entityProvider>
   </entityFields>
   <recordContainers>
     <datalessRecordContainer>
diff --git a/entity/EmployeeRole_entity/EmployeeRole_entity.aod b/entity/EmployeeRole_entity/EmployeeRole_entity.aod
index 25f8670520..83de74fed1 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.15" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.15">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.16" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.16">
   <name>EmployeeRole_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/EmployeeRole_entity/documentation.adoc</documentation>
@@ -65,6 +65,10 @@
     <entityField>
       <name>TARGETCONTEXT</name>
     </entityField>
+    <entityProvider>
+      <name>#PROVIDER_AGGREGATES</name>
+      <useAggregates v="true" />
+    </entityProvider>
   </entityFields>
   <recordContainers>
     <jDitoRecordContainer>
diff --git a/entity/Employee_entity/Employee_entity.aod b/entity/Employee_entity/Employee_entity.aod
index 84123ae4cb..5a1875ca1c 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.15" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.15">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.16" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.16">
   <name>Employee_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/Employee_entity/documentation.adoc</documentation>
@@ -380,6 +380,10 @@
         <element>MASK</element>
       </onValueChangeTypes>
     </entityField>
+    <entityProvider>
+      <name>#PROVIDER_AGGREGATES</name>
+      <useAggregates v="true" />
+    </entityProvider>
   </entityFields>
   <recordContainers>
     <jDitoRecordContainer>
diff --git a/entity/ExportTemplateField_entity/ExportTemplateField_entity.aod b/entity/ExportTemplateField_entity/ExportTemplateField_entity.aod
index 68418931d2..478f6c7333 100644
--- a/entity/ExportTemplateField_entity/ExportTemplateField_entity.aod
+++ b/entity/ExportTemplateField_entity/ExportTemplateField_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.15" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.15">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.16" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.16">
   <name>ExportTemplateField_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/ExportTemplateField_entity/documentation.adoc</documentation>
@@ -60,6 +60,10 @@
       <inputFormat>###</inputFormat>
       <mandatory v="true" />
     </entityField>
+    <entityProvider>
+      <name>#PROVIDER_AGGREGATES</name>
+      <useAggregates v="true" />
+    </entityProvider>
   </entityFields>
   <recordContainers>
     <dbRecordContainer>
diff --git a/entity/ExportTemplatePlaceOfUse_entity/ExportTemplatePlaceOfUse_entity.aod b/entity/ExportTemplatePlaceOfUse_entity/ExportTemplatePlaceOfUse_entity.aod
index d56b4f471a..daa788bbf1 100644
--- a/entity/ExportTemplatePlaceOfUse_entity/ExportTemplatePlaceOfUse_entity.aod
+++ b/entity/ExportTemplatePlaceOfUse_entity/ExportTemplatePlaceOfUse_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.15" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.15">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.16" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.16">
   <name>ExportTemplatePlaceOfUse_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/ExportTemplatePlaceOfUse_entity/documentation.adoc</documentation>
@@ -71,6 +71,10 @@
         </entityParameter>
       </children>
     </entityProvider>
+    <entityProvider>
+      <name>#PROVIDER_AGGREGATES</name>
+      <useAggregates v="true" />
+    </entityProvider>
   </entityFields>
   <recordContainers>
     <dbRecordContainer>
diff --git a/entity/ExportTemplateSelection_entity/ExportTemplateSelection_entity.aod b/entity/ExportTemplateSelection_entity/ExportTemplateSelection_entity.aod
index 4230c44105..117876df7d 100644
--- a/entity/ExportTemplateSelection_entity/ExportTemplateSelection_entity.aod
+++ b/entity/ExportTemplateSelection_entity/ExportTemplateSelection_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.15" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.15">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.16" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.16">
   <name>ExportTemplateSelection_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/ExportTemplateSelection_entity/documentation.adoc</documentation>
@@ -83,6 +83,10 @@
       <titleProcess>%aditoprj%/entity/ExportTemplateSelection_entity/entityfields/exportcount/titleProcess.js</titleProcess>
       <valueProcess>%aditoprj%/entity/ExportTemplateSelection_entity/entityfields/exportcount/valueProcess.js</valueProcess>
     </entityField>
+    <entityProvider>
+      <name>#PROVIDER_AGGREGATES</name>
+      <useAggregates v="true" />
+    </entityProvider>
   </entityFields>
   <recordContainers>
     <datalessRecordContainer>
diff --git a/entity/ExportTemplate_entity/ExportTemplate_entity.aod b/entity/ExportTemplate_entity/ExportTemplate_entity.aod
index 55c0bd86ba..65e085fd59 100644
--- a/entity/ExportTemplate_entity/ExportTemplate_entity.aod
+++ b/entity/ExportTemplate_entity/ExportTemplate_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.15" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.15">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.16" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.16">
   <name>ExportTemplate_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/ExportTemplate_entity/documentation.adoc</documentation>
@@ -147,6 +147,10 @@
       <name>EXPORTTEMPLATE_OBJECTTYPE</name>
       <valueProcess>%aditoprj%/entity/ExportTemplate_entity/entityfields/exporttemplate_objecttype/valueProcess.js</valueProcess>
     </entityField>
+    <entityProvider>
+      <name>#PROVIDER_AGGREGATES</name>
+      <useAggregates v="true" />
+    </entityProvider>
   </entityFields>
   <recordContainers>
     <dbRecordContainer>
diff --git a/entity/Favorite_entity/Favorite_entity.aod b/entity/Favorite_entity/Favorite_entity.aod
index 9710922d9a..3df5d594f4 100644
--- a/entity/Favorite_entity/Favorite_entity.aod
+++ b/entity/Favorite_entity/Favorite_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.15" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.15">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.16" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.16">
   <name>Favorite_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/Favorite_entity/documentation.adoc</documentation>
@@ -56,6 +56,10 @@
       <name>PICTURE</name>
       <contentType>IMAGE</contentType>
     </entityField>
+    <entityProvider>
+      <name>#PROVIDER_AGGREGATES</name>
+      <useAggregates v="true" />
+    </entityProvider>
   </entityFields>
   <recordContainers>
     <jDitoRecordContainer>
diff --git a/entity/Forecast_entity/Forecast_entity.aod b/entity/Forecast_entity/Forecast_entity.aod
index 5cbbb88131..b5b7a6a2f3 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.15" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.15">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.16" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.16">
   <name>Forecast_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/Forecast_entity/documentation.adoc</documentation>
@@ -119,6 +119,10 @@
       <expose v="true" />
       <description>PARAMETER</description>
     </entityParameter>
+    <entityProvider>
+      <name>#PROVIDER_AGGREGATES</name>
+      <useAggregates v="true" />
+    </entityProvider>
   </entityFields>
   <recordContainers>
     <dbRecordContainer>
diff --git a/entity/Gender_keyword/Gender_keyword.aod b/entity/Gender_keyword/Gender_keyword.aod
index fabf8e27da..60b05dbba5 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.15" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.15">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.16" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.16">
   <name>Gender_keyword</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/Gender_keyword/documentation.adoc</documentation>
@@ -23,6 +23,10 @@
         </entityDependency>
       </dependencies>
     </entityProvider>
+    <entityProvider>
+      <name>#PROVIDER_AGGREGATES</name>
+      <useAggregates v="true" />
+    </entityProvider>
   </entityFields>
   <recordContainers>
     <jDitoRecordContainer>
diff --git a/entity/ImportField_Entity/ImportField_Entity.aod b/entity/ImportField_Entity/ImportField_Entity.aod
index bb437ea6d9..b4901e91a3 100644
--- a/entity/ImportField_Entity/ImportField_Entity.aod
+++ b/entity/ImportField_Entity/ImportField_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.15" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.15">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.16" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.16">
   <name>ImportField_Entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/ImportField_Entity/documentation.adoc</documentation>
@@ -83,6 +83,10 @@
         </entityParameter>
       </children>
     </entityConsumer>
+    <entityProvider>
+      <name>#PROVIDER_AGGREGATES</name>
+      <useAggregates v="true" />
+    </entityProvider>
   </entityFields>
   <recordContainers>
     <dbRecordContainer>
diff --git a/entity/IndexSearchEntity/IndexSearchEntity.aod b/entity/IndexSearchEntity/IndexSearchEntity.aod
index 4b960e34ce..695a56ad51 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.15" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.15">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.16" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.16">
   <name>IndexSearchEntity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/IndexSearchEntity/documentation.adoc</documentation>
@@ -10,5 +10,9 @@
     <entityField>
       <name>INDEXSEARCHFIELD</name>
     </entityField>
+    <entityProvider>
+      <name>#PROVIDER_AGGREGATES</name>
+      <useAggregates v="true" />
+    </entityProvider>
   </entityFields>
 </entity>
diff --git a/entity/KeywordAttributeRelation_entity/KeywordAttributeRelation_entity.aod b/entity/KeywordAttributeRelation_entity/KeywordAttributeRelation_entity.aod
index c96b0fd65f..4936f56062 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.15" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.15">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.16" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.16">
   <name>KeywordAttributeRelation_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/KeywordAttributeRelation_entity/documentation.adoc</documentation>
@@ -117,6 +117,10 @@
       <name>LONG_CHAR_VALUE</name>
       <state>INVISIBLE</state>
     </entityField>
+    <entityProvider>
+      <name>#PROVIDER_AGGREGATES</name>
+      <useAggregates v="true" />
+    </entityProvider>
   </entityFields>
   <recordContainers>
     <dbRecordContainer>
diff --git a/entity/KeywordAttribute_entity/KeywordAttribute_entity.aod b/entity/KeywordAttribute_entity/KeywordAttribute_entity.aod
index 427c15d137..b7a9538ae8 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.15" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.15">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.16" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.16">
   <name>KeywordAttribute_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/KeywordAttribute_entity/documentation.adoc</documentation>
@@ -82,6 +82,10 @@
         </entityParameter>
       </children>
     </entityConsumer>
+    <entityProvider>
+      <name>#PROVIDER_AGGREGATES</name>
+      <useAggregates v="true" />
+    </entityProvider>
   </entityFields>
   <recordContainers>
     <dbRecordContainer>
diff --git a/entity/KeywordEntry_entity/KeywordEntry_entity.aod b/entity/KeywordEntry_entity/KeywordEntry_entity.aod
index f738e22c53..33b35f2b05 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.15" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.15">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.16" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.16">
   <name>KeywordEntry_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/KeywordEntry_entity/documentation.adoc</documentation>
@@ -650,6 +650,10 @@
       <iconId>VAADIN:CURLY_BRACKETS</iconId>
       <stateProcess>%aditoprj%/entity/KeywordEntry_entity/entityfields/openadminview/stateProcess.js</stateProcess>
     </entityActionField>
+    <entityProvider>
+      <name>#PROVIDER_AGGREGATES</name>
+      <useAggregates v="true" />
+    </entityProvider>
   </entityFields>
   <recordContainers>
     <dbRecordContainer>
diff --git a/entity/Language_entity/Language_entity.aod b/entity/Language_entity/Language_entity.aod
index b5a5c1ef19..58a441009f 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.15" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.15">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.16" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.16">
   <name>Language_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/Language_entity/documentation.adoc</documentation>
@@ -116,6 +116,10 @@
       <name>ExcludedIds_param</name>
       <expose v="true" />
     </entityParameter>
+    <entityProvider>
+      <name>#PROVIDER_AGGREGATES</name>
+      <useAggregates v="true" />
+    </entityProvider>
   </entityFields>
   <recordContainers>
     <dbRecordContainer>
diff --git a/entity/LeadLog_entity/LeadLog_entity.aod b/entity/LeadLog_entity/LeadLog_entity.aod
index 2f22d18572..4d60dc3a7e 100644
--- a/entity/LeadLog_entity/LeadLog_entity.aod
+++ b/entity/LeadLog_entity/LeadLog_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.15" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.15">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.16" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.16">
   <name>LeadLog_entity</name>
   <description></description>
   <majorModelMode>DISTRIBUTED</majorModelMode>
@@ -81,6 +81,10 @@
         </entityParameter>
       </children>
     </entityConsumer>
+    <entityProvider>
+      <name>#PROVIDER_AGGREGATES</name>
+      <useAggregates v="true" />
+    </entityProvider>
   </entityFields>
   <recordContainers>
     <dbRecordContainer>
diff --git a/entity/LeadTemp_entity/LeadTemp_entity.aod b/entity/LeadTemp_entity/LeadTemp_entity.aod
index fb75e9b397..4e5c3ee1e7 100644
--- a/entity/LeadTemp_entity/LeadTemp_entity.aod
+++ b/entity/LeadTemp_entity/LeadTemp_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.15" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.15">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.16" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.16">
   <name>LeadTemp_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/LeadTemp_entity/documentation.adoc</documentation>
@@ -164,6 +164,10 @@
       <name>LeadImportId</name>
       <expose v="true" />
     </entityParameter>
+    <entityProvider>
+      <name>#PROVIDER_AGGREGATES</name>
+      <useAggregates v="true" />
+    </entityProvider>
   </entityFields>
   <recordContainers>
     <dbRecordContainer>
diff --git a/entity/Lead_entity/Lead_entity.aod b/entity/Lead_entity/Lead_entity.aod
index 0932cf1ecf..11610905fb 100644
--- a/entity/Lead_entity/Lead_entity.aod
+++ b/entity/Lead_entity/Lead_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.15" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.15">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.16" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.16">
   <name>Lead_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/Lead_entity/documentation.adoc</documentation>
@@ -121,6 +121,10 @@
         </entityParameter>
       </children>
     </entityConsumer>
+    <entityProvider>
+      <name>#PROVIDER_AGGREGATES</name>
+      <useAggregates v="true" />
+    </entityProvider>
   </entityFields>
   <recordContainers>
     <dbRecordContainer>
diff --git a/entity/LeadimportMappingAssistant_entity/LeadimportMappingAssistant_entity.aod b/entity/LeadimportMappingAssistant_entity/LeadimportMappingAssistant_entity.aod
index 42f7de6766..8cd12edc37 100644
--- a/entity/LeadimportMappingAssistant_entity/LeadimportMappingAssistant_entity.aod
+++ b/entity/LeadimportMappingAssistant_entity/LeadimportMappingAssistant_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.15" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.15">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.16" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.16">
   <name>LeadimportMappingAssistant_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/LeadimportMappingAssistant_entity/documentation.adoc</documentation>
@@ -79,6 +79,10 @@
         </entityParameter>
       </children>
     </entityConsumer>
+    <entityProvider>
+      <name>#PROVIDER_AGGREGATES</name>
+      <useAggregates v="true" />
+    </entityProvider>
   </entityFields>
   <recordContainers>
     <dbRecordContainer>
diff --git a/entity/Leadimport_entity/Leadimport_entity.aod b/entity/Leadimport_entity/Leadimport_entity.aod
index 1c31506735..44062290e6 100644
--- a/entity/Leadimport_entity/Leadimport_entity.aod
+++ b/entity/Leadimport_entity/Leadimport_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.15" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.15">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.16" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.16">
   <name>Leadimport_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/Leadimport_entity/documentation.adoc</documentation>
@@ -323,6 +323,10 @@
       <name>LEADIMPORT_OBJECTTYPE</name>
       <valueProcess>%aditoprj%/entity/Leadimport_entity/entityfields/leadimport_objecttype/valueProcess.js</valueProcess>
     </entityField>
+    <entityProvider>
+      <name>#PROVIDER_AGGREGATES</name>
+      <useAggregates v="true" />
+    </entityProvider>
   </entityFields>
   <recordContainers>
     <dbRecordContainer>
diff --git a/entity/LetterRecipient_entity/LetterRecipient_entity.aod b/entity/LetterRecipient_entity/LetterRecipient_entity.aod
index 21746fce85..0c1bbd9803 100644
--- a/entity/LetterRecipient_entity/LetterRecipient_entity.aod
+++ b/entity/LetterRecipient_entity/LetterRecipient_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.15" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.15">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.16" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.16">
   <name>LetterRecipient_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/LetterRecipient_entity/documentation.adoc</documentation>
@@ -97,6 +97,10 @@
       <state>READONLY</state>
       <displayValueProcess>%aditoprj%/entity/LetterRecipient_entity/entityfields/address_id/displayValueProcess.js</displayValueProcess>
     </entityField>
+    <entityProvider>
+      <name>#PROVIDER_AGGREGATES</name>
+      <useAggregates v="true" />
+    </entityProvider>
   </entityFields>
   <recordContainers>
     <dbRecordContainer>
diff --git a/entity/Letter_entity/Letter_entity.aod b/entity/Letter_entity/Letter_entity.aod
index cb5cf6a8db..4b0863509e 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.15" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.15">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.16" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.16">
   <name>Letter_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/Letter_entity/documentation.adoc</documentation>
@@ -76,6 +76,10 @@
       <name>AdditionalPlaceholders_param</name>
       <expose v="true" />
     </entityParameter>
+    <entityProvider>
+      <name>#PROVIDER_AGGREGATES</name>
+      <useAggregates v="true" />
+    </entityProvider>
   </entityFields>
   <recordContainers>
     <datalessRecordContainer>
diff --git a/entity/LogHistory_entity/LogHistory_entity.aod b/entity/LogHistory_entity/LogHistory_entity.aod
index aa71d5c5fa..59985906dd 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.15" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.15">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.16" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.16">
   <name>LogHistory_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/LogHistory_entity/documentation.adoc</documentation>
@@ -140,6 +140,10 @@
         </entityActionField>
       </children>
     </entityActionGroup>
+    <entityProvider>
+      <name>#PROVIDER_AGGREGATES</name>
+      <useAggregates v="true" />
+    </entityProvider>
   </entityFields>
   <recordContainers>
     <jDitoRecordContainer>
diff --git a/entity/MemberRoles_entity/MemberRoles_entity.aod b/entity/MemberRoles_entity/MemberRoles_entity.aod
index e41db4aff7..b73a0bd031 100644
--- a/entity/MemberRoles_entity/MemberRoles_entity.aod
+++ b/entity/MemberRoles_entity/MemberRoles_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.15" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.15">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.16" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.16">
   <name>MemberRoles_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/MemberRoles_entity/documentation.adoc</documentation>
@@ -35,6 +35,10 @@
       <expose v="true" />
       <mandatory v="true" />
     </entityParameter>
+    <entityProvider>
+      <name>#PROVIDER_AGGREGATES</name>
+      <useAggregates v="true" />
+    </entityProvider>
   </entityFields>
   <recordContainers>
     <dbRecordContainer>
diff --git a/entity/Member_entity/Member_entity.aod b/entity/Member_entity/Member_entity.aod
index 751a92a242..91c9eb210d 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.15" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.15">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.16" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.16">
   <name>Member_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/Member_entity/documentation.adoc</documentation>
@@ -199,6 +199,10 @@
       <contentType>IMAGE</contentType>
       <valueProcess>%aditoprj%/entity/Member_entity/entityfields/image/valueProcess.js</valueProcess>
     </entityField>
+    <entityProvider>
+      <name>#PROVIDER_AGGREGATES</name>
+      <useAggregates v="true" />
+    </entityProvider>
   </entityFields>
   <recordContainers>
     <dbRecordContainer>
diff --git a/entity/ModuleTree_entity/ModuleTree_entity.aod b/entity/ModuleTree_entity/ModuleTree_entity.aod
index e5153d2b70..1bda506ffa 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.15" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.15">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.16" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.16">
   <name>ModuleTree_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/ModuleTree_entity/documentation.adoc</documentation>
@@ -80,6 +80,10 @@
       <mandatory v="true" />
       <description>PARAMETER</description>
     </entityParameter>
+    <entityProvider>
+      <name>#PROVIDER_AGGREGATES</name>
+      <useAggregates v="true" />
+    </entityProvider>
   </entityFields>
   <recordContainers>
     <jDitoRecordContainer>
diff --git a/entity/Notification_entity/Notification_entity.aod b/entity/Notification_entity/Notification_entity.aod
index 39f08f4e5d..409958dff6 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.15" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.15">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.16" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.16">
   <name>Notification_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/Notification_entity/documentation.adoc</documentation>
@@ -160,6 +160,10 @@
         </entityParameter>
       </children>
     </entityConsumer>
+    <entityProvider>
+      <name>#PROVIDER_AGGREGATES</name>
+      <useAggregates v="true" />
+    </entityProvider>
   </entityFields>
   <recordContainers>
     <dbRecordContainer>
diff --git a/entity/ObjectProxy_entity/ObjectProxy_entity.aod b/entity/ObjectProxy_entity/ObjectProxy_entity.aod
index 6becac0e01..b321948592 100644
--- a/entity/ObjectProxy_entity/ObjectProxy_entity.aod
+++ b/entity/ObjectProxy_entity/ObjectProxy_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.15" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.15">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.16" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.16">
   <name>ObjectProxy_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/ObjectProxy_entity/documentation.adoc</documentation>
@@ -197,6 +197,10 @@
         <fieldName>#PROVIDER</fieldName>
       </dependency>
     </entityConsumer>
+    <entityProvider>
+      <name>#PROVIDER_AGGREGATES</name>
+      <useAggregates v="true" />
+    </entityProvider>
   </entityFields>
   <recordContainers>
     <jDitoRecordContainer>
diff --git a/entity/ObjectRelationType_entity/ObjectRelationType_entity.aod b/entity/ObjectRelationType_entity/ObjectRelationType_entity.aod
index d3cbf9b89a..0f643ee43a 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.15" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.15">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.16" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.16">
   <name>ObjectRelationType_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/ObjectRelationType_entity/documentation.adoc</documentation>
@@ -141,6 +141,10 @@
         </entityActionField>
       </children>
     </entityActionGroup>
+    <entityProvider>
+      <name>#PROVIDER_AGGREGATES</name>
+      <useAggregates v="true" />
+    </entityProvider>
   </entityFields>
   <recordContainers>
     <jDitoRecordContainer>
diff --git a/entity/ObjectTree_entity/ObjectTree_entity.aod b/entity/ObjectTree_entity/ObjectTree_entity.aod
index 5dcdc0b62a..3a5313fb78 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.15" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.15">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.16" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.16">
   <name>ObjectTree_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/ObjectTree_entity/documentation.adoc</documentation>
@@ -167,6 +167,10 @@
     <entityField>
       <name>OBJECTRELATIONID</name>
     </entityField>
+    <entityProvider>
+      <name>#PROVIDER_AGGREGATES</name>
+      <useAggregates v="true" />
+    </entityProvider>
   </entityFields>
   <recordContainers>
     <jDitoRecordContainer>
diff --git a/entity/Object_entity/Object_entity.aod b/entity/Object_entity/Object_entity.aod
index 4853279b5a..8737747449 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.15" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.15">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.16" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.16">
   <name>Object_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/Object_entity/documentation.adoc</documentation>
@@ -271,6 +271,10 @@
         <fieldName>#PROVIDER</fieldName>
       </dependency>
     </entityConsumer>
+    <entityProvider>
+      <name>#PROVIDER_AGGREGATES</name>
+      <useAggregates v="true" />
+    </entityProvider>
   </entityFields>
   <recordContainers>
     <jDitoRecordContainer>
diff --git a/entity/Offer_entity/Offer_entity.aod b/entity/Offer_entity/Offer_entity.aod
index 4ad1ad9d84..4671aca2a2 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.15" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.15">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.16" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.16">
   <name>Offer_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/Offer_entity/documentation.adoc</documentation>
@@ -1046,6 +1046,10 @@
       <name>OfferAggregates</name>
       <useAggregates v="true" />
     </entityProvider>
+    <entityProvider>
+      <name>#PROVIDER_AGGREGATES</name>
+      <useAggregates v="true" />
+    </entityProvider>
   </entityFields>
   <recordContainers>
     <dbRecordContainer>
diff --git a/entity/Offeritem_entity/Offeritem_entity.aod b/entity/Offeritem_entity/Offeritem_entity.aod
index d5ee2f4844..0d253354e1 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.15" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.15">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.16" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.16">
   <name>Offeritem_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/Offeritem_entity/documentation.adoc</documentation>
@@ -244,6 +244,10 @@
       <name>Language_param</name>
       <expose v="true" />
     </entityParameter>
+    <entityProvider>
+      <name>#PROVIDER_AGGREGATES</name>
+      <useAggregates v="true" />
+    </entityProvider>
   </entityFields>
   <recordContainers>
     <dbRecordContainer>
diff --git a/entity/Order_entity/Order_entity.aod b/entity/Order_entity/Order_entity.aod
index a926acda00..aac7d84301 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.15" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.15">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.16" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.16">
   <name>Order_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/Order_entity/documentation.adoc</documentation>
@@ -889,6 +889,10 @@
       <parentField>COUNT</parentField>
       <title>Count</title>
     </entityAggregateField>
+    <entityProvider>
+      <name>#PROVIDER_AGGREGATES</name>
+      <useAggregates v="true" />
+    </entityProvider>
   </entityFields>
   <recordContainers>
     <dbRecordContainer>
diff --git a/entity/Orderitem_entity/Orderitem_entity.aod b/entity/Orderitem_entity/Orderitem_entity.aod
index 5571f1ed5c..ad9e1b9a20 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.15" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.15">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.16" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.16">
   <name>Orderitem_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/Orderitem_entity/documentation.adoc</documentation>
@@ -239,6 +239,10 @@
       <expose v="true" />
       <description>PARAMETER</description>
     </entityParameter>
+    <entityProvider>
+      <name>#PROVIDER_AGGREGATES</name>
+      <useAggregates v="true" />
+    </entityProvider>
   </entityFields>
   <recordContainers>
     <dbRecordContainer>
diff --git a/entity/Organisation_entity/Organisation_entity.aod b/entity/Organisation_entity/Organisation_entity.aod
index 3cbaa43f58..562abcab00 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.15" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.15">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.16" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.16">
   <name>Organisation_entity</name>
   <description>former Org</description>
   <majorModelMode>DISTRIBUTED</majorModelMode>
@@ -1178,6 +1178,10 @@
       <name>ORGANISATION_OBJECTTYPE</name>
       <valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/organisation_objecttype/valueProcess.js</valueProcess>
     </entityField>
+    <entityProvider>
+      <name>#PROVIDER_AGGREGATES</name>
+      <useAggregates v="true" />
+    </entityProvider>
   </entityFields>
   <recordContainers>
     <dbRecordContainer>
diff --git a/entity/PermissionAction_entity/PermissionAction_entity.aod b/entity/PermissionAction_entity/PermissionAction_entity.aod
index 0313847145..925c807fa4 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.15" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.15">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.16" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.16">
   <name>PermissionAction_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/PermissionAction_entity/documentation.adoc</documentation>
@@ -58,6 +58,10 @@
       <name>FullPermissions_param</name>
       <expose v="true" />
     </entityParameter>
+    <entityProvider>
+      <name>#PROVIDER_AGGREGATES</name>
+      <useAggregates v="true" />
+    </entityProvider>
   </entityFields>
   <recordContainers>
     <jDitoRecordContainer>
diff --git a/entity/PermissionCalendar_entity/PermissionCalendar_entity.aod b/entity/PermissionCalendar_entity/PermissionCalendar_entity.aod
index 621f1148b5..d5c8aa58aa 100644
--- a/entity/PermissionCalendar_entity/PermissionCalendar_entity.aod
+++ b/entity/PermissionCalendar_entity/PermissionCalendar_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.15" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.15">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.16" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.16">
   <name>PermissionCalendar_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/PermissionCalendar_entity/documentation.adoc</documentation>
@@ -239,6 +239,10 @@
       <name>PermissionProcurerType_param</name>
       <expose v="true" />
     </entityParameter>
+    <entityProvider>
+      <name>#PROVIDER_AGGREGATES</name>
+      <useAggregates v="true" />
+    </entityProvider>
   </entityFields>
   <recordContainers>
     <dbRecordContainer>
diff --git a/entity/PermissionDetail_entity/PermissionDetail_entity.aod b/entity/PermissionDetail_entity/PermissionDetail_entity.aod
index 2a0b68e854..9713ab6ae9 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.15" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.15">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.16" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.16">
   <name>PermissionDetail_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/PermissionDetail_entity/documentation.adoc</documentation>
@@ -202,6 +202,10 @@
       <contentType>BOOLEAN</contentType>
       <stateProcess>%aditoprj%/entity/PermissionDetail_entity/entityfields/fullpermissions/stateProcess.js</stateProcess>
     </entityField>
+    <entityProvider>
+      <name>#PROVIDER_AGGREGATES</name>
+      <useAggregates v="true" />
+    </entityProvider>
   </entityFields>
   <recordContainers>
     <jDitoRecordContainer>
diff --git a/entity/PermissionMetaData_entity/PermissionMetaData_entity.aod b/entity/PermissionMetaData_entity/PermissionMetaData_entity.aod
index 1f11e54b00..b80beabe1f 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.15" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.15">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.16" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.16">
   <name>PermissionMetaData_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/PermissionMetaData_entity/documentation.adoc</documentation>
@@ -85,6 +85,10 @@
     <entityField>
       <name>USEPERMISSION</name>
     </entityField>
+    <entityProvider>
+      <name>#PROVIDER_AGGREGATES</name>
+      <useAggregates v="true" />
+    </entityProvider>
   </entityFields>
   <recordContainers>
     <jDitoRecordContainer>
diff --git a/entity/PermissionOverview_entity/PermissionOverview_entity.aod b/entity/PermissionOverview_entity/PermissionOverview_entity.aod
index f6745f7b18..9267a2289e 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.15" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.15">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.16" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.16">
   <name>PermissionOverview_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/PermissionOverview_entity/documentation.adoc</documentation>
@@ -85,6 +85,10 @@
       <expose v="true" />
       <description>PARAMETER</description>
     </entityParameter>
+    <entityProvider>
+      <name>#PROVIDER_AGGREGATES</name>
+      <useAggregates v="true" />
+    </entityProvider>
   </entityFields>
   <recordContainers>
     <jDitoRecordContainer>
diff --git a/entity/Person_entity/Person_entity.aod b/entity/Person_entity/Person_entity.aod
index fee96dfc8b..ef08247489 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.15" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.15">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.16" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.16">
   <name>Person_entity</name>
   <description>former Pers</description>
   <majorModelMode>DISTRIBUTED</majorModelMode>
@@ -1274,6 +1274,10 @@
       <name>PERSON_OBJECTTYPE</name>
       <valueProcess>%aditoprj%/entity/Person_entity/entityfields/person_objecttype/valueProcess.js</valueProcess>
     </entityField>
+    <entityProvider>
+      <name>#PROVIDER_AGGREGATES</name>
+      <useAggregates v="true" />
+    </entityProvider>
   </entityFields>
   <recordContainers>
     <dbRecordContainer>
diff --git a/entity/PrivatePerson_entity/PrivatePerson_entity.aod b/entity/PrivatePerson_entity/PrivatePerson_entity.aod
index 70e0cad16e..34ab44e915 100644
--- a/entity/PrivatePerson_entity/PrivatePerson_entity.aod
+++ b/entity/PrivatePerson_entity/PrivatePerson_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.15" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.15">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.16" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.16">
   <name>PrivatePerson_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/PrivatePerson_entity/documentation.adoc</documentation>
@@ -76,6 +76,10 @@
         </entityParameter>
       </children>
     </entityConsumer>
+    <entityProvider>
+      <name>#PROVIDER_AGGREGATES</name>
+      <useAggregates v="true" />
+    </entityProvider>
   </entityFields>
   <recordContainers>
     <dbRecordContainer>
diff --git a/entity/Prod2prod_entity/Prod2prod_entity.aod b/entity/Prod2prod_entity/Prod2prod_entity.aod
index cf5f31d966..69a52bee75 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.15" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.15">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.16" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.16">
   <name>Prod2prod_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/Prod2prod_entity/documentation.adoc</documentation>
@@ -125,6 +125,10 @@
       <expose v="true" />
       <description>PARAMETER</description>
     </entityParameter>
+    <entityProvider>
+      <name>#PROVIDER_AGGREGATES</name>
+      <useAggregates v="true" />
+    </entityProvider>
   </entityFields>
   <recordContainers>
     <jDitoRecordContainer>
diff --git a/entity/Product_entity/Product_entity.aod b/entity/Product_entity/Product_entity.aod
index 4ed9e1192f..0923bd2294 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.15" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.15">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.16" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.16">
   <name>Product_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/Product_entity/documentation.adoc</documentation>
@@ -472,6 +472,10 @@
       <parentField>COUNT</parentField>
       <title>Count</title>
     </entityAggregateField>
+    <entityProvider>
+      <name>#PROVIDER_AGGREGATES</name>
+      <useAggregates v="true" />
+    </entityProvider>
   </entityFields>
   <recordContainers>
     <dbRecordContainer>
diff --git a/entity/Productprice_entity/Productprice_entity.aod b/entity/Productprice_entity/Productprice_entity.aod
index 29677932f2..cb5908d2a6 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.15" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.15">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.16" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.16">
   <name>Productprice_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/Productprice_entity/documentation.adoc</documentation>
@@ -230,6 +230,10 @@
         <fieldName>#PROVIDER</fieldName>
       </dependency>
     </entityConsumer>
+    <entityProvider>
+      <name>#PROVIDER_AGGREGATES</name>
+      <useAggregates v="true" />
+    </entityProvider>
   </entityFields>
   <recordContainers>
     <dbRecordContainer>
diff --git a/entity/QuickEntry_entity/QuickEntry_entity.aod b/entity/QuickEntry_entity/QuickEntry_entity.aod
index 06ccebb5bc..3cb2234c88 100644
--- a/entity/QuickEntry_entity/QuickEntry_entity.aod
+++ b/entity/QuickEntry_entity/QuickEntry_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.15" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.15">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.16" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.16">
   <name>QuickEntry_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/QuickEntry_entity/documentation.adoc</documentation>
@@ -244,6 +244,10 @@
         </entityParameter>
       </children>
     </entityConsumer>
+    <entityProvider>
+      <name>#PROVIDER_AGGREGATES</name>
+      <useAggregates v="true" />
+    </entityProvider>
   </entityFields>
   <recordContainers>
     <jDitoRecordContainer>
diff --git a/entity/RoleChildren_entity/RoleChildren_entity.aod b/entity/RoleChildren_entity/RoleChildren_entity.aod
index 3606195884..1607810c7e 100644
--- a/entity/RoleChildren_entity/RoleChildren_entity.aod
+++ b/entity/RoleChildren_entity/RoleChildren_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.15" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.15">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.16" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.16">
   <name>RoleChildren_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/RoleChildren_entity/documentation.adoc</documentation>
@@ -50,6 +50,10 @@
       <name>RoleType_param</name>
       <expose v="true" />
     </entityParameter>
+    <entityProvider>
+      <name>#PROVIDER_AGGREGATES</name>
+      <useAggregates v="true" />
+    </entityProvider>
   </entityFields>
   <recordContainers>
     <jDitoRecordContainer>
diff --git a/entity/RoleParent_entity/RoleParent_entity.aod b/entity/RoleParent_entity/RoleParent_entity.aod
index 6ed5c0dacb..7ff6f2fc3c 100644
--- a/entity/RoleParent_entity/RoleParent_entity.aod
+++ b/entity/RoleParent_entity/RoleParent_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.15" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.15">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.16" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.16">
   <name>RoleParent_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/RoleParent_entity/documentation.adoc</documentation>
@@ -43,6 +43,10 @@
       <name>RoleId_param</name>
       <expose v="true" />
     </entityParameter>
+    <entityProvider>
+      <name>#PROVIDER_AGGREGATES</name>
+      <useAggregates v="true" />
+    </entityProvider>
   </entityFields>
   <recordContainers>
     <jDitoRecordContainer>
diff --git a/entity/Role_entity/Role_entity.aod b/entity/Role_entity/Role_entity.aod
index aa9948fa24..3d32a413ab 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.15" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.15">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.16" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.16">
   <name>Role_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/Role_entity/documentation.adoc</documentation>
@@ -169,6 +169,10 @@
         </entityParameter>
       </children>
     </entityConsumer>
+    <entityProvider>
+      <name>#PROVIDER_AGGREGATES</name>
+      <useAggregates v="true" />
+    </entityProvider>
   </entityFields>
   <recordContainers>
     <jDitoRecordContainer>
diff --git a/entity/SalesprojectAnalyses_entity/SalesprojectAnalyses_entity.aod b/entity/SalesprojectAnalyses_entity/SalesprojectAnalyses_entity.aod
index fd2b5cb5a7..ec7561f019 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.15" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.15">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.16" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.16">
   <name>SalesprojectAnalyses_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/SalesprojectAnalyses_entity/documentation.adoc</documentation>
@@ -83,6 +83,10 @@
       <titleProcess>%aditoprj%/entity/SalesprojectAnalyses_entity/entityfields/my_turnover/titleProcess.js</titleProcess>
       <valueProcess>%aditoprj%/entity/SalesprojectAnalyses_entity/entityfields/my_turnover/valueProcess.js</valueProcess>
     </entityField>
+    <entityProvider>
+      <name>#PROVIDER_AGGREGATES</name>
+      <useAggregates v="true" />
+    </entityProvider>
   </entityFields>
   <recordContainers>
     <jDitoRecordContainer>
diff --git a/entity/SalesprojectMilestone_entity/SalesprojectMilestone_entity.aod b/entity/SalesprojectMilestone_entity/SalesprojectMilestone_entity.aod
index 3df66f14bf..31c158b798 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.15" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.15">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.16" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.16">
   <name>SalesprojectMilestone_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/SalesprojectMilestone_entity/documentation.adoc</documentation>
@@ -147,6 +147,10 @@
       <name>valueLongName</name>
       <valueProcess>%aditoprj%/entity/SalesprojectMilestone_entity/entityfields/valuelongname/valueProcess.js</valueProcess>
     </entityField>
+    <entityProvider>
+      <name>#PROVIDER_AGGREGATES</name>
+      <useAggregates v="true" />
+    </entityProvider>
   </entityFields>
   <recordContainers>
     <dbRecordContainer>
diff --git a/entity/SalesprojectPhase_entity/SalesprojectPhase_entity.aod b/entity/SalesprojectPhase_entity/SalesprojectPhase_entity.aod
index f013b9eee2..4d486a1faa 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.15" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.15">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.16" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.16">
   <name>SalesprojectPhase_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/SalesprojectPhase_entity/documentation.adoc</documentation>
@@ -48,6 +48,10 @@
         </entityDependency>
       </dependencies>
     </entityProvider>
+    <entityProvider>
+      <name>#PROVIDER_AGGREGATES</name>
+      <useAggregates v="true" />
+    </entityProvider>
   </entityFields>
   <recordContainers>
     <jDitoRecordContainer>
diff --git a/entity/SalesprojectSource_entity/SalesprojectSource_entity.aod b/entity/SalesprojectSource_entity/SalesprojectSource_entity.aod
index af2d9a4857..f3cc95f68b 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.15" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.15">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.16" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.16">
   <name>SalesprojectSource_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/SalesprojectSource_entity/documentation.adoc</documentation>
@@ -84,6 +84,10 @@
       <contentType>IMAGE</contentType>
       <valueProcess>%aditoprj%/entity/SalesprojectSource_entity/entityfields/icon/valueProcess.js</valueProcess>
     </entityField>
+    <entityProvider>
+      <name>#PROVIDER_AGGREGATES</name>
+      <useAggregates v="true" />
+    </entityProvider>
   </entityFields>
   <recordContainers>
     <dbRecordContainer>
diff --git a/entity/Salesproject_entity/Salesproject_entity.aod b/entity/Salesproject_entity/Salesproject_entity.aod
index ae48685a44..7d28b20c5f 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.15" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.15">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.16" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.16">
   <name>Salesproject_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/Salesproject_entity/documentation.adoc</documentation>
@@ -770,6 +770,10 @@
       <parentField>COUNT</parentField>
       <title>Count</title>
     </entityAggregateField>
+    <entityProvider>
+      <name>#PROVIDER_AGGREGATES</name>
+      <useAggregates v="true" />
+    </entityProvider>
   </entityFields>
   <recordContainers>
     <dbRecordContainer>
diff --git a/entity/SalutationDistinct_entity/SalutationDistinct_entity.aod b/entity/SalutationDistinct_entity/SalutationDistinct_entity.aod
index e0e78f0479..81dbd05f81 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.15" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.15">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.16" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.16">
   <name>SalutationDistinct_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/SalutationDistinct_entity/documentation.adoc</documentation>
@@ -34,6 +34,10 @@
       <expose v="true" />
       <description>PARAMETER</description>
     </entityParameter>
+    <entityProvider>
+      <name>#PROVIDER_AGGREGATES</name>
+      <useAggregates v="true" />
+    </entityProvider>
   </entityFields>
   <recordContainers>
     <jDitoRecordContainer>
diff --git a/entity/SalutationTitleDistinct_entity/SalutationTitleDistinct_entity.aod b/entity/SalutationTitleDistinct_entity/SalutationTitleDistinct_entity.aod
index d6d3a5445a..203f4408a0 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.15" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.15">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.16" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.16">
   <name>SalutationTitleDistinct_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/SalutationTitleDistinct_entity/documentation.adoc</documentation>
@@ -43,6 +43,10 @@
       <expose v="true" />
       <description>PARAMETER</description>
     </entityParameter>
+    <entityProvider>
+      <name>#PROVIDER_AGGREGATES</name>
+      <useAggregates v="true" />
+    </entityProvider>
   </entityFields>
   <recordContainers>
     <jDitoRecordContainer>
diff --git a/entity/Salutation_entity/Salutation_entity.aod b/entity/Salutation_entity/Salutation_entity.aod
index eebf0b3158..d818f5e252 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.15" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.15">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.16" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.16">
   <name>Salutation_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/Salutation_entity/documentation.adoc</documentation>
@@ -79,6 +79,10 @@
         <fieldName>ISO3Name</fieldName>
       </dependency>
     </entityConsumer>
+    <entityProvider>
+      <name>#PROVIDER_AGGREGATES</name>
+      <useAggregates v="true" />
+    </entityProvider>
   </entityFields>
   <recordContainers>
     <dbRecordContainer>
diff --git a/entity/SerialLetterAddRecipients_entity/SerialLetterAddRecipients_entity.aod b/entity/SerialLetterAddRecipients_entity/SerialLetterAddRecipients_entity.aod
index a31e661098..a62150b2ec 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.15" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.15">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.16" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.16">
   <name>SerialLetterAddRecipients_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/SerialLetterAddRecipients_entity/documentation.adoc</documentation>
@@ -70,6 +70,10 @@
       <title>Recipients after adding</title>
       <valueProcess>%aditoprj%/entity/SerialLetterAddRecipients_entity/entityfields/futurerecipients/valueProcess.js</valueProcess>
     </entityField>
+    <entityProvider>
+      <name>#PROVIDER_AGGREGATES</name>
+      <useAggregates v="true" />
+    </entityProvider>
   </entityFields>
   <recordContainers>
     <datalessRecordContainer>
diff --git a/entity/SerialLetter_entity/SerialLetter_entity.aod b/entity/SerialLetter_entity/SerialLetter_entity.aod
index 6c62fbeab3..5435d9ba6a 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.15" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.15">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.16" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.16">
   <name>SerialLetter_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/SerialLetter_entity/documentation.adoc</documentation>
@@ -201,6 +201,10 @@
       <iconId>VAADIN:FILE_PROCESS</iconId>
       <tooltip>Generate letter</tooltip>
     </entityActionField>
+    <entityProvider>
+      <name>#PROVIDER_AGGREGATES</name>
+      <useAggregates v="true" />
+    </entityProvider>
   </entityFields>
   <recordContainers>
     <dbRecordContainer>
diff --git a/entity/Social_entity/Social_entity.aod b/entity/Social_entity/Social_entity.aod
index 99ef22cc3f..9f67dff78e 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.15" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.15">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.16" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.16">
   <name>Social_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/Social_entity/documentation.adoc</documentation>
@@ -33,5 +33,9 @@
     <entityProvider>
       <name>#PROVIDER</name>
     </entityProvider>
+    <entityProvider>
+      <name>#PROVIDER_AGGREGATES</name>
+      <useAggregates v="true" />
+    </entityProvider>
   </entityFields>
 </entity>
diff --git a/entity/Stock_entity/Stock_entity.aod b/entity/Stock_entity/Stock_entity.aod
index 18f0a3e927..67b9856ded 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.15" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.15">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.16" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.16">
   <name>Stock_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/Stock_entity/documentation.adoc</documentation>
@@ -108,6 +108,10 @@
         </entityParameter>
       </children>
     </entityConsumer>
+    <entityProvider>
+      <name>#PROVIDER_AGGREGATES</name>
+      <useAggregates v="true" />
+    </entityProvider>
   </entityFields>
   <recordContainers>
     <dbRecordContainer>
diff --git a/entity/SupportTicket_entity/SupportTicket_entity.aod b/entity/SupportTicket_entity/SupportTicket_entity.aod
index 48992a26ea..d8970d387c 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.15" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.15">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.16" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.16">
   <name>SupportTicket_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/SupportTicket_entity/documentation.adoc</documentation>
@@ -411,6 +411,10 @@
       <parentField>COUNT</parentField>
       <title>Count</title>
     </entityAggregateField>
+    <entityProvider>
+      <name>#PROVIDER_AGGREGATES</name>
+      <useAggregates v="true" />
+    </entityProvider>
   </entityFields>
   <recordContainers>
     <dbRecordContainer>
diff --git a/entity/TaskLink_entity/TaskLink_entity.aod b/entity/TaskLink_entity/TaskLink_entity.aod
index 3c4ce63568..9b5a9fbd55 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.15" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.15">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.16" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.16">
   <name>TaskLink_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/TaskLink_entity/documentation.adoc</documentation>
@@ -86,6 +86,10 @@
         </entityParameter>
       </children>
     </entityConsumer>
+    <entityProvider>
+      <name>#PROVIDER_AGGREGATES</name>
+      <useAggregates v="true" />
+    </entityProvider>
   </entityFields>
   <recordContainers>
     <dbRecordContainer>
diff --git a/entity/Task_entity/Task_entity.aod b/entity/Task_entity/Task_entity.aod
index d424144a01..6a775dc901 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.15" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.15">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.16" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.16">
   <name>Task_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/Task_entity/documentation.adoc</documentation>
@@ -464,6 +464,10 @@
       <parentField>COUNT</parentField>
       <title>Count</title>
     </entityAggregateField>
+    <entityProvider>
+      <name>#PROVIDER_AGGREGATES</name>
+      <useAggregates v="true" />
+    </entityProvider>
   </entityFields>
   <recordContainers>
     <dbRecordContainer>
diff --git a/entity/Timetracking_entity/Timetracking_entity.aod b/entity/Timetracking_entity/Timetracking_entity.aod
index ee06301870..e162d0cc7c 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.15" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.15">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.16" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.16">
   <name>Timetracking_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/Timetracking_entity/documentation.adoc</documentation>
@@ -118,6 +118,10 @@
       <valueProcess>%aditoprj%/entity/Timetracking_entity/entityfields/year/valueProcess.js</valueProcess>
       <displayValueProcess>%aditoprj%/entity/Timetracking_entity/entityfields/year/displayValueProcess.js</displayValueProcess>
     </entityField>
+    <entityProvider>
+      <name>#PROVIDER_AGGREGATES</name>
+      <useAggregates v="true" />
+    </entityProvider>
   </entityFields>
   <recordContainers>
     <dbRecordContainer>
diff --git a/entity/TurnoverTree_entity/TurnoverTree_entity.aod b/entity/TurnoverTree_entity/TurnoverTree_entity.aod
index 6ee4a3f469..bef035ac34 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.15" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.15">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.16" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.16">
   <name>TurnoverTree_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/TurnoverTree_entity/documentation.adoc</documentation>
@@ -95,6 +95,10 @@
     <entityField>
       <name>LAYER</name>
     </entityField>
+    <entityProvider>
+      <name>#PROVIDER_AGGREGATES</name>
+      <useAggregates v="true" />
+    </entityProvider>
   </entityFields>
   <recordContainers>
     <jDitoRecordContainer>
diff --git a/entity/Turnover_entity/Turnover_entity.aod b/entity/Turnover_entity/Turnover_entity.aod
index 0bde4ebd32..8f2ba13cb6 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.15" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.15">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.16" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.16">
   <name>Turnover_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/Turnover_entity/documentation.adoc</documentation>
@@ -113,6 +113,10 @@
       <valueProcess>%aditoprj%/entity/Turnover_entity/entityfields/showturnover_param/valueProcess.js</valueProcess>
       <expose v="true" />
     </entityParameter>
+    <entityProvider>
+      <name>#PROVIDER_AGGREGATES</name>
+      <useAggregates v="true" />
+    </entityProvider>
   </entityFields>
   <recordContainers>
     <jDitoRecordContainer>
diff --git a/entity/UniversalFileProcessor_entity/UniversalFileProcessor_entity.aod b/entity/UniversalFileProcessor_entity/UniversalFileProcessor_entity.aod
index 13f59948c1..503c81d0f8 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.15" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.15">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.16" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.16">
   <name>UniversalFileProcessor_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/UniversalFileProcessor_entity/documentation.adoc</documentation>
@@ -36,5 +36,9 @@
         </entityParameter>
       </children>
     </entityConsumer>
+    <entityProvider>
+      <name>#PROVIDER_AGGREGATES</name>
+      <useAggregates v="true" />
+    </entityProvider>
   </entityFields>
 </entity>
diff --git a/entity/UnlinkedMailMappingLink_entity/UnlinkedMailMappingLink_entity.aod b/entity/UnlinkedMailMappingLink_entity/UnlinkedMailMappingLink_entity.aod
index f441c51887..66d658f477 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.15" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.15">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.16" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.16">
   <name>UnlinkedMailMappingLink_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/UnlinkedMailMappingLink_entity/documentation.adoc</documentation>
@@ -50,6 +50,10 @@
       <state>INVISIBLE</state>
       <valueProcess>%aditoprj%/entity/UnlinkedMailMappingLink_entity/entityfields/context_name/valueProcess.js</valueProcess>
     </entityField>
+    <entityProvider>
+      <name>#PROVIDER_AGGREGATES</name>
+      <useAggregates v="true" />
+    </entityProvider>
   </entityFields>
   <recordContainers>
     <jDitoRecordContainer>
diff --git a/entity/UnlinkedMailMappingWrapper_entity/UnlinkedMailMappingWrapper_entity.aod b/entity/UnlinkedMailMappingWrapper_entity/UnlinkedMailMappingWrapper_entity.aod
index 5abbfda6dc..6f99921abd 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.15" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.15">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.16" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.16">
   <name>UnlinkedMailMappingWrapper_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/UnlinkedMailMappingWrapper_entity/documentation.adoc</documentation>
@@ -60,6 +60,10 @@
         </entityParameter>
       </children>
     </entityConsumer>
+    <entityProvider>
+      <name>#PROVIDER_AGGREGATES</name>
+      <useAggregates v="true" />
+    </entityProvider>
   </entityFields>
   <recordContainers>
     <jDitoRecordContainer>
diff --git a/entity/UnlinkedMail_entity/UnlinkedMail_entity.aod b/entity/UnlinkedMail_entity/UnlinkedMail_entity.aod
index 773b7094e4..b2024360ba 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.15" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.15">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.16" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.16">
   <name>UnlinkedMail_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/UnlinkedMail_entity/documentation.adoc</documentation>
@@ -60,6 +60,10 @@
         </entityActionField>
       </children>
     </entityActionGroup>
+    <entityProvider>
+      <name>#PROVIDER_AGGREGATES</name>
+      <useAggregates v="true" />
+    </entityProvider>
   </entityFields>
   <recordContainers>
     <dbRecordContainer>
diff --git a/entity/Usersettings_entity/Usersettings_entity.aod b/entity/Usersettings_entity/Usersettings_entity.aod
index fd32d56552..e847326168 100644
--- a/entity/Usersettings_entity/Usersettings_entity.aod
+++ b/entity/Usersettings_entity/Usersettings_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.15" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.15">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.16" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.16">
   <name>Usersettings_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/Usersettings_entity/documentation.adoc</documentation>
@@ -71,6 +71,10 @@
       <contentType>PASSWORD</contentType>
       <onValidation>%aditoprj%/entity/Usersettings_entity/entityfields/currentpassword/onValidation.js</onValidation>
     </entityField>
+    <entityProvider>
+      <name>#PROVIDER_AGGREGATES</name>
+      <useAggregates v="true" />
+    </entityProvider>
   </entityFields>
   <recordContainers>
     <jDitoRecordContainer>
diff --git a/entity/VisitPlanEmployeeWeek_entity/VisitPlanEmployeeWeek_entity.aod b/entity/VisitPlanEmployeeWeek_entity/VisitPlanEmployeeWeek_entity.aod
index c5fb6de313..64a949cf14 100644
--- a/entity/VisitPlanEmployeeWeek_entity/VisitPlanEmployeeWeek_entity.aod
+++ b/entity/VisitPlanEmployeeWeek_entity/VisitPlanEmployeeWeek_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.15" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.15">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.16" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.16">
   <name>VisitPlanEmployeeWeek_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/VisitPlanEmployeeWeek_entity/documentation.adoc</documentation>
@@ -96,6 +96,10 @@
         </entityParameter>
       </children>
     </entityConsumer>
+    <entityProvider>
+      <name>#PROVIDER_AGGREGATES</name>
+      <useAggregates v="true" />
+    </entityProvider>
   </entityFields>
   <recordContainers>
     <dbRecordContainer>
diff --git a/entity/VisitPlanEntry_entity/VisitPlanEntry_entity.aod b/entity/VisitPlanEntry_entity/VisitPlanEntry_entity.aod
index b5dd275af6..e4dff2e47c 100644
--- a/entity/VisitPlanEntry_entity/VisitPlanEntry_entity.aod
+++ b/entity/VisitPlanEntry_entity/VisitPlanEntry_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.15" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.15">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.16" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.16">
   <name>VisitPlanEntry_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/VisitPlanEntry_entity/documentation.adoc</documentation>
@@ -218,6 +218,10 @@
         </entityDependency>
       </dependencies>
     </entityProvider>
+    <entityProvider>
+      <name>#PROVIDER_AGGREGATES</name>
+      <useAggregates v="true" />
+    </entityProvider>
   </entityFields>
   <recordContainers>
     <jDitoRecordContainer>
diff --git a/entity/VisitRecommendation_entity/VisitRecommendation_entity.aod b/entity/VisitRecommendation_entity/VisitRecommendation_entity.aod
index badd3249ee..09ec5a6bfc 100644
--- a/entity/VisitRecommendation_entity/VisitRecommendation_entity.aod
+++ b/entity/VisitRecommendation_entity/VisitRecommendation_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.15" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.15">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.16" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.16">
   <name>VisitRecommendation_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/VisitRecommendation_entity/documentation.adoc</documentation>
@@ -154,6 +154,10 @@
       <name>TARGET_CONTEXT</name>
       <valueProcess>%aditoprj%/entity/VisitRecommendation_entity/entityfields/target_context/valueProcess.js</valueProcess>
     </entityField>
+    <entityProvider>
+      <name>#PROVIDER_AGGREGATES</name>
+      <useAggregates v="true" />
+    </entityProvider>
   </entityFields>
   <recordContainers>
     <jDitoRecordContainer>
diff --git a/entity/WorkflowDefinition_entity/WorkflowDefinition_entity.aod b/entity/WorkflowDefinition_entity/WorkflowDefinition_entity.aod
index 59485536f7..05ef23256c 100644
--- a/entity/WorkflowDefinition_entity/WorkflowDefinition_entity.aod
+++ b/entity/WorkflowDefinition_entity/WorkflowDefinition_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.15" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.15">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.16" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.16">
   <name>WorkflowDefinition_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/WorkflowDefinition_entity/documentation.adoc</documentation>
@@ -237,6 +237,10 @@
         </entityParameter>
       </children>
     </entityConsumer>
+    <entityProvider>
+      <name>#PROVIDER_AGGREGATES</name>
+      <useAggregates v="true" />
+    </entityProvider>
   </entityFields>
   <recordContainers>
     <jDitoRecordContainer>
diff --git a/entity/WorkflowInstanceHistory_entity/WorkflowInstanceHistory_entity.aod b/entity/WorkflowInstanceHistory_entity/WorkflowInstanceHistory_entity.aod
index 9b317f184b..dac53e6190 100644
--- a/entity/WorkflowInstanceHistory_entity/WorkflowInstanceHistory_entity.aod
+++ b/entity/WorkflowInstanceHistory_entity/WorkflowInstanceHistory_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.15" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.15">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.16" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.16">
   <name>WorkflowInstanceHistory_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/WorkflowInstanceHistory_entity/documentation.adoc</documentation>
@@ -89,6 +89,10 @@
         </entityParameter>
       </children>
     </entityConsumer>
+    <entityProvider>
+      <name>#PROVIDER_AGGREGATES</name>
+      <useAggregates v="true" />
+    </entityProvider>
   </entityFields>
   <recordContainers>
     <jDitoRecordContainer>
diff --git a/entity/WorkflowInstance_entity/WorkflowInstance_entity.aod b/entity/WorkflowInstance_entity/WorkflowInstance_entity.aod
index 3045b6ab7a..e7497bcdc1 100644
--- a/entity/WorkflowInstance_entity/WorkflowInstance_entity.aod
+++ b/entity/WorkflowInstance_entity/WorkflowInstance_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.15" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.15">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.16" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.16">
   <name>WorkflowInstance_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/WorkflowInstance_entity/documentation.adoc</documentation>
@@ -194,6 +194,10 @@
       <contentType>IMAGE</contentType>
       <valueProcess>%aditoprj%/entity/WorkflowInstance_entity/entityfields/diagram/valueProcess.js</valueProcess>
     </entityField>
+    <entityProvider>
+      <name>#PROVIDER_AGGREGATES</name>
+      <useAggregates v="true" />
+    </entityProvider>
   </entityFields>
   <recordContainers>
     <jDitoRecordContainer>
diff --git a/entity/WorkflowModel_entity/WorkflowModel_entity.aod b/entity/WorkflowModel_entity/WorkflowModel_entity.aod
index 588d70a717..8700a0b672 100644
--- a/entity/WorkflowModel_entity/WorkflowModel_entity.aod
+++ b/entity/WorkflowModel_entity/WorkflowModel_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.15" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.15">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.16" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.16">
   <name>WorkflowModel_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/WorkflowModel_entity/documentation.adoc</documentation>
@@ -29,6 +29,10 @@
       <title>Name</title>
       <mandatory v="true" />
     </entityField>
+    <entityProvider>
+      <name>#PROVIDER_AGGREGATES</name>
+      <useAggregates v="true" />
+    </entityProvider>
   </entityFields>
   <recordContainers>
     <jDitoRecordContainer>
diff --git a/entity/WorkflowSignal_entity/WorkflowSignal_entity.aod b/entity/WorkflowSignal_entity/WorkflowSignal_entity.aod
index e4d5c8ece3..56662e0508 100644
--- a/entity/WorkflowSignal_entity/WorkflowSignal_entity.aod
+++ b/entity/WorkflowSignal_entity/WorkflowSignal_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.15" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.15">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.16" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.16">
   <name>WorkflowSignal_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/WorkflowSignal_entity/documentation.adoc</documentation>
@@ -108,6 +108,10 @@
       <selectionMode>MULTI</selectionMode>
       <valueProcess>%aditoprj%/entity/WorkflowSignal_entity/entityfields/variables/valueProcess.js</valueProcess>
     </entityField>
+    <entityProvider>
+      <name>#PROVIDER_AGGREGATES</name>
+      <useAggregates v="true" />
+    </entityProvider>
   </entityFields>
   <recordContainers>
     <dbRecordContainer>
diff --git a/entity/WorkflowStartConfig_entity/WorkflowStartConfig_entity.aod b/entity/WorkflowStartConfig_entity/WorkflowStartConfig_entity.aod
index b97442fead..62070c41af 100644
--- a/entity/WorkflowStartConfig_entity/WorkflowStartConfig_entity.aod
+++ b/entity/WorkflowStartConfig_entity/WorkflowStartConfig_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.15" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.15">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.16" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.16">
   <name>WorkflowStartConfig_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/WorkflowStartConfig_entity/documentation.adoc</documentation>
@@ -79,6 +79,10 @@
         </entityParameter>
       </children>
     </entityConsumer>
+    <entityProvider>
+      <name>#PROVIDER_AGGREGATES</name>
+      <useAggregates v="true" />
+    </entityProvider>
   </entityFields>
   <recordContainers>
     <dbRecordContainer>
diff --git a/entity/WorkflowTask_entity/WorkflowTask_entity.aod b/entity/WorkflowTask_entity/WorkflowTask_entity.aod
index 2cebcbe251..3f6a49c470 100644
--- a/entity/WorkflowTask_entity/WorkflowTask_entity.aod
+++ b/entity/WorkflowTask_entity/WorkflowTask_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.15" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.15">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.16" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.16">
   <name>WorkflowTask_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/WorkflowTask_entity/documentation.adoc</documentation>
@@ -231,6 +231,10 @@
         </entityActionField>
       </children>
     </entityActionGroup>
+    <entityProvider>
+      <name>#PROVIDER_AGGREGATES</name>
+      <useAggregates v="true" />
+    </entityProvider>
   </entityFields>
   <recordContainers>
     <jDitoRecordContainer>
diff --git a/entity/WorkflowVariableValue_entity/WorkflowVariableValue_entity.aod b/entity/WorkflowVariableValue_entity/WorkflowVariableValue_entity.aod
index 670a78afa9..4b11980c03 100644
--- a/entity/WorkflowVariableValue_entity/WorkflowVariableValue_entity.aod
+++ b/entity/WorkflowVariableValue_entity/WorkflowVariableValue_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.15" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.15">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.16" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.16">
   <name>WorkflowVariableValue_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/WorkflowVariableValue_entity/documentation.adoc</documentation>
@@ -44,6 +44,10 @@
       <name>WorkflowInstanceId_param</name>
       <expose v="true" />
     </entityParameter>
+    <entityProvider>
+      <name>#PROVIDER_AGGREGATES</name>
+      <useAggregates v="true" />
+    </entityProvider>
   </entityFields>
   <recordContainers>
     <jDitoRecordContainer>
-- 
GitLab


From 9c82ed5c55401ad833ae752530ebbf9d136f6ce7 Mon Sep 17 00:00:00 2001
From: Sebastian Listl <s.listl@adito.de>
Date: Mon, 31 Aug 2020 15:25:20 +0200
Subject: [PATCH 235/309] Entity models upgraded to version 1.3.17

---
 entity/360Degree_entity/360Degree_entity.aod                    | 2 +-
 entity/ActivityLink_entity/ActivityLink_entity.aod              | 2 +-
 entity/Activity_entity/Activity_entity.aod                      | 2 +-
 entity/AddressType_entity/AddressType_entity.aod                | 2 +-
 entity/AddressValidation_entity/AddressValidation_entity.aod    | 2 +-
 entity/Address_entity/Address_entity.aod                        | 2 +-
 entity/AdminViewRow_entity/AdminViewRow_entity.aod              | 2 +-
 entity/Analyses_entity/Analyses_entity.aod                      | 2 +-
 entity/AnyContact_entity/AnyContact_entity.aod                  | 2 +-
 entity/AppointmentLink_entity/AppointmentLink_entity.aod        | 2 +-
 entity/Appointment_entity/Appointment_entity.aod                | 2 +-
 entity/AttributeRelation_entity/AttributeRelation_entity.aod    | 2 +-
 entity/AttributeUsage_entity/AttributeUsage_entity.aod          | 2 +-
 entity/Attribute_entity/Attribute_entity.aod                    | 2 +-
 .../BulkMailAddRecipients_entity.aod                            | 2 +-
 entity/BulkMailRecipient_entity/BulkMailRecipient_entity.aod    | 2 +-
 .../BulkMailStatusChart_entity/BulkMailStatusChart_entity.aod   | 2 +-
 entity/BulkMailTesting_entity/BulkMailTesting_entity.aod        | 2 +-
 entity/BulkMail_entity/BulkMail_entity.aod                      | 2 +-
 .../CampaignAddParticipants_entity.aod                          | 2 +-
 entity/CampaignAnalysis_entity/CampaignAnalysis_entity.aod      | 2 +-
 entity/CampaignCostChart_entity/CampaignCostChart_entity.aod    | 2 +-
 entity/CampaignCost_entity/CampaignCost_entity.aod              | 2 +-
 .../CampaignParticipantChart_entity.aod                         | 2 +-
 .../CampaignParticipant_entity/CampaignParticipant_entity.aod   | 2 +-
 entity/CampaignPlanning_entity/CampaignPlanning_entity.aod      | 2 +-
 entity/CampaignStep_entity/CampaignStep_entity.aod              | 2 +-
 entity/Campaign_entity/Campaign_entity.aod                      | 2 +-
 .../ClassificationAdmin_entity/ClassificationAdmin_entity.aod   | 2 +-
 .../ClassificationGrading_entity.aod                            | 2 +-
 .../ClassificationGroupAnalyses_entity.aod                      | 2 +-
 .../ClassificationScore_entity/ClassificationScore_entity.aod   | 2 +-
 entity/ClassificationType_entity/ClassificationType_entity.aod  | 2 +-
 entity/Classification_entity/Classification_entity.aod          | 2 +-
 entity/CommRestriction_Entity/CommRestriction_Entity.aod        | 2 +-
 entity/Communication_entity/Communication_entity.aod            | 2 +-
 entity/Competition_entity/Competition_entity.aod                | 2 +-
 entity/Contact_entity/Contact_entity.aod                        | 2 +-
 entity/Context_entity/Context_entity.aod                        | 2 +-
 entity/Contract_entity/Contract_entity.aod                      | 2 +-
 entity/Countries_Entity/Countries_Entity.aod                    | 2 +-
 entity/DSGVOInfo_entity/DSGVOInfo_entity.aod                    | 2 +-
 entity/DSGVOReport_entity/DSGVOReport_entity.aod                | 2 +-
 entity/DSGVO_entity/DSGVO_entity.aod                            | 2 +-
 entity/DefaultAdminView_entity/DefaultAdminView_entity.aod      | 2 +-
 .../DescriptionTranslation_entity.aod                           | 2 +-
 .../DocumentTemplateLink_entity/DocumentTemplateLink_entity.aod | 2 +-
 .../DocumentTemplatePlaceOfUse_entity.aod                       | 2 +-
 .../DocumentTemplateTypeCategory_entity.aod                     | 2 +-
 entity/DocumentTemplate_entity/DocumentTemplate_entity.aod      | 2 +-
 entity/Document_entity/Document_entity.aod                      | 2 +-
 .../DuplicateScannerResultFieldConfig_entity.aod                | 2 +-
 entity/DuplicateScanner_entity/DuplicateScanner_entity.aod      | 2 +-
 .../DuplicatesUnrelated_entity/DuplicatesUnrelated_entity.aod   | 2 +-
 entity/Duplicates_entity/Duplicates_entity.aod                  | 2 +-
 entity/Email_entity/Email_entity.aod                            | 2 +-
 entity/EmployeeRole_entity/EmployeeRole_entity.aod              | 2 +-
 entity/Employee_entity/Employee_entity.aod                      | 2 +-
 .../ExportTemplateField_entity/ExportTemplateField_entity.aod   | 2 +-
 .../ExportTemplatePlaceOfUse_entity.aod                         | 2 +-
 .../ExportTemplateSelection_entity.aod                          | 2 +-
 entity/ExportTemplate_entity/ExportTemplate_entity.aod          | 2 +-
 entity/Favorite_entity/Favorite_entity.aod                      | 2 +-
 entity/Forecast_entity/Forecast_entity.aod                      | 2 +-
 entity/Gender_keyword/Gender_keyword.aod                        | 2 +-
 entity/ImportField_Entity/ImportField_Entity.aod                | 2 +-
 entity/IndexSearchEntity/IndexSearchEntity.aod                  | 2 +-
 .../KeywordAttributeRelation_entity.aod                         | 2 +-
 entity/KeywordAttribute_entity/KeywordAttribute_entity.aod      | 2 +-
 entity/KeywordEntry_entity/KeywordEntry_entity.aod              | 2 +-
 entity/Language_entity/Language_entity.aod                      | 2 +-
 entity/LeadLog_entity/LeadLog_entity.aod                        | 2 +-
 entity/LeadTemp_entity/LeadTemp_entity.aod                      | 2 +-
 entity/Lead_entity/Lead_entity.aod                              | 2 +-
 .../LeadimportMappingAssistant_entity.aod                       | 2 +-
 entity/Leadimport_entity/Leadimport_entity.aod                  | 2 +-
 entity/LetterRecipient_entity/LetterRecipient_entity.aod        | 2 +-
 entity/Letter_entity/Letter_entity.aod                          | 2 +-
 entity/LogHistory_entity/LogHistory_entity.aod                  | 2 +-
 entity/MemberRoles_entity/MemberRoles_entity.aod                | 2 +-
 entity/Member_entity/Member_entity.aod                          | 2 +-
 entity/ModuleTree_entity/ModuleTree_entity.aod                  | 2 +-
 entity/Notification_entity/Notification_entity.aod              | 2 +-
 entity/ObjectProxy_entity/ObjectProxy_entity.aod                | 2 +-
 entity/ObjectRelationType_entity/ObjectRelationType_entity.aod  | 2 +-
 entity/ObjectTree_entity/ObjectTree_entity.aod                  | 2 +-
 entity/Object_entity/Object_entity.aod                          | 2 +-
 entity/Offer_entity/Offer_entity.aod                            | 2 +-
 entity/Offeritem_entity/Offeritem_entity.aod                    | 2 +-
 entity/Order_entity/Order_entity.aod                            | 2 +-
 entity/Orderitem_entity/Orderitem_entity.aod                    | 2 +-
 entity/Organisation_entity/Organisation_entity.aod              | 2 +-
 entity/PermissionAction_entity/PermissionAction_entity.aod      | 2 +-
 entity/PermissionCalendar_entity/PermissionCalendar_entity.aod  | 2 +-
 entity/PermissionDetail_entity/PermissionDetail_entity.aod      | 2 +-
 entity/PermissionMetaData_entity/PermissionMetaData_entity.aod  | 2 +-
 entity/PermissionOverview_entity/PermissionOverview_entity.aod  | 2 +-
 entity/Person_entity/Person_entity.aod                          | 2 +-
 entity/PrivatePerson_entity/PrivatePerson_entity.aod            | 2 +-
 entity/Prod2prod_entity/Prod2prod_entity.aod                    | 2 +-
 entity/Product_entity/Product_entity.aod                        | 2 +-
 entity/Productprice_entity/Productprice_entity.aod              | 2 +-
 entity/QuickEntry_entity/QuickEntry_entity.aod                  | 2 +-
 entity/RoleChildren_entity/RoleChildren_entity.aod              | 2 +-
 entity/RoleParent_entity/RoleParent_entity.aod                  | 2 +-
 entity/Role_entity/Role_entity.aod                              | 2 +-
 .../SalesprojectAnalyses_entity/SalesprojectAnalyses_entity.aod | 2 +-
 .../SalesprojectMilestone_entity.aod                            | 2 +-
 entity/SalesprojectPhase_entity/SalesprojectPhase_entity.aod    | 2 +-
 entity/SalesprojectSource_entity/SalesprojectSource_entity.aod  | 2 +-
 entity/Salesproject_entity/Salesproject_entity.aod              | 2 +-
 entity/SalutationDistinct_entity/SalutationDistinct_entity.aod  | 2 +-
 .../SalutationTitleDistinct_entity.aod                          | 2 +-
 entity/Salutation_entity/Salutation_entity.aod                  | 2 +-
 .../SerialLetterAddRecipients_entity.aod                        | 2 +-
 entity/SerialLetter_entity/SerialLetter_entity.aod              | 2 +-
 entity/Social_entity/Social_entity.aod                          | 2 +-
 entity/Stock_entity/Stock_entity.aod                            | 2 +-
 entity/SupportTicket_entity/SupportTicket_entity.aod            | 2 +-
 entity/TaskLink_entity/TaskLink_entity.aod                      | 2 +-
 entity/Task_entity/Task_entity.aod                              | 2 +-
 entity/Timetracking_entity/Timetracking_entity.aod              | 2 +-
 entity/TurnoverTree_entity/TurnoverTree_entity.aod              | 2 +-
 entity/Turnover_entity/Turnover_entity.aod                      | 2 +-
 .../UniversalFileProcessor_entity.aod                           | 2 +-
 .../UnlinkedMailMappingLink_entity.aod                          | 2 +-
 .../UnlinkedMailMappingWrapper_entity.aod                       | 2 +-
 entity/UnlinkedMail_entity/UnlinkedMail_entity.aod              | 2 +-
 entity/Usersettings_entity/Usersettings_entity.aod              | 2 +-
 .../VisitPlanEmployeeWeek_entity.aod                            | 2 +-
 entity/VisitPlanEntry_entity/VisitPlanEntry_entity.aod          | 2 +-
 .../VisitRecommendation_entity/VisitRecommendation_entity.aod   | 2 +-
 entity/WorkflowDefinition_entity/WorkflowDefinition_entity.aod  | 2 +-
 .../WorkflowInstanceHistory_entity.aod                          | 2 +-
 entity/WorkflowInstance_entity/WorkflowInstance_entity.aod      | 2 +-
 entity/WorkflowModel_entity/WorkflowModel_entity.aod            | 2 +-
 entity/WorkflowSignal_entity/WorkflowSignal_entity.aod          | 2 +-
 .../WorkflowStartConfig_entity/WorkflowStartConfig_entity.aod   | 2 +-
 entity/WorkflowTask_entity/WorkflowTask_entity.aod              | 2 +-
 .../WorkflowVariableValue_entity.aod                            | 2 +-
 140 files changed, 140 insertions(+), 140 deletions(-)

diff --git a/entity/360Degree_entity/360Degree_entity.aod b/entity/360Degree_entity/360Degree_entity.aod
index d2f03aa8a8..87fc35a2bf 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.16" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.16">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
   <name>360Degree_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/360Degree_entity/documentation.adoc</documentation>
diff --git a/entity/ActivityLink_entity/ActivityLink_entity.aod b/entity/ActivityLink_entity/ActivityLink_entity.aod
index 2a5d5c0466..e5518fff2f 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.16" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.16">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
   <name>ActivityLink_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/ActivityLink_entity/documentation.adoc</documentation>
diff --git a/entity/Activity_entity/Activity_entity.aod b/entity/Activity_entity/Activity_entity.aod
index 745ae0974a..ade2e89354 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.16" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.16">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
   <name>Activity_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/Activity_entity/documentation.adoc</documentation>
diff --git a/entity/AddressType_entity/AddressType_entity.aod b/entity/AddressType_entity/AddressType_entity.aod
index dfd4b24b31..44fe6f2915 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.16" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.16">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
   <name>AddressType_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/AddressType_entity/documentation.adoc</documentation>
diff --git a/entity/AddressValidation_entity/AddressValidation_entity.aod b/entity/AddressValidation_entity/AddressValidation_entity.aod
index 023665ad51..f5c5c28ad4 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.16" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.16">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
   <name>AddressValidation_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/AddressValidation_entity/documentation.adoc</documentation>
diff --git a/entity/Address_entity/Address_entity.aod b/entity/Address_entity/Address_entity.aod
index e8db267517..b1cf501940 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.16" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.16">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
   <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 773edbf21a..75795a8f2a 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.16" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.16">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
   <name>AdminViewRow_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/AdminViewRow_entity/documentation.adoc</documentation>
diff --git a/entity/Analyses_entity/Analyses_entity.aod b/entity/Analyses_entity/Analyses_entity.aod
index be3d4533c3..3eadc589a8 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.16" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.16">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
   <name>Analyses_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/Analyses_entity/documentation.adoc</documentation>
diff --git a/entity/AnyContact_entity/AnyContact_entity.aod b/entity/AnyContact_entity/AnyContact_entity.aod
index 2b9d7a04ab..9864eeffcb 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.16" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.16">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
   <name>AnyContact_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/AnyContact_entity/documentation.adoc</documentation>
diff --git a/entity/AppointmentLink_entity/AppointmentLink_entity.aod b/entity/AppointmentLink_entity/AppointmentLink_entity.aod
index d4faa7a10f..a60f3736b9 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.16" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.16">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
   <name>AppointmentLink_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/AppointmentLink_entity/documentation.adoc</documentation>
diff --git a/entity/Appointment_entity/Appointment_entity.aod b/entity/Appointment_entity/Appointment_entity.aod
index 3316cccc9d..d91f52f018 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.16" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.16">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
   <name>Appointment_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/Appointment_entity/documentation.adoc</documentation>
diff --git a/entity/AttributeRelation_entity/AttributeRelation_entity.aod b/entity/AttributeRelation_entity/AttributeRelation_entity.aod
index bc159dfa37..74b45b0ba6 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.16" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.16">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
   <name>AttributeRelation_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/AttributeRelation_entity/documentation.adoc</documentation>
diff --git a/entity/AttributeUsage_entity/AttributeUsage_entity.aod b/entity/AttributeUsage_entity/AttributeUsage_entity.aod
index 0e70bbc0f8..281daa5f5a 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.16" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.16">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
   <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 7534f43f31..34e9a227c4 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.16" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.16">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
   <name>Attribute_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/Attribute_entity/documentation.adoc</documentation>
diff --git a/entity/BulkMailAddRecipients_entity/BulkMailAddRecipients_entity.aod b/entity/BulkMailAddRecipients_entity/BulkMailAddRecipients_entity.aod
index 7dbe041633..7e9ddd1f31 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.16" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.16">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
   <name>BulkMailAddRecipients_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/BulkMailAddRecipients_entity/documentation.adoc</documentation>
diff --git a/entity/BulkMailRecipient_entity/BulkMailRecipient_entity.aod b/entity/BulkMailRecipient_entity/BulkMailRecipient_entity.aod
index daed78c4eb..bae83161b6 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.16" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.16">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
   <name>BulkMailRecipient_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/BulkMailRecipient_entity/documentation.adoc</documentation>
diff --git a/entity/BulkMailStatusChart_entity/BulkMailStatusChart_entity.aod b/entity/BulkMailStatusChart_entity/BulkMailStatusChart_entity.aod
index 35d083358b..63f5f1d407 100644
--- a/entity/BulkMailStatusChart_entity/BulkMailStatusChart_entity.aod
+++ b/entity/BulkMailStatusChart_entity/BulkMailStatusChart_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.16" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.16">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
   <name>BulkMailStatusChart_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/BulkMailStatusChart_entity/documentation.adoc</documentation>
diff --git a/entity/BulkMailTesting_entity/BulkMailTesting_entity.aod b/entity/BulkMailTesting_entity/BulkMailTesting_entity.aod
index 92169c61b5..008aa0177c 100644
--- a/entity/BulkMailTesting_entity/BulkMailTesting_entity.aod
+++ b/entity/BulkMailTesting_entity/BulkMailTesting_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.16" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.16">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
   <name>BulkMailTesting_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/BulkMailTesting_entity/documentation.adoc</documentation>
diff --git a/entity/BulkMail_entity/BulkMail_entity.aod b/entity/BulkMail_entity/BulkMail_entity.aod
index c10a2894aa..a742ec5a58 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.16" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.16">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
   <name>BulkMail_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/BulkMail_entity/documentation.adoc</documentation>
diff --git a/entity/CampaignAddParticipants_entity/CampaignAddParticipants_entity.aod b/entity/CampaignAddParticipants_entity/CampaignAddParticipants_entity.aod
index 589de0a109..739af475cf 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.16" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.16">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
   <name>CampaignAddParticipants_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/CampaignAddParticipants_entity/documentation.adoc</documentation>
diff --git a/entity/CampaignAnalysis_entity/CampaignAnalysis_entity.aod b/entity/CampaignAnalysis_entity/CampaignAnalysis_entity.aod
index 8bb0b2e138..137b70c4aa 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.16" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.16">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
   <name>CampaignAnalysis_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/CampaignAnalysis_entity/documentation.adoc</documentation>
diff --git a/entity/CampaignCostChart_entity/CampaignCostChart_entity.aod b/entity/CampaignCostChart_entity/CampaignCostChart_entity.aod
index 3d95369e5d..de366ec455 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.16" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.16">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
   <name>CampaignCostChart_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/CampaignCostChart_entity/documentation.adoc</documentation>
diff --git a/entity/CampaignCost_entity/CampaignCost_entity.aod b/entity/CampaignCost_entity/CampaignCost_entity.aod
index 40ec25abd3..8481518fc0 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.16" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.16">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
   <name>CampaignCost_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/CampaignCost_entity/documentation.adoc</documentation>
diff --git a/entity/CampaignParticipantChart_entity/CampaignParticipantChart_entity.aod b/entity/CampaignParticipantChart_entity/CampaignParticipantChart_entity.aod
index e8f33ac822..9f4d833b4d 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.16" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.16">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
   <name>CampaignParticipantChart_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/CampaignParticipantChart_entity/documentation.adoc</documentation>
diff --git a/entity/CampaignParticipant_entity/CampaignParticipant_entity.aod b/entity/CampaignParticipant_entity/CampaignParticipant_entity.aod
index 393cf1f209..d622466645 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.16" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.16">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
   <name>CampaignParticipant_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/CampaignParticipant_entity/documentation.adoc</documentation>
diff --git a/entity/CampaignPlanning_entity/CampaignPlanning_entity.aod b/entity/CampaignPlanning_entity/CampaignPlanning_entity.aod
index 0d70b0df45..2de87bf6e8 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.16" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.16">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
   <name>CampaignPlanning_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/CampaignPlanning_entity/documentation.adoc</documentation>
diff --git a/entity/CampaignStep_entity/CampaignStep_entity.aod b/entity/CampaignStep_entity/CampaignStep_entity.aod
index aa6b433400..23338be86f 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.16" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.16">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
   <name>CampaignStep_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/CampaignStep_entity/documentation.adoc</documentation>
diff --git a/entity/Campaign_entity/Campaign_entity.aod b/entity/Campaign_entity/Campaign_entity.aod
index 8498f8347f..f5c8d01e86 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.16" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.16">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
   <name>Campaign_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/Campaign_entity/documentation.adoc</documentation>
diff --git a/entity/ClassificationAdmin_entity/ClassificationAdmin_entity.aod b/entity/ClassificationAdmin_entity/ClassificationAdmin_entity.aod
index 74bcf9b2ed..b974517f78 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.16" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.16">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
   <name>ClassificationAdmin_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/ClassificationAdmin_entity/documentation.adoc</documentation>
diff --git a/entity/ClassificationGrading_entity/ClassificationGrading_entity.aod b/entity/ClassificationGrading_entity/ClassificationGrading_entity.aod
index ab19ae0f43..891ee3d613 100644
--- a/entity/ClassificationGrading_entity/ClassificationGrading_entity.aod
+++ b/entity/ClassificationGrading_entity/ClassificationGrading_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.16" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.16">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
   <name>ClassificationGrading_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/ClassificationGrading_entity/documentation.adoc</documentation>
diff --git a/entity/ClassificationGroupAnalyses_entity/ClassificationGroupAnalyses_entity.aod b/entity/ClassificationGroupAnalyses_entity/ClassificationGroupAnalyses_entity.aod
index 0eb60b08c4..c43b27125f 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.16" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.16">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
   <name>ClassificationGroupAnalyses_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/ClassificationGroupAnalyses_entity/documentation.adoc</documentation>
diff --git a/entity/ClassificationScore_entity/ClassificationScore_entity.aod b/entity/ClassificationScore_entity/ClassificationScore_entity.aod
index 0e066fefa0..4d930ad8b0 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.16" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.16">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
   <name>ClassificationScore_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/ClassificationScore_entity/documentation.adoc</documentation>
diff --git a/entity/ClassificationType_entity/ClassificationType_entity.aod b/entity/ClassificationType_entity/ClassificationType_entity.aod
index 8b99efe8bf..016b698256 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.16" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.16">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
   <name>ClassificationType_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/ClassificationType_entity/documentation.adoc</documentation>
diff --git a/entity/Classification_entity/Classification_entity.aod b/entity/Classification_entity/Classification_entity.aod
index 4bdb408f3d..5cdeeb7889 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.16" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.16">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
   <name>Classification_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/Classification_entity/documentation.adoc</documentation>
diff --git a/entity/CommRestriction_Entity/CommRestriction_Entity.aod b/entity/CommRestriction_Entity/CommRestriction_Entity.aod
index 338815c674..102c450de9 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.16" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.16">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
   <name>CommRestriction_Entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/CommRestriction_Entity/documentation.adoc</documentation>
diff --git a/entity/Communication_entity/Communication_entity.aod b/entity/Communication_entity/Communication_entity.aod
index 90f75ac86c..dbc7bf89b3 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.16" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.16">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
   <name>Communication_entity</name>
   <description>former Comm</description>
   <majorModelMode>DISTRIBUTED</majorModelMode>
diff --git a/entity/Competition_entity/Competition_entity.aod b/entity/Competition_entity/Competition_entity.aod
index 56ed87886c..ac91f28ee4 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.16" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.16">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
   <name>Competition_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/Competition_entity/documentation.adoc</documentation>
diff --git a/entity/Contact_entity/Contact_entity.aod b/entity/Contact_entity/Contact_entity.aod
index 9128e79877..53ca53c9db 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.16" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.16">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
   <name>Contact_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/Contact_entity/documentation.adoc</documentation>
diff --git a/entity/Context_entity/Context_entity.aod b/entity/Context_entity/Context_entity.aod
index e9f6563ef3..c82aab16b5 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.16" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.16">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
   <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 03a1c5e37d..c23930d570 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.16" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.16">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
   <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 5a679b23f5..9b431268c5 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.16" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.16">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
   <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 bd849bc157..5baf9ac2bf 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.16" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.16">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
   <name>DSGVOInfo_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/DSGVOInfo_entity/documentation.adoc</documentation>
diff --git a/entity/DSGVOReport_entity/DSGVOReport_entity.aod b/entity/DSGVOReport_entity/DSGVOReport_entity.aod
index e3dcfa867b..b6fe8ca524 100644
--- a/entity/DSGVOReport_entity/DSGVOReport_entity.aod
+++ b/entity/DSGVOReport_entity/DSGVOReport_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.16" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.16">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
   <name>DSGVOReport_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/DSGVOReport_entity/documentation.adoc</documentation>
diff --git a/entity/DSGVO_entity/DSGVO_entity.aod b/entity/DSGVO_entity/DSGVO_entity.aod
index 8f8e1c40cc..19cefc3a19 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.16" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.16">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
   <name>DSGVO_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/DSGVO_entity/documentation.adoc</documentation>
diff --git a/entity/DefaultAdminView_entity/DefaultAdminView_entity.aod b/entity/DefaultAdminView_entity/DefaultAdminView_entity.aod
index 8c22684782..a84b79d58a 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.16" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.16">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
   <name>DefaultAdminView_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/DefaultAdminView_entity/documentation.adoc</documentation>
diff --git a/entity/DescriptionTranslation_entity/DescriptionTranslation_entity.aod b/entity/DescriptionTranslation_entity/DescriptionTranslation_entity.aod
index d42f6616e8..83aa32b973 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.16" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.16">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
   <name>DescriptionTranslation_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/DescriptionTranslation_entity/documentation.adoc</documentation>
diff --git a/entity/DocumentTemplateLink_entity/DocumentTemplateLink_entity.aod b/entity/DocumentTemplateLink_entity/DocumentTemplateLink_entity.aod
index 0d5940fc0c..dcd594f7b7 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.16" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.16">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
   <name>DocumentTemplateLink_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/DocumentTemplateLink_entity/documentation.adoc</documentation>
diff --git a/entity/DocumentTemplatePlaceOfUse_entity/DocumentTemplatePlaceOfUse_entity.aod b/entity/DocumentTemplatePlaceOfUse_entity/DocumentTemplatePlaceOfUse_entity.aod
index cac308ab7d..3164b4edae 100644
--- a/entity/DocumentTemplatePlaceOfUse_entity/DocumentTemplatePlaceOfUse_entity.aod
+++ b/entity/DocumentTemplatePlaceOfUse_entity/DocumentTemplatePlaceOfUse_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.16" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.16">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
   <name>DocumentTemplatePlaceOfUse_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/DocumentTemplatePlaceOfUse_entity/documentation.adoc</documentation>
diff --git a/entity/DocumentTemplateTypeCategory_entity/DocumentTemplateTypeCategory_entity.aod b/entity/DocumentTemplateTypeCategory_entity/DocumentTemplateTypeCategory_entity.aod
index 41df983c3f..b70fb4f064 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.16" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.16">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
   <name>DocumentTemplateTypeCategory_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/DocumentTemplateTypeCategory_entity/documentation.adoc</documentation>
diff --git a/entity/DocumentTemplate_entity/DocumentTemplate_entity.aod b/entity/DocumentTemplate_entity/DocumentTemplate_entity.aod
index f63ffca46b..1c1eb5c7b7 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.16" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.16">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
   <name>DocumentTemplate_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/DocumentTemplate_entity/documentation.adoc</documentation>
diff --git a/entity/Document_entity/Document_entity.aod b/entity/Document_entity/Document_entity.aod
index 6c20477563..b3e35cd791 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.16" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.16">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
   <name>Document_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/Document_entity/documentation.adoc</documentation>
diff --git a/entity/DuplicateScannerResultFieldConfig_entity/DuplicateScannerResultFieldConfig_entity.aod b/entity/DuplicateScannerResultFieldConfig_entity/DuplicateScannerResultFieldConfig_entity.aod
index ab64bf597b..b587b5faf5 100644
--- a/entity/DuplicateScannerResultFieldConfig_entity/DuplicateScannerResultFieldConfig_entity.aod
+++ b/entity/DuplicateScannerResultFieldConfig_entity/DuplicateScannerResultFieldConfig_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.16" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.16">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
   <name>DuplicateScannerResultFieldConfig_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/DuplicateScannerResultFieldConfig_entity/documentation.adoc</documentation>
diff --git a/entity/DuplicateScanner_entity/DuplicateScanner_entity.aod b/entity/DuplicateScanner_entity/DuplicateScanner_entity.aod
index 51904f5e4e..98691a7490 100644
--- a/entity/DuplicateScanner_entity/DuplicateScanner_entity.aod
+++ b/entity/DuplicateScanner_entity/DuplicateScanner_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.16" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.16">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
   <name>DuplicateScanner_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/DuplicateScanner_entity/documentation.adoc</documentation>
diff --git a/entity/DuplicatesUnrelated_entity/DuplicatesUnrelated_entity.aod b/entity/DuplicatesUnrelated_entity/DuplicatesUnrelated_entity.aod
index 5d507d6309..eb93c9ccc9 100644
--- a/entity/DuplicatesUnrelated_entity/DuplicatesUnrelated_entity.aod
+++ b/entity/DuplicatesUnrelated_entity/DuplicatesUnrelated_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.16" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.16">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
   <name>DuplicatesUnrelated_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/DuplicatesUnrelated_entity/documentation.adoc</documentation>
diff --git a/entity/Duplicates_entity/Duplicates_entity.aod b/entity/Duplicates_entity/Duplicates_entity.aod
index 37a97f1b30..a0a699a39c 100644
--- a/entity/Duplicates_entity/Duplicates_entity.aod
+++ b/entity/Duplicates_entity/Duplicates_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.16" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.16">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
   <name>Duplicates_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/Duplicates_entity/documentation.adoc</documentation>
diff --git a/entity/Email_entity/Email_entity.aod b/entity/Email_entity/Email_entity.aod
index 9306b8443b..3ca3d9550c 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.16" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.16">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
   <name>Email_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/Email_entity/documentation.adoc</documentation>
diff --git a/entity/EmployeeRole_entity/EmployeeRole_entity.aod b/entity/EmployeeRole_entity/EmployeeRole_entity.aod
index 83de74fed1..c437b1692d 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.16" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.16">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
   <name>EmployeeRole_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/EmployeeRole_entity/documentation.adoc</documentation>
diff --git a/entity/Employee_entity/Employee_entity.aod b/entity/Employee_entity/Employee_entity.aod
index 5a1875ca1c..afac629c04 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.16" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.16">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
   <name>Employee_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/Employee_entity/documentation.adoc</documentation>
diff --git a/entity/ExportTemplateField_entity/ExportTemplateField_entity.aod b/entity/ExportTemplateField_entity/ExportTemplateField_entity.aod
index 478f6c7333..51ae4c0b8c 100644
--- a/entity/ExportTemplateField_entity/ExportTemplateField_entity.aod
+++ b/entity/ExportTemplateField_entity/ExportTemplateField_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.16" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.16">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
   <name>ExportTemplateField_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/ExportTemplateField_entity/documentation.adoc</documentation>
diff --git a/entity/ExportTemplatePlaceOfUse_entity/ExportTemplatePlaceOfUse_entity.aod b/entity/ExportTemplatePlaceOfUse_entity/ExportTemplatePlaceOfUse_entity.aod
index daa788bbf1..dec30f9107 100644
--- a/entity/ExportTemplatePlaceOfUse_entity/ExportTemplatePlaceOfUse_entity.aod
+++ b/entity/ExportTemplatePlaceOfUse_entity/ExportTemplatePlaceOfUse_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.16" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.16">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
   <name>ExportTemplatePlaceOfUse_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/ExportTemplatePlaceOfUse_entity/documentation.adoc</documentation>
diff --git a/entity/ExportTemplateSelection_entity/ExportTemplateSelection_entity.aod b/entity/ExportTemplateSelection_entity/ExportTemplateSelection_entity.aod
index 117876df7d..2840322c0f 100644
--- a/entity/ExportTemplateSelection_entity/ExportTemplateSelection_entity.aod
+++ b/entity/ExportTemplateSelection_entity/ExportTemplateSelection_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.16" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.16">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
   <name>ExportTemplateSelection_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/ExportTemplateSelection_entity/documentation.adoc</documentation>
diff --git a/entity/ExportTemplate_entity/ExportTemplate_entity.aod b/entity/ExportTemplate_entity/ExportTemplate_entity.aod
index 65e085fd59..ff7e047785 100644
--- a/entity/ExportTemplate_entity/ExportTemplate_entity.aod
+++ b/entity/ExportTemplate_entity/ExportTemplate_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.16" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.16">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
   <name>ExportTemplate_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/ExportTemplate_entity/documentation.adoc</documentation>
diff --git a/entity/Favorite_entity/Favorite_entity.aod b/entity/Favorite_entity/Favorite_entity.aod
index 3df5d594f4..1ad0dce01d 100644
--- a/entity/Favorite_entity/Favorite_entity.aod
+++ b/entity/Favorite_entity/Favorite_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.16" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.16">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
   <name>Favorite_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/Favorite_entity/documentation.adoc</documentation>
diff --git a/entity/Forecast_entity/Forecast_entity.aod b/entity/Forecast_entity/Forecast_entity.aod
index b5b7a6a2f3..f553dde8f4 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.16" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.16">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
   <name>Forecast_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/Forecast_entity/documentation.adoc</documentation>
diff --git a/entity/Gender_keyword/Gender_keyword.aod b/entity/Gender_keyword/Gender_keyword.aod
index 60b05dbba5..6c4c35a17b 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.16" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.16">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
   <name>Gender_keyword</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/Gender_keyword/documentation.adoc</documentation>
diff --git a/entity/ImportField_Entity/ImportField_Entity.aod b/entity/ImportField_Entity/ImportField_Entity.aod
index b4901e91a3..c3c160e699 100644
--- a/entity/ImportField_Entity/ImportField_Entity.aod
+++ b/entity/ImportField_Entity/ImportField_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.16" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.16">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
   <name>ImportField_Entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/ImportField_Entity/documentation.adoc</documentation>
diff --git a/entity/IndexSearchEntity/IndexSearchEntity.aod b/entity/IndexSearchEntity/IndexSearchEntity.aod
index 695a56ad51..d1274e4307 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.16" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.16">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
   <name>IndexSearchEntity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/IndexSearchEntity/documentation.adoc</documentation>
diff --git a/entity/KeywordAttributeRelation_entity/KeywordAttributeRelation_entity.aod b/entity/KeywordAttributeRelation_entity/KeywordAttributeRelation_entity.aod
index 4936f56062..e4f1112d7f 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.16" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.16">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
   <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 b7a9538ae8..660467e301 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.16" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.16">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
   <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 33b35f2b05..4a37e03e28 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.16" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.16">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
   <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 58a441009f..7387d81814 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.16" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.16">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
   <name>Language_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/Language_entity/documentation.adoc</documentation>
diff --git a/entity/LeadLog_entity/LeadLog_entity.aod b/entity/LeadLog_entity/LeadLog_entity.aod
index 4d60dc3a7e..ca424a627c 100644
--- a/entity/LeadLog_entity/LeadLog_entity.aod
+++ b/entity/LeadLog_entity/LeadLog_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.16" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.16">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
   <name>LeadLog_entity</name>
   <description></description>
   <majorModelMode>DISTRIBUTED</majorModelMode>
diff --git a/entity/LeadTemp_entity/LeadTemp_entity.aod b/entity/LeadTemp_entity/LeadTemp_entity.aod
index 4e5c3ee1e7..51582fefaf 100644
--- a/entity/LeadTemp_entity/LeadTemp_entity.aod
+++ b/entity/LeadTemp_entity/LeadTemp_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.16" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.16">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
   <name>LeadTemp_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/LeadTemp_entity/documentation.adoc</documentation>
diff --git a/entity/Lead_entity/Lead_entity.aod b/entity/Lead_entity/Lead_entity.aod
index 11610905fb..6a8a9fed94 100644
--- a/entity/Lead_entity/Lead_entity.aod
+++ b/entity/Lead_entity/Lead_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.16" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.16">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
   <name>Lead_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/Lead_entity/documentation.adoc</documentation>
diff --git a/entity/LeadimportMappingAssistant_entity/LeadimportMappingAssistant_entity.aod b/entity/LeadimportMappingAssistant_entity/LeadimportMappingAssistant_entity.aod
index 8cd12edc37..0cbf79b0dd 100644
--- a/entity/LeadimportMappingAssistant_entity/LeadimportMappingAssistant_entity.aod
+++ b/entity/LeadimportMappingAssistant_entity/LeadimportMappingAssistant_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.16" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.16">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
   <name>LeadimportMappingAssistant_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/LeadimportMappingAssistant_entity/documentation.adoc</documentation>
diff --git a/entity/Leadimport_entity/Leadimport_entity.aod b/entity/Leadimport_entity/Leadimport_entity.aod
index 44062290e6..1b13419957 100644
--- a/entity/Leadimport_entity/Leadimport_entity.aod
+++ b/entity/Leadimport_entity/Leadimport_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.16" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.16">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
   <name>Leadimport_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/Leadimport_entity/documentation.adoc</documentation>
diff --git a/entity/LetterRecipient_entity/LetterRecipient_entity.aod b/entity/LetterRecipient_entity/LetterRecipient_entity.aod
index 0c1bbd9803..63ec8c1457 100644
--- a/entity/LetterRecipient_entity/LetterRecipient_entity.aod
+++ b/entity/LetterRecipient_entity/LetterRecipient_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.16" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.16">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
   <name>LetterRecipient_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/LetterRecipient_entity/documentation.adoc</documentation>
diff --git a/entity/Letter_entity/Letter_entity.aod b/entity/Letter_entity/Letter_entity.aod
index 4b0863509e..5e357ba666 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.16" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.16">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
   <name>Letter_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/Letter_entity/documentation.adoc</documentation>
diff --git a/entity/LogHistory_entity/LogHistory_entity.aod b/entity/LogHistory_entity/LogHistory_entity.aod
index 59985906dd..7026c8106b 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.16" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.16">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
   <name>LogHistory_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/LogHistory_entity/documentation.adoc</documentation>
diff --git a/entity/MemberRoles_entity/MemberRoles_entity.aod b/entity/MemberRoles_entity/MemberRoles_entity.aod
index b73a0bd031..2871a36c5d 100644
--- a/entity/MemberRoles_entity/MemberRoles_entity.aod
+++ b/entity/MemberRoles_entity/MemberRoles_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.16" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.16">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
   <name>MemberRoles_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/MemberRoles_entity/documentation.adoc</documentation>
diff --git a/entity/Member_entity/Member_entity.aod b/entity/Member_entity/Member_entity.aod
index 91c9eb210d..4e8d292267 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.16" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.16">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
   <name>Member_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/Member_entity/documentation.adoc</documentation>
diff --git a/entity/ModuleTree_entity/ModuleTree_entity.aod b/entity/ModuleTree_entity/ModuleTree_entity.aod
index 1bda506ffa..8bc4b05870 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.16" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.16">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
   <name>ModuleTree_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/ModuleTree_entity/documentation.adoc</documentation>
diff --git a/entity/Notification_entity/Notification_entity.aod b/entity/Notification_entity/Notification_entity.aod
index 409958dff6..0f90322477 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.16" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.16">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
   <name>Notification_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/Notification_entity/documentation.adoc</documentation>
diff --git a/entity/ObjectProxy_entity/ObjectProxy_entity.aod b/entity/ObjectProxy_entity/ObjectProxy_entity.aod
index b321948592..ade8076995 100644
--- a/entity/ObjectProxy_entity/ObjectProxy_entity.aod
+++ b/entity/ObjectProxy_entity/ObjectProxy_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.16" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.16">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
   <name>ObjectProxy_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/ObjectProxy_entity/documentation.adoc</documentation>
diff --git a/entity/ObjectRelationType_entity/ObjectRelationType_entity.aod b/entity/ObjectRelationType_entity/ObjectRelationType_entity.aod
index 0f643ee43a..a2a47eb12c 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.16" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.16">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
   <name>ObjectRelationType_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/ObjectRelationType_entity/documentation.adoc</documentation>
diff --git a/entity/ObjectTree_entity/ObjectTree_entity.aod b/entity/ObjectTree_entity/ObjectTree_entity.aod
index 3a5313fb78..4266919a6b 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.16" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.16">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
   <name>ObjectTree_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/ObjectTree_entity/documentation.adoc</documentation>
diff --git a/entity/Object_entity/Object_entity.aod b/entity/Object_entity/Object_entity.aod
index 8737747449..7fe6b0ab3b 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.16" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.16">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
   <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 4671aca2a2..c5ef46f8c0 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.16" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.16">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
   <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 0d253354e1..dc0d84d447 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.16" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.16">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
   <name>Offeritem_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/Offeritem_entity/documentation.adoc</documentation>
diff --git a/entity/Order_entity/Order_entity.aod b/entity/Order_entity/Order_entity.aod
index aac7d84301..b7a688ff4f 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.16" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.16">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
   <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 ad9e1b9a20..888a453225 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.16" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.16">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
   <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 562abcab00..64bcd117dc 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.16" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.16">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
   <name>Organisation_entity</name>
   <description>former Org</description>
   <majorModelMode>DISTRIBUTED</majorModelMode>
diff --git a/entity/PermissionAction_entity/PermissionAction_entity.aod b/entity/PermissionAction_entity/PermissionAction_entity.aod
index 925c807fa4..ff1497fcaa 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.16" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.16">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
   <name>PermissionAction_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/PermissionAction_entity/documentation.adoc</documentation>
diff --git a/entity/PermissionCalendar_entity/PermissionCalendar_entity.aod b/entity/PermissionCalendar_entity/PermissionCalendar_entity.aod
index d5c8aa58aa..6fd9cfebf5 100644
--- a/entity/PermissionCalendar_entity/PermissionCalendar_entity.aod
+++ b/entity/PermissionCalendar_entity/PermissionCalendar_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.16" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.16">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
   <name>PermissionCalendar_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/PermissionCalendar_entity/documentation.adoc</documentation>
diff --git a/entity/PermissionDetail_entity/PermissionDetail_entity.aod b/entity/PermissionDetail_entity/PermissionDetail_entity.aod
index 9713ab6ae9..e18801ffb9 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.16" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.16">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
   <name>PermissionDetail_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/PermissionDetail_entity/documentation.adoc</documentation>
diff --git a/entity/PermissionMetaData_entity/PermissionMetaData_entity.aod b/entity/PermissionMetaData_entity/PermissionMetaData_entity.aod
index b80beabe1f..b2006b9d74 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.16" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.16">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
   <name>PermissionMetaData_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/PermissionMetaData_entity/documentation.adoc</documentation>
diff --git a/entity/PermissionOverview_entity/PermissionOverview_entity.aod b/entity/PermissionOverview_entity/PermissionOverview_entity.aod
index 9267a2289e..70dfee92a9 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.16" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.16">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
   <name>PermissionOverview_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/PermissionOverview_entity/documentation.adoc</documentation>
diff --git a/entity/Person_entity/Person_entity.aod b/entity/Person_entity/Person_entity.aod
index ef08247489..d2c9eccce9 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.16" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.16">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
   <name>Person_entity</name>
   <description>former Pers</description>
   <majorModelMode>DISTRIBUTED</majorModelMode>
diff --git a/entity/PrivatePerson_entity/PrivatePerson_entity.aod b/entity/PrivatePerson_entity/PrivatePerson_entity.aod
index 34ab44e915..fd51fcaef2 100644
--- a/entity/PrivatePerson_entity/PrivatePerson_entity.aod
+++ b/entity/PrivatePerson_entity/PrivatePerson_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.16" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.16">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
   <name>PrivatePerson_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/PrivatePerson_entity/documentation.adoc</documentation>
diff --git a/entity/Prod2prod_entity/Prod2prod_entity.aod b/entity/Prod2prod_entity/Prod2prod_entity.aod
index 69a52bee75..09e2fcde10 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.16" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.16">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
   <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 0923bd2294..3c58515f1f 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.16" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.16">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
   <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 cb5908d2a6..942d7f465f 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.16" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.16">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
   <name>Productprice_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/Productprice_entity/documentation.adoc</documentation>
diff --git a/entity/QuickEntry_entity/QuickEntry_entity.aod b/entity/QuickEntry_entity/QuickEntry_entity.aod
index 3cb2234c88..fe83641faf 100644
--- a/entity/QuickEntry_entity/QuickEntry_entity.aod
+++ b/entity/QuickEntry_entity/QuickEntry_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.16" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.16">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
   <name>QuickEntry_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/QuickEntry_entity/documentation.adoc</documentation>
diff --git a/entity/RoleChildren_entity/RoleChildren_entity.aod b/entity/RoleChildren_entity/RoleChildren_entity.aod
index 1607810c7e..89c17291b4 100644
--- a/entity/RoleChildren_entity/RoleChildren_entity.aod
+++ b/entity/RoleChildren_entity/RoleChildren_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.16" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.16">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
   <name>RoleChildren_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/RoleChildren_entity/documentation.adoc</documentation>
diff --git a/entity/RoleParent_entity/RoleParent_entity.aod b/entity/RoleParent_entity/RoleParent_entity.aod
index 7ff6f2fc3c..a48ffa5d0d 100644
--- a/entity/RoleParent_entity/RoleParent_entity.aod
+++ b/entity/RoleParent_entity/RoleParent_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.16" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.16">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
   <name>RoleParent_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/RoleParent_entity/documentation.adoc</documentation>
diff --git a/entity/Role_entity/Role_entity.aod b/entity/Role_entity/Role_entity.aod
index 3d32a413ab..b1e75e67c1 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.16" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.16">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
   <name>Role_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/Role_entity/documentation.adoc</documentation>
diff --git a/entity/SalesprojectAnalyses_entity/SalesprojectAnalyses_entity.aod b/entity/SalesprojectAnalyses_entity/SalesprojectAnalyses_entity.aod
index ec7561f019..5b2898641b 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.16" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.16">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
   <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 31c158b798..b1183b77d0 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.16" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.16">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
   <name>SalesprojectMilestone_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/SalesprojectMilestone_entity/documentation.adoc</documentation>
diff --git a/entity/SalesprojectPhase_entity/SalesprojectPhase_entity.aod b/entity/SalesprojectPhase_entity/SalesprojectPhase_entity.aod
index 4d486a1faa..fe5610bd13 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.16" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.16">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
   <name>SalesprojectPhase_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/SalesprojectPhase_entity/documentation.adoc</documentation>
diff --git a/entity/SalesprojectSource_entity/SalesprojectSource_entity.aod b/entity/SalesprojectSource_entity/SalesprojectSource_entity.aod
index f3cc95f68b..21cf70bfb8 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.16" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.16">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
   <name>SalesprojectSource_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/SalesprojectSource_entity/documentation.adoc</documentation>
diff --git a/entity/Salesproject_entity/Salesproject_entity.aod b/entity/Salesproject_entity/Salesproject_entity.aod
index 7d28b20c5f..e176d14951 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.16" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.16">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
   <name>Salesproject_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/Salesproject_entity/documentation.adoc</documentation>
diff --git a/entity/SalutationDistinct_entity/SalutationDistinct_entity.aod b/entity/SalutationDistinct_entity/SalutationDistinct_entity.aod
index 81dbd05f81..bacd4cd101 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.16" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.16">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
   <name>SalutationDistinct_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/SalutationDistinct_entity/documentation.adoc</documentation>
diff --git a/entity/SalutationTitleDistinct_entity/SalutationTitleDistinct_entity.aod b/entity/SalutationTitleDistinct_entity/SalutationTitleDistinct_entity.aod
index 203f4408a0..e23ed314f9 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.16" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.16">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
   <name>SalutationTitleDistinct_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/SalutationTitleDistinct_entity/documentation.adoc</documentation>
diff --git a/entity/Salutation_entity/Salutation_entity.aod b/entity/Salutation_entity/Salutation_entity.aod
index d818f5e252..48def7ff85 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.16" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.16">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
   <name>Salutation_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/Salutation_entity/documentation.adoc</documentation>
diff --git a/entity/SerialLetterAddRecipients_entity/SerialLetterAddRecipients_entity.aod b/entity/SerialLetterAddRecipients_entity/SerialLetterAddRecipients_entity.aod
index a62150b2ec..0de13f5543 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.16" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.16">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
   <name>SerialLetterAddRecipients_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/SerialLetterAddRecipients_entity/documentation.adoc</documentation>
diff --git a/entity/SerialLetter_entity/SerialLetter_entity.aod b/entity/SerialLetter_entity/SerialLetter_entity.aod
index 5435d9ba6a..8edb65a275 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.16" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.16">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
   <name>SerialLetter_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/SerialLetter_entity/documentation.adoc</documentation>
diff --git a/entity/Social_entity/Social_entity.aod b/entity/Social_entity/Social_entity.aod
index 9f67dff78e..41ff421fb2 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.16" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.16">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
   <name>Social_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/Social_entity/documentation.adoc</documentation>
diff --git a/entity/Stock_entity/Stock_entity.aod b/entity/Stock_entity/Stock_entity.aod
index 67b9856ded..79a929f5a6 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.16" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.16">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
   <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 d8970d387c..054a9a5466 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.16" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.16">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
   <name>SupportTicket_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/SupportTicket_entity/documentation.adoc</documentation>
diff --git a/entity/TaskLink_entity/TaskLink_entity.aod b/entity/TaskLink_entity/TaskLink_entity.aod
index 9b5a9fbd55..ad5dad51bb 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.16" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.16">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
   <name>TaskLink_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/TaskLink_entity/documentation.adoc</documentation>
diff --git a/entity/Task_entity/Task_entity.aod b/entity/Task_entity/Task_entity.aod
index 6a775dc901..106bb5a4b7 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.16" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.16">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
   <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 e162d0cc7c..fc20249228 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.16" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.16">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
   <name>Timetracking_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/Timetracking_entity/documentation.adoc</documentation>
diff --git a/entity/TurnoverTree_entity/TurnoverTree_entity.aod b/entity/TurnoverTree_entity/TurnoverTree_entity.aod
index bef035ac34..d275ce95c9 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.16" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.16">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
   <name>TurnoverTree_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/TurnoverTree_entity/documentation.adoc</documentation>
diff --git a/entity/Turnover_entity/Turnover_entity.aod b/entity/Turnover_entity/Turnover_entity.aod
index 8f2ba13cb6..0737e151be 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.16" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.16">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
   <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 503c81d0f8..1abb59ffc8 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.16" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.16">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
   <name>UniversalFileProcessor_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/UniversalFileProcessor_entity/documentation.adoc</documentation>
diff --git a/entity/UnlinkedMailMappingLink_entity/UnlinkedMailMappingLink_entity.aod b/entity/UnlinkedMailMappingLink_entity/UnlinkedMailMappingLink_entity.aod
index 66d658f477..32072b9ff3 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.16" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.16">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
   <name>UnlinkedMailMappingLink_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/UnlinkedMailMappingLink_entity/documentation.adoc</documentation>
diff --git a/entity/UnlinkedMailMappingWrapper_entity/UnlinkedMailMappingWrapper_entity.aod b/entity/UnlinkedMailMappingWrapper_entity/UnlinkedMailMappingWrapper_entity.aod
index 6f99921abd..d82d86fc8e 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.16" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.16">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
   <name>UnlinkedMailMappingWrapper_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/UnlinkedMailMappingWrapper_entity/documentation.adoc</documentation>
diff --git a/entity/UnlinkedMail_entity/UnlinkedMail_entity.aod b/entity/UnlinkedMail_entity/UnlinkedMail_entity.aod
index b2024360ba..7cc21c5dc1 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.16" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.16">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
   <name>UnlinkedMail_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/UnlinkedMail_entity/documentation.adoc</documentation>
diff --git a/entity/Usersettings_entity/Usersettings_entity.aod b/entity/Usersettings_entity/Usersettings_entity.aod
index e847326168..b0aee47cbd 100644
--- a/entity/Usersettings_entity/Usersettings_entity.aod
+++ b/entity/Usersettings_entity/Usersettings_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.16" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.16">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
   <name>Usersettings_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/Usersettings_entity/documentation.adoc</documentation>
diff --git a/entity/VisitPlanEmployeeWeek_entity/VisitPlanEmployeeWeek_entity.aod b/entity/VisitPlanEmployeeWeek_entity/VisitPlanEmployeeWeek_entity.aod
index 64a949cf14..e285bf117f 100644
--- a/entity/VisitPlanEmployeeWeek_entity/VisitPlanEmployeeWeek_entity.aod
+++ b/entity/VisitPlanEmployeeWeek_entity/VisitPlanEmployeeWeek_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.16" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.16">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
   <name>VisitPlanEmployeeWeek_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/VisitPlanEmployeeWeek_entity/documentation.adoc</documentation>
diff --git a/entity/VisitPlanEntry_entity/VisitPlanEntry_entity.aod b/entity/VisitPlanEntry_entity/VisitPlanEntry_entity.aod
index e4dff2e47c..f059c7a986 100644
--- a/entity/VisitPlanEntry_entity/VisitPlanEntry_entity.aod
+++ b/entity/VisitPlanEntry_entity/VisitPlanEntry_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.16" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.16">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
   <name>VisitPlanEntry_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/VisitPlanEntry_entity/documentation.adoc</documentation>
diff --git a/entity/VisitRecommendation_entity/VisitRecommendation_entity.aod b/entity/VisitRecommendation_entity/VisitRecommendation_entity.aod
index 09ec5a6bfc..d70a400985 100644
--- a/entity/VisitRecommendation_entity/VisitRecommendation_entity.aod
+++ b/entity/VisitRecommendation_entity/VisitRecommendation_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.16" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.16">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
   <name>VisitRecommendation_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/VisitRecommendation_entity/documentation.adoc</documentation>
diff --git a/entity/WorkflowDefinition_entity/WorkflowDefinition_entity.aod b/entity/WorkflowDefinition_entity/WorkflowDefinition_entity.aod
index 05ef23256c..6b03a4c7d1 100644
--- a/entity/WorkflowDefinition_entity/WorkflowDefinition_entity.aod
+++ b/entity/WorkflowDefinition_entity/WorkflowDefinition_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.16" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.16">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
   <name>WorkflowDefinition_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/WorkflowDefinition_entity/documentation.adoc</documentation>
diff --git a/entity/WorkflowInstanceHistory_entity/WorkflowInstanceHistory_entity.aod b/entity/WorkflowInstanceHistory_entity/WorkflowInstanceHistory_entity.aod
index dac53e6190..606db71e8c 100644
--- a/entity/WorkflowInstanceHistory_entity/WorkflowInstanceHistory_entity.aod
+++ b/entity/WorkflowInstanceHistory_entity/WorkflowInstanceHistory_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.16" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.16">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
   <name>WorkflowInstanceHistory_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/WorkflowInstanceHistory_entity/documentation.adoc</documentation>
diff --git a/entity/WorkflowInstance_entity/WorkflowInstance_entity.aod b/entity/WorkflowInstance_entity/WorkflowInstance_entity.aod
index e7497bcdc1..5a1d85e3ae 100644
--- a/entity/WorkflowInstance_entity/WorkflowInstance_entity.aod
+++ b/entity/WorkflowInstance_entity/WorkflowInstance_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.16" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.16">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
   <name>WorkflowInstance_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/WorkflowInstance_entity/documentation.adoc</documentation>
diff --git a/entity/WorkflowModel_entity/WorkflowModel_entity.aod b/entity/WorkflowModel_entity/WorkflowModel_entity.aod
index 8700a0b672..73b8d4ebc7 100644
--- a/entity/WorkflowModel_entity/WorkflowModel_entity.aod
+++ b/entity/WorkflowModel_entity/WorkflowModel_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.16" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.16">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
   <name>WorkflowModel_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/WorkflowModel_entity/documentation.adoc</documentation>
diff --git a/entity/WorkflowSignal_entity/WorkflowSignal_entity.aod b/entity/WorkflowSignal_entity/WorkflowSignal_entity.aod
index 56662e0508..0482a952cd 100644
--- a/entity/WorkflowSignal_entity/WorkflowSignal_entity.aod
+++ b/entity/WorkflowSignal_entity/WorkflowSignal_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.16" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.16">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
   <name>WorkflowSignal_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/WorkflowSignal_entity/documentation.adoc</documentation>
diff --git a/entity/WorkflowStartConfig_entity/WorkflowStartConfig_entity.aod b/entity/WorkflowStartConfig_entity/WorkflowStartConfig_entity.aod
index 62070c41af..e57032a87e 100644
--- a/entity/WorkflowStartConfig_entity/WorkflowStartConfig_entity.aod
+++ b/entity/WorkflowStartConfig_entity/WorkflowStartConfig_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.16" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.16">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
   <name>WorkflowStartConfig_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/WorkflowStartConfig_entity/documentation.adoc</documentation>
diff --git a/entity/WorkflowTask_entity/WorkflowTask_entity.aod b/entity/WorkflowTask_entity/WorkflowTask_entity.aod
index 3f6a49c470..96272fe5f1 100644
--- a/entity/WorkflowTask_entity/WorkflowTask_entity.aod
+++ b/entity/WorkflowTask_entity/WorkflowTask_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.16" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.16">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
   <name>WorkflowTask_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/WorkflowTask_entity/documentation.adoc</documentation>
diff --git a/entity/WorkflowVariableValue_entity/WorkflowVariableValue_entity.aod b/entity/WorkflowVariableValue_entity/WorkflowVariableValue_entity.aod
index 4b11980c03..df6d2af4a4 100644
--- a/entity/WorkflowVariableValue_entity/WorkflowVariableValue_entity.aod
+++ b/entity/WorkflowVariableValue_entity/WorkflowVariableValue_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.16" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.16">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
   <name>WorkflowVariableValue_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/WorkflowVariableValue_entity/documentation.adoc</documentation>
-- 
GitLab


From 7135f9e656e8271f44108cf5d4fb47cce1411b0e Mon Sep 17 00:00:00 2001
From: Sebastian Listl <s.listl@adito.de>
Date: Mon, 31 Aug 2020 16:50:09 +0200
Subject: [PATCH 236/309] #1064496 new Contacts could not be removed in
 QuickEntry

---
 entity/Person_entity/grantDeleteProcess.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/entity/Person_entity/grantDeleteProcess.js b/entity/Person_entity/grantDeleteProcess.js
index 2c8fe13800..88573c89e8 100644
--- a/entity/Person_entity/grantDeleteProcess.js
+++ b/entity/Person_entity/grantDeleteProcess.js
@@ -11,7 +11,7 @@ var personCount = newSelect("count(*)")
                         .from("CONTACT")
                         .join("PERSON", "PERSON.PERSONID = CONTACT.PERSON_ID")
                         .where("PERSON.PERSONID", personId)
-                        .cell()
+                        .cell();
 //only delete when the contact doesnt have any functions, because that would currently lead to the person and all his functions being deleted,
 // since there is only one person contact behind all the contacts.
 //ToDo: come back to this and implement the solution for deleting a function (#1059167) once it'S decided how that's being implemented
@@ -30,5 +30,7 @@ if(personCount == 1)
         .andNoEntityRows("ObjectTree_entity", "TreeProvider", {ObjectIds_param : JSON.stringify([contactId, vars.get("$field.PERSON_ID")]), ObjectTypes_param : JSON.stringify([currentContext, "PrivatePerson"])})
         .validate();
 }
+else if (personCount == 0) //special case in QuickEntry where it should be possible to remove a new Person that is not saved in the db yet
+    canDelete = true;
 
 result.string(canDelete);
-- 
GitLab


From f77b8f82620177dee9c48adeb489bf04dc93c656 Mon Sep 17 00:00:00 2001
From: Sebastian Listl <s.listl@adito.de>
Date: Mon, 31 Aug 2020 17:04:34 +0200
Subject: [PATCH 237/309] #1064440 house number address search

---
 process/WsValidation_lib/process.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/process/WsValidation_lib/process.js b/process/WsValidation_lib/process.js
index 7028a04ba7..d7387dcc3d 100644
--- a/process/WsValidation_lib/process.js
+++ b/process/WsValidation_lib/process.js
@@ -364,8 +364,9 @@ WsValidationUtils.setAddressFields = function(pJSON)
     
     for (let field in toSet) 
     {
-        let value = toSet[field] || "";
-        neon.setFieldValue(field, value);
+        let value = toSet[field];
+        if (value)
+            neon.setFieldValue(field, value);
     }
     
     return true;
-- 
GitLab


From cfed96794fd94259069e380afb39b855d5959f77 Mon Sep 17 00:00:00 2001
From: "s.pongratz" <s.pongratz@spongratz.aditosoftware.local>
Date: Mon, 31 Aug 2020 20:04:17 +0200
Subject: [PATCH 238/309] =?UTF-8?q?#1056853-Unverkn=C3=BCpfteMails=5FAktiv?=
 =?UTF-8?q?it=C3=A4tenFilter=20Fehlender=20Import?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../db/filterextensions/isunlinked/filterValuesProcess.js        | 1 +
 1 file changed, 1 insertion(+)

diff --git a/entity/Activity_entity/recordcontainers/db/filterextensions/isunlinked/filterValuesProcess.js b/entity/Activity_entity/recordcontainers/db/filterextensions/isunlinked/filterValuesProcess.js
index 056eacc69d..2c7036f92c 100644
--- a/entity/Activity_entity/recordcontainers/db/filterextensions/isunlinked/filterValuesProcess.js
+++ b/entity/Activity_entity/recordcontainers/db/filterextensions/isunlinked/filterValuesProcess.js
@@ -1,3 +1,4 @@
 import("system.result");
+import("system.translate");
 
 result.object([["true", translate.text("Yes")], ["false", translate.text("No")]]);
\ No newline at end of file
-- 
GitLab


From eeab9b7ea8e5f4b1655ea8808acc753722dfd6d2 Mon Sep 17 00:00:00 2001
From: Johannes Goderbauer <j.goderbauer@adito.de>
Date: Tue, 1 Sep 2020 05:59:28 +0000
Subject: [PATCH 239/309] =?UTF-8?q?Merge=20branch=20'#1056853-Unverkn?=
 =?UTF-8?q?=C3=BCpfteMails=5FAktivit=C3=A4tenFilter'=20into=20'2020.1.3'?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

#1056853-UnverknüpfteMails_AktivitätenFilter Fehlender Import

See merge request xrm/basic!343

(cherry picked from commit 778d579e331cc15fe67aabb8767e678cb1b4796b)

cfed9679 #1056853-UnverknüpfteMails_AktivitätenFilter Fehlender Import
---
 .../db/filterextensions/isunlinked/filterValuesProcess.js        | 1 +
 1 file changed, 1 insertion(+)

diff --git a/entity/Activity_entity/recordcontainers/db/filterextensions/isunlinked/filterValuesProcess.js b/entity/Activity_entity/recordcontainers/db/filterextensions/isunlinked/filterValuesProcess.js
index 4462144da5..06bc384309 100644
--- a/entity/Activity_entity/recordcontainers/db/filterextensions/isunlinked/filterValuesProcess.js
+++ b/entity/Activity_entity/recordcontainers/db/filterextensions/isunlinked/filterValuesProcess.js
@@ -1,4 +1,5 @@
 import("system.translate");
 import("system.result");
+import("system.translate");
 
 result.object([["true", translate.text("Yes")], ["false", translate.text("No")]]);
\ No newline at end of file
-- 
GitLab


From b8c287383deb33ff23ca64967805f48f4d4daeb6 Mon Sep 17 00:00:00 2001
From: Sebastian Listl <s.listl@adito.de>
Date: Tue, 1 Sep 2020 10:43:53 +0200
Subject: [PATCH 240/309] #1064546 indexsearch did not work with Organisation
 and Person

---
 entity/Organisation_entity/Organisation_entity.aod     | 10 ----------
 .../recordcontainers/index/query.js                    |  6 ++----
 entity/Person_entity/recordcontainers/index/query.js   |  9 ++-------
 3 files changed, 4 insertions(+), 21 deletions(-)

diff --git a/entity/Organisation_entity/Organisation_entity.aod b/entity/Organisation_entity/Organisation_entity.aod
index d4baac32bb..8ae5e1fe3a 100644
--- a/entity/Organisation_entity/Organisation_entity.aod
+++ b/entity/Organisation_entity/Organisation_entity.aod
@@ -1357,16 +1357,6 @@
       </affectedTables>
       <affectedIds>%aditoprj%/entity/Organisation_entity/recordcontainers/index/affectedIds.js</affectedIds>
       <indexFieldMappings>
-        <indexRecordFieldMapping>
-          <name>#LOCATION</name>
-          <indexFieldType>LOCATION</indexFieldType>
-          <additionalFieldNameAliases>
-            <element>location</element>
-          </additionalFieldNameAliases>
-          <isGlobalSearchField v="false" />
-          <isFilterable v="false" />
-          <isLookupFilter v="false" />
-        </indexRecordFieldMapping>
         <indexRecordFieldMapping>
           <name>NAME.value</name>
           <indexFieldType>PROPER_NAME</indexFieldType>
diff --git a/entity/Organisation_entity/recordcontainers/index/query.js b/entity/Organisation_entity/recordcontainers/index/query.js
index 10ff797d42..075671c143 100644
--- a/entity/Organisation_entity/recordcontainers/index/query.js
+++ b/entity/Organisation_entity/recordcontainers/index/query.js
@@ -46,9 +46,7 @@ var querySelect = newSelect("CONTACT.CONTACTID "
                     .leftJoin("COMMUNICATION", "PHONE.CONTACT_ID = CONTACT.CONTACTID and PHONE.MEDIUM_ID in ('" + CommMediumPhoneIds.join("', '") + "')", "PHONE")//TODO: refactor to new SqlBuilder
                     .where("CONTACT.STATUS", $KeywordRegistry.contactStatus$inactive(), SqlBuilder.NOT_EQUAL())
 
-if (vars.exists("$local.idvalue") && vars.get("$local.idvalue") && vars.get("$local.idvalue").length > 0) 
-{
-    querySelect.where("CONTACT.CONTACTID", vars.get("$local.idvalue"), SqlBuilder.IN());
-}
+if (vars.exists("$local.idvalue"))
+    querySelect.whereIfSet("CONTACT.CONTACTID", "$local.idvalue");
 
 result.string(querySelect.toString());
diff --git a/entity/Person_entity/recordcontainers/index/query.js b/entity/Person_entity/recordcontainers/index/query.js
index efe2af2c2e..e72a0822ec 100644
--- a/entity/Person_entity/recordcontainers/index/query.js
+++ b/entity/Person_entity/recordcontainers/index/query.js
@@ -42,7 +42,6 @@ var querySelect = newSelect("CONTACT.CONTACTID "
                         )
                     .from("PERSON")
                     .join("CONTACT", "CONTACT.PERSON_ID = PERSON.PERSONID")
-                    .and("CONTACT.STATUS", $KeywordRegistry.contactStatus$inactive(), SqlBuilder.NOT_EQUAL())
                     .join("ORGANISATION", "CONTACT.ORGANISATION_ID = ORGANISATION.ORGANISATIONID")
                     .leftJoin("ADDRESS", "defaultAddress.ADDRESSID = CONTACT.ADDRESS_ID", "defaultAddress")
                     .leftJoin("ADDRESS", "ADDRESS.CONTACT_ID = CONTACT.CONTACTID")
@@ -51,11 +50,7 @@ var querySelect = newSelect("CONTACT.CONTACTID "
                     .where("CONTACT.STATUS", $KeywordRegistry.contactStatus$inactive(), SqlBuilder.NOT_EQUAL())
                     .orderBy("CONTACT.CONTACTID");
 
-if (vars.exists("$local.idvalue")) 
-{
-    affectedIds = vars.get("$local.idvalue");
-    querySelect.whereIfSet("CONTACT.CONTACTID", affectedIds, SqlBuilder.IN());
-}
-
+if (vars.exists("$local.idvalue"))
+    querySelect.whereIfSet("CONTACT.CONTACTID", "$local.idvalue");
 
 result.string(querySelect);
\ No newline at end of file
-- 
GitLab


From 460bb74f0b725b595ba0cc8474cc137e33afef28 Mon Sep 17 00:00:00 2001
From: Sebastian Listl <s.listl@adito.de>
Date: Wed, 2 Sep 2020 11:48:50 +0000
Subject: [PATCH 241/309] Unclosed tag fixed in LANGUAGE_de

---
 language/_____LANGUAGE_de/_____LANGUAGE_de.aod | 1 -
 1 file changed, 1 deletion(-)

diff --git a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
index 784b00d216..2cbfd86cf7 100644
--- a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
+++ b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
@@ -9068,7 +9068,6 @@ Bitte Datumseingabe prüfen</value>
       <key>Permission Procurer Department</key>
       <value>Rechteempfänger Abteilung</value>
     </entry>
-    <entry>
     <entry>
       <key>favorite</key>
     </entry>
-- 
GitLab


From 0102cf7dca73963a39fd822de81f332693a41198 Mon Sep 17 00:00:00 2001
From: "a.schindlbeck" <a.schindlbeck@adito.de>
Date: Wed, 2 Sep 2020 09:38:21 +0200
Subject: [PATCH 242/309] #1060919 Kalender: linked Appointments bugfixing

---
 .../Appointment_entity/grantDeleteProcess.js  |  8 ++++++--
 .../Appointment_entity/grantUpdateProcess.js  | 10 ++++++++--
 .../recordcontainers/jdito/contentProcess.js  |  3 ++-
 .../recordcontainers/jdito/onDelete.js        | 20 ++++++++++++++-----
 .../NotificationFilter_view.aod               |  2 +-
 5 files changed, 32 insertions(+), 11 deletions(-)

diff --git a/entity/Appointment_entity/grantDeleteProcess.js b/entity/Appointment_entity/grantDeleteProcess.js
index 4caa2d99cf..aef302f111 100644
--- a/entity/Appointment_entity/grantDeleteProcess.js
+++ b/entity/Appointment_entity/grantDeleteProcess.js
@@ -2,6 +2,10 @@ import("system.vars");
 import("system.result");
 import("system.calendars");
 import("system.text");
+import("system.tools");
 
-var owner = text.decodeMS(JSON.parse(vars.get("$param.Entry_param"))["h"])[1].split(":")[1];
-result.string(calendars.hasPermission([owner], calendars.VEVENT, "WRITE"));
\ No newline at end of file
+
+var user = tools.getCurrentUser();
+var calUser = calendars.getCalendarUser(user["title"]);
+var calUserCn = text.decodeMS(calUser)[1].split(":")[1];
+result.string(calendars.hasPermission(calUserCn, calendars.VEVENT, "WRITE"));
\ No newline at end of file
diff --git a/entity/Appointment_entity/grantUpdateProcess.js b/entity/Appointment_entity/grantUpdateProcess.js
index 3562ea4a6c..e6ac4c8426 100644
--- a/entity/Appointment_entity/grantUpdateProcess.js
+++ b/entity/Appointment_entity/grantUpdateProcess.js
@@ -2,7 +2,13 @@ import("system.vars");
 import("system.result");
 import("system.calendars");
 import("system.text");
+import("system.tools");
+import("system.logging");
 
-var owner = text.decodeMS(JSON.parse(vars.get("$param.Entry_param"))["h"])[1].split(":")[1];
-result.string(calendars.hasPermission([owner], calendars.VEVENT, "WRITE"));
 
+var user = tools.getCurrentUser();
+var calUser = calendars.getCalendarUser(user["title"]);
+var calUserCn = text.decodeMS(calUser)[1].split(":")[1];
+var permitted = calendars.hasPermission(calUserCn, calendars.VEVENT, "WRITE");
+
+result.string(permitted);
diff --git a/entity/Appointment_entity/recordcontainers/jdito/contentProcess.js b/entity/Appointment_entity/recordcontainers/jdito/contentProcess.js
index e56415a0fa..3d5ff22eaf 100644
--- a/entity/Appointment_entity/recordcontainers/jdito/contentProcess.js
+++ b/entity/Appointment_entity/recordcontainers/jdito/contentProcess.js
@@ -9,6 +9,7 @@ import("system.datetime");
 import("system.eMath");
 import("system.util");
 import("system.neon");
+import("system.text");
 
 var appointmentSelect = newSelect("APPOINTMENT_ID").from("AB_APPOINTMENTLINK");
 var appointmentUids;
@@ -77,7 +78,7 @@ function buildEntry(pEntry, pMasterentry)
     if(pEntry[calendars.ORGANIZER2] != undefined)
         var organizer = pEntry[calendars.ORGANIZER2]["paramvalue"];
     if(pEntry[calendars.USER2] != undefined)
-        var owner = pEntry[calendars.USER2]["paramvalue"];
+        var owner = JSON.stringify(pEntry[calendars.USER2]);
     var status = pEntry[calendars.STATUS];
     var location = pEntry[calendars.LOCATION];
     var reminder = pEntry[calendars.REMINDER_DURATION];
diff --git a/entity/Appointment_entity/recordcontainers/jdito/onDelete.js b/entity/Appointment_entity/recordcontainers/jdito/onDelete.js
index 4e0e5c7a5c..6f6249aee3 100644
--- a/entity/Appointment_entity/recordcontainers/jdito/onDelete.js
+++ b/entity/Appointment_entity/recordcontainers/jdito/onDelete.js
@@ -1,20 +1,30 @@
+import("system.logging");
 import("Sql_lib");
 import("system.neon");
 import("system.calendars");
 import("system.vars");
 
-if (vars.exists("$param.Entry_param"))
+var uid;
+
+if (vars.get("$param.Entry_param") != null)
 {
     var entry = JSON.parse(vars.getString("$param.Entry_param"));
     var reccurenceid = entry[calendars.RECURRENCEID];
+    
     if (reccurenceid == undefined) 
         reccurenceid = null;
     
-    calendars.removeEntryByUID(calendars.VEVENT, entry[calendars.USER2]["cn"], entry[calendars.ID], reccurenceid)
+    uid = entry[calendars.ID];
+    calendars.removeEntryByUID(calendars.VEVENT, entry[calendars.USER2]["cn"], uid, reccurenceid);
+}
+else if(vars.get("$field.OWNER"))
+{
+    uid = vars.get("$field.UID");
+    calendars.removeEntryByUID(calendars.VEVENT, JSON.parse(vars.get("$field.OWNER"))["cn"], uid, vars.get("$field.RECURRENCEID"));
+}
     
     /**
      * Deletes ApointmentLinks referring to the deleted Appointment.
      */
-    newWhereIfSet("AB_APPOINTMENTLINK.APPOINTMENT_ID", entry[calendars.ID])
-            .deleteData();
-}
\ No newline at end of file
+    newWhereIfSet("AB_APPOINTMENTLINK.APPOINTMENT_ID", uid)
+            .deleteData();
\ No newline at end of file
diff --git a/neonView/NotificationFilter_view/NotificationFilter_view.aod b/neonView/NotificationFilter_view/NotificationFilter_view.aod
index d37a1a1cc3..f1b5cbc587 100644
--- a/neonView/NotificationFilter_view/NotificationFilter_view.aod
+++ b/neonView/NotificationFilter_view/NotificationFilter_view.aod
@@ -29,7 +29,7 @@
     <timelineViewTemplate>
       <name>NotificationTimeline</name>
       <favoriteActionGroup1>setNotificationState</favoriteActionGroup1>
-      <dateField>CREATIONDATE</dateField>
+      <dateField>CREATEDATE</dateField>
       <titleField>CAPTION</titleField>
       <descriptionField>DESCRIPTION</descriptionField>
       <iconIdField>ICON</iconIdField>
-- 
GitLab


From b2763c23323b883d9864f10871d4caf6b8c179d4 Mon Sep 17 00:00:00 2001
From: Andreas Schindlbeck <a.schindlbeck@adito.de>
Date: Wed, 2 Sep 2020 12:37:38 +0000
Subject: [PATCH 243/309] Revert "#1060919 Kalender: linked Appointments
 bugfixing"

This reverts commit 0102cf7dca73963a39fd822de81f332693a41198
---
 .../Appointment_entity/grantDeleteProcess.js  |  8 ++------
 .../Appointment_entity/grantUpdateProcess.js  | 10 ++--------
 .../recordcontainers/jdito/contentProcess.js  |  3 +--
 .../recordcontainers/jdito/onDelete.js        | 20 +++++--------------
 .../NotificationFilter_view.aod               |  2 +-
 5 files changed, 11 insertions(+), 32 deletions(-)

diff --git a/entity/Appointment_entity/grantDeleteProcess.js b/entity/Appointment_entity/grantDeleteProcess.js
index aef302f111..4caa2d99cf 100644
--- a/entity/Appointment_entity/grantDeleteProcess.js
+++ b/entity/Appointment_entity/grantDeleteProcess.js
@@ -2,10 +2,6 @@ import("system.vars");
 import("system.result");
 import("system.calendars");
 import("system.text");
-import("system.tools");
 
-
-var user = tools.getCurrentUser();
-var calUser = calendars.getCalendarUser(user["title"]);
-var calUserCn = text.decodeMS(calUser)[1].split(":")[1];
-result.string(calendars.hasPermission(calUserCn, calendars.VEVENT, "WRITE"));
\ No newline at end of file
+var owner = text.decodeMS(JSON.parse(vars.get("$param.Entry_param"))["h"])[1].split(":")[1];
+result.string(calendars.hasPermission([owner], calendars.VEVENT, "WRITE"));
\ No newline at end of file
diff --git a/entity/Appointment_entity/grantUpdateProcess.js b/entity/Appointment_entity/grantUpdateProcess.js
index e6ac4c8426..3562ea4a6c 100644
--- a/entity/Appointment_entity/grantUpdateProcess.js
+++ b/entity/Appointment_entity/grantUpdateProcess.js
@@ -2,13 +2,7 @@ import("system.vars");
 import("system.result");
 import("system.calendars");
 import("system.text");
-import("system.tools");
-import("system.logging");
 
+var owner = text.decodeMS(JSON.parse(vars.get("$param.Entry_param"))["h"])[1].split(":")[1];
+result.string(calendars.hasPermission([owner], calendars.VEVENT, "WRITE"));
 
-var user = tools.getCurrentUser();
-var calUser = calendars.getCalendarUser(user["title"]);
-var calUserCn = text.decodeMS(calUser)[1].split(":")[1];
-var permitted = calendars.hasPermission(calUserCn, calendars.VEVENT, "WRITE");
-
-result.string(permitted);
diff --git a/entity/Appointment_entity/recordcontainers/jdito/contentProcess.js b/entity/Appointment_entity/recordcontainers/jdito/contentProcess.js
index 3d5ff22eaf..e56415a0fa 100644
--- a/entity/Appointment_entity/recordcontainers/jdito/contentProcess.js
+++ b/entity/Appointment_entity/recordcontainers/jdito/contentProcess.js
@@ -9,7 +9,6 @@ import("system.datetime");
 import("system.eMath");
 import("system.util");
 import("system.neon");
-import("system.text");
 
 var appointmentSelect = newSelect("APPOINTMENT_ID").from("AB_APPOINTMENTLINK");
 var appointmentUids;
@@ -78,7 +77,7 @@ function buildEntry(pEntry, pMasterentry)
     if(pEntry[calendars.ORGANIZER2] != undefined)
         var organizer = pEntry[calendars.ORGANIZER2]["paramvalue"];
     if(pEntry[calendars.USER2] != undefined)
-        var owner = JSON.stringify(pEntry[calendars.USER2]);
+        var owner = pEntry[calendars.USER2]["paramvalue"];
     var status = pEntry[calendars.STATUS];
     var location = pEntry[calendars.LOCATION];
     var reminder = pEntry[calendars.REMINDER_DURATION];
diff --git a/entity/Appointment_entity/recordcontainers/jdito/onDelete.js b/entity/Appointment_entity/recordcontainers/jdito/onDelete.js
index 6f6249aee3..4e0e5c7a5c 100644
--- a/entity/Appointment_entity/recordcontainers/jdito/onDelete.js
+++ b/entity/Appointment_entity/recordcontainers/jdito/onDelete.js
@@ -1,30 +1,20 @@
-import("system.logging");
 import("Sql_lib");
 import("system.neon");
 import("system.calendars");
 import("system.vars");
 
-var uid;
-
-if (vars.get("$param.Entry_param") != null)
+if (vars.exists("$param.Entry_param"))
 {
     var entry = JSON.parse(vars.getString("$param.Entry_param"));
     var reccurenceid = entry[calendars.RECURRENCEID];
-    
     if (reccurenceid == undefined) 
         reccurenceid = null;
     
-    uid = entry[calendars.ID];
-    calendars.removeEntryByUID(calendars.VEVENT, entry[calendars.USER2]["cn"], uid, reccurenceid);
-}
-else if(vars.get("$field.OWNER"))
-{
-    uid = vars.get("$field.UID");
-    calendars.removeEntryByUID(calendars.VEVENT, JSON.parse(vars.get("$field.OWNER"))["cn"], uid, vars.get("$field.RECURRENCEID"));
-}
+    calendars.removeEntryByUID(calendars.VEVENT, entry[calendars.USER2]["cn"], entry[calendars.ID], reccurenceid)
     
     /**
      * Deletes ApointmentLinks referring to the deleted Appointment.
      */
-    newWhereIfSet("AB_APPOINTMENTLINK.APPOINTMENT_ID", uid)
-            .deleteData();
\ No newline at end of file
+    newWhereIfSet("AB_APPOINTMENTLINK.APPOINTMENT_ID", entry[calendars.ID])
+            .deleteData();
+}
\ No newline at end of file
diff --git a/neonView/NotificationFilter_view/NotificationFilter_view.aod b/neonView/NotificationFilter_view/NotificationFilter_view.aod
index f1b5cbc587..d37a1a1cc3 100644
--- a/neonView/NotificationFilter_view/NotificationFilter_view.aod
+++ b/neonView/NotificationFilter_view/NotificationFilter_view.aod
@@ -29,7 +29,7 @@
     <timelineViewTemplate>
       <name>NotificationTimeline</name>
       <favoriteActionGroup1>setNotificationState</favoriteActionGroup1>
-      <dateField>CREATEDATE</dateField>
+      <dateField>CREATIONDATE</dateField>
       <titleField>CAPTION</titleField>
       <descriptionField>DESCRIPTION</descriptionField>
       <iconIdField>ICON</iconIdField>
-- 
GitLab


From 4c3ff245547da347a77a05ff006abb52371730eb Mon Sep 17 00:00:00 2001
From: Sebastian Listl <s.listl@adito.de>
Date: Thu, 3 Sep 2020 09:43:37 +0200
Subject: [PATCH 244/309] #1063116 EmployeeRole contentProcess changed

---
 .../EmployeeRole_entity.aod                   |  1 +
 .../recordcontainers/jdito/contentProcess.js  | 37 ++++++-------------
 2 files changed, 13 insertions(+), 25 deletions(-)

diff --git a/entity/EmployeeRole_entity/EmployeeRole_entity.aod b/entity/EmployeeRole_entity/EmployeeRole_entity.aod
index c437b1692d..a25038afe3 100644
--- a/entity/EmployeeRole_entity/EmployeeRole_entity.aod
+++ b/entity/EmployeeRole_entity/EmployeeRole_entity.aod
@@ -74,6 +74,7 @@
     <jDitoRecordContainer>
       <name>jdito</name>
       <jDitoRecordAlias>Data_alias</jDitoRecordAlias>
+      <isSortable v="true" />
       <contentProcess>%aditoprj%/entity/EmployeeRole_entity/recordcontainers/jdito/contentProcess.js</contentProcess>
       <onInsert>%aditoprj%/entity/EmployeeRole_entity/recordcontainers/jdito/onInsert.js</onInsert>
       <onUpdate>%aditoprj%/entity/EmployeeRole_entity/recordcontainers/jdito/onUpdate.js</onUpdate>
diff --git a/entity/EmployeeRole_entity/recordcontainers/jdito/contentProcess.js b/entity/EmployeeRole_entity/recordcontainers/jdito/contentProcess.js
index a798b7a80f..4c099db5f3 100644
--- a/entity/EmployeeRole_entity/recordcontainers/jdito/contentProcess.js
+++ b/entity/EmployeeRole_entity/recordcontainers/jdito/contentProcess.js
@@ -1,9 +1,9 @@
+import("Util_lib");
 import("system.result");
 import("system.vars");
 import("system.tools");
 
 var roles = [];
-var singleRole = [];
 var userTitle = vars.exists("$param.UserTitle_param") && vars.get("$param.UserTitle_param");
 var allRoles = tools.getAllRoles();
 
@@ -24,33 +24,20 @@ if (userTitle && tools.existUsers(userTitle))
     }, existsObj);
 }
 
-var ids = vars.get("$local.idvalues");
-if (ids != null)
+var idvalues = vars.get("$local.idvalues");
+if (!Utils.isNullOrEmpty(idvalues))
 {
     roles = roles.filter(function(role) 
     {
-        for (let i = 0; i < ids.length; i++)
-        {
-            if (role[0] == ids[i])
-                return true;
-        }
-        return ids[i];
+        return idvalues.includes(role[0]);
     });
 }
-if(roles == undefined || roles.length > 0)
-    result.object(roles);
-else
+
+var sortOrder = vars.get("$local.order");
+if (sortOrder && "ROLE.displayValue" in sortOrder)
 {
-    var currentRole = vars.get("$field.ROLE")
-    roles = roles.filter(function(role) 
-    {
-        for (let i = 0; i < ids.length; i++)
-        {
-            if (role[0] == currentRole)
-                return true;
-        }
-        return vars.get("$field.ROLE");
-    });
-    singleRole[0] = [currentRole.toUpperCase(), currentRole.toUpperCase(), allRoles[currentRole][0], "Role"];
-    result.object(singleRole)
-}
\ No newline at end of file
+    ArrayUtils.sort2d(roles, 2, sortOrder["ROLE.displayValue"] === "UP");
+}
+    
+
+result.object(roles);
-- 
GitLab


From a1a543f3f63e0a29a14a37a3beed3aa6ae3b986f Mon Sep 17 00:00:00 2001
From: Sebastian Listl <s.listl@adito.de>
Date: Thu, 3 Sep 2020 07:43:37 +0000
Subject: [PATCH 245/309] #1063116 EmployeeRole contentProcess changed

(cherry picked from commit 4c3ff245547da347a77a05ff006abb52371730eb)
---
 .../EmployeeRole_entity.aod                   |  1 +
 .../recordcontainers/jdito/contentProcess.js  | 37 ++++++-------------
 2 files changed, 13 insertions(+), 25 deletions(-)

diff --git a/entity/EmployeeRole_entity/EmployeeRole_entity.aod b/entity/EmployeeRole_entity/EmployeeRole_entity.aod
index 70d886c3bf..6aac28f337 100644
--- a/entity/EmployeeRole_entity/EmployeeRole_entity.aod
+++ b/entity/EmployeeRole_entity/EmployeeRole_entity.aod
@@ -70,6 +70,7 @@
     <jDitoRecordContainer>
       <name>jdito</name>
       <jDitoRecordAlias>Data_alias</jDitoRecordAlias>
+      <isSortable v="true" />
       <contentProcess>%aditoprj%/entity/EmployeeRole_entity/recordcontainers/jdito/contentProcess.js</contentProcess>
       <onInsert>%aditoprj%/entity/EmployeeRole_entity/recordcontainers/jdito/onInsert.js</onInsert>
       <onUpdate>%aditoprj%/entity/EmployeeRole_entity/recordcontainers/jdito/onUpdate.js</onUpdate>
diff --git a/entity/EmployeeRole_entity/recordcontainers/jdito/contentProcess.js b/entity/EmployeeRole_entity/recordcontainers/jdito/contentProcess.js
index a798b7a80f..4c099db5f3 100644
--- a/entity/EmployeeRole_entity/recordcontainers/jdito/contentProcess.js
+++ b/entity/EmployeeRole_entity/recordcontainers/jdito/contentProcess.js
@@ -1,9 +1,9 @@
+import("Util_lib");
 import("system.result");
 import("system.vars");
 import("system.tools");
 
 var roles = [];
-var singleRole = [];
 var userTitle = vars.exists("$param.UserTitle_param") && vars.get("$param.UserTitle_param");
 var allRoles = tools.getAllRoles();
 
@@ -24,33 +24,20 @@ if (userTitle && tools.existUsers(userTitle))
     }, existsObj);
 }
 
-var ids = vars.get("$local.idvalues");
-if (ids != null)
+var idvalues = vars.get("$local.idvalues");
+if (!Utils.isNullOrEmpty(idvalues))
 {
     roles = roles.filter(function(role) 
     {
-        for (let i = 0; i < ids.length; i++)
-        {
-            if (role[0] == ids[i])
-                return true;
-        }
-        return ids[i];
+        return idvalues.includes(role[0]);
     });
 }
-if(roles == undefined || roles.length > 0)
-    result.object(roles);
-else
+
+var sortOrder = vars.get("$local.order");
+if (sortOrder && "ROLE.displayValue" in sortOrder)
 {
-    var currentRole = vars.get("$field.ROLE")
-    roles = roles.filter(function(role) 
-    {
-        for (let i = 0; i < ids.length; i++)
-        {
-            if (role[0] == currentRole)
-                return true;
-        }
-        return vars.get("$field.ROLE");
-    });
-    singleRole[0] = [currentRole.toUpperCase(), currentRole.toUpperCase(), allRoles[currentRole][0], "Role"];
-    result.object(singleRole)
-}
\ No newline at end of file
+    ArrayUtils.sort2d(roles, 2, sortOrder["ROLE.displayValue"] === "UP");
+}
+    
+
+result.object(roles);
-- 
GitLab


From 2e8f19d92fa486a28053dc5c68c33c49b127a8d7 Mon Sep 17 00:00:00 2001
From: Johannes Goderbauer <j.goderbauer@adito.de>
Date: Thu, 3 Sep 2020 09:17:25 +0000
Subject: [PATCH 246/309] #1060560 area search

---
 .gitignore                                    |   3 +-
 .../AroundLocation_entity.aod                 |  86 +++++++++++++
 .../AroundLocation_entity/documentation.adoc  |  19 +++
 .../entityfields/contactids/valueProcess.js   |  57 +++++++++
 .../entityfields/open/onActionProcess.js      |  10 ++
 .../entityfields/open/stateProcess.js         |  12 ++
 .../onlyshowcontactids_param/valueProcess.js  |  15 +++
 .../originuid_param/documentation.adoc        |   1 +
 .../recordcountinformation/valueProcess.js    |  32 +++++
 .../entityfields/searchradius/onValidation.js |  17 +++
 entity/AroundLocation_entity/onValidation.js  |  15 +++
 entity/Order_entity/Order_entity.aod          |   3 -
 .../testaction/onActionProcess.js             |   5 +
 .../Organisation_entity.aod                   |  83 ++++++++++++-
 .../openaroundlocation/documentation.adoc     |   1 +
 .../openaroundlocation/onActionProcess.js     |  22 ++++
 .../openaroundlocation/stateProcess.js        |  27 +++++
 .../organisationsviaindex/documentation.adoc  |   5 +
 .../index/patternExtensionProcess.js          |  27 +++++
 .../recordcontainers/index/query.js           |   7 +-
 .../_____LANGUAGE_EXTRA.aod                   |  35 +++++-
 .../_____LANGUAGE_de/_____LANGUAGE_de.aod     | 114 +++++++++++-------
 .../_____LANGUAGE_en/_____LANGUAGE_en.aod     |  39 +++++-
 neonContext/AroundLocation/AroundLocation.aod |  20 +++
 neonContext/Organisation/Organisation.aod     |   6 +-
 .../AroundLocationHeader_view.aod             |  26 ++++
 .../AroundOrganisationFooter_view.aod         |  33 +++++
 .../AroundOrganisationLocation_view.aod       |  33 +++++
 .../OrganisationEdit_view.aod                 |   2 +-
 .../OrganisationLesserNoiseTable_view.aod     |  42 +++++++
 .../OrganisationNoNoiseTable_view.aod}        |   4 +-
 process/Entity_lib/process.js                 |  61 ++++++++++
 32 files changed, 800 insertions(+), 62 deletions(-)
 create mode 100644 entity/AroundLocation_entity/AroundLocation_entity.aod
 create mode 100644 entity/AroundLocation_entity/documentation.adoc
 create mode 100644 entity/AroundLocation_entity/entityfields/contactids/valueProcess.js
 create mode 100644 entity/AroundLocation_entity/entityfields/open/onActionProcess.js
 create mode 100644 entity/AroundLocation_entity/entityfields/open/stateProcess.js
 create mode 100644 entity/AroundLocation_entity/entityfields/organisations/children/onlyshowcontactids_param/valueProcess.js
 create mode 100644 entity/AroundLocation_entity/entityfields/originuid_param/documentation.adoc
 create mode 100644 entity/AroundLocation_entity/entityfields/recordcountinformation/valueProcess.js
 create mode 100644 entity/AroundLocation_entity/entityfields/searchradius/onValidation.js
 create mode 100644 entity/AroundLocation_entity/onValidation.js
 create mode 100644 entity/Order_entity/entityfields/testaction/onActionProcess.js
 create mode 100644 entity/Organisation_entity/entityfields/openaroundlocation/documentation.adoc
 create mode 100644 entity/Organisation_entity/entityfields/openaroundlocation/onActionProcess.js
 create mode 100644 entity/Organisation_entity/entityfields/openaroundlocation/stateProcess.js
 create mode 100644 entity/Organisation_entity/entityfields/organisationsviaindex/documentation.adoc
 create mode 100644 entity/Organisation_entity/recordcontainers/index/patternExtensionProcess.js
 create mode 100644 neonContext/AroundLocation/AroundLocation.aod
 create mode 100644 neonView/AroundLocationHeader_view/AroundLocationHeader_view.aod
 create mode 100644 neonView/AroundOrganisationFooter_view/AroundOrganisationFooter_view.aod
 create mode 100644 neonView/AroundOrganisationLocation_view/AroundOrganisationLocation_view.aod
 create mode 100644 neonView/OrganisationLesserNoiseTable_view/OrganisationLesserNoiseTable_view.aod
 rename neonView/{OrganisationDuplicateEditview_view/OrganisationDuplicateEditview_view.aod => OrganisationNoNoiseTable_view/OrganisationNoNoiseTable_view.aod} (94%)

diff --git a/.gitignore b/.gitignore
index 7f791a6b5a..3e6393c7c2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,7 @@
 /.aditoprj/cache
 /.aditoprj/UUIDNameMap.txt
+/.idea
 /data
 /others/db_changes/liqui_update.bat
 /others/db_changes/liqui_reset.ps1
-/others/jsdocOut
\ No newline at end of file
+/others/jsdocOut
diff --git a/entity/AroundLocation_entity/AroundLocation_entity.aod b/entity/AroundLocation_entity/AroundLocation_entity.aod
new file mode 100644
index 0000000000..c91531dc4c
--- /dev/null
+++ b/entity/AroundLocation_entity/AroundLocation_entity.aod
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
+  <name>AroundLocation_entity</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <documentation>%aditoprj%/entity/AroundLocation_entity/documentation.adoc</documentation>
+  <onValidation>%aditoprj%/entity/AroundLocation_entity/onValidation.js</onValidation>
+  <recordContainer>dataless</recordContainer>
+  <entityFields>
+    <entityProvider>
+      <name>#PROVIDER</name>
+    </entityProvider>
+    <entityField>
+      <name>SearchRadius</name>
+      <title>Radius in km</title>
+      <contentType>NUMBER</contentType>
+      <outputFormat>#</outputFormat>
+      <inputFormat>#</inputFormat>
+      <state>EDITABLE</state>
+      <onValidation>%aditoprj%/entity/AroundLocation_entity/entityfields/searchradius/onValidation.js</onValidation>
+    </entityField>
+    <entityConsumer>
+      <name>Organisations</name>
+      <state>READONLY</state>
+      <dependency>
+        <name>dependency</name>
+        <entityName>Organisation_entity</entityName>
+        <fieldName>OrganisationsViaIndex</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>OnlyShowContactIds_param</name>
+          <valueProcess>%aditoprj%/entity/AroundLocation_entity/entityfields/organisations/children/onlyshowcontactids_param/valueProcess.js</valueProcess>
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityActionField>
+      <name>Open</name>
+      <title>${ACTION_DO_OPEN}</title>
+      <onActionProcess>%aditoprj%/entity/AroundLocation_entity/entityfields/open/onActionProcess.js</onActionProcess>
+      <iconId>VAADIN:FOLDER_OPEN</iconId>
+      <state>DISABLED</state>
+      <stateProcess>%aditoprj%/entity/AroundLocation_entity/entityfields/open/stateProcess.js</stateProcess>
+    </entityActionField>
+    <entityField>
+      <name>ContactIds</name>
+      <valueProcess>%aditoprj%/entity/AroundLocation_entity/entityfields/contactids/valueProcess.js</valueProcess>
+    </entityField>
+    <entityParameter>
+      <name>LocationLat_param</name>
+      <expose v="true" />
+      <mandatory v="true" />
+    </entityParameter>
+    <entityParameter>
+      <name>LocationLon_param</name>
+      <expose v="true" />
+      <mandatory v="true" />
+    </entityParameter>
+    <entityField>
+      <name>RecordCountInformation</name>
+      <color>readonly-color</color>
+      <valueProcess>%aditoprj%/entity/AroundLocation_entity/entityfields/recordcountinformation/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>HitCount</name>
+    </entityField>
+    <entityField>
+      <name>TotalHitCount</name>
+    </entityField>
+    <entityParameter>
+      <name>OriginUid_param</name>
+      <expose v="true" />
+      <mandatory v="true" />
+      <documentation>%aditoprj%/entity/AroundLocation_entity/entityfields/originuid_param/documentation.adoc</documentation>
+    </entityParameter>
+    <entityProvider>
+      <name>#PROVIDER_AGGREGATES</name>
+      <useAggregates v="true" />
+    </entityProvider>
+  </entityFields>
+  <recordContainers>
+    <datalessRecordContainer>
+      <name>dataless</name>
+      <alias>Data_alias</alias>
+    </datalessRecordContainer>
+  </recordContainers>
+</entity>
diff --git a/entity/AroundLocation_entity/documentation.adoc b/entity/AroundLocation_entity/documentation.adoc
new file mode 100644
index 0000000000..a84e68c897
--- /dev/null
+++ b/entity/AroundLocation_entity/documentation.adoc
@@ -0,0 +1,19 @@
+= AroundLocation_entity
+
+Entity with a _dataless_ recordContainer that enables the user to enter a distance for a radius search and determinig the result records.
+This is done as following:
+
+. After a distance is entered, a indexsearch is run that determines the affected records that are within the given distance
+. the UIDs of the records are collected
+. the collected UIDs are passed to other entities via a param, and the other entites can filter for these uids
+
+IMPORTANT: It's necessary to determine only the IDs and pass them to next entity because there is currently no way to filter the results by distance 
+in the next entity. This is due to a restriction of how solr handels such radius search requests.
+
+== Related Entities
+
+* `Organisation_entity`: This entity lists organisation that were found around a specific location.
+
+== FAQ
+
+_No questions have been added yet. You can help expanding this section by adding the first questions._
\ No newline at end of file
diff --git a/entity/AroundLocation_entity/entityfields/contactids/valueProcess.js b/entity/AroundLocation_entity/entityfields/contactids/valueProcess.js
new file mode 100644
index 0000000000..8c557caa9b
--- /dev/null
+++ b/entity/AroundLocation_entity/entityfields/contactids/valueProcess.js
@@ -0,0 +1,57 @@
+import("system.result");
+import("system.util");
+import("system.vars");
+import("system.indexsearch");
+import("system.neon");
+
+var contactIds = [];
+
+var radius = vars.get("$field.SearchRadius");
+var lat  = vars.get("$param.LocationLat_param");
+var lon  = vars.get("$param.LocationLon_param");
+
+if (radius && lat && lon)
+{
+    //filter our origin uid because otherwise we would have the origin organisation in our resultset
+    var excludedUid = vars.get("$param.OriginUid_param");
+    var pattern;
+    if (excludedUid)
+    {
+        var patternConfig = indexsearch.createPatternConfig();
+        var searchTerm = indexsearch.createTerm(excludedUid);
+        patternConfig.not(searchTerm);
+        pattern = indexsearch.buildPattern(patternConfig);
+    }
+    //spatial filter
+    var spatialSearchExtension = indexsearch.createSpatialSearchExtension()
+        .setDistance(radius)
+        .setCenterPoint(lat, lon);
+    /* 
+    We need to limit the resulting records since we only collect ids and pass them as parameter via a consumer.
+    It would be bad for performance reasons to set no limit an e.g. pass 400k IDs there.
+    
+    However increasing the RECORD_LIMIT does not necessarily increase the amount of loaded data by the indexsearch. There is another internal handled
+    limit of the indexsarch. The RECORD_LIMIT will not overwrite that internal limit. 
+    For example: If the RECORD_LIMIT is 500, and the interal limit 250 only 250 records are returned by the indexsearch. 
+    However, if the RECORD_LIMIT is 100, and the interal limit 250 only 100 records are returned by the indexsearch.
+    */
+    var RECORD_LIMIT = 250;
+    var indexQuery = indexsearch.createIndexQuery()
+        .addExtension(spatialSearchExtension)
+        .setRows(RECORD_LIMIT)
+        .addIndexGroups("Organisation")
+        .addResultIndexFields([indexsearch.FIELD_ID]);
+
+    if (pattern)
+        indexQuery.setPattern(pattern);
+
+    var indexResult = indexsearch.searchIndex(indexQuery);
+    if (indexResult.TOTALHITS > 0)
+        contactIds = indexResult.HITS.map(function (e){
+            return e[indexsearch.FIELD_ID];
+        });
+        neon.setFieldValue("$field.HitCount", contactIds.length);
+        neon.setFieldValue("$field.TotalHitCount", indexResult.TOTALHITS);
+}
+
+result.string(JSON.stringify(contactIds));
\ No newline at end of file
diff --git a/entity/AroundLocation_entity/entityfields/open/onActionProcess.js b/entity/AroundLocation_entity/entityfields/open/onActionProcess.js
new file mode 100644
index 0000000000..064f8348f4
--- /dev/null
+++ b/entity/AroundLocation_entity/entityfields/open/onActionProcess.js
@@ -0,0 +1,10 @@
+import("system.vars");
+import("system.neon");
+
+var contactIds = vars.get("$field.ContactIds");
+
+if (contactIds)
+    contactIds = JSON.parse(contactIds);
+
+neon.openContext("Organisation", "OrganisationFilter_view", contactIds, neon.OPERATINGSTATE_SEARCH, null, null);
+//neon.openContext("Organisation", null, contactIds, null, null, null);
\ No newline at end of file
diff --git a/entity/AroundLocation_entity/entityfields/open/stateProcess.js b/entity/AroundLocation_entity/entityfields/open/stateProcess.js
new file mode 100644
index 0000000000..d2425e0275
--- /dev/null
+++ b/entity/AroundLocation_entity/entityfields/open/stateProcess.js
@@ -0,0 +1,12 @@
+import("system.vars");
+import("system.result");
+import("system.neon");
+
+var res;
+var hitCount = vars.get("$field.HitCount");
+if (vars.get("$sys.validationerrors") || hitCount == null || hitCount == "" || parseInt(hitCount) == 0)
+    res = neon.COMPONENTSTATE_DISABLED;
+else
+    res = neon.COMPONENTSTATE_EDITABLE;
+
+result.string(res);
\ No newline at end of file
diff --git a/entity/AroundLocation_entity/entityfields/organisations/children/onlyshowcontactids_param/valueProcess.js b/entity/AroundLocation_entity/entityfields/organisations/children/onlyshowcontactids_param/valueProcess.js
new file mode 100644
index 0000000000..c81f940ed4
--- /dev/null
+++ b/entity/AroundLocation_entity/entityfields/organisations/children/onlyshowcontactids_param/valueProcess.js
@@ -0,0 +1,15 @@
+import("system.vars");
+import("system.util");
+import("system.result");
+
+var contactIds = vars.get("$field.ContactIds");
+
+if (contactIds)
+    contactIds = JSON.parse(contactIds);
+else 
+    contactIds = [];
+    
+if (contactIds.length == 0)
+    contactIds = ["###dummy###" + util.getNewUUID() + "###dummy###"];
+
+result.string(JSON.stringify(contactIds));
\ No newline at end of file
diff --git a/entity/AroundLocation_entity/entityfields/originuid_param/documentation.adoc b/entity/AroundLocation_entity/entityfields/originuid_param/documentation.adoc
new file mode 100644
index 0000000000..45e00239aa
--- /dev/null
+++ b/entity/AroundLocation_entity/entityfields/originuid_param/documentation.adoc
@@ -0,0 +1 @@
+This parameter is used to exclude ourself from the search results.
\ No newline at end of file
diff --git a/entity/AroundLocation_entity/entityfields/recordcountinformation/valueProcess.js b/entity/AroundLocation_entity/entityfields/recordcountinformation/valueProcess.js
new file mode 100644
index 0000000000..ead2ce1444
--- /dev/null
+++ b/entity/AroundLocation_entity/entityfields/recordcountinformation/valueProcess.js
@@ -0,0 +1,32 @@
+import("system.translate");
+import("system.vars");
+import("system.result");
+import("system.logging");
+
+var displayedHitCount = vars.get("$field.HitCount");
+var totalHitCount = vars.get("$field.TotalHitCount");
+
+var res;
+if (displayedHitCount && totalHitCount)
+{
+    if (parseInt(displayedHitCount) == 0)
+    {
+        res = "";
+    }
+    else if (parseInt(displayedHitCount) == 1)
+    {
+        res = translate.withArguments("${DISPLAY_AND_OPEN_ONE_HIT}", [displayedHitCount]);
+    }
+    else if (displayedHitCount == totalHitCount) 
+    {
+        res = translate.withArguments("${DISPLAY_AND_OPEN_%0_HITS}", [displayedHitCount]);
+    }
+    else 
+    {
+        res = translate.withArguments("${DISPLAY_AND_OPEN_%0_OF_%1_HITS}", [displayedHitCount, totalHitCount]);
+    }
+}
+else
+    res = "";
+
+result.string(res);
\ No newline at end of file
diff --git a/entity/AroundLocation_entity/entityfields/searchradius/onValidation.js b/entity/AroundLocation_entity/entityfields/searchradius/onValidation.js
new file mode 100644
index 0000000000..d616454144
--- /dev/null
+++ b/entity/AroundLocation_entity/entityfields/searchradius/onValidation.js
@@ -0,0 +1,17 @@
+import("system.vars");
+import("system.result");
+import("system.translate");
+
+var value = vars.get("$local.value");
+var res;
+if (value)
+{
+   value = parseInt(value);
+   if (value < 1)
+       res = translate.withArguments("The radius has to be at least %0.", ["1"]);
+   else if (value > 100)
+       res = translate.withArguments("The radius has to be %0 or lesser.", ["100"]);
+}
+
+if (res)
+    result.string(res);
\ No newline at end of file
diff --git a/entity/AroundLocation_entity/onValidation.js b/entity/AroundLocation_entity/onValidation.js
new file mode 100644
index 0000000000..fb43d2d307
--- /dev/null
+++ b/entity/AroundLocation_entity/onValidation.js
@@ -0,0 +1,15 @@
+import("system.translate");
+import("system.vars");
+import("system.result");
+
+var res;
+var lat  = vars.get("$param.LocationLat_param");
+var lon  = vars.get("$param.LocationLon_param");
+
+if (lat == null || lon == null)
+{
+    res = translate.text("The given starting location is empty. An area search can not be performed.");
+}
+
+if (res)
+    result.string(res);
\ No newline at end of file
diff --git a/entity/Order_entity/Order_entity.aod b/entity/Order_entity/Order_entity.aod
index b7a688ff4f..20e41538fa 100644
--- a/entity/Order_entity/Order_entity.aod
+++ b/entity/Order_entity/Order_entity.aod
@@ -1107,9 +1107,6 @@
           <name>ORDERTYPE.displayValue</name>
           <expression>%aditoprj%/entity/Order_entity/recordcontainers/db/recordfieldmappings/ordertype.displayvalue/expression.js</expression>
         </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>COUNT.value</name>
-        </dbRecordFieldMapping>
         <aggregateFieldDbMapping>
           <name>COUNT_aggregate.value</name>
           <recordfield>SALESORDER.SALESORDERID</recordfield>
diff --git a/entity/Order_entity/entityfields/testaction/onActionProcess.js b/entity/Order_entity/entityfields/testaction/onActionProcess.js
new file mode 100644
index 0000000000..232cd1d982
--- /dev/null
+++ b/entity/Order_entity/entityfields/testaction/onActionProcess.js
@@ -0,0 +1,5 @@
+import("system.vars");
+import("system.question");
+
+var r = vars.get("$field.#CONTENTTITLE");
+question.showMessage(r);
\ No newline at end of file
diff --git a/entity/Organisation_entity/Organisation_entity.aod b/entity/Organisation_entity/Organisation_entity.aod
index 64bcd117dc..d2cd92e613 100644
--- a/entity/Organisation_entity/Organisation_entity.aod
+++ b/entity/Organisation_entity/Organisation_entity.aod
@@ -1171,12 +1171,75 @@
       <title>Count</title>
     </entityAggregateField>
     <entityProvider>
-      <name>indexP</name>
+      <name>OrganisationsViaIndex</name>
+      <documentation>%aditoprj%/entity/Organisation_entity/entityfields/organisationsviaindex/documentation.adoc</documentation>
       <recordContainer>index</recordContainer>
+      <dependencies>
+        <entityDependency>
+          <name>e60b8983-166d-4280-a1a5-f990ad77eeb9</name>
+          <entityName>AroundLocation_entity</entityName>
+          <fieldName>Organisations</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+      </dependencies>
+      <children>
+        <entityParameter>
+          <name>ExcludeOrganisationsByPersonId</name>
+          <expose v="false" />
+        </entityParameter>
+        <entityParameter>
+          <name>AttributeId_param</name>
+          <expose v="false" />
+        </entityParameter>
+        <entityParameter>
+          <name>AttributeKeyId_param</name>
+          <expose v="false" />
+        </entityParameter>
+        <entityParameter>
+          <name>DuplicateActionsControl_param</name>
+          <expose v="false" />
+        </entityParameter>
+        <entityParameter>
+          <name>DuplicateCurrentContactId_param</name>
+          <expose v="false" />
+        </entityParameter>
+        <entityParameter>
+          <name>ExcludedContactIds_param</name>
+          <expose v="false" />
+        </entityParameter>
+        <entityParameter>
+          <name>OnlyOwnSupervised_param</name>
+          <expose v="false" />
+        </entityParameter>
+        <entityParameter>
+          <name>OnlyShowContactIds_param</name>
+          <expose v="true" />
+        </entityParameter>
+        <entityParameter>
+          <name>OrganisationType_param</name>
+          <expose v="false" />
+        </entityParameter>
+        <entityParameter>
+          <name>WithPrivate_param</name>
+          <expose v="true" />
+        </entityParameter>
+      </children>
     </entityProvider>
+    <entityActionField>
+      <name>openAroundLocation</name>
+      <documentation>%aditoprj%/entity/Organisation_entity/entityfields/openaroundlocation/documentation.adoc</documentation>
+      <title>Radius Search</title>
+      <onActionProcess>%aditoprj%/entity/Organisation_entity/entityfields/openaroundlocation/onActionProcess.js</onActionProcess>
+      <isSelectionAction v="true" />
+      <iconId>VAADIN:LOCATION_ARROW_CIRCLE_O</iconId>
+      <state>DISABLED</state>
+      <stateProcess>%aditoprj%/entity/Organisation_entity/entityfields/openaroundlocation/stateProcess.js</stateProcess>
+    </entityActionField>
     <entityField>
-      <name>ORGANISATION_OBJECTTYPE</name>
-      <valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/organisation_objecttype/valueProcess.js</valueProcess>
+      <name>STANDARD_LAT</name>
+    </entityField>
+    <entityField>
+      <name>STANDARD_LON</name>
     </entityField>
     <entityProvider>
       <name>#PROVIDER_AGGREGATES</name>
@@ -1393,6 +1456,14 @@
           <recordfield>ORGANISATION.ORGANISATIONID</recordfield>
           <aggregateType>COUNT</aggregateType>
         </aggregateFieldDbMapping>
+        <dbRecordFieldMapping>
+          <name>STANDARD_LAT.value</name>
+          <recordfield>ADDRESS.LAT</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>STANDARD_LON.value</name>
+          <recordfield>ADDRESS.LON</recordfield>
+        </dbRecordFieldMapping>
       </recordFieldMappings>
       <filterExtensions>
         <filterExtensionSet>
@@ -1407,6 +1478,7 @@
     <indexRecordContainer>
       <name>index</name>
       <configMode>INDEXGROUP_DEFINITION</configMode>
+      <patternExtensionProcess>%aditoprj%/entity/Organisation_entity/recordcontainers/index/patternExtensionProcess.js</patternExtensionProcess>
       <indexRecordAlias>Data_alias</indexRecordAlias>
       <query>%aditoprj%/entity/Organisation_entity/recordcontainers/index/query.js</query>
       <affectedTables>
@@ -1497,6 +1569,11 @@
           </additionalFieldNameAliases>
           <isMultiValued v="true" />
         </indexRecordFieldMapping>
+        <indexRecordFieldMapping>
+          <name>ADDRESS_ID.displayValue</name>
+          <indexFieldType>ADDRESS</indexFieldType>
+          <isGlobalSearchField v="false" />
+        </indexRecordFieldMapping>
       </indexFieldMappings>
     </indexRecordContainer>
   </recordContainers>
diff --git a/entity/Organisation_entity/entityfields/openaroundlocation/documentation.adoc b/entity/Organisation_entity/entityfields/openaroundlocation/documentation.adoc
new file mode 100644
index 0000000000..71a6bebdaa
--- /dev/null
+++ b/entity/Organisation_entity/entityfields/openaroundlocation/documentation.adoc
@@ -0,0 +1 @@
+Only available if location-data is present.
\ No newline at end of file
diff --git a/entity/Organisation_entity/entityfields/openaroundlocation/onActionProcess.js b/entity/Organisation_entity/entityfields/openaroundlocation/onActionProcess.js
new file mode 100644
index 0000000000..df10e3d43c
--- /dev/null
+++ b/entity/Organisation_entity/entityfields/openaroundlocation/onActionProcess.js
@@ -0,0 +1,22 @@
+import("system.entities");
+import("system.vars");
+import("system.neon");
+
+var rowConfig = entities.createConfigForLoadingRows()
+    .fields(["STANDARD_LAT", "STANDARD_LON"])
+    .entity("Organisation_entity")
+//    .entity(vars.get("$sys.currententityname"))
+    .uid(vars.get("$sys.uid"));
+var row = entities.getRow(rowConfig);
+
+//todo: use read entity and comment why (data is not loaded)
+var lat = row["STANDARD_LAT"];
+var lon = row["STANDARD_LON"];
+
+var params = {
+    OriginUid_param: vars.get("$sys.uid"),
+    LocationLat_param: lat,
+    LocationLon_param: lon
+}
+
+neon.openContext("AroundLocation", "AroundOrganisationLocation_view", null, null, params, null);
\ No newline at end of file
diff --git a/entity/Organisation_entity/entityfields/openaroundlocation/stateProcess.js b/entity/Organisation_entity/entityfields/openaroundlocation/stateProcess.js
new file mode 100644
index 0000000000..a2899dea4d
--- /dev/null
+++ b/entity/Organisation_entity/entityfields/openaroundlocation/stateProcess.js
@@ -0,0 +1,27 @@
+import("system.result");
+import("system.neon");
+import("system.vars");
+import("system.entities");
+
+//todo: only visible if location tracking is enabled
+
+
+//todo: use read entity and comment why (data is not loaded)
+
+var rowConfig = entities.createConfigForLoadingRows()
+    .fields(["STANDARD_LAT", "STANDARD_LON"])
+    .entity(vars.get("$sys.currententityname"))
+    .uid(vars.get("$sys.uid"));
+var row = entities.getRow(rowConfig);
+
+var lat = row["STANDARD_LAT"];
+var lon = row["STANDARD_LON"];
+
+var res;
+if (lat && lon)
+    res = neon.COMPONENTSTATE_AUTO;
+else
+    res = neon.COMPONENTSTATE_DISABLED;
+    
+result.string(res);
+    
\ No newline at end of file
diff --git a/entity/Organisation_entity/entityfields/organisationsviaindex/documentation.adoc b/entity/Organisation_entity/entityfields/organisationsviaindex/documentation.adoc
new file mode 100644
index 0000000000..3230ced75e
--- /dev/null
+++ b/entity/Organisation_entity/entityfields/organisationsviaindex/documentation.adoc
@@ -0,0 +1,5 @@
+Provides organisations via the index recordContainer and not the default (database) recorcContainer.
+
+WARNING: Not all Parameters are supported in the index recordContainer. 
+Especially the parameters that are used for filtering. 
+If these parameters are necessary they need to be implemented in the  `patternExtensionProcess` of the IndexRecordContainer.
\ No newline at end of file
diff --git a/entity/Organisation_entity/recordcontainers/index/patternExtensionProcess.js b/entity/Organisation_entity/recordcontainers/index/patternExtensionProcess.js
new file mode 100644
index 0000000000..a8964d1160
--- /dev/null
+++ b/entity/Organisation_entity/recordcontainers/index/patternExtensionProcess.js
@@ -0,0 +1,27 @@
+import("Entity_lib");
+import("system.result");
+import("system.vars");
+import("system.indexsearch");
+import("system.logging");
+
+var patternConfig = indexsearch.createPatternConfig();
+
+// filter privat company if it is not needed
+if (vars.exists("$param.WithPrivate_param") && vars.getString("$param.WithPrivate_param") != "true")
+{
+    patternConfig.not(indexsearch.createTerm("0").setIndexField("organisationid_value"));
+}
+
+ParameterUtils.handleNotEmptyEntityParam("$param.OnlyShowContactIds_param", function(pContactIds){
+    var contactIdsToFilter = JSON.parse(pContactIds);
+    var filterGroup = indexsearch.createGroupTerm();
+    
+    contactIdsToFilter.forEach(function (contactId){
+        filterGroup.or(indexsearch.createTerm(contactId).setIndexField(indexsearch.FIELD_ID));
+    });
+    patternConfig.and(filterGroup);
+});
+
+var pattern = indexsearch.buildPattern(patternConfig);
+logging.log("Pattern:" + pattern);
+result.string(pattern);
diff --git a/entity/Organisation_entity/recordcontainers/index/query.js b/entity/Organisation_entity/recordcontainers/index/query.js
index 668b6b227f..baa055d29c 100644
--- a/entity/Organisation_entity/recordcontainers/index/query.js
+++ b/entity/Organisation_entity/recordcontainers/index/query.js
@@ -28,7 +28,7 @@ var querySelect = newSelect([
         sqlHelper.concat([sqlHelper.cast("defaultAddress.LAT", SQLTYPES.VARCHAR, 16), sqlHelper.cast("defaultAddress.LON", SQLTYPES.VARCHAR, 16)], ","),
         //additional indexed fields
         "ORGANISATION.NAME",
-        "ORGANISATION.ORGANISATIONID",
+        sqlHelper.trim("ORGANISATION.ORGANISATIONID"),//trim to enable filter patterns like: >> -organisationid_value:0<<
         "CONTACT.CONTACTID",
         "ORGANISATION.CUSTOMERCODE",
         "ADDRESS.ADDRESS",
@@ -36,7 +36,10 @@ var querySelect = newSelect([
         "ADDRESS.ZIP",
         "ADDRESS.CITY",
         "COMMUNICATION.ADDR",
-        "PHONE.ADDR" 
+        "PHONE.ADDR",
+        sqlHelper.concat([sqlHelper.concat(["defaultAddress.ADDRESS", "defaultAddress.BUILDINGNO"])
+            ,sqlHelper.concat(["defaultAddress.COUNTRY", "defaultAddress.ZIP", "defaultAddress.CITY"])
+        ], " - ")
     ])
     .from("ORGANISATION")
     .join("CONTACT", "CONTACT.ORGANISATION_ID = ORGANISATION.ORGANISATIONID and CONTACT.PERSON_ID is null")
diff --git a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
index d09abcb5d7..bab1be7ecc 100644
--- a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
+++ b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
@@ -7149,6 +7149,21 @@
     <entry>
       <key>export using the selected template</key>
     </entry>
+    <entry>
+      <key>${DISPLAY_AND_OPEN_ONE_HIT}</key>
+    </entry>
+    <entry>
+      <key>${DISPLAY_AND_OPEN_%0_OF_%1_HITS}</key>
+    </entry>
+    <entry>
+      <key>${ACTION_DO_OPEN}</key>
+    </entry>
+    <entry>
+      <key>${DISPLAY_AND_OPEN_%0_HITS}</key>
+    </entry>
+    <entry>
+      <key>Radius Search</key>
+    </entry>
     <entry>
       <key>Input value</key>
     </entry>
@@ -7171,7 +7186,7 @@
       <key>Mappings</key>
     </entry>
     <entry>
-      <key>Sort up</key>
+      <key>Radius in km</key>
     </entry>
     <entry>
       <key>Titel</key>
@@ -7179,9 +7194,6 @@
     <entry>
       <key>Set missing address locations</key>
     </entry>
-    <entry>
-      <key>Sort down</key>
-    </entry>
     <entry>
       <key>FavoriteFilter_view</key>
     </entry>
@@ -7194,6 +7206,21 @@
     <entry>
       <key>Gruppenname</key>
     </entry>
+    <entry>
+      <key>The radius has to be %0 or lesser.</key>
+    </entry>
+    <entry>
+      <key>The given starting location is empty. An area search can not be performed.</key>
+    </entry>
+    <entry>
+      <key>The radius has to be at least %0.</key>
+    </entry>
+    <entry>
+      <key>Sort up</key>
+    </entry>
+    <entry>
+      <key>Sort down</key>
+    </entry>
     <entry>
       <key>Enter current password to verify</key>
     </entry>
diff --git a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
index 2cbfd86cf7..3df93124ed 100644
--- a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
+++ b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
@@ -10,6 +10,10 @@
       <key>Probability AI</key>
       <value>Wahrscheinlichkeit KI</value>
     </entry>
+    <entry>
+      <key>The given starting location is empty. An area search can not be performed.</key>
+      <value>Der übergebene Startpunkt ist leer. Die Umkreissuche kann nicht ausgeführt werden.</value>
+    </entry>
     <entry>
       <key>Settings</key>
       <value>Einstellungen</value>
@@ -41,6 +45,10 @@
       <key>Show my organisations</key>
       <value>Meine Firmen anzeigen</value>
     </entry>
+    <entry>
+      <key>Radius Search</key>
+      <value>Umkreissuche</value>
+    </entry>
     <entry>
       <key>${FILTER_DYNAMIC_VALUE_ME}</key>
       <value>Ich</value>
@@ -8224,6 +8232,14 @@ Bitte Datumseingabe prüfen</value>
       <key>Invalid year!</key>
       <value>Ungültiges jahr!</value>
     </entry>
+    <entry>
+      <key>The radius has to be %0 or lesser.</key>
+      <value>Der Radius muss %0 km oder weniger betragen.</value>
+    </entry>
+    <entry>
+      <key>The radius has to be at least %0.</key>
+      <value>Der Radius muss mindestens %0 km betragen.</value>
+    </entry>
     <entry>
       <key>high</key>
       <value>hoch</value>
@@ -8874,7 +8890,6 @@ Bitte Datumseingabe prüfen</value>
     </entry>
     <entry>
       <key>Download letter and create Activity</key>
-      <value>Brief herunterladen und Aktivität erstellen</value>
     </entry>
     <entry>
       <key>Extend</key>
@@ -8945,17 +8960,10 @@ Bitte Datumseingabe prüfen</value>
     <entry>
       <key>Create model</key>
     </entry>
-    <entry>
-      <key>Edit workflow</key>
-    </entry>
     <entry>
       <key>Recipients after adding</key>
       <value>Empfänger nach dem hinzufügen</value>
     </entry>
-    <entry>
-      <key>%0 new recipients will be added to the bulk mail.</key>
-      <value>Der Serienmail werden %0 neue Empfänger hinzugefügt.</value>
-    </entry>
     <entry>
       <key>%0 new participants will be added to the campaign.</key>
       <value>Der Kampagne werden %0 neue Empfänger hinzugefügt.</value>
@@ -8995,6 +9003,10 @@ Bitte Datumseingabe prüfen</value>
     <entry>
       <key>Receive new Department Permission</key>
     </entry>
+    <entry>
+      <key>Selection placeholder</key>
+      <value>Suche Platzhalter</value>
+    </entry>
     <entry>
       <key>Grant new Department Permission</key>
       <value>Neue Abteilungs-Berechtigung vergeben</value>
@@ -9003,6 +9015,10 @@ Bitte Datumseingabe prüfen</value>
       <key>Current password</key>
       <value>Aktuelles Passwort</value>
     </entry>
+    <entry>
+      <key>Calendar maintime start</key>
+      <value>Kalender Kernzeit Beginn</value>
+    </entry>
     <entry>
       <key>New password</key>
       <value>Neues Passwort</value>
@@ -9016,13 +9032,17 @@ Bitte Datumseingabe prüfen</value>
       <value>Aktuelles Passwort zur Verifizierung eingeben</value>
     </entry>
     <entry>
-      <key>Selection placeholder</key>
-      <value>Suche Platzhalter</value>
+      <key>Password must contain special characters</key>
+      <value>Passwort muss Sonderzeichen enhalten</value>
     </entry>
     <entry>
       <key>SELECTION_POSTFIX</key>
       <value>Hinten</value>
     </entry>
+    <entry>
+      <key>Password must be at least %0 characters</key>
+      <value>Passwort muss aus mindestens %0 Zeichen bestehen</value>
+    </entry>
     <entry>
       <key>SELECTION_PREFIX</key>
       <value>Vorne</value>
@@ -9041,23 +9061,23 @@ Bitte Datumseingabe prüfen</value>
     </entry>
     <entry>
       <key>Selection ignore case</key>
-      <value>Groß-/Kleinschreibung ignorieren</value>
+      <value>Suche Groß-/Kleinschreibung ignorieren</value>
     </entry>
     <entry>
       <key>Calendar hour divider</key>
-      <value>Stundenunterteilung</value>
-    </entry>
-    <entry>
-      <key>Calendar maintime start</key>
-      <value>Kernzeit Beginn</value>
+      <value>Kalender Stundenunterteilung</value>
     </entry>
     <entry>
       <key>Calendar maintime end</key>
-      <value>Kernzeit Ende</value>
+      <value>Kalender Kernzeit Ende</value>
     </entry>
     <entry>
       <key>{SENT_MAIL}</key>
     </entry>
+    <entry>
+      <key>Password must contain numbers</key>
+      <value>Passwort muss Zahlen enhalten</value>
+    </entry>
     <entry>
       <key>favorties</key>
     </entry>
@@ -9092,10 +9112,10 @@ Bitte Datumseingabe prüfen</value>
     </entry>
     <entry>
       <key>Add Recipients</key>
-      <value>Teilnehmer hinzufügen</value>
     </entry>
     <entry>
       <key>Grant new User Permission</key>
+      <value>Neue Benutzer-Berechtigung vergeben</value>
     </entry>
     <entry>
       <key>{SEND_MAIL}</key>
@@ -9104,71 +9124,83 @@ Bitte Datumseingabe prüfen</value>
       <key>Latitude</key>
     </entry>
     <entry>
-      <key>Longitude</key>
+      <key>Password must contain spaces</key>
+      <value>Passwort muss Leerzeichen enhalten</value>
     </entry>
     <entry>
-      <key>Permission Procurer User</key>
-      <value>Rechteempfänger Benutzer</value>
+      <key>Enddatum</key>
     </entry>
     <entry>
-      <key>Grant new User Permission</key>
-      <value>Neue Benutzer-Berechtigung vergeben</value>
+      <key>Startdatum</key>
     </entry>
     <entry>
-      <key>Permission Procurer Department</key>
-      <value>Rechteempfänger Abteilung</value>
+      <key>favorites</key>
     </entry>
     <entry>
-      <key>Grant new Department Permission</key>
-      <value>Neue Abteilungs-Berechtigung vergeben</value>
+      <key>Input value</key>
     </entry>
     <entry>
-      <key>favorites</key>
+      <key>Output value</key>
     </entry>
     <entry>
-      <key>Input value</key>
+      <key>Mapping</key>
     </entry>
     <entry>
-      <key>Output value</key>
+      <key>The use of any of your previous %0 passwords is prohibited</key>
+      <value>Die Verwendung eines Ihrer vorherigen %0 Passwörter ist untersagt</value>
     </entry>
     <entry>
-      <key>Enddatum</key>
+      <key>Mappings</key>
     </entry>
     <entry>
-      <key>Startdatum</key>
+      <key>Sort up</key>
     </entry>
     <entry>
-      <key>Mapping</key>
+      <key>Password must contain letters</key>
+      <value>Passwort muss Buchstaben enhalten</value>
     </entry>
     <entry>
-      <key>Typ</key>
+      <key>${DISPLAY_AND_OPEN_ONE_HIT}</key>
+      <value>Ein Ergebnis wurde gefunden und kann geöffnet werden.</value>
     </entry>
     <entry>
-      <key>Mappings</key>
+      <key>${DISPLAY_AND_OPEN_%0_OF_%1_HITS}</key>
+      <value>%0 von insgesamt %1  Ergebnissen werden derzeit angezeigt und können geöffnet werden.</value>
     </entry>
     <entry>
-      <key>Sort up</key>
+      <key>${ACTION_DO_OPEN}</key>
+      <value>Öffnen</value>
     </entry>
     <entry>
-      <key>Titel</key>
+      <key>${DISPLAY_AND_OPEN_%0_HITS}</key>
+      <value>Alle %0 Ergebnisse werden derzeit angezeigt und können geöffnet werden.</value>
+    </entry>
+    <entry>
+      <key>Radius in km</key>
     </entry>
     <entry>
       <key>Set missing address locations</key>
     </entry>
     <entry>
-      <key>Sort down</key>
+      <key>Set all address locations</key>
+    </entry>
+    <entry>
+      <key>Titel</key>
+    </entry>
+    <entry>
+      <key>Gruppenname</key>
     </entry>
     <entry>
       <key>FavoriteFilter_view</key>
     </entry>
     <entry>
-      <key>Set all address locations</key>
+      <key>Typ</key>
     </entry>
     <entry>
       <key>Members</key>
     </entry>
     <entry>
-      <key>Gruppenname</key>
+      <key>Sort down</key>
     </entry>
     <entry>
       <key>Total in euros</key>
@@ -9177,7 +9209,7 @@ Bitte Datumseingabe prüfen</value>
       <key>Add Participants</key>
     </entry>
     <entry>
-      <key>Add Recipients</key>
+      <key>Longitude</key>
     </entry>
   </keyValueMap>
   <font name="Dialog" style="0" size="11" />
diff --git a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
index a92be903f8..1b29727a41 100644
--- a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
+++ b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
@@ -10,15 +10,27 @@
       <key>${ORDER_CANCELLED}</key>
       <value>cancelled</value>
     </entry>
+    <entry>
+      <key>${DISPLAY_AND_OPEN_%0_HITS}</key>
+      <value>%0 results are displayed and will be opened.</value>
+    </entry>
     <entry>
       <key>Company</key>
     </entry>
     <entry>
       <key>New step</key>
     </entry>
+    <entry>
+      <key>${DISPLAY_AND_OPEN_%0_OF_%1_HITS}</key>
+      <value>%0 of %1 results are displayed and will be opened.</value>
+    </entry>
     <entry>
       <key>E-Mail</key>
     </entry>
+    <entry>
+      <key>${DISPLAY_AND_OPEN_ONE_HIT}</key>
+      <value>One result is displayed and will be opened.</value>
+    </entry>
     <entry>
       <key>Male</key>
     </entry>
@@ -113,6 +125,10 @@
     <entry>
       <key>Salutation</key>
     </entry>
+    <entry>
+      <key>${ACTION_DO_OPEN}</key>
+      <value>Open</value>
+    </entry>
     <entry>
       <key>Middlename</key>
     </entry>
@@ -7216,6 +7232,9 @@
     <entry>
       <key>export using the selected template</key>
     </entry>
+    <entry>
+      <key>Radius Search</key>
+    </entry>
     <entry>
       <key>Input value</key>
     </entry>
@@ -7238,7 +7257,7 @@
       <key>Mappings</key>
     </entry>
     <entry>
-      <key>Sort up</key>
+      <key>Radius in km</key>
     </entry>
     <entry>
       <key>Titel</key>
@@ -7246,9 +7265,6 @@
     <entry>
       <key>Set missing address locations</key>
     </entry>
-    <entry>
-      <key>Sort down</key>
-    </entry>
     <entry>
       <key>FavoriteFilter_view</key>
     </entry>
@@ -7261,6 +7277,21 @@
     <entry>
       <key>Gruppenname</key>
     </entry>
+    <entry>
+      <key>The radius has to be %0 or lesser.</key>
+    </entry>
+    <entry>
+      <key>The given starting location is empty. An area search can not be performed.</key>
+    </entry>
+    <entry>
+      <key>The radius has to be at least %0.</key>
+    </entry>
+    <entry>
+      <key>Sort up</key>
+    </entry>
+    <entry>
+      <key>Sort down</key>
+    </entry>
     <entry>
       <key>Enter current password to verify</key>
     </entry>
diff --git a/neonContext/AroundLocation/AroundLocation.aod b/neonContext/AroundLocation/AroundLocation.aod
new file mode 100644
index 0000000000..0df97bbbfd
--- /dev/null
+++ b/neonContext/AroundLocation/AroundLocation.aod
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<neonContext xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonContext/1.1.1">
+  <name>AroundLocation</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <entity>AroundLocation_entity</entity>
+  <references>
+    <neonViewReference>
+      <name>b0b5f41e-d5c6-4532-8d1a-be7efb23bd33</name>
+      <view>AroundOrganisationLocation_view</view>
+    </neonViewReference>
+    <neonViewReference>
+      <name>606fdae5-244e-4258-8f04-770ca6ca04a3</name>
+      <view>AroundLocationHeader_view</view>
+    </neonViewReference>
+    <neonViewReference>
+      <name>6bf1facb-814a-41ef-b8c8-5dee49b54e56</name>
+      <view>AroundOrganisationFooter_view</view>
+    </neonViewReference>
+  </references>
+</neonContext>
diff --git a/neonContext/Organisation/Organisation.aod b/neonContext/Organisation/Organisation.aod
index 90a9c418df..90ec3706d7 100644
--- a/neonContext/Organisation/Organisation.aod
+++ b/neonContext/Organisation/Organisation.aod
@@ -53,7 +53,7 @@
     </neonViewReference>
     <neonViewReference>
       <name>a97ac17d-171b-4c9a-83fa-bb5a466c7b20</name>
-      <view>OrganisationDuplicateEditview_view</view>
+      <view>OrganisationNoNoiseTable_view</view>
     </neonViewReference>
     <neonViewReference>
       <name>ade0ed85-260d-4da5-bf4c-f838cfdcc693</name>
@@ -67,5 +67,9 @@
       <name>1efa420b-42f4-4d4d-8c23-aba7e6824f4b</name>
       <view>OrganisationClassificationDrawer_view</view>
     </neonViewReference>
+    <neonViewReference>
+      <name>0b052872-d6b4-41ac-ad0b-580575893e1b</name>
+      <view>OrganisationLesserNoiseTable_view</view>
+    </neonViewReference>
   </references>
 </neonContext>
diff --git a/neonView/AroundLocationHeader_view/AroundLocationHeader_view.aod b/neonView/AroundLocationHeader_view/AroundLocationHeader_view.aod
new file mode 100644
index 0000000000..ce86ba2afd
--- /dev/null
+++ b/neonView/AroundLocationHeader_view/AroundLocationHeader_view.aod
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.6">
+  <name>AroundLocationHeader_view</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <layout>
+    <boxLayout>
+      <name>layout</name>
+      <autoHeight v="true" />
+    </boxLayout>
+  </layout>
+  <children>
+    <genericViewTemplate>
+      <name>GenericEditable</name>
+      <editMode v="true" />
+      <hideEmptyFields v="false" />
+      <entityField>#ENTITY</entityField>
+      <isEditable v="true" />
+      <fields>
+        <entityFieldLink>
+          <name>2b61a88c-d3ca-42df-98ab-0db350346fef</name>
+          <entityField>SearchRadius</entityField>
+        </entityFieldLink>
+      </fields>
+    </genericViewTemplate>
+  </children>
+</neonView>
diff --git a/neonView/AroundOrganisationFooter_view/AroundOrganisationFooter_view.aod b/neonView/AroundOrganisationFooter_view/AroundOrganisationFooter_view.aod
new file mode 100644
index 0000000000..74bac1d844
--- /dev/null
+++ b/neonView/AroundOrganisationFooter_view/AroundOrganisationFooter_view.aod
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.6">
+  <name>AroundOrganisationFooter_view</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <layout>
+    <boxLayout>
+      <name>layout</name>
+      <autoHeight v="true" />
+    </boxLayout>
+  </layout>
+  <children>
+    <genericViewTemplate>
+      <name>readonlyGeneric</name>
+      <hideLabels v="true" />
+      <hideEmptyFields v="false" />
+      <entityField>#ENTITY</entityField>
+      <isEditable v="false" />
+      <fields>
+        <entityFieldLink>
+          <name>60b0acd1-288c-4b45-87fb-c135282b9a70</name>
+          <entityField>RecordCountInformation</entityField>
+        </entityFieldLink>
+      </fields>
+    </genericViewTemplate>
+    <actionsViewTemplate>
+      <name>actions</name>
+      <actions>
+        <element>Open</element>
+      </actions>
+      <entityField>#ENTITY</entityField>
+    </actionsViewTemplate>
+  </children>
+</neonView>
diff --git a/neonView/AroundOrganisationLocation_view/AroundOrganisationLocation_view.aod b/neonView/AroundOrganisationLocation_view/AroundOrganisationLocation_view.aod
new file mode 100644
index 0000000000..6ee6f9459f
--- /dev/null
+++ b/neonView/AroundOrganisationLocation_view/AroundOrganisationLocation_view.aod
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.6">
+  <name>AroundOrganisationLocation_view</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <filterable v="false" />
+  <size>NORMAL</size>
+  <isOverlay v="true" />
+  <overlayOrientation>LANDSCAPE</overlayOrientation>
+  <layout>
+    <headerFooterLayout>
+      <name>layout</name>
+      <header>b156824b-7611-4f94-a42e-d49e3878d93c</header>
+      <footer>1d0bb6f6-e645-438a-9601-683798899187</footer>
+    </headerFooterLayout>
+  </layout>
+  <children>
+    <neonViewReference>
+      <name>b156824b-7611-4f94-a42e-d49e3878d93c</name>
+      <entityField>#ENTITY</entityField>
+      <view>AroundLocationHeader_view</view>
+    </neonViewReference>
+    <neonViewReference>
+      <name>66974669-21d3-47bd-b776-f8cc6a5106a4</name>
+      <entityField>Organisations</entityField>
+      <view>OrganisationLesserNoiseTable_view</view>
+    </neonViewReference>
+    <neonViewReference>
+      <name>1d0bb6f6-e645-438a-9601-683798899187</name>
+      <entityField>#ENTITY</entityField>
+      <view>AroundOrganisationFooter_view</view>
+    </neonViewReference>
+  </children>
+</neonView>
diff --git a/neonView/OrganisationEdit_view/OrganisationEdit_view.aod b/neonView/OrganisationEdit_view/OrganisationEdit_view.aod
index 81ab662529..5a59c451c7 100644
--- a/neonView/OrganisationEdit_view/OrganisationEdit_view.aod
+++ b/neonView/OrganisationEdit_view/OrganisationEdit_view.aod
@@ -14,7 +14,7 @@
     <neonViewReference>
       <name>f2fa0351-15af-4d1c-b7dd-0e42d9c7889f</name>
       <entityField>SelfDuplicatesUncached</entityField>
-      <view>OrganisationDuplicateEditview_view</view>
+      <view>OrganisationNoNoiseTable_view</view>
     </neonViewReference>
     <genericViewTemplate>
       <name>Edit</name>
diff --git a/neonView/OrganisationLesserNoiseTable_view/OrganisationLesserNoiseTable_view.aod b/neonView/OrganisationLesserNoiseTable_view/OrganisationLesserNoiseTable_view.aod
new file mode 100644
index 0000000000..6cdd2403b2
--- /dev/null
+++ b/neonView/OrganisationLesserNoiseTable_view/OrganisationLesserNoiseTable_view.aod
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.6">
+  <name>OrganisationLesserNoiseTable_view</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <layout>
+    <noneLayout>
+      <name>layout</name>
+    </noneLayout>
+  </layout>
+  <children>
+    <tableViewTemplate>
+      <name>table</name>
+      <hideActions v="true" />
+      <hideContentSearch v="true" />
+      <iconField></iconField>
+      <entityField>#ENTITY</entityField>
+      <hideHeader v="false" />
+      <columns>
+        <neonTableColumn>
+          <name>8b764a88-ea38-4810-9647-036de8e2bdb5</name>
+          <entityField>#IMAGE</entityField>
+        </neonTableColumn>
+        <neonTableColumn>
+          <name>d45ea163-ac10-4a4c-8a6a-1f0680df3c2e</name>
+          <entityField>NAME</entityField>
+        </neonTableColumn>
+        <neonTableColumn>
+          <name>0fc13178-f186-4c1a-82f4-5a9f89ed6779</name>
+          <entityField>STANDARD_PHONE_COMMUNICATION</entityField>
+        </neonTableColumn>
+        <neonTableColumn>
+          <name>d052d240-7001-4a65-bd04-7f90cac2b88e</name>
+          <entityField>STANDARD_EMAIL_COMMUNICATION</entityField>
+        </neonTableColumn>
+        <neonTableColumn>
+          <name>8d815ffd-7b16-45bc-9ee9-557277147818</name>
+          <entityField>ADDRESS_ID</entityField>
+        </neonTableColumn>
+      </columns>
+    </tableViewTemplate>
+  </children>
+</neonView>
diff --git a/neonView/OrganisationDuplicateEditview_view/OrganisationDuplicateEditview_view.aod b/neonView/OrganisationNoNoiseTable_view/OrganisationNoNoiseTable_view.aod
similarity index 94%
rename from neonView/OrganisationDuplicateEditview_view/OrganisationDuplicateEditview_view.aod
rename to neonView/OrganisationNoNoiseTable_view/OrganisationNoNoiseTable_view.aod
index 3020a87d6f..22d274421a 100644
--- a/neonView/OrganisationDuplicateEditview_view/OrganisationDuplicateEditview_view.aod
+++ b/neonView/OrganisationNoNoiseTable_view/OrganisationNoNoiseTable_view.aod
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.6">
-  <name>OrganisationDuplicateEditview_view</name>
+  <name>OrganisationNoNoiseTable_view</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <layout>
     <noneLayout>
@@ -9,7 +9,7 @@
   </layout>
   <children>
     <tableViewTemplate>
-      <name>DuplicateEditview_Table</name>
+      <name>table</name>
       <hideActions v="true" />
       <hideContentSearch v="true" />
       <iconField></iconField>
diff --git a/process/Entity_lib/process.js b/process/Entity_lib/process.js
index 126ef4f9e1..cd17d5d9e2 100644
--- a/process/Entity_lib/process.js
+++ b/process/Entity_lib/process.js
@@ -30,6 +30,67 @@ EntityUtils.parseUidColumn = function(pFullUidName)
     };
 };
 
+
+/**
+* provides static methods for handling of entity parameters
+* do not create an instance of this
+* 
+* @class
+*/
+function ParameterUtils(){}
+
+/**
+ * will check if a parameter exists and if it is not empty (null, undefined, emtpy string) a callback function is called </br>
+ * this is usefull for simple checks of a single parameter
+ * 
+ * @param {String} pParameterName   <p>Full name of the paramter that is handled
+ * @param {function} pCallbackFn    <p>a callback function that is called when the parameter is staded okay</br>
+ *                                     The following parameters are passed to the function:
+ *                                     <ul>
+ *                                      <li>String:parameter value</li>
+ *                                      <li>String:parameter name</li>
+ *                                     </ul>
+ *                                     The this-reference is null
+ * 
+ * @return {Object} returns null if the parameter was empty or does not exist, otherwise the return-value of the callback-function is returned
+ */
+ParameterUtils.handleNotEmptyEntityParam = function(pParameterName, pCallbackFn) 
+{
+    if (vars.exists(pParameterName))
+    {
+        var paramValue = vars.get(pParameterName);
+        if (paramValue != null && paramValue != "")
+            return pCallbackFn.call(null, paramValue, pParameterName);
+    }
+    return null;
+};
+
+
+/**
+ * will check if a parameter exists and calls a given callback function </br>
+ * this is usefull for simple checks of a single parameter
+ * 
+ * @param {String} pParameterName   <p>Full name of the paramter that is handled
+ * @param {function} pCallbackFn    <p>a callback function that is called when the parameter is staded okay</br>
+ *                                     The following parameters are passed to the function:
+ *                                     <ul>
+ *                                      <li>String:parameter value</li>
+ *                                      <li>String:parameter name</li>
+ *                                     </ul>
+ *                                     The this-reference is null
+ * 
+ * @return {Object} returns null if the parameter does not exist, otherwise the return-value of the callback-function is returned
+ */
+ParameterUtils.handleAnyEntityParam = function(pParameterName, pCallbackFn) 
+{
+    if (vars.exists(pParameterName))
+    {
+        var paramValue = vars.get(pParameterName);
+        return pCallbackFn.call(null, paramValue, pParameterName);
+    }
+    return null;
+};
+
 /**
 * provides static methods for special handling of entities in JDito-Processes
 * do not create an instance of this
-- 
GitLab


From 388898f93e0022599afcc3f9e7d00699d06ab625 Mon Sep 17 00:00:00 2001
From: Sebastian Listl <s.listl@adito.de>
Date: Thu, 3 Sep 2020 13:12:11 +0200
Subject: [PATCH 247/309] #1064666 initFilter check for presentationmode

---
 entity/AnyContact_entity/initFilterProcess.js | 33 +++++++++--------
 entity/Contact_entity/initFilterProcess.js    | 33 +++++++++--------
 .../Organisation_entity/initFilterProcess.js  | 35 +++++++++++--------
 entity/Person_entity/initFilterProcess.js     | 35 +++++++++++--------
 entity/Task_entity/initFilterProcess.js       | 33 +++++++++--------
 .../initFilterProcess.js                      | 31 +++++++++-------
 process/DuplicateScanner_lib/process.js       |  9 ++++-
 7 files changed, 123 insertions(+), 86 deletions(-)

diff --git a/entity/AnyContact_entity/initFilterProcess.js b/entity/AnyContact_entity/initFilterProcess.js
index 695577262b..c33a0cbce2 100644
--- a/entity/AnyContact_entity/initFilterProcess.js
+++ b/entity/AnyContact_entity/initFilterProcess.js
@@ -1,19 +1,24 @@
+import("system.neon");
+import("system.vars");
 import("system.result");
 import("Keyword_lib");
 import("KeywordRegistry_basic");
 
-var statusInactive = $KeywordRegistry.contactStatus$inactive();
-var filter = {
-    type: "group",
-    operator: "AND",
-    childs: [{
-        type: "row",
-        name: "STATUS",
-        operator: "NOT_EQUAL",
-        contenttype: "TEXT",
-        key: statusInactive,
-        value: KeywordUtils.getViewValue($KeywordRegistry.contactStatus(), statusInactive)
-    }]
-};
+if (vars.get("$sys.presentationmode") === neon.CONTEXT_PRESENTATIONMODE_FILTER) 
+{
+    var statusInactive = $KeywordRegistry.contactStatus$inactive();
+    var filter = {
+        type: "group",
+        operator: "AND",
+        childs: [{
+            type: "row",
+            name: "STATUS",
+            operator: "NOT_EQUAL",
+            contenttype: "TEXT",
+            key: statusInactive,
+            value: KeywordUtils.getViewValue($KeywordRegistry.contactStatus(), statusInactive)
+        }]
+    };
 
-result.string(JSON.stringify(filter));
\ No newline at end of file
+    result.string(JSON.stringify(filter));
+}
\ No newline at end of file
diff --git a/entity/Contact_entity/initFilterProcess.js b/entity/Contact_entity/initFilterProcess.js
index 695577262b..c33a0cbce2 100644
--- a/entity/Contact_entity/initFilterProcess.js
+++ b/entity/Contact_entity/initFilterProcess.js
@@ -1,19 +1,24 @@
+import("system.neon");
+import("system.vars");
 import("system.result");
 import("Keyword_lib");
 import("KeywordRegistry_basic");
 
-var statusInactive = $KeywordRegistry.contactStatus$inactive();
-var filter = {
-    type: "group",
-    operator: "AND",
-    childs: [{
-        type: "row",
-        name: "STATUS",
-        operator: "NOT_EQUAL",
-        contenttype: "TEXT",
-        key: statusInactive,
-        value: KeywordUtils.getViewValue($KeywordRegistry.contactStatus(), statusInactive)
-    }]
-};
+if (vars.get("$sys.presentationmode") === neon.CONTEXT_PRESENTATIONMODE_FILTER) 
+{
+    var statusInactive = $KeywordRegistry.contactStatus$inactive();
+    var filter = {
+        type: "group",
+        operator: "AND",
+        childs: [{
+            type: "row",
+            name: "STATUS",
+            operator: "NOT_EQUAL",
+            contenttype: "TEXT",
+            key: statusInactive,
+            value: KeywordUtils.getViewValue($KeywordRegistry.contactStatus(), statusInactive)
+        }]
+    };
 
-result.string(JSON.stringify(filter));
\ No newline at end of file
+    result.string(JSON.stringify(filter));
+}
\ No newline at end of file
diff --git a/entity/Organisation_entity/initFilterProcess.js b/entity/Organisation_entity/initFilterProcess.js
index 26ce7fa02b..dccabf9d95 100644
--- a/entity/Organisation_entity/initFilterProcess.js
+++ b/entity/Organisation_entity/initFilterProcess.js
@@ -1,19 +1,24 @@
+import("system.neon");
+import("system.vars");
 import("Keyword_lib");
 import("KeywordRegistry_basic");
 import("system.result");
 
-var statusInactive = $KeywordRegistry.contactStatus$inactive();
-var filter = {
-    type: "group",
-    operator: "AND",
-    childs: [{
-        type: "row",
-        name: "STATUS",
-        operator: "NOT_EQUAL",
-        contenttype: "TEXT",
-        key: statusInactive,
-        value: KeywordUtils.getViewValue($KeywordRegistry.contactStatus(), statusInactive)
-    }]
-};
-    
-result.string(JSON.stringify(filter));
\ No newline at end of file
+if (vars.get("$sys.presentationmode") === neon.CONTEXT_PRESENTATIONMODE_FILTER) 
+{
+    var statusInactive = $KeywordRegistry.contactStatus$inactive();
+    var filter = {
+        type: "group",
+        operator: "AND",
+        childs: [{
+            type: "row",
+            name: "STATUS",
+            operator: "NOT_EQUAL",
+            contenttype: "TEXT",
+            key: statusInactive,
+            value: KeywordUtils.getViewValue($KeywordRegistry.contactStatus(), statusInactive)
+        }]
+    };
+
+    result.string(JSON.stringify(filter));
+}
\ No newline at end of file
diff --git a/entity/Person_entity/initFilterProcess.js b/entity/Person_entity/initFilterProcess.js
index 26ce7fa02b..c30d06ea24 100644
--- a/entity/Person_entity/initFilterProcess.js
+++ b/entity/Person_entity/initFilterProcess.js
@@ -1,19 +1,24 @@
 import("Keyword_lib");
 import("KeywordRegistry_basic");
 import("system.result");
+import("system.vars");
+import("system.neon");
 
-var statusInactive = $KeywordRegistry.contactStatus$inactive();
-var filter = {
-    type: "group",
-    operator: "AND",
-    childs: [{
-        type: "row",
-        name: "STATUS",
-        operator: "NOT_EQUAL",
-        contenttype: "TEXT",
-        key: statusInactive,
-        value: KeywordUtils.getViewValue($KeywordRegistry.contactStatus(), statusInactive)
-    }]
-};
-    
-result.string(JSON.stringify(filter));
\ No newline at end of file
+if (vars.get("$sys.presentationmode") === neon.CONTEXT_PRESENTATIONMODE_FILTER) 
+{
+    var statusInactive = $KeywordRegistry.contactStatus$inactive();
+    var filter = {
+        type: "group",
+        operator: "AND",
+        childs: [{
+            type: "row",
+            name: "STATUS",
+            operator: "NOT_EQUAL",
+            contenttype: "TEXT",
+            key: statusInactive,
+            value: KeywordUtils.getViewValue($KeywordRegistry.contactStatus(), statusInactive)
+        }]
+    };
+
+    result.string(JSON.stringify(filter));
+}
\ No newline at end of file
diff --git a/entity/Task_entity/initFilterProcess.js b/entity/Task_entity/initFilterProcess.js
index 39b6e0b2e2..bfea2877c6 100644
--- a/entity/Task_entity/initFilterProcess.js
+++ b/entity/Task_entity/initFilterProcess.js
@@ -1,19 +1,24 @@
 import("system.result");
 import("Keyword_lib");
 import("KeywordRegistry_basic");
+import("system.neon");
+import("system.vars");
 
-var statusEnded = $KeywordRegistry.taskStatus$ended();
-var filter = {
-    type: "group",
-    operator: "AND",
-    childs: [{
-        type: "row",
-        name: "STATUS",
-        operator: "NOT_EQUAL",
-        contenttype: "TEXT",
-        key: statusEnded,
-        value: KeywordUtils.getViewValue($KeywordRegistry.taskStatus(), statusEnded)
-    }]
-};
+if (vars.get("$sys.presentationmode") === neon.CONTEXT_PRESENTATIONMODE_FILTER) 
+{
+    var statusEnded = $KeywordRegistry.taskStatus$ended();
+    var filter = {
+        type: "group",
+        operator: "AND",
+        childs: [{
+            type: "row",
+            name: "STATUS",
+            operator: "NOT_EQUAL",
+            contenttype: "TEXT",
+            key: statusEnded,
+            value: KeywordUtils.getViewValue($KeywordRegistry.taskStatus(), statusEnded)
+        }]
+    };
 
-result.string(JSON.stringify(filter));
\ No newline at end of file
+    result.string(JSON.stringify(filter));
+}
\ No newline at end of file
diff --git a/entity/WorkflowInstance_entity/initFilterProcess.js b/entity/WorkflowInstance_entity/initFilterProcess.js
index 80a38560e2..d4649f5520 100644
--- a/entity/WorkflowInstance_entity/initFilterProcess.js
+++ b/entity/WorkflowInstance_entity/initFilterProcess.js
@@ -1,17 +1,22 @@
+import("system.neon");
+import("system.vars");
 import("system.result");
 import("system.translate");
 
-var filterOnlyUnfinished = {
-    type : "group",
-    operator : "AND",
-    childs : [{
-        type : "row",
-        name : "ISFINISHED",
-        operator : "EQUAL",
-        value : translate.text("No"),
-        key : "false",
-        contenttype : "BOOLEAN"
-    }]
-};
+if (vars.get("$sys.presentationmode") === neon.CONTEXT_PRESENTATIONMODE_FILTER) 
+{
+    var filterOnlyUnfinished = {
+        type : "group",
+        operator : "AND",
+        childs : [{
+            type : "row",
+            name : "ISFINISHED",
+            operator : "EQUAL",
+            value : translate.text("No"),
+            key : "false",
+            contenttype : "BOOLEAN"
+        }]
+    };
 
-result.string(JSON.stringify(filterOnlyUnfinished));
\ No newline at end of file
+    result.string(JSON.stringify(filterOnlyUnfinished));
+}
\ No newline at end of file
diff --git a/process/DuplicateScanner_lib/process.js b/process/DuplicateScanner_lib/process.js
index 7cc968d72b..366d2b45e1 100644
--- a/process/DuplicateScanner_lib/process.js
+++ b/process/DuplicateScanner_lib/process.js
@@ -897,7 +897,14 @@ _DuplicateScannerUtils._filterToScanPattern = function(filterString) {
     if (filterString == null || filterString.trim() == "")
         return "";
     
-    let filter = JSON.parse(filterString);
+    try 
+    {
+        var filter = JSON.parse(filterString);
+    }
+    catch (err)
+    {
+        return "";
+    }
     return _DuplicateScannerUtils._filterChildsToScanPattern(filter.filter.childs, filter.filter.operator);
 }
 
-- 
GitLab


From 4509ef6ed8e5af5a1148e5408057adc8cbd088e4 Mon Sep 17 00:00:00 2001
From: "d.buechler" <d.buechler@adito.de>
Date: Fri, 4 Sep 2020 11:41:47 +0200
Subject: [PATCH 248/309] #1063108 Userhelp appears now in the clients
 administration category

---
 .../_____SYSTEM_APPLICATION_NEON.aod                          | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/application/_____SYSTEM_APPLICATION_NEON/_____SYSTEM_APPLICATION_NEON.aod b/application/_____SYSTEM_APPLICATION_NEON/_____SYSTEM_APPLICATION_NEON.aod
index d78037d313..256d8c0500 100644
--- a/application/_____SYSTEM_APPLICATION_NEON/_____SYSTEM_APPLICATION_NEON.aod
+++ b/application/_____SYSTEM_APPLICATION_NEON/_____SYSTEM_APPLICATION_NEON.aod
@@ -302,6 +302,10 @@
                 <kind v="10077" />
                 <title></title>
               </entityNode>
+              <entityNode>
+                <name>Userhelp</name>
+                <kind v="10077" />
+              </entityNode>
             </childNodes>
           </entityNode>
         </childNodes>
-- 
GitLab


From 0e770d5255b1422cc8dd3a262a928443275976ba Mon Sep 17 00:00:00 2001
From: Johannes Goderbauer <j.goderbauer@adito.de>
Date: Mon, 7 Sep 2020 10:39:29 +0200
Subject: [PATCH 249/309] [Projekt: Entwicklung - Neon][TicketNr.:
 1064796][Liquibase Fehler bei Update]

---
 .../VisitPlanEntry/rename_VisitPlanEntry_ORGANISATION_ID.xml    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.liquibase/Data_alias/basic/2020.1.3/VisitPlanEntry/rename_VisitPlanEntry_ORGANISATION_ID.xml b/.liquibase/Data_alias/basic/2020.1.3/VisitPlanEntry/rename_VisitPlanEntry_ORGANISATION_ID.xml
index 17f5ed88b3..b29eab2d9c 100644
--- a/.liquibase/Data_alias/basic/2020.1.3/VisitPlanEntry/rename_VisitPlanEntry_ORGANISATION_ID.xml
+++ b/.liquibase/Data_alias/basic/2020.1.3/VisitPlanEntry/rename_VisitPlanEntry_ORGANISATION_ID.xml
@@ -3,7 +3,7 @@
                    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
         <changeSet id="3d7f038c-04f1-45a2-9a1c-73c1a8666fea" author="b.ulrich" >
     <renameColumn
-            columnDataType="CHAR"  
+            columnDataType="CHAR(36)"  
             oldColumnName="ORGANISATION_ID"  
             newColumnName="ORGANISATION_CONTACT_ID"  
             tableName="VISITPLANENTRY"/>  
-- 
GitLab


From e0f59720610f80e9e6462ffdfa586f43fbeb3b1d Mon Sep 17 00:00:00 2001
From: "a.schindlbeck" <a.schindlbeck@adito.de>
Date: Mon, 7 Sep 2020 11:02:23 +0200
Subject: [PATCH 250/309] Favorites: Organisation Bugfix

---
 entity/Organisation_entity/Organisation_entity.aod            | 4 ++++
 .../OrganisationPreview_view/OrganisationPreview_view.aod     | 1 +
 2 files changed, 5 insertions(+)

diff --git a/entity/Organisation_entity/Organisation_entity.aod b/entity/Organisation_entity/Organisation_entity.aod
index d2cd92e613..8f4496b5bb 100644
--- a/entity/Organisation_entity/Organisation_entity.aod
+++ b/entity/Organisation_entity/Organisation_entity.aod
@@ -1245,6 +1245,10 @@
       <name>#PROVIDER_AGGREGATES</name>
       <useAggregates v="true" />
     </entityProvider>
+    <entityField>
+      <name>ORGANISATION_OBJECTTYPE</name>
+      <valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/organisation_objecttype/valueProcess.js</valueProcess>
+    </entityField>
   </entityFields>
   <recordContainers>
     <dbRecordContainer>
diff --git a/neonView/OrganisationPreview_view/OrganisationPreview_view.aod b/neonView/OrganisationPreview_view/OrganisationPreview_view.aod
index eca1cae966..bf5ee6388f 100644
--- a/neonView/OrganisationPreview_view/OrganisationPreview_view.aod
+++ b/neonView/OrganisationPreview_view/OrganisationPreview_view.aod
@@ -90,6 +90,7 @@
     </genericViewTemplate>
     <scoreCardViewTemplate>
       <name>OrganistaionInformation</name>
+      <fieldActions />
       <entityField>#ENTITY</entityField>
       <fields>
         <entityFieldLink>
-- 
GitLab


From ee92fe1157c3db0067a6689d6df6f463d3ab0ae0 Mon Sep 17 00:00:00 2001
From: "j.goderbauer" <j.goderbauer@adito.de>
Date: Mon, 7 Sep 2020 11:14:52 +0200
Subject: [PATCH 251/309] upgrade models

---
 entity/UserhelpResources/UserhelpResources.aod              | 6 +++++-
 .../PermissionCalendarFilterReverse__view_de__DE.adoc       | 1 -
 .../PermissionCalendarFilterReverse__view_de__DE.aod        | 6 ------
 .../PermissionCalendarFilter__view_de__DE.adoc              | 1 -
 .../PermissionCalendarFilter__view_de__DE.aod               | 6 ------
 5 files changed, 5 insertions(+), 15 deletions(-)
 delete mode 100644 userhelp/PermissionCalendarFilterReverse__view_de__DE/PermissionCalendarFilterReverse__view_de__DE.adoc
 delete mode 100644 userhelp/PermissionCalendarFilterReverse__view_de__DE/PermissionCalendarFilterReverse__view_de__DE.aod
 delete mode 100644 userhelp/PermissionCalendarFilter__view_de__DE/PermissionCalendarFilter__view_de__DE.adoc
 delete mode 100644 userhelp/PermissionCalendarFilter__view_de__DE/PermissionCalendarFilter__view_de__DE.aod

diff --git a/entity/UserhelpResources/UserhelpResources.aod b/entity/UserhelpResources/UserhelpResources.aod
index 84eed213c7..9a1b9a31ac 100644
--- a/entity/UserhelpResources/UserhelpResources.aod
+++ b/entity/UserhelpResources/UserhelpResources.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.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
   <name>UserhelpResources</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <entityFields>
@@ -27,5 +27,9 @@
         </entityParameter>
       </children>
     </entityConsumer>
+    <entityProvider>
+      <name>#PROVIDER_AGGREGATES</name>
+      <useAggregates v="true" />
+    </entityProvider>
   </entityFields>
 </entity>
diff --git a/userhelp/PermissionCalendarFilterReverse__view_de__DE/PermissionCalendarFilterReverse__view_de__DE.adoc b/userhelp/PermissionCalendarFilterReverse__view_de__DE/PermissionCalendarFilterReverse__view_de__DE.adoc
deleted file mode 100644
index 43131cb415..0000000000
--- a/userhelp/PermissionCalendarFilterReverse__view_de__DE/PermissionCalendarFilterReverse__view_de__DE.adoc
+++ /dev/null
@@ -1 +0,0 @@
-Berechtigungen, die ich auf die Kalendar habe
\ No newline at end of file
diff --git a/userhelp/PermissionCalendarFilterReverse__view_de__DE/PermissionCalendarFilterReverse__view_de__DE.aod b/userhelp/PermissionCalendarFilterReverse__view_de__DE/PermissionCalendarFilterReverse__view_de__DE.aod
deleted file mode 100644
index 1ddc712ce4..0000000000
--- a/userhelp/PermissionCalendarFilterReverse__view_de__DE/PermissionCalendarFilterReverse__view_de__DE.aod
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<userhelp xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.0.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/userhelp/1.0.0">
-  <name>PermissionCalendarFilterReverse__view_de__DE</name>
-  <majorModelMode>DISTRIBUTED</majorModelMode>
-  <reference>%aditoprj%/userhelp/PermissionCalendarFilterReverse__view_de__DE/PermissionCalendarFilterReverse__view_de__DE.adoc</reference>
-</userhelp>
diff --git a/userhelp/PermissionCalendarFilter__view_de__DE/PermissionCalendarFilter__view_de__DE.adoc b/userhelp/PermissionCalendarFilter__view_de__DE/PermissionCalendarFilter__view_de__DE.adoc
deleted file mode 100644
index bf4e8234a2..0000000000
--- a/userhelp/PermissionCalendarFilter__view_de__DE/PermissionCalendarFilter__view_de__DE.adoc
+++ /dev/null
@@ -1 +0,0 @@
-Berechtigungen, die andere Mitarbeiter auf meinen Kalender haben
\ No newline at end of file
diff --git a/userhelp/PermissionCalendarFilter__view_de__DE/PermissionCalendarFilter__view_de__DE.aod b/userhelp/PermissionCalendarFilter__view_de__DE/PermissionCalendarFilter__view_de__DE.aod
deleted file mode 100644
index 92371c4cff..0000000000
--- a/userhelp/PermissionCalendarFilter__view_de__DE/PermissionCalendarFilter__view_de__DE.aod
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<userhelp xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.0.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/userhelp/1.0.0">
-  <name>PermissionCalendarFilter__view_de__DE</name>
-  <majorModelMode>DISTRIBUTED</majorModelMode>
-  <reference>%aditoprj%/userhelp/PermissionCalendarFilter__view_de__DE/PermissionCalendarFilter__view_de__DE.adoc</reference>
-</userhelp>
-- 
GitLab


From 7ae6a540e86c30d350b8acb0271d5eee78b00667 Mon Sep 17 00:00:00 2001
From: "j.goderbauer" <j.goderbauer@adito.de>
Date: Tue, 8 Sep 2020 10:00:07 +0200
Subject: [PATCH 252/309] =?UTF-8?q?[Projekt:=20Entwicklung=20-=20Pool][Tic?=
 =?UTF-8?q?ketNr.:=201064907]["Filter-Preview"=20=C3=B6ffnet=20sich=20nich?=
 =?UTF-8?q?t=20mehr]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 entity/Organisation_entity/Organisation_entity.aod           | 5 +++++
 .../entityfields/indexp/documentation.adoc                   | 2 ++
 entity/Person_entity/Person_entity.aod                       | 1 +
 entity/Person_entity/entityfields/indexp/documentation.adoc  | 2 ++
 4 files changed, 10 insertions(+)
 create mode 100644 entity/Organisation_entity/entityfields/indexp/documentation.adoc
 create mode 100644 entity/Person_entity/entityfields/indexp/documentation.adoc

diff --git a/entity/Organisation_entity/Organisation_entity.aod b/entity/Organisation_entity/Organisation_entity.aod
index 8f4496b5bb..8a881b9f62 100644
--- a/entity/Organisation_entity/Organisation_entity.aod
+++ b/entity/Organisation_entity/Organisation_entity.aod
@@ -1249,6 +1249,11 @@
       <name>ORGANISATION_OBJECTTYPE</name>
       <valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/organisation_objecttype/valueProcess.js</valueProcess>
     </entityField>
+    <entityProvider>
+      <name>indexP</name>
+      <documentation>%aditoprj%/entity/Organisation_entity/entityfields/indexp/documentation.adoc</documentation>
+      <recordContainer>index</recordContainer>
+    </entityProvider>
   </entityFields>
   <recordContainers>
     <dbRecordContainer>
diff --git a/entity/Organisation_entity/entityfields/indexp/documentation.adoc b/entity/Organisation_entity/entityfields/indexp/documentation.adoc
new file mode 100644
index 0000000000..7922ff204b
--- /dev/null
+++ b/entity/Organisation_entity/entityfields/indexp/documentation.adoc
@@ -0,0 +1,2 @@
+Indexprovider used for duplicate-pattern-config.
+//this provider is named poorly, but it's if it is changed a process is needed to update exisiting duplicate-pattern-configs.
\ No newline at end of file
diff --git a/entity/Person_entity/Person_entity.aod b/entity/Person_entity/Person_entity.aod
index d2c9eccce9..9a7067f642 100644
--- a/entity/Person_entity/Person_entity.aod
+++ b/entity/Person_entity/Person_entity.aod
@@ -1268,6 +1268,7 @@
     </entityAggregateField>
     <entityProvider>
       <name>indexP</name>
+      <documentation>%aditoprj%/entity/Person_entity/entityfields/indexp/documentation.adoc</documentation>
       <recordContainer>index</recordContainer>
     </entityProvider>
     <entityField>
diff --git a/entity/Person_entity/entityfields/indexp/documentation.adoc b/entity/Person_entity/entityfields/indexp/documentation.adoc
new file mode 100644
index 0000000000..7922ff204b
--- /dev/null
+++ b/entity/Person_entity/entityfields/indexp/documentation.adoc
@@ -0,0 +1,2 @@
+Indexprovider used for duplicate-pattern-config.
+//this provider is named poorly, but it's if it is changed a process is needed to update exisiting duplicate-pattern-configs.
\ No newline at end of file
-- 
GitLab


From 7bf81a4f0a98bd9498a3e5f3a3c95ce67cbc891f Mon Sep 17 00:00:00 2001
From: "j.goderbauer" <j.goderbauer@adito.de>
Date: Tue, 8 Sep 2020 10:39:49 +0200
Subject: [PATCH 253/309] cti: use first created entry when several active
 contacts were found

---
 process/IncomingCallExecutor_lib/process.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/process/IncomingCallExecutor_lib/process.js b/process/IncomingCallExecutor_lib/process.js
index 6ba61f39cb..876bb084ac 100644
--- a/process/IncomingCallExecutor_lib/process.js
+++ b/process/IncomingCallExecutor_lib/process.js
@@ -408,6 +408,8 @@ IncomingCallExecutor._getContactsFromNumber = function(pNumber, pContactIds)
                         .leftJoin("PERSON", "CONTACT.PERSON_ID = PERSON.PERSONID")
                         .where("CONTACT.STATUS", $KeywordRegistry.contactStatus$active())
                         .and("CONTACT.CONTACTID", contactIds, SqlBuilder.IN())
+                        //order by import if more than one record would be returned to give a statement: the first created, active contact is used
+                        .orderBy("CONTACT.DATE_NEW asc")
                         .table();
     
     //map to the result how the entities-methods would return it to have less effort later when the mentioned ticket is done
-- 
GitLab


From db6e320c12e4d220a8909bcfeed5a6e407953b49 Mon Sep 17 00:00:00 2001
From: Benjamin Ulrich <b.ulrich@adito.de>
Date: Tue, 8 Sep 2020 09:15:05 +0000
Subject: [PATCH 254/309] [Projekt: Entwicklung - Neon][TicketNr.:
 1058900][Ausweisung der Klassifizierung in Firma (FilterView und
 PreviewView)]

---
 .../2020.2.0/Classification/changelog.xml     |    5 +-
 .../create_classificationGrading.xml          |   17 +
 .../create_classificationGroup.xml            |   20 +
 .../create_classificationStorage.xml          |   22 +
 .../rename_ClassificationTypeToObjectType.xml |   11 +
 .../Data_alias/basic/_demoData/changelog.xml  |    2 +
 .../generatedData/classification.xml          | 1348 ++++++++++++++++-
 .../generatedData/classificationgrading.xml   |   40 +-
 .../generatedData/classificationgroup.xml     |   31 +
 .../generatedData/classificationscore.xml     |   10 +-
 .../generatedData/classificationstorage.xml   |  162 ++
 .../generatedData/classificationtype.xml      |   81 +-
 .../_demoData/generatedData/visitplan.xml     |    4 +-
 aliasDefinition/Data_alias/Data_alias.aod     |  160 +-
 .../ClassificationAdmin_entity.aod            |  198 +--
 .../contentTitleProcess.js                    |    4 -
 .../documentation.adoc                        |   74 +-
 .../valueProcess.js                           |    4 -
 .../displayValueProcess.js                    |    8 +-
 .../classificationgroup/dropDownProcess.js    |   15 +-
 .../classificationgroup/mandatoryProcess.js   |    5 -
 .../classificationgroup/onValidation.js       |   28 -
 .../classificationgroup/titleProcess.js       |   13 -
 .../classificationgroup/valueProcess.js       |   33 +-
 .../classificationgroup_param/valueProcess.js |    4 -
 .../classificationtype_param/valueProcess.js  |    4 -
 .../classificationtype/displayValueProcess.js |    6 -
 .../classificationtype/stateProcess.js        |   11 -
 .../displayValueProcess.js                    |    5 +
 .../classificationtypeid/stateProcess.js      |    8 +
 .../classificationtypeid/valueProcess.js      |   10 +
 .../stateProcess.js                           |   12 +
 .../valueProcess.js                           |   21 +
 .../updateclassification/onActionProcess.js   |   21 +
 .../containername_param/valueProcess.js       |    4 -
 .../object_type/dropDownProcess.js            |    6 +
 .../entityfields/object_type/onValueChange.js |    4 +
 .../entityfields/object_type/valueProcess.js  |   27 +
 .../recordcategory/valueProcess.js            |   34 +
 .../entityfields/sorting/stateProcess.js      |   16 +
 .../entityfields/sorting/valueProcess.js      |   43 +
 .../target_context/valueProcess.js            |   16 +
 .../entityfields/target_id/valueProcess.js    |   28 +
 .../entityfields/uid/linkedContextProcess.js  |   24 +
 .../grantDeleteProcess.js                     |   14 +-
 .../grantUpdateProcess.js                     |    9 +
 .../recordcontainers/db/orderClauseProcess.js |    6 -
 .../recordcontainers/jdito/contentProcess.js  |   81 +
 .../recordcontainers/jdito/onDelete.js        |   78 +
 .../recordcontainers/jdito/onInsert.js        |   78 +
 .../recordcontainers/jdito/onUpdate.js        |  203 +++
 .../ClassificationGrading_entity.aod          |   32 +-
 .../documentation.adoc                        |   55 +-
 .../valueProcess.js                           |    0
 .../maxgradeforscore/onValidation.js          |    9 +-
 .../maxgradeforscore/valueProcess.js          |    2 +-
 .../recordcontainers/db/cacheKeyProcess.js    |    5 +
 .../recordcontainers/db/conditionProcess.js   |    2 +-
 .../ClassificationGroupAnalyses_entity.aod    |   83 -
 .../contentTitleProcess.js                    |    3 -
 .../documentation.adoc                        |    3 -
 .../groupanalyses/documentation.adoc          |    3 -
 .../recordcontainers/jdito/contentProcess.js  |   13 -
 .../ClassificationGroup_entity.aod            |  112 ++
 .../contentTitleProcess.js                    |    4 +
 .../documentation.adoc                        |   49 +
 .../valueProcess.js                           |    4 +
 .../classificationgroupid}/valueProcess.js    |    4 +-
 .../entityfields/object_type/valueProcess.js  |   14 +
 .../documentation.adoc                        |    2 +
 .../entityfields/title/displayValueProcess.js |    4 +
 .../translatedtitle/valueProcess.js           |   11 +
 .../recordcontainers/db/cacheKeyProcess.js    |    5 +
 .../recordcontainers/db/conditionProcess.js   |   20 +
 .../recordcontainers/db/orderClauseProcess.js |    7 +
 .../ClassificationScore_entity.aod            |   20 +-
 .../documentation.adoc                        |   46 +-
 .../displayValueProcess.js                    |    9 +
 .../classificationgroup_id/valueProcess.js    |    7 +
 .../classificationscoreid/valueProcess.js     |    6 +-
 .../valueProcess.js                           |    4 +
 .../classificationtype_id/valueProcess.js     |    4 +-
 .../entityfields/maxvalue/valueProcess.js     |   22 -
 .../entityfields/score/onValidation.js        |    0
 .../translatedtitle/valueProcess.js           |    5 +
 .../recordcontainers/db/cacheKeyProcess.js    |    5 +
 .../recordcontainers/db/onDBDelete.js         |   48 +-
 .../recordcontainers/db/onDBInsert.js         |   47 +-
 .../recordcontainers/db/onDBUpdate.js         |   45 +-
 .../ClassificationType_entity.aod             |   89 +-
 .../contentTitleProcess.js}                   |    2 +-
 .../documentation.adoc                        |   47 +-
 .../displayValueProcess.js                    |    9 +
 .../classificationgroup_param/valueProcess.js |    4 +
 .../valueProcess.js                           |    0
 .../classificationtypeid/valueProcess.js      |    5 +
 .../documentation.adoc                        |    1 +
 .../entityfields/infofield/valueProcess.js    |   75 +
 .../entityfields/maxscore/valueProcess.js     |   16 +
 .../object_type/displayValueProcess.js        |    9 +
 .../scoretype/displayValueProcess.js          |    5 +
 .../recordcontainers/db/cacheKeyProcess.js    |    5 +
 .../recordcontainers/db/conditionProcess.js   |    7 +
 .../maxscore.value/expression.js              |   10 +
 .../Classification_entity.aod                 |   26 +-
 .../afterOperatingState.js                    |   15 +-
 .../Classification_entity/documentation.adoc  |   44 +-
 .../displayValueProcess.js                    |    8 +-
 .../classificationgroup/documentation.adoc    |    1 +
 .../classificationscore_id/titleProcess.js    |    2 +-
 .../classificationtype_param/valueProcess.js  |    2 +-
 .../classificationtype/displayValueProcess.js |    2 +-
 .../classificationtype/stateProcess.js        |    8 +-
 .../classificationtype_id/valueProcess.js     |    7 +-
 .../entityfields/object_rowid/valueProcess.js |    2 +-
 .../entityfields/object_type/valueProcess.js  |    4 +-
 .../recordcontainers/jdito/contentProcess.js  |  177 ++-
 .../KeywordEntry_entity.aod                   |    6 -
 .../entityfields/expanded/valueProcess.js     |    2 +-
 .../Notification_entity.aod                   |    7 -
 .../Organisation_entity.aod                   |   74 +-
 .../classificationtype_param/valueProcess.js  |    4 -
 .../objectrowid_param/valueProcess.js         |    4 -
 .../children/objecttype_param/valueProcess.js |    4 -
 .../objectrowid_param/valueProcess.js         |    2 +-
 .../classificationstorage_id/valueProcess.js  |   10 +
 .../entityfields/opentasks/valueProcess.js    |    6 -
 .../filterConditionProcess.js                 |    6 +
 .../filterFieldsProcess.js                    |    7 +
 .../filterValuesProcess.js                    |    5 +
 .../groupQueryProcess.js                      |   23 +
 .../filterConditionProcess.js                 |    6 +
 .../filterFieldsProcess.js                    |    8 +
 .../filterValuesProcess.js                    |    5 +
 .../groupQueryProcess.js                      |   25 +
 .../recordcontainers/db/fromClauseProcess.js  |    4 +-
 .../recordcontainers/db/onDBDelete.js         |    1 +
 .../recordcontainers/db/onDBInsert.js         |   10 +
 .../recordcontainers/index/query.js           |    4 +-
 .../Salesproject_entity.aod                   |   50 +-
 .../classificationresult/valueProcess.js      |    8 -
 .../filterConditionProcess.js                 |    7 +
 .../filterFieldsProcess.js                    |    8 +
 .../filterValuesProcess.js                    |    6 +
 .../filterConditionProcess.js                 |   33 -
 .../filterFieldsProcess.js                    |   28 -
 .../filterValuesProcess.js                    |   27 -
 .../filterConditionProcess.js                 |   49 -
 .../filterFieldsProcess.js                    |   34 -
 .../filterValuesProcess.js                    |    6 -
 .../filterConditionProcess.js                 |    6 +
 .../filterFieldsProcess.js                    |    7 +
 .../filterValuesProcess.js                    |    5 +
 .../groupQueryProcess.js                      |   22 +
 .../recordcontainers/db/fromClauseProcess.js  |    4 +-
 .../recordcontainers/db/onDBDelete.js         |   10 +-
 .../recordcontainers/db/onDBInsert.js         |    8 +
 .../contact_id/displayValueProcess.js         |    1 -
 .../_____LANGUAGE_EXTRA.aod                   |   84 +-
 .../_____LANGUAGE_de/_____LANGUAGE_de.aod     |  155 +-
 .../_____LANGUAGE_en/_____LANGUAGE_en.aod     |  136 +-
 neonContext/Classification/Classification.aod |    8 -
 .../ClassificationAdmin.aod                   |   15 +-
 .../ClassificationGrading.aod                 |    5 +-
 .../ClassificationGroup.aod                   |   13 +
 .../ClassificationScore.aod                   |    5 +-
 .../ClassificationType.aod}                   |    9 +-
 neonContext/Organisation/Organisation.aod     |    6 +-
 neonContext/Salesproject/Salesproject.aod     |   20 -
 .../AttributeRelationTree_view.aod            |    1 +
 .../ClassificationAdminEdit_view.aod          |   21 +-
 .../ClassificationAdminFilter_view.aod        |   35 +
 .../ClassificationAdminGrading.aod            |   42 -
 .../ClassificationAdminTree_view.aod          |   23 -
 .../ClassificationChart_view.aod              |   18 -
 .../ClassificationDrawer_view.aod             |   18 -
 ...lassificationGradingMultipleEdit_view.aod} |    3 +-
 .../ClassificationGroupAnalysesChart_view.aod |   22 -
 .../ClassificationGroupPreview_view.aod       |   36 +
 .../ClassificationScoreMultipleEdit_view.aod  |   21 +-
 ...lassificationScoreMultiplePreview_view.aod |   24 -
 .../ClassificationTree_view.aod               |    6 +-
 .../ClassificationTypePreview_View.aod        |   40 +
 .../ClassificatonAdminPreview_view.aod        |   45 -
 .../ClassificatonPreview_view.aod             |    7 +-
 .../KeywordEntryFilter_view.aod               |    6 +-
 .../OrganisationClassification.aod}           |    7 +-
 .../OrganisationClassificationDrawer_view.aod |    2 +-
 .../OrganisationFilter_view.aod               |    8 +
 .../OrganisationMain_view.aod                 |   10 +-
 .../OrganisationPreview_view.aod              |    4 +-
 .../SaleprojectOverviewCharts_view.aod        |   24 -
 ...alesprojectClassificationAndChart_view.aod |   25 -
 ...lesprojectClassificationAttribute_view.aod |   23 -
 .../SalesprojectClassificationDrawer_view.aod |   19 -
 .../SalesprojectClassification_view.aod       |   28 -
 .../SalesprojectFilter_view.aod               |   11 +
 .../SalesprojectMain_view.aod                 |   11 +-
 .../SalesprojectOverview_view.aod             |    6 +-
 .../SalesprojectPreview_view.aod              |    5 +-
 process/AISalesproject_lib/process.js         |    2 +-
 process/AttributeFilter_lib/process.js        |    2 +-
 .../ClassificationFilter_lib.aod              |    9 +
 process/ClassificationFilter_lib/process.js   |  343 +++++
 process/Classification_lib/process.js         |  502 +++---
 process/Entity_lib/process.js                 |    8 +-
 process/KeywordRegistry_basic/process.js      |    4 +-
 process/Sql_lib/process.js                    |   40 +-
 process/Util_lib/process.js                   |   28 +-
 .../process.js                                |  222 +++
 .../updateClassifications_serverProcess.aod   |   11 +
 211 files changed, 5505 insertions(+), 1579 deletions(-)
 create mode 100644 .liquibase/Data_alias/basic/2020.2.0/Classification/create_classificationGrading.xml
 create mode 100644 .liquibase/Data_alias/basic/2020.2.0/Classification/create_classificationGroup.xml
 create mode 100644 .liquibase/Data_alias/basic/2020.2.0/Classification/create_classificationStorage.xml
 create mode 100644 .liquibase/Data_alias/basic/2020.2.0/Classification/rename_ClassificationTypeToObjectType.xml
 create mode 100644 .liquibase/Data_alias/basic/_demoData/generatedData/classificationgroup.xml
 create mode 100644 .liquibase/Data_alias/basic/_demoData/generatedData/classificationstorage.xml
 delete mode 100644 entity/ClassificationAdmin_entity/contentTitleProcess.js
 delete mode 100644 entity/ClassificationAdmin_entity/entityfields/classificationgradings/children/classificationtypeid_param/valueProcess.js
 delete mode 100644 entity/ClassificationAdmin_entity/entityfields/classificationgroup/mandatoryProcess.js
 delete mode 100644 entity/ClassificationAdmin_entity/entityfields/classificationgroup/onValidation.js
 delete mode 100644 entity/ClassificationAdmin_entity/entityfields/classificationgroup/titleProcess.js
 delete mode 100644 entity/ClassificationAdmin_entity/entityfields/classificationscores/children/classificationgroup_param/valueProcess.js
 delete mode 100644 entity/ClassificationAdmin_entity/entityfields/classificationscores/children/classificationtype_param/valueProcess.js
 delete mode 100644 entity/ClassificationAdmin_entity/entityfields/classificationtype/displayValueProcess.js
 delete mode 100644 entity/ClassificationAdmin_entity/entityfields/classificationtype/stateProcess.js
 create mode 100644 entity/ClassificationAdmin_entity/entityfields/classificationtypeid/displayValueProcess.js
 create mode 100644 entity/ClassificationAdmin_entity/entityfields/classificationtypeid/stateProcess.js
 create mode 100644 entity/ClassificationAdmin_entity/entityfields/classificationtypeid/valueProcess.js
 create mode 100644 entity/ClassificationAdmin_entity/entityfields/classificationtypeiddisplayvalue/stateProcess.js
 create mode 100644 entity/ClassificationAdmin_entity/entityfields/classificationtypeiddisplayvalue/valueProcess.js
 create mode 100644 entity/ClassificationAdmin_entity/entityfields/filterviewactiongroup/children/updateclassification/onActionProcess.js
 delete mode 100644 entity/ClassificationAdmin_entity/entityfields/keywordclassificationtypes/children/containername_param/valueProcess.js
 create mode 100644 entity/ClassificationAdmin_entity/entityfields/object_type/dropDownProcess.js
 create mode 100644 entity/ClassificationAdmin_entity/entityfields/object_type/onValueChange.js
 create mode 100644 entity/ClassificationAdmin_entity/entityfields/object_type/valueProcess.js
 create mode 100644 entity/ClassificationAdmin_entity/entityfields/recordcategory/valueProcess.js
 create mode 100644 entity/ClassificationAdmin_entity/entityfields/sorting/stateProcess.js
 create mode 100644 entity/ClassificationAdmin_entity/entityfields/sorting/valueProcess.js
 create mode 100644 entity/ClassificationAdmin_entity/entityfields/target_context/valueProcess.js
 create mode 100644 entity/ClassificationAdmin_entity/entityfields/target_id/valueProcess.js
 create mode 100644 entity/ClassificationAdmin_entity/entityfields/uid/linkedContextProcess.js
 create mode 100644 entity/ClassificationAdmin_entity/grantUpdateProcess.js
 delete mode 100644 entity/ClassificationAdmin_entity/recordcontainers/db/orderClauseProcess.js
 create mode 100644 entity/ClassificationAdmin_entity/recordcontainers/jdito/contentProcess.js
 create mode 100644 entity/ClassificationAdmin_entity/recordcontainers/jdito/onDelete.js
 create mode 100644 entity/ClassificationAdmin_entity/recordcontainers/jdito/onInsert.js
 create mode 100644 entity/ClassificationAdmin_entity/recordcontainers/jdito/onUpdate.js
 rename entity/ClassificationGrading_entity/entityfields/{classificationtype_group => classificationgroup_id}/valueProcess.js (100%)
 create mode 100644 entity/ClassificationGrading_entity/recordcontainers/db/cacheKeyProcess.js
 delete mode 100644 entity/ClassificationGroupAnalyses_entity/ClassificationGroupAnalyses_entity.aod
 delete mode 100644 entity/ClassificationGroupAnalyses_entity/contentTitleProcess.js
 delete mode 100644 entity/ClassificationGroupAnalyses_entity/documentation.adoc
 delete mode 100644 entity/ClassificationGroupAnalyses_entity/entityfields/groupanalyses/documentation.adoc
 delete mode 100644 entity/ClassificationGroupAnalyses_entity/recordcontainers/jdito/contentProcess.js
 create mode 100644 entity/ClassificationGroup_entity/ClassificationGroup_entity.aod
 create mode 100644 entity/ClassificationGroup_entity/contentTitleProcess.js
 create mode 100644 entity/ClassificationGroup_entity/documentation.adoc
 create mode 100644 entity/ClassificationGroup_entity/entityfields/classificationgradings/children/classificationtypeid_param/valueProcess.js
 rename entity/{ClassificationAdmin_entity/entityfields/classificationtype => ClassificationGroup_entity/entityfields/classificationgroupid}/valueProcess.js (61%)
 create mode 100644 entity/ClassificationGroup_entity/entityfields/object_type/valueProcess.js
 create mode 100644 entity/ClassificationGroup_entity/entityfields/specificobjecttypegroups/documentation.adoc
 create mode 100644 entity/ClassificationGroup_entity/entityfields/title/displayValueProcess.js
 create mode 100644 entity/ClassificationGroup_entity/entityfields/translatedtitle/valueProcess.js
 create mode 100644 entity/ClassificationGroup_entity/recordcontainers/db/cacheKeyProcess.js
 create mode 100644 entity/ClassificationGroup_entity/recordcontainers/db/conditionProcess.js
 create mode 100644 entity/ClassificationGroup_entity/recordcontainers/db/orderClauseProcess.js
 create mode 100644 entity/ClassificationScore_entity/entityfields/classificationgroup_id/displayValueProcess.js
 create mode 100644 entity/ClassificationScore_entity/entityfields/classificationgroup_id/valueProcess.js
 create mode 100644 entity/ClassificationScore_entity/entityfields/classificationscores/children/classificationtypeid_param/valueProcess.js
 delete mode 100644 entity/ClassificationScore_entity/entityfields/maxvalue/valueProcess.js
 create mode 100644 entity/ClassificationScore_entity/entityfields/score/onValidation.js
 create mode 100644 entity/ClassificationScore_entity/entityfields/translatedtitle/valueProcess.js
 create mode 100644 entity/ClassificationScore_entity/recordcontainers/db/cacheKeyProcess.js
 rename entity/{ClassificationAdmin_entity/entityfields/scoretype/displayValueProcess.js => ClassificationType_entity/contentTitleProcess.js} (100%)
 create mode 100644 entity/ClassificationType_entity/entityfields/classificationgroup_id/displayValueProcess.js
 create mode 100644 entity/ClassificationType_entity/entityfields/classificationscores/children/classificationgroup_param/valueProcess.js
 rename entity/{ClassificationAdmin_entity => ClassificationType_entity}/entityfields/classificationscores/children/classificationtypeid_param/valueProcess.js (100%)
 create mode 100644 entity/ClassificationType_entity/entityfields/classificationtypeid/valueProcess.js
 create mode 100644 entity/ClassificationType_entity/entityfields/classificationtypesforgroup/documentation.adoc
 create mode 100644 entity/ClassificationType_entity/entityfields/infofield/valueProcess.js
 create mode 100644 entity/ClassificationType_entity/entityfields/maxscore/valueProcess.js
 create mode 100644 entity/ClassificationType_entity/entityfields/object_type/displayValueProcess.js
 create mode 100644 entity/ClassificationType_entity/entityfields/scoretype/displayValueProcess.js
 create mode 100644 entity/ClassificationType_entity/recordcontainers/db/cacheKeyProcess.js
 create mode 100644 entity/ClassificationType_entity/recordcontainers/db/conditionProcess.js
 create mode 100644 entity/ClassificationType_entity/recordcontainers/db/recordfieldmappings/maxscore.value/expression.js
 create mode 100644 entity/Classification_entity/entityfields/classificationgroup/documentation.adoc
 delete mode 100644 entity/Organisation_entity/entityfields/classificationgroups/children/classificationtype_param/valueProcess.js
 delete mode 100644 entity/Organisation_entity/entityfields/classificationgroups/children/objectrowid_param/valueProcess.js
 delete mode 100644 entity/Organisation_entity/entityfields/classificationgroups/children/objecttype_param/valueProcess.js
 create mode 100644 entity/Organisation_entity/entityfields/classificationstorage_id/valueProcess.js
 delete mode 100644 entity/Organisation_entity/entityfields/opentasks/valueProcess.js
 create mode 100644 entity/Organisation_entity/recordcontainers/db/filterextensions/classificationgroup_filter/filterConditionProcess.js
 create mode 100644 entity/Organisation_entity/recordcontainers/db/filterextensions/classificationgroup_filter/filterFieldsProcess.js
 create mode 100644 entity/Organisation_entity/recordcontainers/db/filterextensions/classificationgroup_filter/filterValuesProcess.js
 create mode 100644 entity/Organisation_entity/recordcontainers/db/filterextensions/classificationgroup_filter/groupQueryProcess.js
 create mode 100644 entity/Organisation_entity/recordcontainers/db/filterextensions/classificationtype_filter/filterConditionProcess.js
 create mode 100644 entity/Organisation_entity/recordcontainers/db/filterextensions/classificationtype_filter/filterFieldsProcess.js
 create mode 100644 entity/Organisation_entity/recordcontainers/db/filterextensions/classificationtype_filter/filterValuesProcess.js
 create mode 100644 entity/Organisation_entity/recordcontainers/db/filterextensions/classificationtype_filter/groupQueryProcess.js
 delete mode 100644 entity/Salesproject_entity/entityfields/classificationresult/valueProcess.js
 create mode 100644 entity/Salesproject_entity/recordcontainers/db/filterextensions/classificationgroup_filter/filterConditionProcess.js
 create mode 100644 entity/Salesproject_entity/recordcontainers/db/filterextensions/classificationgroup_filter/filterFieldsProcess.js
 create mode 100644 entity/Salesproject_entity/recordcontainers/db/filterextensions/classificationgroup_filter/filterValuesProcess.js
 delete mode 100644 entity/Salesproject_entity/recordcontainers/db/filterextensions/classificationscore_filter/filterConditionProcess.js
 delete mode 100644 entity/Salesproject_entity/recordcontainers/db/filterextensions/classificationscore_filter/filterFieldsProcess.js
 delete mode 100644 entity/Salesproject_entity/recordcontainers/db/filterextensions/classificationscore_filter/filterValuesProcess.js
 delete mode 100644 entity/Salesproject_entity/recordcontainers/db/filterextensions/classificationsummary_filter/filterConditionProcess.js
 delete mode 100644 entity/Salesproject_entity/recordcontainers/db/filterextensions/classificationsummary_filter/filterFieldsProcess.js
 delete mode 100644 entity/Salesproject_entity/recordcontainers/db/filterextensions/classificationsummary_filter/filterValuesProcess.js
 create mode 100644 entity/Salesproject_entity/recordcontainers/db/filterextensions/classificationtype_filter/filterConditionProcess.js
 create mode 100644 entity/Salesproject_entity/recordcontainers/db/filterextensions/classificationtype_filter/filterFieldsProcess.js
 create mode 100644 entity/Salesproject_entity/recordcontainers/db/filterextensions/classificationtype_filter/filterValuesProcess.js
 create mode 100644 entity/Salesproject_entity/recordcontainers/db/filterextensions/classificationtype_filter/groupQueryProcess.js
 create mode 100644 neonContext/ClassificationGroup/ClassificationGroup.aod
 rename neonContext/{ClassificationGroupAnalyses/ClassificationGroupAnalyses.aod => ClassificationType/ClassificationType.aod} (61%)
 create mode 100644 neonView/ClassificationAdminFilter_view/ClassificationAdminFilter_view.aod
 delete mode 100644 neonView/ClassificationAdminGrading/ClassificationAdminGrading.aod
 delete mode 100644 neonView/ClassificationAdminTree_view/ClassificationAdminTree_view.aod
 delete mode 100644 neonView/ClassificationChart_view/ClassificationChart_view.aod
 delete mode 100644 neonView/ClassificationDrawer_view/ClassificationDrawer_view.aod
 rename neonView/{ClassificationGradingMultiplePreview_view/ClassificationGradingMultiplePreview_view.aod => ClassificationGradingMultipleEdit_view/ClassificationGradingMultipleEdit_view.aod} (90%)
 delete mode 100644 neonView/ClassificationGroupAnalysesChart_view/ClassificationGroupAnalysesChart_view.aod
 create mode 100644 neonView/ClassificationGroupPreview_view/ClassificationGroupPreview_view.aod
 delete mode 100644 neonView/ClassificationScoreMultiplePreview_view/ClassificationScoreMultiplePreview_view.aod
 create mode 100644 neonView/ClassificationTypePreview_View/ClassificationTypePreview_View.aod
 delete mode 100644 neonView/ClassificatonAdminPreview_view/ClassificatonAdminPreview_view.aod
 rename neonView/{OrganisationtClassificationAndChart_view/OrganisationtClassificationAndChart_view.aod => OrganisationClassification/OrganisationClassification.aod} (73%)
 delete mode 100644 neonView/SaleprojectOverviewCharts_view/SaleprojectOverviewCharts_view.aod
 delete mode 100644 neonView/SalesprojectClassificationAndChart_view/SalesprojectClassificationAndChart_view.aod
 delete mode 100644 neonView/SalesprojectClassificationAttribute_view/SalesprojectClassificationAttribute_view.aod
 delete mode 100644 neonView/SalesprojectClassificationDrawer_view/SalesprojectClassificationDrawer_view.aod
 delete mode 100644 neonView/SalesprojectClassification_view/SalesprojectClassification_view.aod
 create mode 100644 process/ClassificationFilter_lib/ClassificationFilter_lib.aod
 create mode 100644 process/ClassificationFilter_lib/process.js
 create mode 100644 process/updateClassifications_serverProcess/process.js
 create mode 100644 process/updateClassifications_serverProcess/updateClassifications_serverProcess.aod

diff --git a/.liquibase/Data_alias/basic/2020.2.0/Classification/changelog.xml b/.liquibase/Data_alias/basic/2020.2.0/Classification/changelog.xml
index 1fe0427646..be74e7af35 100644
--- a/.liquibase/Data_alias/basic/2020.2.0/Classification/changelog.xml
+++ b/.liquibase/Data_alias/basic/2020.2.0/Classification/changelog.xml
@@ -2,5 +2,8 @@
 <databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
                    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
                    <include relativeToChangelogFile="true" file="update_keywordClassificationOrganisation.xml"/>
-                   <include relativeToChangelogFile="true" file="add_classificationGrading.xml"/>
+                   <include relativeToChangelogFile="true" file="create_classificationGrading.xml"/>
+                   <include relativeToChangelogFile="true" file="create_classificationGroup.xml"/>
+                   <include relativeToChangelogFile="true" file="create_classificationStorage.xml"/>
+                   <include relativeToChangelogFile="true" file="rename_ClassificationTypeToObjectType.xml"/>
 </databaseChangeLog>
diff --git a/.liquibase/Data_alias/basic/2020.2.0/Classification/create_classificationGrading.xml b/.liquibase/Data_alias/basic/2020.2.0/Classification/create_classificationGrading.xml
new file mode 100644
index 0000000000..ee954ba558
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2020.2.0/Classification/create_classificationGrading.xml
@@ -0,0 +1,17 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+                   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+    <changeSet author="b.ulrich" id="094af11f-c308-42bf-a78e-99d55883900a">
+        <createTable tableName="CLASSIFICATIONGRADING">
+            <column name="CLASSIFICATIONGRADINGID" type="CHAR(36)">
+                <constraints primaryKey="true" primaryKeyName="PK_CLASSIFICATIONGRADING_CLASSIFICATIONGRADINGID"/>
+            </column>
+            <column name="GRADING" type="NVARCHAR(1)"/>
+            <column name="MAXGRADEFORSCORE" type="INTEGER"/>
+            <column name="CLASSIFICATIONGROUP_ID" type="CHAR(36)"/>
+        </createTable>
+        <createIndex indexName="IDX_CLASSIFICATION_GRADING" tableName="CLASSIFICATIONGRADING">
+            <column name="CLASSIFICATIONGROUP_ID"/>
+        </createIndex>
+    </changeSet>
+</databaseChangeLog>
diff --git a/.liquibase/Data_alias/basic/2020.2.0/Classification/create_classificationGroup.xml b/.liquibase/Data_alias/basic/2020.2.0/Classification/create_classificationGroup.xml
new file mode 100644
index 0000000000..2072d1c79a
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2020.2.0/Classification/create_classificationGroup.xml
@@ -0,0 +1,20 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+                   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+    <changeSet author="b.ulrich" id="7d965008-8161-45bd-bb5c-a2d4e623324d">
+        <createTable tableName="CLASSIFICATIONGROUP">
+            <column name="CLASSIFICATIONGROUPID" type="CHAR(36)">
+                <constraints primaryKey="true" primaryKeyName="PK_CLASSIFICATIONGROUP_CLASSIFICATIONGROUPID"/>
+            </column>
+            <column name="TITLE" type="VARCHAR(36)"/>
+            <column name="SORTING" type="SMALLINT"/>
+        </createTable>
+        <addColumn tableName="CLASSIFICATIONTYPE">
+            <column name="CLASSIFICATIONGROUP_ID" type="CHAR(36)"/>
+	</addColumn> 
+        <dropColumn tableName="CLASSIFICATIONTYPE" columnName="CLASSIFICATIONGROUP"/>
+        <createIndex indexName="IDX_CLASSIFICATION_TYPE" tableName="CLASSIFICATIONTYPE">
+            <column name="CLASSIFICATIONGROUP_ID"/>
+        </createIndex>
+    </changeSet>
+</databaseChangeLog>
diff --git a/.liquibase/Data_alias/basic/2020.2.0/Classification/create_classificationStorage.xml b/.liquibase/Data_alias/basic/2020.2.0/Classification/create_classificationStorage.xml
new file mode 100644
index 0000000000..33fe07cd6a
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2020.2.0/Classification/create_classificationStorage.xml
@@ -0,0 +1,22 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+                   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+    <changeSet author="b.ulrich" id="7d965008-8161-45bd-bb5c-a2d4e623324d">
+        <createTable tableName="CLASSIFICATIONSTORAGE">
+            <column name="CLASSIFICATIONSTORAGEID" type="CHAR(36)">
+                <constraints primaryKey="true" primaryKeyName="PK_CLASSIFICATIONSTORAGE_CLASSIFICATIONSTORAGEID"/>
+            </column>
+            <column name="CLASSIFICATIONVALUE" type="VARCHAR(20)"/>
+            <column name="OBJECT_ROWID" type="CHAR(36)"/>
+            <column name="OBJECT_TYPE" type="VARCHAR(63)"/>
+        </createTable>
+        <addUniqueConstraint  
+            columnNames="OBJECT_ROWID, OBJECT_TYPE"  
+            constraintName="const_classificationstrage"  
+            tableName="CLASSIFICATIONSTORAGE"  
+            validate="true"/>  
+        <createIndex indexName="IDX_CLASSIFICATION_STORAGE" tableName="CLASSIFICATIONSTORAGE">
+            <column name="OBJECT_ROWID"/>
+        </createIndex>
+    </changeSet>
+</databaseChangeLog>
diff --git a/.liquibase/Data_alias/basic/2020.2.0/Classification/rename_ClassificationTypeToObjectType.xml b/.liquibase/Data_alias/basic/2020.2.0/Classification/rename_ClassificationTypeToObjectType.xml
new file mode 100644
index 0000000000..d0e3475b1c
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2020.2.0/Classification/rename_ClassificationTypeToObjectType.xml
@@ -0,0 +1,11 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+                   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+    <changeSet author="b.ulrich" id="b693a8ff-3267-4813-9a89-e17120e1346a">
+        <renameColumn
+            columnDataType="VARCHAR(63)"  
+            newColumnName="OBJECT_TYPE"  
+            oldColumnName="CLASSIFICATIONTYPE"  
+            tableName="CLASSIFICATIONTYPE"/>  
+    </changeSet>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/_demoData/changelog.xml b/.liquibase/Data_alias/basic/_demoData/changelog.xml
index f1d01f3712..22fe51ac97 100644
--- a/.liquibase/Data_alias/basic/_demoData/changelog.xml
+++ b/.liquibase/Data_alias/basic/_demoData/changelog.xml
@@ -52,4 +52,6 @@
   <include file="generatedData/documenttemplateplaceofuse.xml" relativeToChangelogFile="true"/>
   <include file="generatedData/visitplan.xml" relativeToChangelogFile="true"/>
   <include file="generatedData/classificationgrading.xml" relativeToChangelogFile="true"/>
+  <include file="generatedData/classificationgroup.xml" relativeToChangelogFile="true"/>
+  <include file="generatedData/classificationstorage.xml" relativeToChangelogFile="true"/>
 </databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/_demoData/generatedData/classification.xml b/.liquibase/Data_alias/basic/_demoData/generatedData/classification.xml
index be1edc314b..a083c7e957 100644
--- a/.liquibase/Data_alias/basic/_demoData/generatedData/classification.xml
+++ b/.liquibase/Data_alias/basic/_demoData/generatedData/classification.xml
@@ -4,60 +4,471 @@
     <delete tableName="classification"/>
     <insert tableName="classification">
       <column name="CLASSIFICATIONID" value="028181fe-5687-4904-b7cb-c4a1befe7eed"/>
-      <column name="CLASSIFICATIONSCORE_ID" value="a0c55ee2-0d15-4779-a5a6-93774d5bc393"/>
-      <column name="CLASSIFICATIONTYPE_ID" value="8c1e8f81-145f-4efe-936f-3f4147f4d59a"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="90361317-d80e-4466-a45b-3021bf02e2f9"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="382b311e-b2b2-49da-b6e1-339afae92657"/>
       <column name="OBJECT_ROWID" value="438537db-0dc6-4aed-b1d1-813011baf88c"/>
       <column name="OBJECT_TYPE" value="Salesproject"/>
     </insert>
     <insert tableName="classification">
       <column name="CLASSIFICATIONID" value="13771cd8-3694-4a44-8793-cd0fc3fb4b53"/>
-      <column name="CLASSIFICATIONSCORE_ID" value="636af750-fcd3-4480-bfe7-ead42bf85280"/>
-      <column name="CLASSIFICATIONTYPE_ID" value="57604bc1-d99f-4d61-b28d-55218a72045b"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="35d8ae15-8993-4ab2-99f6-e57c2ebf0bb3"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="4977ba88-074c-4fe5-b04a-97c9a5eae982"/>
       <column name="OBJECT_ROWID" value="438537db-0dc6-4aed-b1d1-813011baf88c"/>
       <column name="OBJECT_TYPE" value="Salesproject"/>
     </insert>
     <insert tableName="classification">
       <column name="CLASSIFICATIONID" value="13985a1a-1660-4a85-86c1-612bd62df8d7"/>
-      <column name="CLASSIFICATIONSCORE_ID" value="ed6a38f7-97bf-4e3d-a34c-4a1e636fa6a7"/>
-      <column name="CLASSIFICATIONTYPE_ID" value="d8091374-f3fd-41dc-8468-91469618c6fc"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="2fdb4d7e-24d5-4eb1-a130-3a0aaeebd8db"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="54128957-c80b-4b5a-ad1b-cfce665dfb10"/>
       <column name="OBJECT_ROWID" value="438537db-0dc6-4aed-b1d1-813011baf88c"/>
       <column name="OBJECT_TYPE" value="Salesproject"/>
     </insert>
     <insert tableName="classification">
       <column name="CLASSIFICATIONID" value="166f3484-53a8-4c44-aad7-ef47a268ae71"/>
-      <column name="CLASSIFICATIONSCORE_ID" value="61fe4e4f-e64d-4195-87b5-658f36ce1736"/>
-      <column name="CLASSIFICATIONTYPE_ID" value="2a702a31-9907-4f1b-abfd-3342640f1c9e"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="3dc5fc76-d2d5-4911-891a-3aacc5a9c925"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="2031525e-6ca3-46b4-91d4-7f90cd31a630"/>
       <column name="OBJECT_ROWID" value="438537db-0dc6-4aed-b1d1-813011baf88c"/>
       <column name="OBJECT_TYPE" value="Salesproject"/>
     </insert>
     <insert tableName="classification">
       <column name="CLASSIFICATIONID" value="421cdeeb-a5d6-4612-b47b-49db966de27f"/>
-      <column name="CLASSIFICATIONSCORE_ID" value="7e569319-5885-452e-9331-a507f3365236"/>
-      <column name="CLASSIFICATIONTYPE_ID" value="31c169aa-ba5b-4f9d-9dd3-b0d0e8d1b632"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="3e1e21b0-c10d-4bcb-882c-ac1b239b9cb2"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="2a702a31-9907-4f1b-abfd-3342640f1c9e"/>
       <column name="OBJECT_ROWID" value="438537db-0dc6-4aed-b1d1-813011baf88c"/>
       <column name="OBJECT_TYPE" value="Salesproject"/>
     </insert>
     <insert tableName="classification">
       <column name="CLASSIFICATIONID" value="440d25a3-39c1-412e-90c7-c0a6366f0794"/>
-      <column name="CLASSIFICATIONSCORE_ID" value="2fdb4d7e-24d5-4eb1-a130-3a0aaeebd8db"/>
-      <column name="CLASSIFICATIONTYPE_ID" value="54128957-c80b-4b5a-ad1b-cfce665dfb10"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="ba5d70c3-e77a-45ff-828b-7b3e0a61eec2"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="d8091374-f3fd-41dc-8468-91469618c6fc"/>
       <column name="OBJECT_ROWID" value="438537db-0dc6-4aed-b1d1-813011baf88c"/>
       <column name="OBJECT_TYPE" value="Salesproject"/>
     </insert>
     <insert tableName="classification">
       <column name="CLASSIFICATIONID" value="81d75e31-673b-426e-827f-c505b386ce0e"/>
-      <column name="CLASSIFICATIONSCORE_ID" value="ec51d975-bda6-415e-9b91-32f0e981ecd8"/>
-      <column name="CLASSIFICATIONTYPE_ID" value="4977ba88-074c-4fe5-b04a-97c9a5eae982"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="47ec3dbf-f8f6-4418-8dc2-0062510c1a28"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="31c169aa-ba5b-4f9d-9dd3-b0d0e8d1b632"/>
       <column name="OBJECT_ROWID" value="438537db-0dc6-4aed-b1d1-813011baf88c"/>
       <column name="OBJECT_TYPE" value="Salesproject"/>
     </insert>
     <insert tableName="classification">
       <column name="CLASSIFICATIONID" value="c7b46dff-956a-47e1-8a7f-7d3f56c81da1"/>
-      <column name="CLASSIFICATIONSCORE_ID" value="b1c55bcd-16c6-4b2f-8f73-e16397b40e93"/>
-      <column name="CLASSIFICATIONTYPE_ID" value="382b311e-b2b2-49da-b6e1-339afae92657"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="d5beb18f-c53e-438d-8b0b-7699aa20fba7"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="57604bc1-d99f-4d61-b28d-55218a72045b"/>
+      <column name="OBJECT_ROWID" value="438537db-0dc6-4aed-b1d1-813011baf88c"/>
+      <column name="OBJECT_TYPE" value="Salesproject"/>
+    </insert>
+    <insert tableName="classification">
+      <column name="CLASSIFICATIONID" value="1743c169-ef67-42b9-81af-99fc753d7a64"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="a0c55ee2-0d15-4779-a5a6-93774d5bc393"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="8c1e8f81-145f-4efe-936f-3f4147f4d59a"/>
+      <column name="OBJECT_ROWID" value="438537db-0dc6-4aed-b1d1-813011baf88c"/>
+      <column name="OBJECT_TYPE" value="Salesproject"/>
+    </insert>
+    <insert tableName="classification">
+      <column name="CLASSIFICATIONID" value="0a7ec07b-d429-4b0a-aebb-0a194e76428e"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="bf6b1757-11da-49a9-a02c-8340139968ee"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="a43189fc-b712-45ed-9398-58d6e15760ca"/>
+      <column name="OBJECT_ROWID" value="438537db-0dc6-4aed-b1d1-813011baf88c"/>
+      <column name="OBJECT_TYPE" value="Salesproject"/>
+    </insert>
+    <insert tableName="classification">
+      <column name="CLASSIFICATIONID" value="b6d36680-909d-4470-9bf4-0a8b8a7807b1"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="c328cb9e-5cef-4052-a3c1-98e1898eeb63"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="f4d3791e-1717-4473-987b-0cd751805387"/>
       <column name="OBJECT_ROWID" value="438537db-0dc6-4aed-b1d1-813011baf88c"/>
       <column name="OBJECT_TYPE" value="Salesproject"/>
     </insert>
+    
+    <insert tableName="classification">
+      <column name="CLASSIFICATIONID" value="93f4dfdf-b07b-4dc5-91a3-7db80cc314fc"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="3c9ceefa-5c98-4629-9c6d-d46b6cad8b78"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="382b311e-b2b2-49da-b6e1-339afae92657"/>
+      <column name="OBJECT_ROWID" value="ef7f4726-4476-4f59-97c2-706dc1e0046f"/>
+      <column name="OBJECT_TYPE" value="Salesproject"/>
+    </insert>
+    <insert tableName="classification">
+      <column name="CLASSIFICATIONID" value="1180d429-0453-4b67-a805-7dc101e6ead2"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="3fe9f04b-6a85-4a73-a138-ca90b6d8e61c"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="4977ba88-074c-4fe5-b04a-97c9a5eae982"/>
+      <column name="OBJECT_ROWID" value="ef7f4726-4476-4f59-97c2-706dc1e0046f"/>
+      <column name="OBJECT_TYPE" value="Salesproject"/>
+    </insert>
+    <insert tableName="classification">
+      <column name="CLASSIFICATIONID" value="b38101bf-3d36-4509-9637-a428beb9999a"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="2fdb4d7e-24d5-4eb1-a130-3a0aaeebd8db"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="54128957-c80b-4b5a-ad1b-cfce665dfb10"/>
+      <column name="OBJECT_ROWID" value="ef7f4726-4476-4f59-97c2-706dc1e0046f"/>
+      <column name="OBJECT_TYPE" value="Salesproject"/>
+    </insert>
+    <insert tableName="classification">
+      <column name="CLASSIFICATIONID" value="c28d914e-ad91-4202-9fe6-0d0d41e53836"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="3dc5fc76-d2d5-4911-891a-3aacc5a9c925"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="2031525e-6ca3-46b4-91d4-7f90cd31a630"/>
+      <column name="OBJECT_ROWID" value="ef7f4726-4476-4f59-97c2-706dc1e0046f"/>
+      <column name="OBJECT_TYPE" value="Salesproject"/>
+    </insert>
+    <insert tableName="classification">
+      <column name="CLASSIFICATIONID" value="0969044c-33eb-41eb-9aec-fa3795d8c49f"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="3e1e21b0-c10d-4bcb-882c-ac1b239b9cb2"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="2a702a31-9907-4f1b-abfd-3342640f1c9e"/>
+      <column name="OBJECT_ROWID" value="ef7f4726-4476-4f59-97c2-706dc1e0046f"/>
+      <column name="OBJECT_TYPE" value="Salesproject"/>
+    </insert>
+    <insert tableName="classification">
+      <column name="CLASSIFICATIONID" value="6e187a9b-2e57-4da2-8132-9f576a28d6f7"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="2f4fddd2-be83-4190-99c3-6de8a7e328c5"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="d8091374-f3fd-41dc-8468-91469618c6fc"/>
+      <column name="OBJECT_ROWID" value="ef7f4726-4476-4f59-97c2-706dc1e0046f"/>
+      <column name="OBJECT_TYPE" value="Salesproject"/>
+    </insert>
+    <insert tableName="classification">
+      <column name="CLASSIFICATIONID" value="4d67d40e-4656-46b0-b5a0-9c299c1ef9d3"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="f1534026-34cc-4898-8711-41cbe4accb60"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="31c169aa-ba5b-4f9d-9dd3-b0d0e8d1b632"/>
+      <column name="OBJECT_ROWID" value="ef7f4726-4476-4f59-97c2-706dc1e0046f"/>
+      <column name="OBJECT_TYPE" value="Salesproject"/>
+    </insert>
+    <insert tableName="classification">
+      <column name="CLASSIFICATIONID" value="58642867-f8fc-45c1-a926-06306498a9c8"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="d5beb18f-c53e-438d-8b0b-7699aa20fba7"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="57604bc1-d99f-4d61-b28d-55218a72045b"/>
+      <column name="OBJECT_ROWID" value="ef7f4726-4476-4f59-97c2-706dc1e0046f"/>
+      <column name="OBJECT_TYPE" value="Salesproject"/>
+    </insert>
+    <insert tableName="classification">
+      <column name="CLASSIFICATIONID" value="6bbe5de0-4302-4467-9f3b-a0292485b214"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="a0c55ee2-0d15-4779-a5a6-93774d5bc393"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="8c1e8f81-145f-4efe-936f-3f4147f4d59a"/>
+      <column name="OBJECT_ROWID" value="ef7f4726-4476-4f59-97c2-706dc1e0046f"/>
+      <column name="OBJECT_TYPE" value="Salesproject"/>
+    </insert>
+    <insert tableName="classification">
+      <column name="CLASSIFICATIONID" value="1ec41224-e21c-4adf-8b7c-235eca10801c"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="bf6b1757-11da-49a9-a02c-8340139968ee"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="a43189fc-b712-45ed-9398-58d6e15760ca"/>
+      <column name="OBJECT_ROWID" value="ef7f4726-4476-4f59-97c2-706dc1e0046f"/>
+      <column name="OBJECT_TYPE" value="Salesproject"/>
+    </insert>
+    <insert tableName="classification">
+      <column name="CLASSIFICATIONID" value="4164397b-a129-4e37-9586-af6e6133befd"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="c328cb9e-5cef-4052-a3c1-98e1898eeb63"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="f4d3791e-1717-4473-987b-0cd751805387"/>
+      <column name="OBJECT_ROWID" value="ef7f4726-4476-4f59-97c2-706dc1e0046f"/>
+      <column name="OBJECT_TYPE" value="Salesproject"/>
+    </insert>
+
+    <insert tableName="classification">
+      <column name="CLASSIFICATIONID" value="6111dd76-4786-43bf-b6ce-74b36415ad03"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="3c9ceefa-5c98-4629-9c6d-d46b6cad8b78"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="382b311e-b2b2-49da-b6e1-339afae92657"/>
+      <column name="OBJECT_ROWID" value="7e2680f6-a438-45aa-956a-787363f85923"/>
+      <column name="OBJECT_TYPE" value="Salesproject"/>
+    </insert>
+    <insert tableName="classification">
+      <column name="CLASSIFICATIONID" value="9cc46dc2-f40a-4c3b-aabd-c77858f5d770"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="3fe9f04b-6a85-4a73-a138-ca90b6d8e61c"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="4977ba88-074c-4fe5-b04a-97c9a5eae982"/>
+      <column name="OBJECT_ROWID" value="7e2680f6-a438-45aa-956a-787363f85923"/>
+      <column name="OBJECT_TYPE" value="Salesproject"/>
+    </insert>
+    <insert tableName="classification">
+      <column name="CLASSIFICATIONID" value="045365c1-9561-4e4f-ad9b-9ce6ef0d0279"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="2fdb4d7e-24d5-4eb1-a130-3a0aaeebd8db"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="54128957-c80b-4b5a-ad1b-cfce665dfb10"/>
+      <column name="OBJECT_ROWID" value="7e2680f6-a438-45aa-956a-787363f85923"/>
+      <column name="OBJECT_TYPE" value="Salesproject"/>
+    </insert>
+    <insert tableName="classification">
+      <column name="CLASSIFICATIONID" value="cd531b73-1390-498e-a83d-a50c964c24ea"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="3dc5fc76-d2d5-4911-891a-3aacc5a9c925"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="2031525e-6ca3-46b4-91d4-7f90cd31a630"/>
+      <column name="OBJECT_ROWID" value="7e2680f6-a438-45aa-956a-787363f85923"/>
+      <column name="OBJECT_TYPE" value="Salesproject"/>
+    </insert>
+    <insert tableName="classification">
+      <column name="CLASSIFICATIONID" value="8f44739a-7103-4dd3-8f1f-25afbae07cd0"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="3e1e21b0-c10d-4bcb-882c-ac1b239b9cb2"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="2a702a31-9907-4f1b-abfd-3342640f1c9e"/>
+      <column name="OBJECT_ROWID" value="7e2680f6-a438-45aa-956a-787363f85923"/>
+      <column name="OBJECT_TYPE" value="Salesproject"/>
+    </insert>
+    <insert tableName="classification">
+      <column name="CLASSIFICATIONID" value="02f2f9a4-0d34-472a-b8b2-461fad057c4e"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="ba5d70c3-e77a-45ff-828b-7b3e0a61eec2"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="d8091374-f3fd-41dc-8468-91469618c6fc"/>
+      <column name="OBJECT_ROWID" value="7e2680f6-a438-45aa-956a-787363f85923"/>
+      <column name="OBJECT_TYPE" value="Salesproject"/>
+    </insert>
+    <insert tableName="classification">
+      <column name="CLASSIFICATIONID" value="3f410195-bca5-41ac-a819-a8d29506f9e5"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="47ec3dbf-f8f6-4418-8dc2-0062510c1a28"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="31c169aa-ba5b-4f9d-9dd3-b0d0e8d1b632"/>
+      <column name="OBJECT_ROWID" value="7e2680f6-a438-45aa-956a-787363f85923"/>
+      <column name="OBJECT_TYPE" value="Salesproject"/>
+    </insert>
+    <insert tableName="classification">
+      <column name="CLASSIFICATIONID" value="77a11bd3-a521-4701-b564-7f8b07000f0b"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="d5beb18f-c53e-438d-8b0b-7699aa20fba7"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="57604bc1-d99f-4d61-b28d-55218a72045b"/>
+      <column name="OBJECT_ROWID" value="7e2680f6-a438-45aa-956a-787363f85923"/>
+      <column name="OBJECT_TYPE" value="Salesproject"/>
+    </insert>
+    <insert tableName="classification">
+      <column name="CLASSIFICATIONID" value="9aa3789c-bc9d-43cf-a121-2575090c2dc4"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="a0c55ee2-0d15-4779-a5a6-93774d5bc393"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="8c1e8f81-145f-4efe-936f-3f4147f4d59a"/>
+      <column name="OBJECT_ROWID" value="7e2680f6-a438-45aa-956a-787363f85923"/>
+      <column name="OBJECT_TYPE" value="Salesproject"/>
+    </insert>
+    <insert tableName="classification">
+      <column name="CLASSIFICATIONID" value="fbc32ea9-8350-463a-846e-71a30851f15a"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="bf6b1757-11da-49a9-a02c-8340139968ee"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="a43189fc-b712-45ed-9398-58d6e15760ca"/>
+      <column name="OBJECT_ROWID" value="7e2680f6-a438-45aa-956a-787363f85923"/>
+      <column name="OBJECT_TYPE" value="Salesproject"/>
+    </insert>
+    <insert tableName="classification">
+      <column name="CLASSIFICATIONID" value="3e9b7598-39a6-4ebc-aa49-8ec3a20f9eb4"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="c328cb9e-5cef-4052-a3c1-98e1898eeb63"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="f4d3791e-1717-4473-987b-0cd751805387"/>
+      <column name="OBJECT_ROWID" value="7e2680f6-a438-45aa-956a-787363f85923"/>
+      <column name="OBJECT_TYPE" value="Salesproject"/>
+    </insert>
+    
+    <insert tableName="classification">
+      <column name="CLASSIFICATIONID" value="80beaf88-415d-49da-ae0b-c4d6528747a2"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="3c9ceefa-5c98-4629-9c6d-d46b6cad8b78"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="382b311e-b2b2-49da-b6e1-339afae92657"/>
+      <column name="OBJECT_ROWID" value="ebb04ae2-d1f9-4ef3-bdfa-e9f562d215ba"/>
+      <column name="OBJECT_TYPE" value="Salesproject"/>
+    </insert>
+    <insert tableName="classification">
+      <column name="CLASSIFICATIONID" value="053f18d1-8fe2-4a79-978d-03cc37454ffe"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="3fe9f04b-6a85-4a73-a138-ca90b6d8e61c"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="4977ba88-074c-4fe5-b04a-97c9a5eae982"/>
+      <column name="OBJECT_ROWID" value="ebb04ae2-d1f9-4ef3-bdfa-e9f562d215ba"/>
+      <column name="OBJECT_TYPE" value="Salesproject"/>
+    </insert>
+    <insert tableName="classification">
+      <column name="CLASSIFICATIONID" value="208c8324-e7f9-41b9-93ec-ac7e7f7262b7"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="2fdb4d7e-24d5-4eb1-a130-3a0aaeebd8db"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="54128957-c80b-4b5a-ad1b-cfce665dfb10"/>
+      <column name="OBJECT_ROWID" value="ebb04ae2-d1f9-4ef3-bdfa-e9f562d215ba"/>
+      <column name="OBJECT_TYPE" value="Salesproject"/>
+    </insert>
+    <insert tableName="classification">
+      <column name="CLASSIFICATIONID" value="9f85a0f0-6576-4077-99fc-953d8ab53352"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="3dc5fc76-d2d5-4911-891a-3aacc5a9c925"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="2031525e-6ca3-46b4-91d4-7f90cd31a630"/>
+      <column name="OBJECT_ROWID" value="ebb04ae2-d1f9-4ef3-bdfa-e9f562d215ba"/>
+      <column name="OBJECT_TYPE" value="Salesproject"/>
+    </insert>
+    <insert tableName="classification">
+      <column name="CLASSIFICATIONID" value="c4dc8a62-edc1-4af6-b7c6-f91f6ab700c5"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="3e1e21b0-c10d-4bcb-882c-ac1b239b9cb2"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="2a702a31-9907-4f1b-abfd-3342640f1c9e"/>
+      <column name="OBJECT_ROWID" value="ebb04ae2-d1f9-4ef3-bdfa-e9f562d215ba"/>
+      <column name="OBJECT_TYPE" value="Salesproject"/>
+    </insert>
+    <insert tableName="classification">
+      <column name="CLASSIFICATIONID" value="122116f6-e858-4605-af18-6c8b21da6455"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="2f4fddd2-be83-4190-99c3-6de8a7e328c5"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="d8091374-f3fd-41dc-8468-91469618c6fc"/>
+      <column name="OBJECT_ROWID" value="ebb04ae2-d1f9-4ef3-bdfa-e9f562d215ba"/>
+      <column name="OBJECT_TYPE" value="Salesproject"/>
+    </insert>
+    <insert tableName="classification">
+      <column name="CLASSIFICATIONID" value="3da8549a-762a-438f-9878-271c52943fd2"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="7e569319-5885-452e-9331-a507f3365236"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="31c169aa-ba5b-4f9d-9dd3-b0d0e8d1b632"/>
+      <column name="OBJECT_ROWID" value="ebb04ae2-d1f9-4ef3-bdfa-e9f562d215ba"/>
+      <column name="OBJECT_TYPE" value="Salesproject"/>
+    </insert>
+    <insert tableName="classification">
+      <column name="CLASSIFICATIONID" value="28405f79-a635-4ede-8b11-11284c5e7190"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="636af750-fcd3-4480-bfe7-ead42bf85280"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="57604bc1-d99f-4d61-b28d-55218a72045b"/>
+      <column name="OBJECT_ROWID" value="ebb04ae2-d1f9-4ef3-bdfa-e9f562d215ba"/>
+      <column name="OBJECT_TYPE" value="Salesproject"/>
+    </insert>
+    <insert tableName="classification">
+      <column name="CLASSIFICATIONID" value="905cae71-9e4b-48f2-9de3-fcb8607d01a1"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="a0c55ee2-0d15-4779-a5a6-93774d5bc393"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="8c1e8f81-145f-4efe-936f-3f4147f4d59a"/>
+      <column name="OBJECT_ROWID" value="ebb04ae2-d1f9-4ef3-bdfa-e9f562d215ba"/>
+      <column name="OBJECT_TYPE" value="Salesproject"/>
+    </insert>
+    <insert tableName="classification">
+      <column name="CLASSIFICATIONID" value="d33aeb65-0c28-48a1-9a81-105faa882a4c"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="c9d4e28d-7935-42c5-9da5-5ce0b51b425a"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="a43189fc-b712-45ed-9398-58d6e15760ca"/>
+      <column name="OBJECT_ROWID" value="ebb04ae2-d1f9-4ef3-bdfa-e9f562d215ba"/>
+      <column name="OBJECT_TYPE" value="Salesproject"/>
+    </insert>
+    <insert tableName="classification">
+      <column name="CLASSIFICATIONID" value="da44d022-9ea6-4fcb-9491-c5b7236c642f"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="b3792b08-4b07-4ed2-9bee-4673182b7349"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="f4d3791e-1717-4473-987b-0cd751805387"/>
+      <column name="OBJECT_ROWID" value="ebb04ae2-d1f9-4ef3-bdfa-e9f562d215ba"/>
+      <column name="OBJECT_TYPE" value="Salesproject"/>
+    </insert>
+
+    <insert tableName="classification">
+      <column name="CLASSIFICATIONID" value="3672003e-0624-4a51-bb15-48f93bbd4342"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="39547328-ccc6-47ad-b31a-d6a149081c44"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="382b311e-b2b2-49da-b6e1-339afae92657"/>
+      <column name="OBJECT_ROWID" value="6d3d16cd-733e-41d1-ab6c-8a6cba63ba4a"/>
+      <column name="OBJECT_TYPE" value="Salesproject"/>
+    </insert>
+    <insert tableName="classification">
+      <column name="CLASSIFICATIONID" value="a027bccd-c894-443e-bdde-f32ee0b88285"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="1f924d71-c500-4cdd-bc52-4718a6b88e45"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="4977ba88-074c-4fe5-b04a-97c9a5eae982"/>
+      <column name="OBJECT_ROWID" value="6d3d16cd-733e-41d1-ab6c-8a6cba63ba4a"/>
+      <column name="OBJECT_TYPE" value="Salesproject"/>
+    </insert>
+    <insert tableName="classification">
+      <column name="CLASSIFICATIONID" value="e10a5ecb-b0f3-4b08-a380-de1a04fbc87f"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="a177b155-4665-4af1-b50e-0b59e8ac2752"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="54128957-c80b-4b5a-ad1b-cfce665dfb10"/>
+      <column name="OBJECT_ROWID" value="6d3d16cd-733e-41d1-ab6c-8a6cba63ba4a"/>
+      <column name="OBJECT_TYPE" value="Salesproject"/>
+    </insert>
+    <insert tableName="classification">
+      <column name="CLASSIFICATIONID" value="b7d6e658-96b3-4664-b7db-139b73add7e3"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="e70a23b4-f2a9-4438-8ba6-742c6c17e5cc"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="2031525e-6ca3-46b4-91d4-7f90cd31a630"/>
+      <column name="OBJECT_ROWID" value="6d3d16cd-733e-41d1-ab6c-8a6cba63ba4a"/>
+      <column name="OBJECT_TYPE" value="Salesproject"/>
+    </insert>
+    <insert tableName="classification">
+      <column name="CLASSIFICATIONID" value="6382b5d7-06a3-4584-8314-e00abdd8e8e9"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="3e1e21b0-c10d-4bcb-882c-ac1b239b9cb2"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="2a702a31-9907-4f1b-abfd-3342640f1c9e"/>
+      <column name="OBJECT_ROWID" value="6d3d16cd-733e-41d1-ab6c-8a6cba63ba4a"/>
+      <column name="OBJECT_TYPE" value="Salesproject"/>
+    </insert>
+    <insert tableName="classification">
+      <column name="CLASSIFICATIONID" value="94a83ec1-8e6d-4c1b-90a0-54eeac52277b"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="ba5d70c3-e77a-45ff-828b-7b3e0a61eec2"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="d8091374-f3fd-41dc-8468-91469618c6fc"/>
+      <column name="OBJECT_ROWID" value="6d3d16cd-733e-41d1-ab6c-8a6cba63ba4a"/>
+      <column name="OBJECT_TYPE" value="Salesproject"/>
+    </insert>
+    <insert tableName="classification">
+      <column name="CLASSIFICATIONID" value="6017fea2-7e31-4220-86f4-cf72123af805"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="47ec3dbf-f8f6-4418-8dc2-0062510c1a28"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="31c169aa-ba5b-4f9d-9dd3-b0d0e8d1b632"/>
+      <column name="OBJECT_ROWID" value="6d3d16cd-733e-41d1-ab6c-8a6cba63ba4a"/>
+      <column name="OBJECT_TYPE" value="Salesproject"/>
+    </insert>
+    <insert tableName="classification">
+      <column name="CLASSIFICATIONID" value="dfaec9c0-d9fa-4362-a955-341addc3a76d"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="d5beb18f-c53e-438d-8b0b-7699aa20fba7"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="57604bc1-d99f-4d61-b28d-55218a72045b"/>
+      <column name="OBJECT_ROWID" value="6d3d16cd-733e-41d1-ab6c-8a6cba63ba4a"/>
+      <column name="OBJECT_TYPE" value="Salesproject"/>
+    </insert>
+    <insert tableName="classification">
+      <column name="CLASSIFICATIONID" value="a28dd724-cd0b-48f4-afd5-840ddc611026"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="a0c55ee2-0d15-4779-a5a6-93774d5bc393"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="8c1e8f81-145f-4efe-936f-3f4147f4d59a"/>
+      <column name="OBJECT_ROWID" value="6d3d16cd-733e-41d1-ab6c-8a6cba63ba4a"/>
+      <column name="OBJECT_TYPE" value="Salesproject"/>
+    </insert>
+    <insert tableName="classification">
+      <column name="CLASSIFICATIONID" value="25bfa0ce-433a-4bb9-992c-df66b02a76da"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="6bd19de4-691b-4e78-84dc-cf6f41231978"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="a43189fc-b712-45ed-9398-58d6e15760ca"/>
+      <column name="OBJECT_ROWID" value="6d3d16cd-733e-41d1-ab6c-8a6cba63ba4a"/>
+      <column name="OBJECT_TYPE" value="Salesproject"/>
+    </insert>
+    <insert tableName="classification">
+      <column name="CLASSIFICATIONID" value="b06e62a0-53b0-4046-b024-b00293e632f2"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="b3792b08-4b07-4ed2-9bee-4673182b7349"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="f4d3791e-1717-4473-987b-0cd751805387"/>
+      <column name="OBJECT_ROWID" value="6d3d16cd-733e-41d1-ab6c-8a6cba63ba4a"/>
+      <column name="OBJECT_TYPE" value="Salesproject"/>
+    </insert>
+    
+    <insert tableName="classification">
+      <column name="CLASSIFICATIONID" value="58671a19-6522-46e6-93ba-8f62bf580048"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="3c9ceefa-5c98-4629-9c6d-d46b6cad8b78"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="382b311e-b2b2-49da-b6e1-339afae92657"/>
+      <column name="OBJECT_ROWID" value="d422ad81-717f-42b0-bd64-fc892744aac7"/>
+      <column name="OBJECT_TYPE" value="Salesproject"/>
+    </insert>
+    <insert tableName="classification">
+      <column name="CLASSIFICATIONID" value="2a9353ec-78c3-42ae-836f-dcec0a4cfaad"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="3fe9f04b-6a85-4a73-a138-ca90b6d8e61c"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="4977ba88-074c-4fe5-b04a-97c9a5eae982"/>
+      <column name="OBJECT_ROWID" value="d422ad81-717f-42b0-bd64-fc892744aac7"/>
+      <column name="OBJECT_TYPE" value="Salesproject"/>
+    </insert>
+    <insert tableName="classification">
+      <column name="CLASSIFICATIONID" value="2abfbf1f-8f2c-4713-a61b-13ba593d1055"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="2fdb4d7e-24d5-4eb1-a130-3a0aaeebd8db"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="54128957-c80b-4b5a-ad1b-cfce665dfb10"/>
+      <column name="OBJECT_ROWID" value="d422ad81-717f-42b0-bd64-fc892744aac7"/>
+      <column name="OBJECT_TYPE" value="Salesproject"/>
+    </insert>
+    <insert tableName="classification">
+      <column name="CLASSIFICATIONID" value="a3e22367-c33f-4f2c-ad0c-8f9eb6ab572a"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="3dc5fc76-d2d5-4911-891a-3aacc5a9c925"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="2031525e-6ca3-46b4-91d4-7f90cd31a630"/>
+      <column name="OBJECT_ROWID" value="d422ad81-717f-42b0-bd64-fc892744aac7"/>
+      <column name="OBJECT_TYPE" value="Salesproject"/>
+    </insert>
+    <insert tableName="classification">
+      <column name="CLASSIFICATIONID" value="297cc1a1-1813-4f30-ad70-b452292c3371"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="3e1e21b0-c10d-4bcb-882c-ac1b239b9cb2"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="2a702a31-9907-4f1b-abfd-3342640f1c9e"/>
+      <column name="OBJECT_ROWID" value="d422ad81-717f-42b0-bd64-fc892744aac7"/>
+      <column name="OBJECT_TYPE" value="Salesproject"/>
+    </insert>
+    <insert tableName="classification">
+      <column name="CLASSIFICATIONID" value="0521dd6e-49ca-4a3a-9906-12e8359e3db9"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="2f4fddd2-be83-4190-99c3-6de8a7e328c5"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="d8091374-f3fd-41dc-8468-91469618c6fc"/>
+      <column name="OBJECT_ROWID" value="d422ad81-717f-42b0-bd64-fc892744aac7"/>
+      <column name="OBJECT_TYPE" value="Salesproject"/>
+    </insert>
+    <insert tableName="classification">
+      <column name="CLASSIFICATIONID" value="0fcfa75f-9844-49d7-a088-56e570be4cd0"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="f1534026-34cc-4898-8711-41cbe4accb60"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="31c169aa-ba5b-4f9d-9dd3-b0d0e8d1b632"/>
+      <column name="OBJECT_ROWID" value="d422ad81-717f-42b0-bd64-fc892744aac7"/>
+      <column name="OBJECT_TYPE" value="Salesproject"/>
+    </insert>
+    <insert tableName="classification">
+      <column name="CLASSIFICATIONID" value="9452b219-64af-4c27-8f35-0ba81210abf3"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="d5beb18f-c53e-438d-8b0b-7699aa20fba7"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="57604bc1-d99f-4d61-b28d-55218a72045b"/>
+      <column name="OBJECT_ROWID" value="d422ad81-717f-42b0-bd64-fc892744aac7"/>
+      <column name="OBJECT_TYPE" value="Salesproject"/>
+    </insert>
+    <insert tableName="classification">
+      <column name="CLASSIFICATIONID" value="4e96b522-209b-48ca-b04d-f328416aacdd"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="a0c55ee2-0d15-4779-a5a6-93774d5bc393"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="8c1e8f81-145f-4efe-936f-3f4147f4d59a"/>
+      <column name="OBJECT_ROWID" value="d422ad81-717f-42b0-bd64-fc892744aac7"/>
+      <column name="OBJECT_TYPE" value="Salesproject"/>
+    </insert>
+    <insert tableName="classification">
+      <column name="CLASSIFICATIONID" value="f47c0ea2-3a6d-4d7b-8f89-bb2d9799fd0e"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="bf6b1757-11da-49a9-a02c-8340139968ee"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="a43189fc-b712-45ed-9398-58d6e15760ca"/>
+      <column name="OBJECT_ROWID" value="d422ad81-717f-42b0-bd64-fc892744aac7"/>
+      <column name="OBJECT_TYPE" value="Salesproject"/>
+    </insert>
+    <insert tableName="classification">
+      <column name="CLASSIFICATIONID" value="e90c4086-db5f-4099-ba26-67799eb25e44"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="c328cb9e-5cef-4052-a3c1-98e1898eeb63"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="f4d3791e-1717-4473-987b-0cd751805387"/>
+      <column name="OBJECT_ROWID" value="d422ad81-717f-42b0-bd64-fc892744aac7"/>
+      <column name="OBJECT_TYPE" value="Salesproject"/>
+    </insert>
 
   <insert tableName="classification">
       <column name="CLASSIFICATIONID" value="35b79ed1-7002-44f1-af61-891cdf863ac9"/>
@@ -189,7 +600,7 @@
     
   <insert tableName="classification">
       <column name="CLASSIFICATIONID" value="f7f7022f-57a2-4944-a9d3-e092e1be43b3"/>
-      <column name="CLASSIFICATIONSCORE_ID" value="3eb18b76-f51e-4ad2-9080-74b4a603667b"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="2119cb62-b57c-40be-aff8-ace8e40378d4"/>
       <column name="CLASSIFICATIONTYPE_ID" value="d67397c5-5e05-433b-b61d-12807906aa5a"/>
       <column name="OBJECT_ROWID" value="019651a4-503e-4e06-aefd-e7e631bf3144"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
@@ -203,7 +614,7 @@
     </insert>
     <insert tableName="classification">
       <column name="CLASSIFICATIONID" value="008ac315-31ab-4320-bf29-6681708eda88"/>
-      <column name="CLASSIFICATIONSCORE_ID" value="b41e180f-db8c-44c3-9fbb-179ab58d5852"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="47ca5b54-423f-4bf1-a4d6-a0c55a2488e6"/>
       <column name="CLASSIFICATIONTYPE_ID" value="970b251c-ca6e-43f4-9162-ebc5d1142a8b"/>
       <column name="OBJECT_ROWID" value="019651a4-503e-4e06-aefd-e7e631bf3144"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
@@ -233,7 +644,7 @@
       <column name="CLASSIFICATIONID" value="5f0cdce4-81b4-4c05-9011-4d76bdc21b65"/>
       <column name="CLASSIFICATIONSCORE_ID" value="07f21cf8-c369-45f3-88fe-40ca586ed11b"/>
       <column name="CLASSIFICATIONTYPE_ID" value="f581dcb9-db6f-4a82-995c-695d0a7393d3"/>
-      <column name="OBJECT_ROWID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
+      <column name="OBJECT_ROWID" value="019651a4-503e-4e06-aefd-e7e631bf3144"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
     </insert>
   <insert tableName="classification">
@@ -442,6 +853,70 @@
       <column name="OBJECT_TYPE" value="Organisation"/>
     </insert>
     
+    <insert tableName="classification">
+      <column name="CLASSIFICATIONID" value="3cc8a674-7934-4b8f-b200-bd19ddcb4689"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="618bf0d1-18d4-4a96-900c-80a5a616da9b"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="d67397c5-5e05-433b-b61d-12807906aa5a"/>
+      <column name="OBJECT_ROWID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
+      <column name="OBJECT_TYPE" value="Organisation"/>
+    </insert>
+    <insert tableName="classification">
+      <column name="CLASSIFICATIONID" value="57a2e5d3-0aa9-48a1-89f8-2db8967ffed6"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="b7b763d4-994d-483d-9a1c-6eb85786d61a"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="037a9de1-fa6d-4895-9db3-82f7769682ae"/>
+      <column name="OBJECT_ROWID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
+      <column name="OBJECT_TYPE" value="Organisation"/>
+    </insert>
+    <insert tableName="classification">
+      <column name="CLASSIFICATIONID" value="a3081728-77d9-4c92-96b5-6fa21659a33f"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="47ca5b54-423f-4bf1-a4d6-a0c55a2488e6"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="970b251c-ca6e-43f4-9162-ebc5d1142a8b"/>
+      <column name="OBJECT_ROWID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
+      <column name="OBJECT_TYPE" value="Organisation"/>
+    </insert>
+    <insert tableName="classification">
+      <column name="CLASSIFICATIONID" value="342c7c38-ca79-4e46-9677-5da074ceb60b"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="4d868dc5-747a-4f22-9134-638198d3084a"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="4b72857e-863d-4254-accf-25281bb7bb64"/>
+      <column name="OBJECT_ROWID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
+      <column name="OBJECT_TYPE" value="Organisation"/>
+    </insert>
+    <insert tableName="classification">
+      <column name="CLASSIFICATIONID" value="a3e2d764-bd51-4f06-a0a0-0e5f4b37d41b"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="a60aaf2d-88aa-4c72-9606-0eb3ac9493cf"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="95396ee7-f0e2-41b4-995e-bac5749709ec"/>
+      <column name="OBJECT_ROWID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
+      <column name="OBJECT_TYPE" value="Organisation"/>
+    </insert>
+    <insert tableName="classification">
+      <column name="CLASSIFICATIONID" value="f7504a50-2748-434a-ae08-cff2f4f8035a"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="4982ab85-0961-4d85-8fee-2b55887add96"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="be76dab1-c6ab-4b1e-8322-8b052ccda4d9"/>
+      <column name="OBJECT_ROWID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
+      <column name="OBJECT_TYPE" value="Organisation"/>
+    </insert>
+  <insert tableName="classification">
+      <column name="CLASSIFICATIONID" value="cea579d4-35fa-4376-b791-8b91cbe05d3a"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="07f21cf8-c369-45f3-88fe-40ca586ed11b"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="f581dcb9-db6f-4a82-995c-695d0a7393d3"/>
+      <column name="OBJECT_ROWID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
+      <column name="OBJECT_TYPE" value="Organisation"/>
+    </insert>
+  <insert tableName="classification">
+      <column name="CLASSIFICATIONID" value="c6fe5361-777d-4047-99dd-e8495ebb8c73"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="5be4d454-1f3e-4a3d-b8a4-3eb49ce1bc35"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="4d878689-15c0-46cc-acc8-3c524463db5c"/>
+      <column name="OBJECT_ROWID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
+      <column name="OBJECT_TYPE" value="Organisation"/>
+    </insert>
+  <insert tableName="classification">
+      <column name="CLASSIFICATIONID" value="aa291e2a-646d-4b73-b826-85bd357fd5c0"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="4285d598-06c0-435d-bb5e-28dec5f31521"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="80c6ec8b-eb54-4d25-a4f5-0adaf4cdc84e"/>
+      <column name="OBJECT_ROWID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
+      <column name="OBJECT_TYPE" value="Organisation"/>
+    </insert>
+    
     <insert tableName="classification">
       <column name="CLASSIFICATIONID" value="d70e23a7-bc3c-43ae-8b2c-44d85fc7a2d3"/>
       <column name="CLASSIFICATIONSCORE_ID" value="3eb18b76-f51e-4ad2-9080-74b4a603667b"/>
@@ -458,9 +933,9 @@
     </insert>
     <insert tableName="classification">
       <column name="CLASSIFICATIONID" value="a63b089c-f856-4513-8691-57422e400dc4"/>
-      <column name="CLASSIFICATIONSCORE_ID" value="b41e180f-db8c-44c3-9fbb-179ab58d5852"/>
-      <column name="CLASSIFICATIONTYPE_ID" value="6efb4fab-64f9-4d8e-aa6f-a158d13fc273"/>
-      <column name="OBJECT_ROWID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="47ca5b54-423f-4bf1-a4d6-a0c55a2488e6"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="970b251c-ca6e-43f4-9162-ebc5d1142a8b"/>
+      <column name="OBJECT_ROWID" value="6efb4fab-64f9-4d8e-aa6f-a158d13fc273"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
     </insert>
     <insert tableName="classification">
@@ -506,7 +981,836 @@
       <column name="OBJECT_TYPE" value="Organisation"/>
     </insert>
     
+  <insert tableName="classification">
+      <column name="CLASSIFICATIONID" value="a5ce852a-83e6-4b0e-b3fa-310ea99c7e87"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="4d868dc5-747a-4f22-9134-638198d3084a"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="4b72857e-863d-4254-accf-25281bb7bb64"/>
+      <column name="OBJECT_ROWID" value="8707accf-b1fd-4bde-97b1-ab44b75f66f9"/>
+      <column name="OBJECT_TYPE" value="Organisation"/>
+    </insert>
+    <insert tableName="classification">
+      <column name="CLASSIFICATIONID" value="fc10831b-65ea-4ecb-b52e-98c6f54b2a9a"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="47ca5b54-423f-4bf1-a4d6-a0c55a2488e6"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="970b251c-ca6e-43f4-9162-ebc5d1142a8b"/>
+      <column name="OBJECT_ROWID" value="8707accf-b1fd-4bde-97b1-ab44b75f66f9"/>
+      <column name="OBJECT_TYPE" value="Organisation"/>
+    </insert>
+    <insert tableName="classification">
+      <column name="CLASSIFICATIONID" value="058a9ef7-adca-4278-840a-720665fa3cd3"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="b7b763d4-994d-483d-9a1c-6eb85786d61a"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="037a9de1-fa6d-4895-9db3-82f7769682ae"/>
+      <column name="OBJECT_ROWID" value="8707accf-b1fd-4bde-97b1-ab44b75f66f9"/>
+      <column name="OBJECT_TYPE" value="Organisation"/>
+    </insert>
+    <insert tableName="classification">
+      <column name="CLASSIFICATIONID" value="f11eeaac-645d-416e-a50d-259f6ead0c30"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="22581c2e-bb4d-43cb-b6b3-80244425e209"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="d67397c5-5e05-433b-b61d-12807906aa5a"/>
+      <column name="OBJECT_ROWID" value="8707accf-b1fd-4bde-97b1-ab44b75f66f9"/>
+      <column name="OBJECT_TYPE" value="Organisation"/>
+    </insert>
+    <insert tableName="classification">
+      <column name="CLASSIFICATIONID" value="cb7df4e3-e15c-4e65-92f4-ecd5cda09f95"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="4285d598-06c0-435d-bb5e-28dec5f31521"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="80c6ec8b-eb54-4d25-a4f5-0adaf4cdc84e"/>
+      <column name="OBJECT_ROWID" value="8707accf-b1fd-4bde-97b1-ab44b75f66f9"/>
+      <column name="OBJECT_TYPE" value="Organisation"/>
+    </insert>
+    <insert tableName="classification">
+      <column name="CLASSIFICATIONID" value="dccab9b9-5306-4325-896f-99646139b5ba"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="893720f9-3780-4868-af0c-cbef5a564024"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="4d878689-15c0-46cc-acc8-3c524463db5c"/>
+      <column name="OBJECT_ROWID" value="8707accf-b1fd-4bde-97b1-ab44b75f66f9"/>
+      <column name="OBJECT_TYPE" value="Organisation"/>
+    </insert>
+    <insert tableName="classification">
+      <column name="CLASSIFICATIONID" value="03bb8bbb-0644-4376-99fb-b21fc2807f14"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="29134094-66f2-4331-9f14-fc6a27ab111e"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="f581dcb9-db6f-4a82-995c-695d0a7393d3"/>
+      <column name="OBJECT_ROWID" value="8707accf-b1fd-4bde-97b1-ab44b75f66f9"/>
+      <column name="OBJECT_TYPE" value="Organisation"/>
+    </insert>
+    <insert tableName="classification">
+      <column name="CLASSIFICATIONID" value="5ce0c1b0-c040-462e-bd19-c8e109449b8e"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="4982ab85-0961-4d85-8fee-2b55887add96"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="be76dab1-c6ab-4b1e-8322-8b052ccda4d9"/>
+      <column name="OBJECT_ROWID" value="8707accf-b1fd-4bde-97b1-ab44b75f66f9"/>
+      <column name="OBJECT_TYPE" value="Organisation"/>
+    </insert>
+    <insert tableName="classification">
+      <column name="CLASSIFICATIONID" value="a728d498-dd75-4b96-a5e5-cbdccd10b0b2"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="4ed5e22f-222a-4a51-83d3-597fa035d2df"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="95396ee7-f0e2-41b4-995e-bac5749709ec"/>
+      <column name="OBJECT_ROWID" value="8707accf-b1fd-4bde-97b1-ab44b75f66f9"/>
+      <column name="OBJECT_TYPE" value="Organisation"/>
+    </insert>
+    
+    <insert tableName="classification">
+      <column name="CLASSIFICATIONID" value="b923621f-e48e-4a77-9f67-f63f5a0b0fbb"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="4d868dc5-747a-4f22-9134-638198d3084a"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="4b72857e-863d-4254-accf-25281bb7bb64"/>
+      <column name="OBJECT_ROWID" value="e450d126-eab8-4517-ba7c-8b6804f8c859"/>
+      <column name="OBJECT_TYPE" value="Organisation"/>
+    </insert>
+    <insert tableName="classification">
+      <column name="CLASSIFICATIONID" value="9c457191-c7c7-4a4f-bb91-8a48d27add92"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="47ca5b54-423f-4bf1-a4d6-a0c55a2488e6"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="970b251c-ca6e-43f4-9162-ebc5d1142a8b"/>
+      <column name="OBJECT_ROWID" value="e450d126-eab8-4517-ba7c-8b6804f8c859"/>
+      <column name="OBJECT_TYPE" value="Organisation"/>
+    </insert>
+    <insert tableName="classification">
+      <column name="CLASSIFICATIONID" value="d6d64590-9299-4348-8e21-0cac9f84f51a"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="b7b763d4-994d-483d-9a1c-6eb85786d61a"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="037a9de1-fa6d-4895-9db3-82f7769682ae"/>
+      <column name="OBJECT_ROWID" value="e450d126-eab8-4517-ba7c-8b6804f8c859"/>
+      <column name="OBJECT_TYPE" value="Organisation"/>
+    </insert>
+    <insert tableName="classification">
+      <column name="CLASSIFICATIONID" value="da16c6c0-3bdf-4af5-b810-e85babe83e69"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="22581c2e-bb4d-43cb-b6b3-80244425e209"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="d67397c5-5e05-433b-b61d-12807906aa5a"/>
+      <column name="OBJECT_ROWID" value="e450d126-eab8-4517-ba7c-8b6804f8c859"/>
+      <column name="OBJECT_TYPE" value="Organisation"/>
+    </insert>
+    <insert tableName="classification">
+      <column name="CLASSIFICATIONID" value="9fcf5382-f070-4698-a011-748c8584733b"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="5564a330-8c13-424f-a24b-5f97185a9036"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="80c6ec8b-eb54-4d25-a4f5-0adaf4cdc84e"/>
+      <column name="OBJECT_ROWID" value="e450d126-eab8-4517-ba7c-8b6804f8c859"/>
+      <column name="OBJECT_TYPE" value="Organisation"/>
+    </insert>
+    <insert tableName="classification">
+      <column name="CLASSIFICATIONID" value="a0120295-79d1-429f-aef4-b9cce9c92de2"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="893720f9-3780-4868-af0c-cbef5a564024"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="4d878689-15c0-46cc-acc8-3c524463db5c"/>
+      <column name="OBJECT_ROWID" value="e450d126-eab8-4517-ba7c-8b6804f8c859"/>
+      <column name="OBJECT_TYPE" value="Organisation"/>
+    </insert>
+    <insert tableName="classification">
+      <column name="CLASSIFICATIONID" value="8c792586-2d2d-41a3-933b-6f679dd4011e"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="07f21cf8-c369-45f3-88fe-40ca586ed11b"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="f581dcb9-db6f-4a82-995c-695d0a7393d3"/>
+      <column name="OBJECT_ROWID" value="e450d126-eab8-4517-ba7c-8b6804f8c859"/>
+      <column name="OBJECT_TYPE" value="Organisation"/>
+    </insert>
+    <insert tableName="classification">
+      <column name="CLASSIFICATIONID" value="7d131f29-0430-44ad-b4ec-7044a67e0e3b"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="4982ab85-0961-4d85-8fee-2b55887add96"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="be76dab1-c6ab-4b1e-8322-8b052ccda4d9"/>
+      <column name="OBJECT_ROWID" value="e450d126-eab8-4517-ba7c-8b6804f8c859"/>
+      <column name="OBJECT_TYPE" value="Organisation"/>
+    </insert>
+    <insert tableName="classification">
+      <column name="CLASSIFICATIONID" value="5c1b2604-da33-4268-8400-5fb4b23c436b"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="4ed5e22f-222a-4a51-83d3-597fa035d2df"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="95396ee7-f0e2-41b4-995e-bac5749709ec"/>
+      <column name="OBJECT_ROWID" value="e450d126-eab8-4517-ba7c-8b6804f8c859"/>
+      <column name="OBJECT_TYPE" value="Organisation"/>
+    </insert>
+    
+    <insert tableName="classification">
+      <column name="CLASSIFICATIONID" value="f25ef82a-6466-49c7-aa35-1f4d750218ca"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="92708239-fd7f-4699-8aaa-b6290fedaac0"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="4b72857e-863d-4254-accf-25281bb7bb64"/>
+      <column name="OBJECT_ROWID" value="eda61ea6-35ed-4a92-a93c-6118fc67d533"/>
+      <column name="OBJECT_TYPE" value="Organisation"/>
+    </insert>
+    <insert tableName="classification">
+      <column name="CLASSIFICATIONID" value="fd0fea13-2322-4664-bf15-8026a91bebd2"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="47ca5b54-423f-4bf1-a4d6-a0c55a2488e6"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="970b251c-ca6e-43f4-9162-ebc5d1142a8b"/>
+      <column name="OBJECT_ROWID" value="eda61ea6-35ed-4a92-a93c-6118fc67d533"/>
+      <column name="OBJECT_TYPE" value="Organisation"/>
+    </insert>
+    <insert tableName="classification">
+      <column name="CLASSIFICATIONID" value="a7b9862c-6a25-4bbc-92ec-7bfb25cdb6c0"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="b7b763d4-994d-483d-9a1c-6eb85786d61a"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="037a9de1-fa6d-4895-9db3-82f7769682ae"/>
+      <column name="OBJECT_ROWID" value="eda61ea6-35ed-4a92-a93c-6118fc67d533"/>
+      <column name="OBJECT_TYPE" value="Organisation"/>
+    </insert>
+    <insert tableName="classification">
+      <column name="CLASSIFICATIONID" value="eba1581a-1235-4139-a33a-687513436777"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="4c8cfcec-f183-4d82-8a59-ae743ec772b4"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="d67397c5-5e05-433b-b61d-12807906aa5a"/>
+      <column name="OBJECT_ROWID" value="eda61ea6-35ed-4a92-a93c-6118fc67d533"/>
+      <column name="OBJECT_TYPE" value="Organisation"/>
+    </insert>
+    <insert tableName="classification">
+      <column name="CLASSIFICATIONID" value="c61069c1-fe41-4585-9d75-cef27d534ceb"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="4285d598-06c0-435d-bb5e-28dec5f31521"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="80c6ec8b-eb54-4d25-a4f5-0adaf4cdc84e"/>
+      <column name="OBJECT_ROWID" value="eda61ea6-35ed-4a92-a93c-6118fc67d533"/>
+      <column name="OBJECT_TYPE" value="Organisation"/>
+    </insert>
+    <insert tableName="classification">
+      <column name="CLASSIFICATIONID" value="81deaf11-9f63-4cc8-b83c-8711f5e3f734"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="893720f9-3780-4868-af0c-cbef5a564024"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="4d878689-15c0-46cc-acc8-3c524463db5c"/>
+      <column name="OBJECT_ROWID" value="eda61ea6-35ed-4a92-a93c-6118fc67d533"/>
+      <column name="OBJECT_TYPE" value="Organisation"/>
+    </insert>
+    <insert tableName="classification">
+      <column name="CLASSIFICATIONID" value="a7d7fd5c-624c-4d64-929b-2b0eb146ab9d"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="07f21cf8-c369-45f3-88fe-40ca586ed11b"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="f581dcb9-db6f-4a82-995c-695d0a7393d3"/>
+      <column name="OBJECT_ROWID" value="eda61ea6-35ed-4a92-a93c-6118fc67d533"/>
+      <column name="OBJECT_TYPE" value="Organisation"/>
+    </insert>
+    <insert tableName="classification">
+      <column name="CLASSIFICATIONID" value="d3b5f0ad-1a66-4eee-a40d-36daf317d510"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="4982ab85-0961-4d85-8fee-2b55887add96"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="be76dab1-c6ab-4b1e-8322-8b052ccda4d9"/>
+      <column name="OBJECT_ROWID" value="eda61ea6-35ed-4a92-a93c-6118fc67d533"/>
+      <column name="OBJECT_TYPE" value="Organisation"/>
+    </insert>
+    <insert tableName="classification">
+      <column name="CLASSIFICATIONID" value="597de33c-b223-4d55-bed7-aeb1d161fc2e"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="4ed5e22f-222a-4a51-83d3-597fa035d2df"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="95396ee7-f0e2-41b4-995e-bac5749709ec"/>
+      <column name="OBJECT_ROWID" value="eda61ea6-35ed-4a92-a93c-6118fc67d533"/>
+      <column name="OBJECT_TYPE" value="Organisation"/>
+    </insert>
     
+    <insert tableName="classification">
+      <column name="CLASSIFICATIONID" value="6d3464fa-eadd-4afd-b4e1-3031726770d5"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="4d868dc5-747a-4f22-9134-638198d3084a"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="4b72857e-863d-4254-accf-25281bb7bb64"/>
+      <column name="OBJECT_ROWID" value="cabf6192-f9c3-4bd4-9366-ad2b073bdfa3"/>
+      <column name="OBJECT_TYPE" value="Organisation"/>
+    </insert>
+    <insert tableName="classification">
+      <column name="CLASSIFICATIONID" value="1ac75382-0af9-42d2-8fe5-22295a93e8b3"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="47ca5b54-423f-4bf1-a4d6-a0c55a2488e6"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="970b251c-ca6e-43f4-9162-ebc5d1142a8b"/>
+      <column name="OBJECT_ROWID" value="cabf6192-f9c3-4bd4-9366-ad2b073bdfa3"/>
+      <column name="OBJECT_TYPE" value="Organisation"/>
+    </insert>
+    <insert tableName="classification">
+      <column name="CLASSIFICATIONID" value="522566b0-6eca-40bb-977c-c9a26f730890"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="b7b763d4-994d-483d-9a1c-6eb85786d61a"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="037a9de1-fa6d-4895-9db3-82f7769682ae"/>
+      <column name="OBJECT_ROWID" value="cabf6192-f9c3-4bd4-9366-ad2b073bdfa3"/>
+      <column name="OBJECT_TYPE" value="Organisation"/>
+    </insert>
+    <insert tableName="classification">
+      <column name="CLASSIFICATIONID" value="caaa6b4e-34e3-4337-b65f-abe761a8c24c"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="22581c2e-bb4d-43cb-b6b3-80244425e209"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="d67397c5-5e05-433b-b61d-12807906aa5a"/>
+      <column name="OBJECT_ROWID" value="cabf6192-f9c3-4bd4-9366-ad2b073bdfa3"/>
+      <column name="OBJECT_TYPE" value="Organisation"/>
+    </insert>
+    <insert tableName="classification">
+      <column name="CLASSIFICATIONID" value="e4d83d98-fcf8-402e-9d81-17f374654df7"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="4285d598-06c0-435d-bb5e-28dec5f31521"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="80c6ec8b-eb54-4d25-a4f5-0adaf4cdc84e"/>
+      <column name="OBJECT_ROWID" value="cabf6192-f9c3-4bd4-9366-ad2b073bdfa3"/>
+      <column name="OBJECT_TYPE" value="Organisation"/>
+    </insert>
+    <insert tableName="classification">
+      <column name="CLASSIFICATIONID" value="62b9dacc-7d6f-4e05-81f8-6a425e369489"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="893720f9-3780-4868-af0c-cbef5a564024"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="4d878689-15c0-46cc-acc8-3c524463db5c"/>
+      <column name="OBJECT_ROWID" value="cabf6192-f9c3-4bd4-9366-ad2b073bdfa3"/>
+      <column name="OBJECT_TYPE" value="Organisation"/>
+    </insert>
+    <insert tableName="classification">
+      <column name="CLASSIFICATIONID" value="77941d3d-e876-44b3-b824-3a075d7dd398"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="07f21cf8-c369-45f3-88fe-40ca586ed11b"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="f581dcb9-db6f-4a82-995c-695d0a7393d3"/>
+      <column name="OBJECT_ROWID" value="cabf6192-f9c3-4bd4-9366-ad2b073bdfa3"/>
+      <column name="OBJECT_TYPE" value="Organisation"/>
+    </insert>
+    <insert tableName="classification">
+      <column name="CLASSIFICATIONID" value="a03201a8-0858-45e0-a0e2-9b70f5a35061"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="4982ab85-0961-4d85-8fee-2b55887add96"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="be76dab1-c6ab-4b1e-8322-8b052ccda4d9"/>
+      <column name="OBJECT_ROWID" value="cabf6192-f9c3-4bd4-9366-ad2b073bdfa3"/>
+      <column name="OBJECT_TYPE" value="Organisation"/>
+    </insert>
+    <insert tableName="classification">
+      <column name="CLASSIFICATIONID" value="3056c0b4-5e4b-4580-ab89-75ac80920415"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="4ed5e22f-222a-4a51-83d3-597fa035d2df"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="95396ee7-f0e2-41b4-995e-bac5749709ec"/>
+      <column name="OBJECT_ROWID" value="cabf6192-f9c3-4bd4-9366-ad2b073bdfa3"/>
+      <column name="OBJECT_TYPE" value="Organisation"/>
+    </insert>
     
+    <insert tableName="classification">
+      <column name="CLASSIFICATIONID" value="00c30050-c850-46b0-8e1d-d70f889655e3"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="4d868dc5-747a-4f22-9134-638198d3084a"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="4b72857e-863d-4254-accf-25281bb7bb64"/>
+      <column name="OBJECT_ROWID" value="a3fd3c23-12e1-4820-b76e-2cd70103d94d"/>
+      <column name="OBJECT_TYPE" value="Organisation"/>
+    </insert>
+    <insert tableName="classification">
+      <column name="CLASSIFICATIONID" value="4444b22f-02d1-4e8f-9073-82d61eba18e0"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="47ca5b54-423f-4bf1-a4d6-a0c55a2488e6"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="970b251c-ca6e-43f4-9162-ebc5d1142a8b"/>
+      <column name="OBJECT_ROWID" value="a3fd3c23-12e1-4820-b76e-2cd70103d94d"/>
+      <column name="OBJECT_TYPE" value="Organisation"/>
+    </insert>
+    <insert tableName="classification">
+      <column name="CLASSIFICATIONID" value="f5e4ebc2-e0a7-4ab0-b7e1-dc43c2913135"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="b7b763d4-994d-483d-9a1c-6eb85786d61a"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="037a9de1-fa6d-4895-9db3-82f7769682ae"/>
+      <column name="OBJECT_ROWID" value="a3fd3c23-12e1-4820-b76e-2cd70103d94d"/>
+      <column name="OBJECT_TYPE" value="Organisation"/>
+    </insert>
+    <insert tableName="classification">
+      <column name="CLASSIFICATIONID" value="b6ed4614-ea3d-4b2d-a9c3-44d146724b71"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="22581c2e-bb4d-43cb-b6b3-80244425e209"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="d67397c5-5e05-433b-b61d-12807906aa5a"/>
+      <column name="OBJECT_ROWID" value="a3fd3c23-12e1-4820-b76e-2cd70103d94d"/>
+      <column name="OBJECT_TYPE" value="Organisation"/>
+    </insert>
+    <insert tableName="classification">
+      <column name="CLASSIFICATIONID" value="e7a7da18-7283-4d75-ab9f-06f62972293c"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="5564a330-8c13-424f-a24b-5f97185a9036"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="80c6ec8b-eb54-4d25-a4f5-0adaf4cdc84e"/>
+      <column name="OBJECT_ROWID" value="a3fd3c23-12e1-4820-b76e-2cd70103d94d"/>
+      <column name="OBJECT_TYPE" value="Organisation"/>
+    </insert>
+    <insert tableName="classification">
+      <column name="CLASSIFICATIONID" value="d6443737-e23b-42fa-81a8-d5e86636fb79"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="893720f9-3780-4868-af0c-cbef5a564024"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="4d878689-15c0-46cc-acc8-3c524463db5c"/>
+      <column name="OBJECT_ROWID" value="a3fd3c23-12e1-4820-b76e-2cd70103d94d"/>
+      <column name="OBJECT_TYPE" value="Organisation"/>
+    </insert>
+    <insert tableName="classification">
+      <column name="CLASSIFICATIONID" value="94a737b7-d4f6-4a13-b06b-05a225d9225b"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="07f21cf8-c369-45f3-88fe-40ca586ed11b"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="f581dcb9-db6f-4a82-995c-695d0a7393d3"/>
+      <column name="OBJECT_ROWID" value="a3fd3c23-12e1-4820-b76e-2cd70103d94d"/>
+      <column name="OBJECT_TYPE" value="Organisation"/>
+    </insert>
+    <insert tableName="classification">
+      <column name="CLASSIFICATIONID" value="319dec0d-5ed5-40f8-8c98-b912582a8817"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="4982ab85-0961-4d85-8fee-2b55887add96"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="be76dab1-c6ab-4b1e-8322-8b052ccda4d9"/>
+      <column name="OBJECT_ROWID" value="a3fd3c23-12e1-4820-b76e-2cd70103d94d"/>
+      <column name="OBJECT_TYPE" value="Organisation"/>
+    </insert>
+    <insert tableName="classification">
+      <column name="CLASSIFICATIONID" value="22429945-9c82-493c-a0a6-ff31ecaa4b56"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="4ed5e22f-222a-4a51-83d3-597fa035d2df"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="95396ee7-f0e2-41b4-995e-bac5749709ec"/>
+      <column name="OBJECT_ROWID" value="a3fd3c23-12e1-4820-b76e-2cd70103d94d"/>
+      <column name="OBJECT_TYPE" value="Organisation"/>
+    </insert>
+    
+    <insert tableName="classification">
+      <column name="CLASSIFICATIONID" value="a898ffe5-96ec-4eef-9e0c-6a2622fc74fc"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="92708239-fd7f-4699-8aaa-b6290fedaac0"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="4b72857e-863d-4254-accf-25281bb7bb64"/>
+      <column name="OBJECT_ROWID" value="e83c45e0-c30b-436e-b445-00a8b58383b0"/>
+      <column name="OBJECT_TYPE" value="Organisation"/>
+    </insert>
+    <insert tableName="classification">
+      <column name="CLASSIFICATIONID" value="0f77577a-7a45-4c3f-be39-35ec364e8242"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="47ca5b54-423f-4bf1-a4d6-a0c55a2488e6"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="970b251c-ca6e-43f4-9162-ebc5d1142a8b"/>
+      <column name="OBJECT_ROWID" value="e83c45e0-c30b-436e-b445-00a8b58383b0"/>
+      <column name="OBJECT_TYPE" value="Organisation"/>
+    </insert>
+    <insert tableName="classification">
+      <column name="CLASSIFICATIONID" value="cf051c11-5f8e-401c-8e57-aabc55496eb8"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="b7b763d4-994d-483d-9a1c-6eb85786d61a"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="037a9de1-fa6d-4895-9db3-82f7769682ae"/>
+      <column name="OBJECT_ROWID" value="e83c45e0-c30b-436e-b445-00a8b58383b0"/>
+      <column name="OBJECT_TYPE" value="Organisation"/>
+    </insert>
+    <insert tableName="classification">
+      <column name="CLASSIFICATIONID" value="d18a0dec-5161-488d-958d-3d9ea88f32f3"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="4c8cfcec-f183-4d82-8a59-ae743ec772b4"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="d67397c5-5e05-433b-b61d-12807906aa5a"/>
+      <column name="OBJECT_ROWID" value="e83c45e0-c30b-436e-b445-00a8b58383b0"/>
+      <column name="OBJECT_TYPE" value="Organisation"/>
+    </insert>
+    <insert tableName="classification">
+      <column name="CLASSIFICATIONID" value="0359b7b8-7526-4165-8b01-e90403b206eb"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="4285d598-06c0-435d-bb5e-28dec5f31521"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="80c6ec8b-eb54-4d25-a4f5-0adaf4cdc84e"/>
+      <column name="OBJECT_ROWID" value="e83c45e0-c30b-436e-b445-00a8b58383b0"/>
+      <column name="OBJECT_TYPE" value="Organisation"/>
+    </insert>
+    <insert tableName="classification">
+      <column name="CLASSIFICATIONID" value="91cd0603-ac46-420b-81d4-0e1c72a916bf"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="893720f9-3780-4868-af0c-cbef5a564024"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="4d878689-15c0-46cc-acc8-3c524463db5c"/>
+      <column name="OBJECT_ROWID" value="e83c45e0-c30b-436e-b445-00a8b58383b0"/>
+      <column name="OBJECT_TYPE" value="Organisation"/>
+    </insert>
+    <insert tableName="classification">
+      <column name="CLASSIFICATIONID" value="62cc115a-f80e-4a0f-899e-8060e9ed575e"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="07f21cf8-c369-45f3-88fe-40ca586ed11b"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="f581dcb9-db6f-4a82-995c-695d0a7393d3"/>
+      <column name="OBJECT_ROWID" value="e83c45e0-c30b-436e-b445-00a8b58383b0"/>
+      <column name="OBJECT_TYPE" value="Organisation"/>
+    </insert>
+    <insert tableName="classification">
+      <column name="CLASSIFICATIONID" value="31a22039-ac7d-4bb9-9f36-d1f91c6c4052"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="4982ab85-0961-4d85-8fee-2b55887add96"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="be76dab1-c6ab-4b1e-8322-8b052ccda4d9"/>
+      <column name="OBJECT_ROWID" value="e83c45e0-c30b-436e-b445-00a8b58383b0"/>
+      <column name="OBJECT_TYPE" value="Organisation"/>
+    </insert>
+    <insert tableName="classification">
+      <column name="CLASSIFICATIONID" value="289cea03-2c65-4557-b0f9-0dd29b26cecc"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="4ed5e22f-222a-4a51-83d3-597fa035d2df"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="95396ee7-f0e2-41b4-995e-bac5749709ec"/>
+      <column name="OBJECT_ROWID" value="e83c45e0-c30b-436e-b445-00a8b58383b0"/>
+      <column name="OBJECT_TYPE" value="Organisation"/>
+    </insert>
+    
+    <insert tableName="classification">
+      <column name="CLASSIFICATIONID" value="e27e1f4b-bca2-4928-9652-950762723531"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="4d868dc5-747a-4f22-9134-638198d3084a"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="4b72857e-863d-4254-accf-25281bb7bb64"/>
+      <column name="OBJECT_ROWID" value="e6da1393-f46b-41a4-826b-2c7d22de2246"/>
+      <column name="OBJECT_TYPE" value="Organisation"/>
+    </insert>
+    <insert tableName="classification">
+      <column name="CLASSIFICATIONID" value="95f0f027-799b-48fd-b1b5-49f70760a008"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="47ca5b54-423f-4bf1-a4d6-a0c55a2488e6"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="970b251c-ca6e-43f4-9162-ebc5d1142a8b"/>
+      <column name="OBJECT_ROWID" value="e6da1393-f46b-41a4-826b-2c7d22de2246"/>
+      <column name="OBJECT_TYPE" value="Organisation"/>
+    </insert>
+    <insert tableName="classification">
+      <column name="CLASSIFICATIONID" value="52c6bccc-1055-48dc-ad5d-311e80a12d2a"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="b7b763d4-994d-483d-9a1c-6eb85786d61a"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="037a9de1-fa6d-4895-9db3-82f7769682ae"/>
+      <column name="OBJECT_ROWID" value="e6da1393-f46b-41a4-826b-2c7d22de2246"/>
+      <column name="OBJECT_TYPE" value="Organisation"/>
+    </insert>
+    <insert tableName="classification">
+      <column name="CLASSIFICATIONID" value="5dd419ab-971f-42fd-9bb6-2247a6b4175b"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="22581c2e-bb4d-43cb-b6b3-80244425e209"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="d67397c5-5e05-433b-b61d-12807906aa5a"/>
+      <column name="OBJECT_ROWID" value="e6da1393-f46b-41a4-826b-2c7d22de2246"/>
+      <column name="OBJECT_TYPE" value="Organisation"/>
+    </insert>
+    <insert tableName="classification">
+      <column name="CLASSIFICATIONID" value="beb7f0ec-3331-49f9-b440-0099f62205c0"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="4285d598-06c0-435d-bb5e-28dec5f31521"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="80c6ec8b-eb54-4d25-a4f5-0adaf4cdc84e"/>
+      <column name="OBJECT_ROWID" value="e6da1393-f46b-41a4-826b-2c7d22de2246"/>
+      <column name="OBJECT_TYPE" value="Organisation"/>
+    </insert>
+    <insert tableName="classification">
+      <column name="CLASSIFICATIONID" value="359fddf8-baae-497f-8ad6-d2cab1438473"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="893720f9-3780-4868-af0c-cbef5a564024"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="4d878689-15c0-46cc-acc8-3c524463db5c"/>
+      <column name="OBJECT_ROWID" value="e6da1393-f46b-41a4-826b-2c7d22de2246"/>
+      <column name="OBJECT_TYPE" value="Organisation"/>
+    </insert>
+    <insert tableName="classification">
+      <column name="CLASSIFICATIONID" value="2314864a-76f7-4fe9-a01f-c5be6ba0669e"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="07f21cf8-c369-45f3-88fe-40ca586ed11b"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="f581dcb9-db6f-4a82-995c-695d0a7393d3"/>
+      <column name="OBJECT_ROWID" value="e6da1393-f46b-41a4-826b-2c7d22de2246"/>
+      <column name="OBJECT_TYPE" value="Organisation"/>
+    </insert>
+    <insert tableName="classification">
+      <column name="CLASSIFICATIONID" value="203fb867-ee2f-4c01-8fb5-8e49da32be64"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="4982ab85-0961-4d85-8fee-2b55887add96"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="be76dab1-c6ab-4b1e-8322-8b052ccda4d9"/>
+      <column name="OBJECT_ROWID" value="e6da1393-f46b-41a4-826b-2c7d22de2246"/>
+      <column name="OBJECT_TYPE" value="Organisation"/>
+    </insert>
+    <insert tableName="classification">
+      <column name="CLASSIFICATIONID" value="a51c9515-80bc-4902-8d9b-115179ab40df"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="4ed5e22f-222a-4a51-83d3-597fa035d2df"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="95396ee7-f0e2-41b4-995e-bac5749709ec"/>
+      <column name="OBJECT_ROWID" value="e6da1393-f46b-41a4-826b-2c7d22de2246"/>
+      <column name="OBJECT_TYPE" value="Organisation"/>
+    </insert>
+    
+    <insert tableName="classification">
+      <column name="CLASSIFICATIONID" value="9260ed8f-3b4a-4c5a-9077-0fe59105883b"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="4d868dc5-747a-4f22-9134-638198d3084a"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="4b72857e-863d-4254-accf-25281bb7bb64"/>
+      <column name="OBJECT_ROWID" value="33ae2997-7bff-4c3c-8038-2fa6781dbe9d"/>
+      <column name="OBJECT_TYPE" value="Organisation"/>
+    </insert>
+    <insert tableName="classification">
+      <column name="CLASSIFICATIONID" value="1a093afe-066e-4bbc-b6c9-b913ab8dfdc0"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="47ca5b54-423f-4bf1-a4d6-a0c55a2488e6"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="970b251c-ca6e-43f4-9162-ebc5d1142a8b"/>
+      <column name="OBJECT_ROWID" value="33ae2997-7bff-4c3c-8038-2fa6781dbe9d"/>
+      <column name="OBJECT_TYPE" value="Organisation"/>
+    </insert>
+    <insert tableName="classification">
+      <column name="CLASSIFICATIONID" value="bc61586b-a63e-4d69-82ad-62b02ea2b28a"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="b7b763d4-994d-483d-9a1c-6eb85786d61a"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="037a9de1-fa6d-4895-9db3-82f7769682ae"/>
+      <column name="OBJECT_ROWID" value="33ae2997-7bff-4c3c-8038-2fa6781dbe9d"/>
+      <column name="OBJECT_TYPE" value="Organisation"/>
+    </insert>
+    <insert tableName="classification">
+      <column name="CLASSIFICATIONID" value="051e9f0f-fc99-4046-90b9-6cfb403844e9"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="22581c2e-bb4d-43cb-b6b3-80244425e209"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="d67397c5-5e05-433b-b61d-12807906aa5a"/>
+      <column name="OBJECT_ROWID" value="33ae2997-7bff-4c3c-8038-2fa6781dbe9d"/>
+      <column name="OBJECT_TYPE" value="Organisation"/>
+    </insert>
+    <insert tableName="classification">
+      <column name="CLASSIFICATIONID" value="32b4f1b2-6cc2-4702-a9e0-0a75184c5698"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="5564a330-8c13-424f-a24b-5f97185a9036"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="80c6ec8b-eb54-4d25-a4f5-0adaf4cdc84e"/>
+      <column name="OBJECT_ROWID" value="33ae2997-7bff-4c3c-8038-2fa6781dbe9d"/>
+      <column name="OBJECT_TYPE" value="Organisation"/>
+    </insert>
+    <insert tableName="classification">
+      <column name="CLASSIFICATIONID" value="f5dd89ed-f6ae-4676-aa83-906211570a5b"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="893720f9-3780-4868-af0c-cbef5a564024"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="4d878689-15c0-46cc-acc8-3c524463db5c"/>
+      <column name="OBJECT_ROWID" value="33ae2997-7bff-4c3c-8038-2fa6781dbe9d"/>
+      <column name="OBJECT_TYPE" value="Organisation"/>
+    </insert>
+    <insert tableName="classification">
+      <column name="CLASSIFICATIONID" value="b3846b7c-e70a-43fe-9637-ea74ed1fe0d7"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="07f21cf8-c369-45f3-88fe-40ca586ed11b"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="f581dcb9-db6f-4a82-995c-695d0a7393d3"/>
+      <column name="OBJECT_ROWID" value="33ae2997-7bff-4c3c-8038-2fa6781dbe9d"/>
+      <column name="OBJECT_TYPE" value="Organisation"/>
+    </insert>
+    <insert tableName="classification">
+      <column name="CLASSIFICATIONID" value="f60f8fe8-5ee9-43b4-a0cd-50b0f354bf79"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="4982ab85-0961-4d85-8fee-2b55887add96"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="be76dab1-c6ab-4b1e-8322-8b052ccda4d9"/>
+      <column name="OBJECT_ROWID" value="33ae2997-7bff-4c3c-8038-2fa6781dbe9d"/>
+      <column name="OBJECT_TYPE" value="Organisation"/>
+    </insert>
+    <insert tableName="classification">
+      <column name="CLASSIFICATIONID" value="83d2e0f5-b7f5-4305-8da7-69e27da99f98"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="4ed5e22f-222a-4a51-83d3-597fa035d2df"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="95396ee7-f0e2-41b4-995e-bac5749709ec"/>
+      <column name="OBJECT_ROWID" value="33ae2997-7bff-4c3c-8038-2fa6781dbe9d"/>
+      <column name="OBJECT_TYPE" value="Organisation"/>
+    </insert>
+    
+    <insert tableName="classification">
+      <column name="CLASSIFICATIONID" value="717dfb2c-2e2c-46c8-b72c-8d81e61b94c1"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="92708239-fd7f-4699-8aaa-b6290fedaac0"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="4b72857e-863d-4254-accf-25281bb7bb64"/>
+      <column name="OBJECT_ROWID" value="fd082db5-be43-4219-a705-588f9c06e59b"/>
+      <column name="OBJECT_TYPE" value="Organisation"/>
+    </insert>
+    <insert tableName="classification">
+      <column name="CLASSIFICATIONID" value="0423c091-7e65-43eb-9ab3-f5a847350845"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="47ca5b54-423f-4bf1-a4d6-a0c55a2488e6"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="970b251c-ca6e-43f4-9162-ebc5d1142a8b"/>
+      <column name="OBJECT_ROWID" value="fd082db5-be43-4219-a705-588f9c06e59b"/>
+      <column name="OBJECT_TYPE" value="Organisation"/>
+    </insert>
+    <insert tableName="classification">
+      <column name="CLASSIFICATIONID" value="d9cce938-36d9-4a80-9bc2-9e37e6ed64ce"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="b7b763d4-994d-483d-9a1c-6eb85786d61a"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="037a9de1-fa6d-4895-9db3-82f7769682ae"/>
+      <column name="OBJECT_ROWID" value="fd082db5-be43-4219-a705-588f9c06e59b"/>
+      <column name="OBJECT_TYPE" value="Organisation"/>
+    </insert>
+    <insert tableName="classification">
+      <column name="CLASSIFICATIONID" value="9ec7bc3e-dc4c-40e4-bcee-bd59ab949d42"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="4c8cfcec-f183-4d82-8a59-ae743ec772b4"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="d67397c5-5e05-433b-b61d-12807906aa5a"/>
+      <column name="OBJECT_ROWID" value="fd082db5-be43-4219-a705-588f9c06e59b"/>
+      <column name="OBJECT_TYPE" value="Organisation"/>
+    </insert>
+    <insert tableName="classification">
+      <column name="CLASSIFICATIONID" value="14f31249-544a-46f9-a2e4-c3bdcf3e49a3"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="4285d598-06c0-435d-bb5e-28dec5f31521"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="80c6ec8b-eb54-4d25-a4f5-0adaf4cdc84e"/>
+      <column name="OBJECT_ROWID" value="fd082db5-be43-4219-a705-588f9c06e59b"/>
+      <column name="OBJECT_TYPE" value="Organisation"/>
+    </insert>
+    <insert tableName="classification">
+      <column name="CLASSIFICATIONID" value="3807eda2-aa0f-4caf-b3ab-0ff341eb887b"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="893720f9-3780-4868-af0c-cbef5a564024"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="4d878689-15c0-46cc-acc8-3c524463db5c"/>
+      <column name="OBJECT_ROWID" value="fd082db5-be43-4219-a705-588f9c06e59b"/>
+      <column name="OBJECT_TYPE" value="Organisation"/>
+    </insert>
+    <insert tableName="classification">
+      <column name="CLASSIFICATIONID" value="36b1ed8c-a4d4-4203-aa20-52cf10f8d8a0"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="07f21cf8-c369-45f3-88fe-40ca586ed11b"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="f581dcb9-db6f-4a82-995c-695d0a7393d3"/>
+      <column name="OBJECT_ROWID" value="fd082db5-be43-4219-a705-588f9c06e59b"/>
+      <column name="OBJECT_TYPE" value="Organisation"/>
+    </insert>
+    <insert tableName="classification">
+      <column name="CLASSIFICATIONID" value="d74914a9-05f6-4433-9121-87755b724fb4"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="4982ab85-0961-4d85-8fee-2b55887add96"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="be76dab1-c6ab-4b1e-8322-8b052ccda4d9"/>
+      <column name="OBJECT_ROWID" value="fd082db5-be43-4219-a705-588f9c06e59b"/>
+      <column name="OBJECT_TYPE" value="Organisation"/>
+    </insert>
+    <insert tableName="classification">
+      <column name="CLASSIFICATIONID" value="a69faa8d-afaa-40cd-97e6-65a851f5dde1"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="4ed5e22f-222a-4a51-83d3-597fa035d2df"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="95396ee7-f0e2-41b4-995e-bac5749709ec"/>
+      <column name="OBJECT_ROWID" value="fd082db5-be43-4219-a705-588f9c06e59b"/>
+      <column name="OBJECT_TYPE" value="Organisation"/>
+    </insert>
+    
+    <insert tableName="classification">
+      <column name="CLASSIFICATIONID" value="c179fe12-4bb0-495d-99d0-0159d0466bc0"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="4d868dc5-747a-4f22-9134-638198d3084a"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="4b72857e-863d-4254-accf-25281bb7bb64"/>
+      <column name="OBJECT_ROWID" value="777246d5-7a73-4c52-af14-84df66128e5d"/>
+      <column name="OBJECT_TYPE" value="Organisation"/>
+    </insert>
+    <insert tableName="classification">
+      <column name="CLASSIFICATIONID" value="ed2a3c86-814d-4212-a2da-5875d0d3c598"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="47ca5b54-423f-4bf1-a4d6-a0c55a2488e6"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="970b251c-ca6e-43f4-9162-ebc5d1142a8b"/>
+      <column name="OBJECT_ROWID" value="777246d5-7a73-4c52-af14-84df66128e5d"/>
+      <column name="OBJECT_TYPE" value="Organisation"/>
+    </insert>
+    <insert tableName="classification">
+      <column name="CLASSIFICATIONID" value="688cdc0d-d1a7-46ad-95c3-7503c054ee2c"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="b7b763d4-994d-483d-9a1c-6eb85786d61a"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="037a9de1-fa6d-4895-9db3-82f7769682ae"/>
+      <column name="OBJECT_ROWID" value="777246d5-7a73-4c52-af14-84df66128e5d"/>
+      <column name="OBJECT_TYPE" value="Organisation"/>
+    </insert>
+    <insert tableName="classification">
+      <column name="CLASSIFICATIONID" value="77f0f0bd-eaca-44ef-abfa-9156eac6eb7e"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="22581c2e-bb4d-43cb-b6b3-80244425e209"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="d67397c5-5e05-433b-b61d-12807906aa5a"/>
+      <column name="OBJECT_ROWID" value="777246d5-7a73-4c52-af14-84df66128e5d"/>
+      <column name="OBJECT_TYPE" value="Organisation"/>
+    </insert>
+    <insert tableName="classification">
+      <column name="CLASSIFICATIONID" value="9f5975c7-3df6-4fa4-87e4-7a1c0dbd967c"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="4285d598-06c0-435d-bb5e-28dec5f31521"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="80c6ec8b-eb54-4d25-a4f5-0adaf4cdc84e"/>
+      <column name="OBJECT_ROWID" value="777246d5-7a73-4c52-af14-84df66128e5d"/>
+      <column name="OBJECT_TYPE" value="Organisation"/>
+    </insert>
+    <insert tableName="classification">
+      <column name="CLASSIFICATIONID" value="d03c3aa2-c97f-4bd4-b92f-7e09d594cdb8"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="893720f9-3780-4868-af0c-cbef5a564024"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="4d878689-15c0-46cc-acc8-3c524463db5c"/>
+      <column name="OBJECT_ROWID" value="777246d5-7a73-4c52-af14-84df66128e5d"/>
+      <column name="OBJECT_TYPE" value="Organisation"/>
+    </insert>
+    <insert tableName="classification">
+      <column name="CLASSIFICATIONID" value="6800e69f-33b1-44ae-b3a2-d7362bfddbf8"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="07f21cf8-c369-45f3-88fe-40ca586ed11b"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="f581dcb9-db6f-4a82-995c-695d0a7393d3"/>
+      <column name="OBJECT_ROWID" value="777246d5-7a73-4c52-af14-84df66128e5d"/>
+      <column name="OBJECT_TYPE" value="Organisation"/>
+    </insert>
+    <insert tableName="classification">
+      <column name="CLASSIFICATIONID" value="218f1794-26e6-45f2-a26d-98185a49bf4f"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="4982ab85-0961-4d85-8fee-2b55887add96"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="be76dab1-c6ab-4b1e-8322-8b052ccda4d9"/>
+      <column name="OBJECT_ROWID" value="777246d5-7a73-4c52-af14-84df66128e5d"/>
+      <column name="OBJECT_TYPE" value="Organisation"/>
+    </insert>
+    <insert tableName="classification">
+      <column name="CLASSIFICATIONID" value="f738a3d6-b4e0-491e-8d51-a83ce039fbc8"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="4ed5e22f-222a-4a51-83d3-597fa035d2df"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="95396ee7-f0e2-41b4-995e-bac5749709ec"/>
+      <column name="OBJECT_ROWID" value="777246d5-7a73-4c52-af14-84df66128e5d"/>
+      <column name="OBJECT_TYPE" value="Organisation"/>
+    </insert>
+    
+    <insert tableName="classification">
+      <column name="CLASSIFICATIONID" value="a653069f-927d-425a-8956-aeb15a2c4bc8"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="4d868dc5-747a-4f22-9134-638198d3084a"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="4b72857e-863d-4254-accf-25281bb7bb64"/>
+      <column name="OBJECT_ROWID" value="2c14fb05-d48e-4eeb-8a7f-85d423746848"/>
+      <column name="OBJECT_TYPE" value="Organisation"/>
+    </insert>
+    <insert tableName="classification">
+      <column name="CLASSIFICATIONID" value="a8c2d3c5-423f-45fa-a8db-cd2ab59c5045"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="47ca5b54-423f-4bf1-a4d6-a0c55a2488e6"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="970b251c-ca6e-43f4-9162-ebc5d1142a8b"/>
+      <column name="OBJECT_ROWID" value="2c14fb05-d48e-4eeb-8a7f-85d423746848"/>
+      <column name="OBJECT_TYPE" value="Organisation"/>
+    </insert>
+    <insert tableName="classification">
+      <column name="CLASSIFICATIONID" value="fa07168c-6aa5-4b9d-935e-6ece6e1c5bdb"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="b7b763d4-994d-483d-9a1c-6eb85786d61a"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="037a9de1-fa6d-4895-9db3-82f7769682ae"/>
+      <column name="OBJECT_ROWID" value="2c14fb05-d48e-4eeb-8a7f-85d423746848"/>
+      <column name="OBJECT_TYPE" value="Organisation"/>
+    </insert>
+    <insert tableName="classification">
+      <column name="CLASSIFICATIONID" value="14148c9a-8afb-42ad-a4c5-d1102241e9f8"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="22581c2e-bb4d-43cb-b6b3-80244425e209"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="d67397c5-5e05-433b-b61d-12807906aa5a"/>
+      <column name="OBJECT_ROWID" value="2c14fb05-d48e-4eeb-8a7f-85d423746848"/>
+      <column name="OBJECT_TYPE" value="Organisation"/>
+    </insert>
+    <insert tableName="classification">
+      <column name="CLASSIFICATIONID" value="2b0e75e0-0a36-4397-988d-2ae60e5d2658"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="5564a330-8c13-424f-a24b-5f97185a9036"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="80c6ec8b-eb54-4d25-a4f5-0adaf4cdc84e"/>
+      <column name="OBJECT_ROWID" value="2c14fb05-d48e-4eeb-8a7f-85d423746848"/>
+      <column name="OBJECT_TYPE" value="Organisation"/>
+    </insert>
+    <insert tableName="classification">
+      <column name="CLASSIFICATIONID" value="b828dfb2-943a-4f81-b950-fbe4db3d19b7"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="893720f9-3780-4868-af0c-cbef5a564024"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="4d878689-15c0-46cc-acc8-3c524463db5c"/>
+      <column name="OBJECT_ROWID" value="2c14fb05-d48e-4eeb-8a7f-85d423746848"/>
+      <column name="OBJECT_TYPE" value="Organisation"/>
+    </insert>
+    <insert tableName="classification">
+      <column name="CLASSIFICATIONID" value="5a5e780b-01af-4a0f-bcd6-74c0c588210a"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="07f21cf8-c369-45f3-88fe-40ca586ed11b"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="f581dcb9-db6f-4a82-995c-695d0a7393d3"/>
+      <column name="OBJECT_ROWID" value="2c14fb05-d48e-4eeb-8a7f-85d423746848"/>
+      <column name="OBJECT_TYPE" value="Organisation"/>
+    </insert>
+    <insert tableName="classification">
+      <column name="CLASSIFICATIONID" value="1dc7de76-80d9-4240-97ae-cab241301a68"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="4982ab85-0961-4d85-8fee-2b55887add96"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="be76dab1-c6ab-4b1e-8322-8b052ccda4d9"/>
+      <column name="OBJECT_ROWID" value="2c14fb05-d48e-4eeb-8a7f-85d423746848"/>
+      <column name="OBJECT_TYPE" value="Organisation"/>
+    </insert>
+    <insert tableName="classification">
+      <column name="CLASSIFICATIONID" value="a76fcafb-a84d-4505-8c68-1b221482e292"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="4ed5e22f-222a-4a51-83d3-597fa035d2df"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="95396ee7-f0e2-41b4-995e-bac5749709ec"/>
+      <column name="OBJECT_ROWID" value="2c14fb05-d48e-4eeb-8a7f-85d423746848"/>
+      <column name="OBJECT_TYPE" value="Organisation"/>
+    </insert>
+    
+    <insert tableName="classification">
+      <column name="CLASSIFICATIONID" value="9ea74c40-7732-4d0a-a489-f50bc60caf8b"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="92708239-fd7f-4699-8aaa-b6290fedaac0"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="4b72857e-863d-4254-accf-25281bb7bb64"/>
+      <column name="OBJECT_ROWID" value="8eecb5e5-40d9-4bf0-a152-1ca456795563"/>
+      <column name="OBJECT_TYPE" value="Organisation"/>
+    </insert>
+    <insert tableName="classification">
+      <column name="CLASSIFICATIONID" value="2c644b64-0404-4eac-841c-d8579ff25fa6"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="47ca5b54-423f-4bf1-a4d6-a0c55a2488e6"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="970b251c-ca6e-43f4-9162-ebc5d1142a8b"/>
+      <column name="OBJECT_ROWID" value="8eecb5e5-40d9-4bf0-a152-1ca456795563"/>
+      <column name="OBJECT_TYPE" value="Organisation"/>
+    </insert>
+    <insert tableName="classification">
+      <column name="CLASSIFICATIONID" value="ac0944d2-b184-45f5-983a-6c873aadfb8e"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="b7b763d4-994d-483d-9a1c-6eb85786d61a"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="037a9de1-fa6d-4895-9db3-82f7769682ae"/>
+      <column name="OBJECT_ROWID" value="8eecb5e5-40d9-4bf0-a152-1ca456795563"/>
+      <column name="OBJECT_TYPE" value="Organisation"/>
+    </insert>
+    <insert tableName="classification">
+      <column name="CLASSIFICATIONID" value="5bb5e000-5bba-4895-a5b8-374c2c5bd3a4"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="4c8cfcec-f183-4d82-8a59-ae743ec772b4"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="d67397c5-5e05-433b-b61d-12807906aa5a"/>
+      <column name="OBJECT_ROWID" value="8eecb5e5-40d9-4bf0-a152-1ca456795563"/>
+      <column name="OBJECT_TYPE" value="Organisation"/>
+    </insert>
+    <insert tableName="classification">
+      <column name="CLASSIFICATIONID" value="b49911f5-fccc-4dba-a46a-32fd56cf8b8f"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="4285d598-06c0-435d-bb5e-28dec5f31521"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="80c6ec8b-eb54-4d25-a4f5-0adaf4cdc84e"/>
+      <column name="OBJECT_ROWID" value="8eecb5e5-40d9-4bf0-a152-1ca456795563"/>
+      <column name="OBJECT_TYPE" value="Organisation"/>
+    </insert>
+    <insert tableName="classification">
+      <column name="CLASSIFICATIONID" value="65f45f0d-ab41-4a83-b5f7-795dc21d0fd4"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="893720f9-3780-4868-af0c-cbef5a564024"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="4d878689-15c0-46cc-acc8-3c524463db5c"/>
+      <column name="OBJECT_ROWID" value="8eecb5e5-40d9-4bf0-a152-1ca456795563"/>
+      <column name="OBJECT_TYPE" value="Organisation"/>
+    </insert>
+    <insert tableName="classification">
+      <column name="CLASSIFICATIONID" value="13f634ef-70ba-440b-91af-e6324cdb20bb"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="07f21cf8-c369-45f3-88fe-40ca586ed11b"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="f581dcb9-db6f-4a82-995c-695d0a7393d3"/>
+      <column name="OBJECT_ROWID" value="8eecb5e5-40d9-4bf0-a152-1ca456795563"/>
+      <column name="OBJECT_TYPE" value="Organisation"/>
+    </insert>
+    <insert tableName="classification">
+      <column name="CLASSIFICATIONID" value="555a280b-a2e4-4eb5-bbec-87bca3987395"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="4982ab85-0961-4d85-8fee-2b55887add96"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="be76dab1-c6ab-4b1e-8322-8b052ccda4d9"/>
+      <column name="OBJECT_ROWID" value="8eecb5e5-40d9-4bf0-a152-1ca456795563"/>
+      <column name="OBJECT_TYPE" value="Organisation"/>
+    </insert>
+    <insert tableName="classification">
+      <column name="CLASSIFICATIONID" value="c58b5e5a-b4fe-4dec-a93d-79848e564b87"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="4ed5e22f-222a-4a51-83d3-597fa035d2df"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="95396ee7-f0e2-41b4-995e-bac5749709ec"/>
+      <column name="OBJECT_ROWID" value="8eecb5e5-40d9-4bf0-a152-1ca456795563"/>
+      <column name="OBJECT_TYPE" value="Organisation"/>
+    </insert>
+    
+    <insert tableName="classification">
+      <column name="CLASSIFICATIONID" value="85b54389-50f9-4bd3-838b-d3941bda2cc1"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="92708239-fd7f-4699-8aaa-b6290fedaac0"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="4b72857e-863d-4254-accf-25281bb7bb64"/>
+      <column name="OBJECT_ROWID" value="5a52304e-65e8-40ed-9aca-a76af6c8c3a0"/>
+      <column name="OBJECT_TYPE" value="Organisation"/>
+    </insert>
+    <insert tableName="classification">
+      <column name="CLASSIFICATIONID" value="9286af56-8942-4e30-8ed3-cde6bf2e77d5"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="47ca5b54-423f-4bf1-a4d6-a0c55a2488e6"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="970b251c-ca6e-43f4-9162-ebc5d1142a8b"/>
+      <column name="OBJECT_ROWID" value="5a52304e-65e8-40ed-9aca-a76af6c8c3a0"/>
+      <column name="OBJECT_TYPE" value="Organisation"/>
+    </insert>
+    <insert tableName="classification">
+      <column name="CLASSIFICATIONID" value="445ccf23-4d44-489a-8054-b46194e104e7"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="b7b763d4-994d-483d-9a1c-6eb85786d61a"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="037a9de1-fa6d-4895-9db3-82f7769682ae"/>
+      <column name="OBJECT_ROWID" value="5a52304e-65e8-40ed-9aca-a76af6c8c3a0"/>
+      <column name="OBJECT_TYPE" value="Organisation"/>
+    </insert>
+    <insert tableName="classification">
+      <column name="CLASSIFICATIONID" value="46065d3f-a811-430d-8fa2-e048aee894c7"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="4c8cfcec-f183-4d82-8a59-ae743ec772b4"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="d67397c5-5e05-433b-b61d-12807906aa5a"/>
+      <column name="OBJECT_ROWID" value="5a52304e-65e8-40ed-9aca-a76af6c8c3a0"/>
+      <column name="OBJECT_TYPE" value="Organisation"/>
+    </insert>
+    <insert tableName="classification">
+      <column name="CLASSIFICATIONID" value="7884869d-85ab-458f-9078-e2dd7234be91"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="4285d598-06c0-435d-bb5e-28dec5f31521"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="80c6ec8b-eb54-4d25-a4f5-0adaf4cdc84e"/>
+      <column name="OBJECT_ROWID" value="5a52304e-65e8-40ed-9aca-a76af6c8c3a0"/>
+      <column name="OBJECT_TYPE" value="Organisation"/>
+    </insert>
+    <insert tableName="classification">
+      <column name="CLASSIFICATIONID" value="6a6dfe13-6fcc-4ae9-b12b-dced4a55daef"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="893720f9-3780-4868-af0c-cbef5a564024"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="4d878689-15c0-46cc-acc8-3c524463db5c"/>
+      <column name="OBJECT_ROWID" value="5a52304e-65e8-40ed-9aca-a76af6c8c3a0"/>
+      <column name="OBJECT_TYPE" value="Organisation"/>
+    </insert>
+    <insert tableName="classification">
+      <column name="CLASSIFICATIONID" value="740bcc4c-b621-458e-874e-034cf70965bc"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="07f21cf8-c369-45f3-88fe-40ca586ed11b"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="f581dcb9-db6f-4a82-995c-695d0a7393d3"/>
+      <column name="OBJECT_ROWID" value="5a52304e-65e8-40ed-9aca-a76af6c8c3a0"/>
+      <column name="OBJECT_TYPE" value="Organisation"/>
+    </insert>
+    <insert tableName="classification">
+      <column name="CLASSIFICATIONID" value="20092371-2723-45e2-aae0-3a697b1265fc"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="4982ab85-0961-4d85-8fee-2b55887add96"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="be76dab1-c6ab-4b1e-8322-8b052ccda4d9"/>
+      <column name="OBJECT_ROWID" value="5a52304e-65e8-40ed-9aca-a76af6c8c3a0"/>
+      <column name="OBJECT_TYPE" value="Organisation"/>
+    </insert>
+    <insert tableName="classification">
+      <column name="CLASSIFICATIONID" value="b1cb759c-f17c-4277-bee1-e50717d8934a"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="4ed5e22f-222a-4a51-83d3-597fa035d2df"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="95396ee7-f0e2-41b4-995e-bac5749709ec"/>
+      <column name="OBJECT_ROWID" value="5a52304e-65e8-40ed-9aca-a76af6c8c3a0"/>
+      <column name="OBJECT_TYPE" value="Organisation"/>
+    </insert>
   </changeSet>
 </databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/_demoData/generatedData/classificationgrading.xml b/.liquibase/Data_alias/basic/_demoData/generatedData/classificationgrading.xml
index 43958c7b36..ad66344241 100644
--- a/.liquibase/Data_alias/basic/_demoData/generatedData/classificationgrading.xml
+++ b/.liquibase/Data_alias/basic/_demoData/generatedData/classificationgrading.xml
@@ -6,122 +6,122 @@
       <column name="CLASSIFICATIONGRADINGID" value="68dd4d91-d472-477d-935c-70cbe5606c51"/>
       <column name="GRADING" value="A"/>
       <column name="MAXGRADEFORSCORE" valueNumeric="100"/>
-      <column name="CLASSIFICATIONTYPE_GROUP" value="1. Classification"/>
+      <column name="CLASSIFICATIONGROUP_ID" value="00cc7b8f-d99e-46bf-90c3-74e05b5af685"/>
     </insert>
     <insert tableName="classificationgrading">
       <column name="CLASSIFICATIONGRADINGID" value="9437f368-bea1-47f4-b76e-d6a391af438d"/>
       <column name="GRADING" value="B"/>
       <column name="MAXGRADEFORSCORE" valueNumeric="75"/>
-      <column name="CLASSIFICATIONTYPE_GROUP" value="1. Classification"/>
+      <column name="CLASSIFICATIONGROUP_ID" value="00cc7b8f-d99e-46bf-90c3-74e05b5af685"/>
     </insert>
     <insert tableName="classificationgrading">
       <column name="CLASSIFICATIONGRADINGID" value="348a2af8-ec01-4a58-8ff6-5e3a837852a4"/>
       <column name="GRADING" value="C"/>
       <column name="MAXGRADEFORSCORE" valueNumeric="50"/>
-      <column name="CLASSIFICATIONTYPE_GROUP" value="1. Classification"/>
+      <column name="CLASSIFICATIONGROUP_ID" value="00cc7b8f-d99e-46bf-90c3-74e05b5af685"/>
     </insert>
     <insert tableName="classificationgrading">
       <column name="CLASSIFICATIONGRADINGID" value="9a823957-0ca9-4972-95df-d894d4e4fc25"/>
       <column name="GRADING" value="D"/>
       <column name="MAXGRADEFORSCORE" valueNumeric="25"/>
-      <column name="CLASSIFICATIONTYPE_GROUP" value="1. Classification"/>
+      <column name="CLASSIFICATIONGROUP_ID" value="00cc7b8f-d99e-46bf-90c3-74e05b5af685"/>
     </insert>
     <insert tableName="classificationgrading">
       <column name="CLASSIFICATIONGRADINGID" value="4ef54a02-ddf8-4238-b9fd-f5a043032b7d"/>
       <column name="GRADING" value="A"/>
       <column name="MAXGRADEFORSCORE" valueNumeric="100"/>
-      <column name="CLASSIFICATIONTYPE_GROUP" value="2. Classification"/>
+      <column name="CLASSIFICATIONGROUP_ID" value="b2126d9d-8d18-46d4-a48f-1a03fc456ddd"/>
     </insert>
     <insert tableName="classificationgrading">
       <column name="CLASSIFICATIONGRADINGID" value="748ef65c-af41-42d8-8ac4-480bc9390591"/>
       <column name="GRADING" value="B"/>
       <column name="MAXGRADEFORSCORE" valueNumeric="75"/>
-      <column name="CLASSIFICATIONTYPE_GROUP" value="2. Classification"/>
+      <column name="CLASSIFICATIONGROUP_ID" value="b2126d9d-8d18-46d4-a48f-1a03fc456ddd"/>
     </insert>
     <insert tableName="classificationgrading">
       <column name="CLASSIFICATIONGRADINGID" value="8e73dd97-4428-4316-882d-7b2af56330ef"/>
       <column name="GRADING" value="C"/>
       <column name="MAXGRADEFORSCORE" valueNumeric="50"/>
-      <column name="CLASSIFICATIONTYPE_GROUP" value="2. Classification"/>
+      <column name="CLASSIFICATIONGROUP_ID" value="b2126d9d-8d18-46d4-a48f-1a03fc456ddd"/>
     </insert>
     <insert tableName="classificationgrading">
       <column name="CLASSIFICATIONGRADINGID" value="76af9750-a714-4a35-bfd2-6eab3c316e5b"/>
       <column name="GRADING" value="D"/>
       <column name="MAXGRADEFORSCORE" valueNumeric="25"/>
-      <column name="CLASSIFICATIONTYPE_GROUP" value="2. Classification"/>
+      <column name="CLASSIFICATIONGROUP_ID" value="b2126d9d-8d18-46d4-a48f-1a03fc456ddd"/>
     </insert>
     <insert tableName="classificationgrading">
       <column name="CLASSIFICATIONGRADINGID" value="c021718f-b6ca-4d4d-87f7-e4450d103fe2"/>
       <column name="GRADING" value="A"/>
       <column name="MAXGRADEFORSCORE" valueNumeric="100"/>
-      <column name="CLASSIFICATIONTYPE_GROUP" value="3. Classification"/>
+      <column name="CLASSIFICATIONGROUP_ID" value="c1305d16-320e-44f8-95f9-e4cff05d3cfb"/>
     </insert>
     <insert tableName="classificationgrading">
       <column name="CLASSIFICATIONGRADINGID" value="8f702450-83fc-4085-92c2-ac09f96dcd6b"/>
       <column name="GRADING" value="B"/>
       <column name="MAXGRADEFORSCORE" valueNumeric="75"/>
-      <column name="CLASSIFICATIONTYPE_GROUP" value="3. Classification"/>
+      <column name="CLASSIFICATIONGROUP_ID" value="c1305d16-320e-44f8-95f9-e4cff05d3cfb"/>
     </insert>
     <insert tableName="classificationgrading">
       <column name="CLASSIFICATIONGRADINGID" value="14da2618-88be-425c-92c3-68d8584aa0bf"/>
       <column name="GRADING" value="C"/>
       <column name="MAXGRADEFORSCORE" valueNumeric="50"/>
-      <column name="CLASSIFICATIONTYPE_GROUP" value="3. Classification"/>
+      <column name="CLASSIFICATIONGROUP_ID" value="c1305d16-320e-44f8-95f9-e4cff05d3cfb"/>
     </insert>
     <insert tableName="classificationgrading">
       <column name="CLASSIFICATIONGRADINGID" value="5e5c3ffe-3fa6-41e3-8659-1b03e7e1a1cd"/>
       <column name="GRADING" value="D"/>
       <column name="MAXGRADEFORSCORE" valueNumeric="25"/>
-      <column name="CLASSIFICATIONTYPE_GROUP" value="3. Classification"/>
+      <column name="CLASSIFICATIONGROUP_ID" value="c1305d16-320e-44f8-95f9-e4cff05d3cfb"/>
     </insert>
     
     <insert tableName="classificationgrading">
       <column name="CLASSIFICATIONGRADINGID" value="5e46e499-00c2-4cc2-9f4c-952290484623"/>
       <column name="GRADING" value="D"/>
       <column name="MAXGRADEFORSCORE" valueNumeric="25"/>
-      <column name="CLASSIFICATIONTYPE_GROUP" value="1. Target group"/>
+      <column name="CLASSIFICATIONGROUP_ID" value="e3b0a84f-d2a7-4d7c-b734-82ab4b262e84"/>
     </insert>
     <insert tableName="classificationgrading">
       <column name="CLASSIFICATIONGRADINGID" value="8c982beb-bc53-4bcf-8b76-7ee919bbf653"/>
       <column name="GRADING" value="C"/>
       <column name="MAXGRADEFORSCORE" valueNumeric="50"/>
-      <column name="CLASSIFICATIONTYPE_GROUP" value="1. Target group"/>
+      <column name="CLASSIFICATIONGROUP_ID" value="e3b0a84f-d2a7-4d7c-b734-82ab4b262e84"/>
     </insert>
     <insert tableName="classificationgrading">
       <column name="CLASSIFICATIONGRADINGID" value="a89c81df-9380-41b1-9c7c-52d3a1862ac7"/>
       <column name="GRADING" value="B"/>
       <column name="MAXGRADEFORSCORE" valueNumeric="75"/>
-      <column name="CLASSIFICATIONTYPE_GROUP" value="1. Target group"/>
+      <column name="CLASSIFICATIONGROUP_ID" value="e3b0a84f-d2a7-4d7c-b734-82ab4b262e84"/>
     </insert>
     <insert tableName="classificationgrading">
       <column name="CLASSIFICATIONGRADINGID" value="7afd58ad-6eae-4d6b-8d4b-2ca4bdd177e6"/>
       <column name="GRADING" value="A"/>
       <column name="MAXGRADEFORSCORE" valueNumeric="100"/>
-      <column name="CLASSIFICATIONTYPE_GROUP" value="1. Target group"/>
+      <column name="CLASSIFICATIONGROUP_ID" value="e3b0a84f-d2a7-4d7c-b734-82ab4b262e84"/>
     </insert>
     <insert tableName="classificationgrading">
       <column name="CLASSIFICATIONGRADINGID" value="8408ca43-a4dc-4767-8127-e52c08276815"/>
       <column name="GRADING" value="D"/>
       <column name="MAXGRADEFORSCORE" valueNumeric="25"/>
-      <column name="CLASSIFICATIONTYPE_GROUP" value="2. Customer value"/>
+      <column name="CLASSIFICATIONGROUP_ID" value="fb1349b6-6dc1-44b7-b7ea-03d5483e7fac"/>
     </insert>
     <insert tableName="classificationgrading">
       <column name="CLASSIFICATIONGRADINGID" value="03aa277d-873b-4913-9051-d44aa4f77627"/>
       <column name="GRADING" value="C"/>
       <column name="MAXGRADEFORSCORE" valueNumeric="50"/>
-      <column name="CLASSIFICATIONTYPE_GROUP" value="2. Customer value"/>
+      <column name="CLASSIFICATIONGROUP_ID" value="fb1349b6-6dc1-44b7-b7ea-03d5483e7fac"/>
     </insert>
     <insert tableName="classificationgrading">
       <column name="CLASSIFICATIONGRADINGID" value="29226adf-eb79-4696-a4b8-7be73c9488e6"/>
       <column name="GRADING" value="B"/>
       <column name="MAXGRADEFORSCORE" valueNumeric="75"/>
-      <column name="CLASSIFICATIONTYPE_GROUP" value="2. Customer value"/>
+      <column name="CLASSIFICATIONGROUP_ID" value="fb1349b6-6dc1-44b7-b7ea-03d5483e7fac"/>
     </insert>
     <insert tableName="classificationgrading">
       <column name="CLASSIFICATIONGRADINGID" value="f8e1c5a4-b0d0-4b73-9700-11ff916adfdd"/>
       <column name="GRADING" value="A"/>
       <column name="MAXGRADEFORSCORE" valueNumeric="100"/>
-      <column name="CLASSIFICATIONTYPE_GROUP" value="2. Customer value"/>
+      <column name="CLASSIFICATIONGROUP_ID" value="fb1349b6-6dc1-44b7-b7ea-03d5483e7fac"/>
     </insert>
   </changeSet>
 </databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/_demoData/generatedData/classificationgroup.xml b/.liquibase/Data_alias/basic/_demoData/generatedData/classificationgroup.xml
new file mode 100644
index 0000000000..73d7c48a4d
--- /dev/null
+++ b/.liquibase/Data_alias/basic/_demoData/generatedData/classificationgroup.xml
@@ -0,0 +1,31 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+  <changeSet author="autogenerated" id="c71ca120-5de6-4a44-a795-1127653c25df">
+    <delete tableName="classificationgroup"/>
+    <insert tableName="classificationgroup">
+      <column name="CLASSIFICATIONGROUPID" value="00cc7b8f-d99e-46bf-90c3-74e05b5af685"/>
+      <column name="TITLE" value="1. Classification"/>
+      <column name="SORTING" valueNumeric="1"/>
+    </insert>
+    <insert tableName="classificationgroup">
+      <column name="CLASSIFICATIONGROUPID" value="b2126d9d-8d18-46d4-a48f-1a03fc456ddd"/>
+      <column name="TITLE" value="2. Classification"/>
+      <column name="SORTING" valueNumeric="2"/>
+    </insert>
+    <insert tableName="classificationgroup">
+      <column name="CLASSIFICATIONGROUPID" value="c1305d16-320e-44f8-95f9-e4cff05d3cfb"/>
+      <column name="TITLE" value="3. Classification"/>
+      <column name="SORTING" valueNumeric="3"/>
+    </insert>
+    <insert tableName="classificationgroup">
+      <column name="CLASSIFICATIONGROUPID" value="e3b0a84f-d2a7-4d7c-b734-82ab4b262e84"/>
+      <column name="TITLE" value="1. Target group"/>
+      <column name="SORTING" valueNumeric="1"/>
+    </insert>
+    <insert tableName="classificationgroup">
+      <column name="CLASSIFICATIONGROUPID" value="fb1349b6-6dc1-44b7-b7ea-03d5483e7fac"/>
+      <column name="TITLE" value="2. Customer value"/>
+      <column name="SORTING" valueNumeric="2"/>
+    </insert> 
+  </changeSet>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/_demoData/generatedData/classificationscore.xml b/.liquibase/Data_alias/basic/_demoData/generatedData/classificationscore.xml
index 7e855d0f6b..69ade9eca1 100644
--- a/.liquibase/Data_alias/basic/_demoData/generatedData/classificationscore.xml
+++ b/.liquibase/Data_alias/basic/_demoData/generatedData/classificationscore.xml
@@ -646,35 +646,35 @@
       <column name="CLASSIFICATIONTYPE_ID" value="f581dcb9-db6f-4a82-995c-695d0a7393d3"/>
       <column name="SCORE" valueNumeric="0.00"/>
       <column name="SORT" valueNumeric="10"/>
-      <column name="TITLE" value="0-49 T€"/>
+      <column name="TITLE" value="0-49 D€"/>
     </insert>
     <insert tableName="CLASSIFICATIONSCORE">
       <column name="CLASSIFICATIONSCOREID" value="07f21cf8-c369-45f3-88fe-40ca586ed11b"/>
       <column name="CLASSIFICATIONTYPE_ID" value="f581dcb9-db6f-4a82-995c-695d0a7393d3"/>
       <column name="SCORE" valueNumeric="10.00"/>
       <column name="SORT" valueNumeric="30"/>
-      <column name="TITLE" value="100-199 T€"/>
+      <column name="TITLE" value="100-199 D€"/>
     </insert>
     <insert tableName="CLASSIFICATIONSCORE">
       <column name="CLASSIFICATIONSCOREID" value="733323d6-ff3d-4ccb-b179-ad1fea05dfe8"/>
       <column name="CLASSIFICATIONTYPE_ID" value="f581dcb9-db6f-4a82-995c-695d0a7393d3"/>
       <column name="SCORE" valueNumeric="15.00"/>
       <column name="SORT" valueNumeric="40"/>
-      <column name="TITLE" value="200-349 T€"/>
+      <column name="TITLE" value="200-349 D€"/>
     </insert>
     <insert tableName="CLASSIFICATIONSCORE">
       <column name="CLASSIFICATIONSCOREID" value="839cd672-5981-4207-8a82-caddd00107e4"/>
       <column name="CLASSIFICATIONTYPE_ID" value="f581dcb9-db6f-4a82-995c-695d0a7393d3"/>
       <column name="SCORE" valueNumeric="5.00"/>
       <column name="SORT" valueNumeric="20"/>
-      <column name="TITLE" value="50-99 T€"/>
+      <column name="TITLE" value="50-99 D€"/>
     </insert>
     <insert tableName="CLASSIFICATIONSCORE">
       <column name="CLASSIFICATIONSCOREID" value="f02cfd28-5a09-42ca-b805-07b7b38e3363"/>
       <column name="CLASSIFICATIONTYPE_ID" value="f581dcb9-db6f-4a82-995c-695d0a7393d3"/>
       <column name="SCORE" valueNumeric="20.00"/>
       <column name="SORT" valueNumeric="50"/>
-      <column name="TITLE" value="ab 350 T€"/>
+      <column name="TITLE" value="ab 350 D€"/>
     </insert>
     <insert tableName="CLASSIFICATIONSCORE">
       <column name="CLASSIFICATIONSCOREID" value="4982ab85-0961-4d85-8fee-2b55887add96"/>
diff --git a/.liquibase/Data_alias/basic/_demoData/generatedData/classificationstorage.xml b/.liquibase/Data_alias/basic/_demoData/generatedData/classificationstorage.xml
new file mode 100644
index 0000000000..aa7419f65c
--- /dev/null
+++ b/.liquibase/Data_alias/basic/_demoData/generatedData/classificationstorage.xml
@@ -0,0 +1,162 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+  <changeSet author="autogenerated" id="c71ca120-5de6-4a44-a795-1127653c25df">
+    <delete tableName="CLASSIFICATIONSTORAGE"/>
+    <insert tableName="CLASSIFICATIONSTORAGE">
+      <column name="CLASSIFICATIONSTORAGEID" value="166e729d-45c6-4dab-bff2-940d2b618f6b"/>
+      <column name="CLASSIFICATIONVALUE" value="BBB"/>
+      <column name="OBJECT_ROWID" value="438537db-0dc6-4aed-b1d1-813011baf88c"/>
+      <column name="OBJECT_TYPE" value="Salesproject"/>
+    </insert>
+    <insert tableName="CLASSIFICATIONSTORAGE">
+      <column name="CLASSIFICATIONSTORAGEID" value="1aafcbf6-6feb-4916-a4fd-58c138eb8f8f"/>
+      <column name="CLASSIFICATIONVALUE" value="DBA"/>
+      <column name="OBJECT_ROWID" value="6d3d16cd-733e-41d1-ab6c-8a6cba63ba4a"/>
+      <column name="OBJECT_TYPE" value="Salesproject"/>
+    </insert>
+    <insert tableName="CLASSIFICATIONSTORAGE">
+      <column name="CLASSIFICATIONSTORAGEID" value="04b4ac80-a316-437a-b113-e7de14e181a8"/>
+      <column name="CLASSIFICATIONVALUE" value="ABB"/>
+      <column name="OBJECT_ROWID" value="7e2680f6-a438-45aa-956a-787363f85923"/>
+      <column name="OBJECT_TYPE" value="Salesproject"/>
+    </insert>
+    <insert tableName="CLASSIFICATIONSTORAGE">
+      <column name="CLASSIFICATIONSTORAGEID" value="42cc772e-53c6-4849-be29-ebb4e18ab860"/>
+      <column name="CLASSIFICATIONVALUE" value="ACB"/>
+      <column name="OBJECT_ROWID" value="d422ad81-717f-42b0-bd64-fc892744aac7"/>
+      <column name="OBJECT_TYPE" value="Salesproject"/>
+    </insert>
+    <insert tableName="CLASSIFICATIONSTORAGE">
+      <column name="CLASSIFICATIONSTORAGEID" value="7f7dfe1d-cb98-44c8-8106-858d991d2b06"/>
+      <column name="CLASSIFICATIONVALUE" value="ACA"/>
+      <column name="OBJECT_ROWID" value="ebb04ae2-d1f9-4ef3-bdfa-e9f562d215ba"/>
+      <column name="OBJECT_TYPE" value="Salesproject"/>
+    </insert>
+    <insert tableName="CLASSIFICATIONSTORAGE">
+      <column name="CLASSIFICATIONSTORAGEID" value="471aafd5-a348-453f-8b2a-64bb365fd0ee"/>
+      <column name="CLASSIFICATIONVALUE" value="ACB"/>
+      <column name="OBJECT_ROWID" value="ef7f4726-4476-4f59-97c2-706dc1e0046f"/>
+      <column name="OBJECT_TYPE" value="Salesproject"/>
+    </insert>
+    <insert tableName="CLASSIFICATIONSTORAGE">
+      <column name="CLASSIFICATIONSTORAGEID" value="63dd36bb-74b8-487b-811f-521438ef9491"/>
+      <column name="CLASSIFICATIONVALUE" value="AC"/>
+      <column name="OBJECT_ROWID" value="019651a4-503e-4e06-aefd-e7e631bf3144"/>
+      <column name="OBJECT_TYPE" value="Organisation"/>
+    </insert>
+    <insert tableName="CLASSIFICATIONSTORAGE">
+      <column name="CLASSIFICATIONSTORAGEID" value="4ce62df5-f0ea-4593-a152-6704c61d7cef"/>
+      <column name="CLASSIFICATIONVALUE" value="BD"/>
+      <column name="OBJECT_ROWID" value="2c14fb05-d48e-4eeb-8a7f-85d423746848"/>
+      <column name="OBJECT_TYPE" value="Organisation"/>
+    </insert>
+    <insert tableName="CLASSIFICATIONSTORAGE">
+      <column name="CLASSIFICATIONSTORAGEID" value="821c7eed-7bee-4879-97ec-44d2014a192b"/>
+      <column name="CLASSIFICATIONVALUE" value="BD"/>
+      <column name="OBJECT_ROWID" value="33ae2997-7bff-4c3c-8038-2fa6781dbe9d"/>
+      <column name="OBJECT_TYPE" value="Organisation"/>
+    </insert>
+    <insert tableName="CLASSIFICATIONSTORAGE">
+      <column name="CLASSIFICATIONSTORAGEID" value="7e59d485-01a8-4e43-9655-ba751d5983a4"/>
+      <column name="CLASSIFICATIONVALUE" value="BC"/>
+      <column name="OBJECT_ROWID" value="449080f6-b714-4189-a261-37439d0d4010"/>
+      <column name="OBJECT_TYPE" value="Organisation"/>
+    </insert>
+    <insert tableName="CLASSIFICATIONSTORAGE">
+      <column name="CLASSIFICATIONSTORAGEID" value="c64c9f31-a108-4df9-b515-6e523b1341c1"/>
+      <column name="CLASSIFICATIONVALUE" value="AC"/>
+      <column name="OBJECT_ROWID" value="5a52304e-65e8-40ed-9aca-a76af6c8c3a0"/>
+      <column name="OBJECT_TYPE" value="Organisation"/>
+    </insert>
+    <insert tableName="CLASSIFICATIONSTORAGE">
+      <column name="CLASSIFICATIONSTORAGEID" value="1251e4b0-195d-4556-a10e-7942f1b0e337"/>
+      <column name="CLASSIFICATIONVALUE" value="AB"/>
+      <column name="OBJECT_ROWID" value="6efb4fab-64f9-4d8e-aa6f-a158d13fc273"/>
+      <column name="OBJECT_TYPE" value="Organisation"/>
+    </insert>
+    <insert tableName="CLASSIFICATIONSTORAGE">
+      <column name="CLASSIFICATIONSTORAGEID" value="3893da8a-f357-46e0-a0b9-65aa58b0dfa6"/>
+      <column name="CLASSIFICATIONVALUE" value="BC"/>
+      <column name="OBJECT_ROWID" value="777246d5-7a73-4c52-af14-84df66128e5d"/>
+      <column name="OBJECT_TYPE" value="Organisation"/>
+    </insert>
+    <insert tableName="CLASSIFICATIONSTORAGE">
+      <column name="CLASSIFICATIONSTORAGEID" value="84a92c36-88df-4c06-a36a-650ed92d4d0a"/>
+      <column name="CLASSIFICATIONVALUE" value="BD"/>
+      <column name="OBJECT_ROWID" value="8707accf-b1fd-4bde-97b1-ab44b75f66f9"/>
+      <column name="OBJECT_TYPE" value="Organisation"/>
+    </insert>
+    <insert tableName="CLASSIFICATIONSTORAGE">
+      <column name="CLASSIFICATIONSTORAGEID" value="f451479f-97dc-4570-b342-c8d53f04b493"/>
+      <column name="CLASSIFICATIONVALUE" value="AC"/>
+      <column name="OBJECT_ROWID" value="8eecb5e5-40d9-4bf0-a152-1ca456795563"/>
+      <column name="OBJECT_TYPE" value="Organisation"/>
+    </insert>
+    <insert tableName="CLASSIFICATIONSTORAGE">
+      <column name="CLASSIFICATIONSTORAGEID" value="80eac6e6-f237-455e-96fd-8484722a79d4"/>
+      <column name="CLASSIFICATIONVALUE" value="BD"/>
+      <column name="OBJECT_ROWID" value="a3fd3c23-12e1-4820-b76e-2cd70103d94d"/>
+      <column name="OBJECT_TYPE" value="Organisation"/>
+    </insert>
+    <insert tableName="CLASSIFICATIONSTORAGE">
+      <column name="CLASSIFICATIONSTORAGEID" value="25a1b340-538d-4c4f-8b1e-25126286cd53"/>
+      <column name="CLASSIFICATIONVALUE" value="BB"/>
+      <column name="OBJECT_ROWID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
+      <column name="OBJECT_TYPE" value="Organisation"/>
+    </insert>
+    <insert tableName="CLASSIFICATIONSTORAGE">
+      <column name="CLASSIFICATIONSTORAGEID" value="bbc19466-8d76-4f35-be56-8458f677d4a9"/>
+      <column name="CLASSIFICATIONVALUE" value="BC"/>
+      <column name="OBJECT_ROWID" value="cabf6192-f9c3-4bd4-9366-ad2b073bdfa3"/>
+      <column name="OBJECT_TYPE" value="Organisation"/>
+    </insert>
+    <insert tableName="CLASSIFICATIONSTORAGE">
+      <column name="CLASSIFICATIONSTORAGEID" value="0adb8953-1685-45cf-bcf7-c2c2098aa215"/>
+      <column name="CLASSIFICATIONVALUE" value="BB"/>
+      <column name="OBJECT_ROWID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
+      <column name="OBJECT_TYPE" value="Organisation"/>
+    </insert>
+    <insert tableName="CLASSIFICATIONSTORAGE">
+      <column name="CLASSIFICATIONSTORAGEID" value="b4d2847f-0548-4cc8-b002-7723b5fc9184"/>
+      <column name="CLASSIFICATIONVALUE" value="BD"/>
+      <column name="OBJECT_ROWID" value="e450d126-eab8-4517-ba7c-8b6804f8c859"/>
+      <column name="OBJECT_TYPE" value="Organisation"/>
+    </insert>
+    <insert tableName="CLASSIFICATIONSTORAGE">
+      <column name="CLASSIFICATIONSTORAGEID" value="e2142492-eeab-482d-a37e-b1c8fe7b2545"/>
+      <column name="CLASSIFICATIONVALUE" value="BC"/>
+      <column name="OBJECT_ROWID" value="e6da1393-f46b-41a4-826b-2c7d22de2246"/>
+      <column name="OBJECT_TYPE" value="Organisation"/>
+    </insert>
+    <insert tableName="CLASSIFICATIONSTORAGE">
+      <column name="CLASSIFICATIONSTORAGEID" value="7a4762f5-90a3-4b6c-8a5d-93125381c18a"/>
+      <column name="CLASSIFICATIONVALUE" value="AC"/>
+      <column name="OBJECT_ROWID" value="e83c45e0-c30b-436e-b445-00a8b58383b0"/>
+      <column name="OBJECT_TYPE" value="Organisation"/>
+    </insert>
+    <insert tableName="CLASSIFICATIONSTORAGE">
+      <column name="CLASSIFICATIONSTORAGEID" value="fc665249-9efc-4d90-839d-cdffb4c3f407"/>
+      <column name="CLASSIFICATIONVALUE" value="AC"/>
+      <column name="OBJECT_ROWID" value="eda61ea6-35ed-4a92-a93c-6118fc67d533"/>
+      <column name="OBJECT_TYPE" value="Organisation"/>
+    </insert>
+    <insert tableName="CLASSIFICATIONSTORAGE">
+      <column name="CLASSIFICATIONSTORAGEID" value="7b2eb62a-b686-4eaf-bde1-2e1dd1028f65"/>
+      <column name="CLASSIFICATIONVALUE" value="BC"/>
+      <column name="OBJECT_ROWID" value="fb07cb0e-c391-4503-9c47-a39ec7388f4f"/>
+      <column name="OBJECT_TYPE" value="Organisation"/>
+    </insert>
+    <insert tableName="CLASSIFICATIONSTORAGE">
+      <column name="CLASSIFICATIONSTORAGEID" value="2ab913d3-e1a8-4fe2-904b-77b02f6be689"/>
+      <column name="CLASSIFICATIONVALUE" value="BB"/>
+      <column name="OBJECT_ROWID" value="fc465f2f-803b-4a1f-b79d-7b466d7ecff4"/>
+      <column name="OBJECT_TYPE" value="Organisation"/>
+    </insert>
+    <insert tableName="CLASSIFICATIONSTORAGE">
+      <column name="CLASSIFICATIONSTORAGEID" value="8db70618-5840-4d4b-90e2-66e1919fc6c1"/>
+      <column name="CLASSIFICATIONVALUE" value="AC"/>
+      <column name="OBJECT_ROWID" value="fd082db5-be43-4219-a705-588f9c06e59b"/>
+      <column name="OBJECT_TYPE" value="Organisation"/>
+    </insert>
+  </changeSet>
+</databaseChangeLog>
diff --git a/.liquibase/Data_alias/basic/_demoData/generatedData/classificationtype.xml b/.liquibase/Data_alias/basic/_demoData/generatedData/classificationtype.xml
index 9b58008a92..f758025469 100644
--- a/.liquibase/Data_alias/basic/_demoData/generatedData/classificationtype.xml
+++ b/.liquibase/Data_alias/basic/_demoData/generatedData/classificationtype.xml
@@ -3,126 +3,125 @@
   <changeSet author="autogenerated" id="de26cf22-891e-4584-97cd-fe877ebc790c">
     <delete tableName="classificationtype"/>
     <insert tableName="classificationtype">
-      <column name="CLASSIFICATIONGROUP" value="2. Classification"/>
-      <column name="CLASSIFICATIONTYPE" value="SALESPROJ"/>
+      <column name="CLASSIFICATIONGROUP_ID" value="b2126d9d-8d18-46d4-a48f-1a03fc456ddd"/>
+      <column name="OBJECT_TYPE" value="Salesproject"/>
       <column name="CLASSIFICATIONTYPEID" value="2031525e-6ca3-46b4-91d4-7f90cd31a630"/>
       <column name="SCORETYPE" value="ScoreCustomizing"/>
     </insert>
     <insert tableName="classificationtype">
-      <column name="CLASSIFICATIONGROUP" value="2. Classification"/>
-      <column name="CLASSIFICATIONTYPE" value="SALESPROJ"/>
+      <column name="CLASSIFICATIONGROUP_ID" value="b2126d9d-8d18-46d4-a48f-1a03fc456ddd"/>
+      <column name="OBJECT_TYPE" value="Salesproject"/>
       <column name="CLASSIFICATIONTYPEID" value="2a702a31-9907-4f1b-abfd-3342640f1c9e"/>
       <column name="SCORETYPE" value="ScoreStandard"/>
     </insert>
     <insert tableName="classificationtype">
-      <column name="CLASSIFICATIONGROUP" value="3. Classification"/>
-      <column name="CLASSIFICATIONTYPE" value="SALESPROJ"/>
+      <column name="CLASSIFICATIONGROUP_ID" value="c1305d16-320e-44f8-95f9-e4cff05d3cfb"/>
+      <column name="OBJECT_TYPE" value="Salesproject"/>
       <column name="CLASSIFICATIONTYPEID" value="31c169aa-ba5b-4f9d-9dd3-b0d0e8d1b632"/>
       <column name="SCORETYPE" value="ScoreDepartment"/>
     </insert>
     <insert tableName="classificationtype">
-      <column name="CLASSIFICATIONGROUP" value="1. Classification"/>
-      <column name="CLASSIFICATIONTYPE" value="SALESPROJ"/>
+      <column name="CLASSIFICATIONGROUP_ID" value="00cc7b8f-d99e-46bf-90c3-74e05b5af685"/>
+      <column name="OBJECT_TYPE" value="Salesproject"/>
       <column name="CLASSIFICATIONTYPEID" value="382b311e-b2b2-49da-b6e1-339afae92657"/>
       <column name="SCORETYPE" value="ScoreUsers"/>
     </insert>
     <insert tableName="classificationtype">
-      <column name="CLASSIFICATIONGROUP" value="1. Classification"/>
-      <column name="CLASSIFICATIONTYPE" value="SALESPROJ"/>
+      <column name="CLASSIFICATIONGROUP_ID" value="00cc7b8f-d99e-46bf-90c3-74e05b5af685"/>
+      <column name="OBJECT_TYPE" value="Salesproject"/>
       <column name="CLASSIFICATIONTYPEID" value="4977ba88-074c-4fe5-b04a-97c9a5eae982"/>
       <column name="SCORETYPE" value="ScoreBranch"/>
     </insert>
     <insert tableName="classificationtype">
-      <column name="CLASSIFICATIONGROUP" value="1. Classification"/>
-      <column name="CLASSIFICATIONTYPE" value="SALESPROJ"/>
+      <column name="CLASSIFICATIONGROUP_ID" value="00cc7b8f-d99e-46bf-90c3-74e05b5af685"/>
+      <column name="OBJECT_TYPE" value="Salesproject"/>
       <column name="CLASSIFICATIONTYPEID" value="54128957-c80b-4b5a-ad1b-cfce665dfb10"/>
       <column name="SCORETYPE" value="ScoreBased"/>
     </insert>
     <insert tableName="classificationtype">
-      <column name="CLASSIFICATIONGROUP" value="3. Classification"/>
-      <column name="CLASSIFICATIONTYPE" value="SALESPROJ"/>
+      <column name="CLASSIFICATIONGROUP_ID" value="c1305d16-320e-44f8-95f9-e4cff05d3cfb"/>
+      <column name="OBJECT_TYPE" value="Salesproject"/>
       <column name="CLASSIFICATIONTYPEID" value="57604bc1-d99f-4d61-b28d-55218a72045b"/>
       <column name="SCORETYPE" value="ScoreDecisionPhase"/>
     </insert>
     <insert tableName="classificationtype">
-      <column name="CLASSIFICATIONGROUP" value="3. Classification"/>
-      <column name="CLASSIFICATIONTYPE" value="SALESPROJ"/>
+      <column name="CLASSIFICATIONGROUP_ID" value="c1305d16-320e-44f8-95f9-e4cff05d3cfb"/>
+      <column name="OBJECT_TYPE" value="Salesproject"/>
       <column name="CLASSIFICATIONTYPEID" value="8c1e8f81-145f-4efe-936f-3f4147f4d59a"/>
       <column name="SCORETYPE" value="ScoreCloud"/>
     </insert>
     <insert tableName="classificationtype">
-      <column name="CLASSIFICATIONGROUP" value="3. Classification"/>
-      <column name="CLASSIFICATIONTYPE" value="SALESPROJ"/>
+      <column name="CLASSIFICATIONGROUP_ID" value="c1305d16-320e-44f8-95f9-e4cff05d3cfb"/>
+      <column name="OBJECT_TYPE" value="Salesproject"/>
       <column name="CLASSIFICATIONTYPEID" value="a43189fc-b712-45ed-9398-58d6e15760ca"/>
       <column name="SCORETYPE" value="ScorePosition"/>
     </insert>
     <insert tableName="classificationtype">
-      <column name="CLASSIFICATIONGROUP" value="2. Classification"/>
-      <column name="CLASSIFICATIONTYPE" value="SALESPROJ"/>
+      <column name="CLASSIFICATIONGROUP_ID" value="b2126d9d-8d18-46d4-a48f-1a03fc456ddd"/>
+      <column name="OBJECT_TYPE" value="Salesproject"/>
       <column name="CLASSIFICATIONTYPEID" value="d8091374-f3fd-41dc-8468-91469618c6fc"/>
       <column name="SCORETYPE" value="ScoreBudget"/>
     </insert>
     <insert tableName="classificationtype">
-      <column name="CLASSIFICATIONGROUP" value="3. Classification"/>
-      <column name="CLASSIFICATIONTYPE" value="SALESPROJ"/>
+      <column name="CLASSIFICATIONGROUP_ID" value="c1305d16-320e-44f8-95f9-e4cff05d3cfb"/>
+      <column name="OBJECT_TYPE" value="Salesproject"/>
       <column name="CLASSIFICATIONTYPEID" value="f4d3791e-1717-4473-987b-0cd751805387"/>
       <column name="SCORETYPE" value="ScoreProjectStart"/>
     </insert>
     
     <insert tableName="CLASSIFICATIONTYPE">
-        <column name="CLASSIFICATIONGROUP" value="1. Target group"/>
-        <column name="CLASSIFICATIONTYPE" value="ORGANISATION"/>
+        <column name="CLASSIFICATIONGROUP_ID" value="e3b0a84f-d2a7-4d7c-b734-82ab4b262e84"/>
+        <column name="OBJECT_TYPE" value="Organisation"/>
         <column name="CLASSIFICATIONTYPEID" value="4b72857e-863d-4254-accf-25281bb7bb64"/>
         <column name="SCORETYPE" value="Number of employees"/>
         </insert>
         <insert tableName="CLASSIFICATIONTYPE">
-        <column name="CLASSIFICATIONGROUP" value="1. Target group"/>
-        <column name="CLASSIFICATIONTYPE" value="ORGANISATION"/>
+        <column name="CLASSIFICATIONGROUP_ID" value="e3b0a84f-d2a7-4d7c-b734-82ab4b262e84"/>
+        <column name="OBJECT_TYPE" value="Organisation"/>
         <column name="CLASSIFICATIONTYPEID" value="970b251c-ca6e-43f4-9162-ebc5d1142a8b"/>
         <column name="SCORETYPE" value="Product preference"/>
         </insert>
         <insert tableName="CLASSIFICATIONTYPE">
-        <column name="CLASSIFICATIONGROUP" value="1. Target group"/>
-        <column name="CLASSIFICATIONTYPE" value="ORGANISATION"/>
+        <column name="CLASSIFICATIONGROUP_ID" value="e3b0a84f-d2a7-4d7c-b734-82ab4b262e84"/>
+        <column name="OBJECT_TYPE" value="Organisation"/>
         <column name="CLASSIFICATIONTYPEID" value="037a9de1-fa6d-4895-9db3-82f7769682ae"/>
         <column name="SCORETYPE" value="Headquarters"/>
         </insert>
         <insert tableName="CLASSIFICATIONTYPE">
-        <column name="CLASSIFICATIONGROUP" value="1. Target group"/>
-        <column name="CLASSIFICATIONTYPE" value="ORGANISATION"/>
+        <column name="CLASSIFICATIONGROUP_ID" value="e3b0a84f-d2a7-4d7c-b734-82ab4b262e84"/>
+        <column name="OBJECT_TYPE" value="Organisation"/>
         <column name="CLASSIFICATIONTYPEID" value="d67397c5-5e05-433b-b61d-12807906aa5a"/>
         <column name="SCORETYPE" value="Industry"/>
         </insert>
         <insert tableName="CLASSIFICATIONTYPE">
-        <column name="CLASSIFICATIONGROUP" value="2. Customer value"/>
-        <column name="CLASSIFICATIONTYPE" value="ORGANISATION"/>
+        <column name="CLASSIFICATIONGROUP_ID" value="fb1349b6-6dc1-44b7-b7ea-03d5483e7fac"/>
+        <column name="OBJECT_TYPE" value="Organisation"/>
         <column name="CLASSIFICATIONTYPEID" value="80c6ec8b-eb54-4d25-a4f5-0adaf4cdc84e"/>
         <column name="SCORETYPE" value="Creditworthiness"/>
         </insert>
         <insert tableName="CLASSIFICATIONTYPE">
-        <column name="CLASSIFICATIONGROUP" value="2. Customer value"/>
-        <column name="CLASSIFICATIONTYPE" value="ORGANISATION"/>
+        <column name="CLASSIFICATIONGROUP_ID" value="fb1349b6-6dc1-44b7-b7ea-03d5483e7fac"/>
+        <column name="OBJECT_TYPE" value="Organisation"/>
         <column name="CLASSIFICATIONTYPEID" value="4d878689-15c0-46cc-acc8-3c524463db5c"/>
         <column name="SCORETYPE" value="Loyalty"/>
         </insert>
         <insert tableName="CLASSIFICATIONTYPE">
-        <column name="CLASSIFICATIONGROUP" value="2. Customer value"/>
-        <column name="CLASSIFICATIONTYPE" value="ORGANISATION"/>
+        <column name="CLASSIFICATIONGROUP_ID" value="fb1349b6-6dc1-44b7-b7ea-03d5483e7fac"/>
+        <column name="OBJECT_TYPE" value="Organisation"/>
         <column name="CLASSIFICATIONTYPEID" value="f581dcb9-db6f-4a82-995c-695d0a7393d3"/>
         <column name="SCORETYPE" value="Purchasing potential p. a."/>
         </insert>
         <insert tableName="CLASSIFICATIONTYPE">
-        <column name="CLASSIFICATIONGROUP" value="2. Customer value"/>
-        <column name="CLASSIFICATIONTYPE" value="ORGANISATION"/>
+        <column name="CLASSIFICATIONGROUP_ID" value="fb1349b6-6dc1-44b7-b7ea-03d5483e7fac"/>
+        <column name="OBJECT_TYPE" value="Organisation"/>
         <column name="CLASSIFICATIONTYPEID" value="be76dab1-c6ab-4b1e-8322-8b052ccda4d9"/>
         <column name="SCORETYPE" value="Current supply share"/>
         </insert>
         <insert tableName="CLASSIFICATIONTYPE">
-        <column name="CLASSIFICATIONGROUP" value="2. Customer value"/>
-        <column name="CLASSIFICATIONTYPE" value="ORGANISATION"/>
+        <column name="CLASSIFICATIONGROUP_ID" value="fb1349b6-6dc1-44b7-b7ea-03d5483e7fac"/>
+        <column name="OBJECT_TYPE" value="Organisation"/>
         <column name="CLASSIFICATIONTYPEID" value="95396ee7-f0e2-41b4-995e-bac5749709ec"/>
         <column name="SCORETYPE" value="Business development"/>
         </insert>
-        
   </changeSet>
 </databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/_demoData/generatedData/visitplan.xml b/.liquibase/Data_alias/basic/_demoData/generatedData/visitplan.xml
index 88789b1a24..5c29131bd0 100644
--- a/.liquibase/Data_alias/basic/_demoData/generatedData/visitplan.xml
+++ b/.liquibase/Data_alias/basic/_demoData/generatedData/visitplan.xml
@@ -1,7 +1,7 @@
 <?xml version="1.1" encoding="UTF-8" standalone="no"?>
 <databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
     <changeSet author="autogenerated" id="62ad16a9-7312-4dda-9e4b-460673b9af82">
-        
+        <!--
         <insert tableName="VISITPLANEMPLOYEEWEEK">
           <column name="VISITPLANEMPLOYEEWEEKID" value="821b3424-b6d2-41f8-b0b2-6a7c2c050214"/>
           <column name="VISITPLAN_YEAR" valueNumeric="2020"/>
@@ -96,6 +96,6 @@
           <column name="CONTACT_ID" value="fc465f2f-803b-4a1f-b79d-7b466d7ecff4"/>
           <column name="INFO" value="Kontrolltermin"/>
         </insert>
-        
+        -->
     </changeSet>
 </databaseChangeLog>
\ No newline at end of file
diff --git a/aliasDefinition/Data_alias/Data_alias.aod b/aliasDefinition/Data_alias/Data_alias.aod
index 34e089b535..4bb598459a 100644
--- a/aliasDefinition/Data_alias/Data_alias.aod
+++ b/aliasDefinition/Data_alias/Data_alias.aod
@@ -9424,25 +9424,25 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>CLASSIFICATIONTYPE</name>
+                <name>CLASSIFICATIONGROUP_ID</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
+                <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
-                <index v="false" />
+                <index v="true" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>CLASSIFICATIONGROUP</name>
+                <name>OBJECT_TYPE</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
-                <size v="80" />
+                <size v="36" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -14987,25 +14987,163 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>CLASSIFICATIONTYPE_GROUP</name>
+                <name>GRADING</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="1" />
+                <size v="1" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>MAXGRADEFORSCORE</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="4" />
+                <size v="10" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>CLASSIFICATIONGROUP_ID</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="1" />
+                <size v="36" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="true" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+            </entityFields>
+          </entityDb>
+          <entityDb>
+            <name>CLASSIFICATIONSTORAGE</name>
+            <dbName></dbName>
+            <idColumn>CLASSIFICATIONSTORAGEID</idColumn>
+            <idGeneratorType v="0" />
+            <idGeneratorInterval v="1" />
+            <documentation></documentation>
+            <title></title>
+            <description></description>
+            <auditSyncConfig>
+              <name>auditSyncConfig</name>
+              <auditMode v="0" />
+              <syncActive v="false" />
+              <syncComplete v="true" />
+              <syncDirection v="1" />
+              <syncIds></syncIds>
+            </auditSyncConfig>
+            <entityFields>
+              <entityFieldDb>
+                <name>OBJECT_ROWID</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
                 <size v="36" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
+                <index v="true" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>CLASSIFICATIONVALUE</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="20" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>GRADING</name>
+                <name>CLASSIFICATIONSTORAGEID</name>
+                <dbName></dbName>
+                <primaryKey v="true" />
+                <columnType v="1" />
+                <size v="36" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="true" />
+                <index v="true" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>OBJECT_TYPE</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="36" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+            </entityFields>
+          </entityDb>
+          <entityDb>
+            <name>CLASSIFICATIONGROUP</name>
+            <dbName></dbName>
+            <idColumn>CLASSIFICATIONGROUPID</idColumn>
+            <idGeneratorType v="0" />
+            <idGeneratorInterval v="1" />
+            <documentation></documentation>
+            <title></title>
+            <description></description>
+            <auditSyncConfig>
+              <name>auditSyncConfig</name>
+              <auditMode v="0" />
+              <syncActive v="false" />
+              <syncComplete v="true" />
+              <syncDirection v="1" />
+              <syncIds></syncIds>
+            </auditSyncConfig>
+            <entityFields>
+              <entityFieldDb>
+                <name>CLASSIFICATIONGROUPID</name>
+                <dbName></dbName>
+                <primaryKey v="true" />
                 <columnType v="1" />
-                <size v="1" />
+                <size v="36" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="true" />
+                <index v="true" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>SORTING</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="5" />
+                <size v="5" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -15015,11 +15153,11 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>MAXGRADEFORSCORE</name>
+                <name>TITLE</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="4" />
-                <size v="10" />
+                <columnType v="12" />
+                <size v="36" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
diff --git a/entity/ClassificationAdmin_entity/ClassificationAdmin_entity.aod b/entity/ClassificationAdmin_entity/ClassificationAdmin_entity.aod
index b974517f78..2ceed05d81 100644
--- a/entity/ClassificationAdmin_entity/ClassificationAdmin_entity.aod
+++ b/entity/ClassificationAdmin_entity/ClassificationAdmin_entity.aod
@@ -5,14 +5,16 @@
   <documentation>%aditoprj%/entity/ClassificationAdmin_entity/documentation.adoc</documentation>
   <icon>VAADIN:LIST_OL</icon>
   <title>Classification</title>
+  <grantUpdateProcess>%aditoprj%/entity/ClassificationAdmin_entity/grantUpdateProcess.js</grantUpdateProcess>
   <grantDeleteProcess>%aditoprj%/entity/ClassificationAdmin_entity/grantDeleteProcess.js</grantDeleteProcess>
-  <contentTitleProcess>%aditoprj%/entity/ClassificationAdmin_entity/contentTitleProcess.js</contentTitleProcess>
   <iconId>VAADIN:LIST_OL</iconId>
   <titlePlural>Classifications</titlePlural>
-  <recordContainer>db</recordContainer>
+  <recordContainer>jDito</recordContainer>
   <entityFields>
     <entityProvider>
       <name>#PROVIDER</name>
+      <targetContextField>TARGET_CONTEXT</targetContextField>
+      <targetIdField>TARGET_ID</targetIdField>
     </entityProvider>
     <entityParameter>
       <name>ClassificationType_param</name>
@@ -34,128 +36,130 @@
     </entityParameter>
     <entityField>
       <name>CLASSIFICATIONTYPEID</name>
+      <title>Indicator</title>
+      <mandatory v="true" />
+      <stateProcess>%aditoprj%/entity/ClassificationAdmin_entity/entityfields/classificationtypeid/stateProcess.js</stateProcess>
+      <valueProcess>%aditoprj%/entity/ClassificationAdmin_entity/entityfields/classificationtypeid/valueProcess.js</valueProcess>
+      <displayValueProcess>%aditoprj%/entity/ClassificationAdmin_entity/entityfields/classificationtypeid/displayValueProcess.js</displayValueProcess>
     </entityField>
     <entityField>
       <name>CLASSIFICATIONGROUP</name>
-      <title>Group</title>
+      <title>Classification</title>
       <contentType>TEXT</contentType>
       <groupable v="true" />
-      <mandatoryProcess>%aditoprj%/entity/ClassificationAdmin_entity/entityfields/classificationgroup/mandatoryProcess.js</mandatoryProcess>
+      <mandatory v="true" />
       <dropDownProcess>%aditoprj%/entity/ClassificationAdmin_entity/entityfields/classificationgroup/dropDownProcess.js</dropDownProcess>
       <textInputAllowed v="true" />
-      <titleProcess>%aditoprj%/entity/ClassificationAdmin_entity/entityfields/classificationgroup/titleProcess.js</titleProcess>
       <valueProcess>%aditoprj%/entity/ClassificationAdmin_entity/entityfields/classificationgroup/valueProcess.js</valueProcess>
       <displayValueProcess>%aditoprj%/entity/ClassificationAdmin_entity/entityfields/classificationgroup/displayValueProcess.js</displayValueProcess>
-      <onValidation>%aditoprj%/entity/ClassificationAdmin_entity/entityfields/classificationgroup/onValidation.js</onValidation>
     </entityField>
-    <entityConsumer>
-      <name>KeywordClassificationTypes</name>
-      <dependency>
-        <name>dependency</name>
-        <entityName>KeywordEntry_entity</entityName>
-        <fieldName>SpecificContainerKeywords</fieldName>
-      </dependency>
-      <children>
-        <entityParameter>
-          <name>ContainerName_param</name>
-          <valueProcess>%aditoprj%/entity/ClassificationAdmin_entity/entityfields/keywordclassificationtypes/children/containername_param/valueProcess.js</valueProcess>
-        </entityParameter>
-      </children>
-    </entityConsumer>
-    <entityConsumer>
-      <name>ClassificationScores</name>
-      <state>EDITABLE</state>
-      <dependency>
-        <name>dependency</name>
-        <entityName>ClassificationScore_entity</entityName>
-        <fieldName>ClassificationScores</fieldName>
-      </dependency>
+    <entityParameter>
+      <name>group_param</name>
+      <expose v="true" />
+      <mandatory v="true" />
+    </entityParameter>
+    <entityField>
+      <name>CLASSIFICATION_PARENT_ID</name>
+    </entityField>
+    <entityField>
+      <name>UID</name>
+      <linkedContextProcess>%aditoprj%/entity/ClassificationAdmin_entity/entityfields/uid/linkedContextProcess.js</linkedContextProcess>
+    </entityField>
+    <entityField>
+      <name>OBJECT_TYPE</name>
+      <title>Place Of Use</title>
+      <mandatory v="true" />
+      <dropDownProcess>%aditoprj%/entity/ClassificationAdmin_entity/entityfields/object_type/dropDownProcess.js</dropDownProcess>
+      <valueProcess>%aditoprj%/entity/ClassificationAdmin_entity/entityfields/object_type/valueProcess.js</valueProcess>
+      <onValueChange>%aditoprj%/entity/ClassificationAdmin_entity/entityfields/object_type/onValueChange.js</onValueChange>
+      <onValueChangeTypes>
+        <element>MASK</element>
+      </onValueChangeTypes>
+    </entityField>
+    <entityField>
+      <name>TARGET_CONTEXT</name>
+      <valueProcess>%aditoprj%/entity/ClassificationAdmin_entity/entityfields/target_context/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>TARGET_ID</name>
+      <valueProcess>%aditoprj%/entity/ClassificationAdmin_entity/entityfields/target_id/valueProcess.js</valueProcess>
+    </entityField>
+    <entityActionGroup>
+      <name>FilterviewActionGroup</name>
       <children>
-        <entityParameter>
-          <name>ClassificationGroup_param</name>
-          <valueProcess>%aditoprj%/entity/ClassificationAdmin_entity/entityfields/classificationscores/children/classificationgroup_param/valueProcess.js</valueProcess>
-        </entityParameter>
-        <entityParameter>
-          <name>ClassificationTypeId_param</name>
-          <valueProcess>%aditoprj%/entity/ClassificationAdmin_entity/entityfields/classificationscores/children/classificationtypeid_param/valueProcess.js</valueProcess>
-        </entityParameter>
-        <entityParameter>
-          <name>ClassificationType_param</name>
-          <valueProcess>%aditoprj%/entity/ClassificationAdmin_entity/entityfields/classificationscores/children/classificationtype_param/valueProcess.js</valueProcess>
-        </entityParameter>
+        <entityActionField>
+          <name>UpdateClassification</name>
+          <title>Recalculate all Classifications</title>
+          <onActionProcess>%aditoprj%/entity/ClassificationAdmin_entity/entityfields/filterviewactiongroup/children/updateclassification/onActionProcess.js</onActionProcess>
+          <iconId>VAADIN:AUTOMATION</iconId>
+        </entityActionField>
       </children>
-    </entityConsumer>
+    </entityActionGroup>
     <entityField>
-      <name>CLASSIFICATIONTYPE</name>
-      <title>Usage</title>
-      <consumer>KeywordClassificationTypes</consumer>
-      <groupable v="true" />
+      <name>SORTING</name>
+      <title>Sorting</title>
+      <contentType>NUMBER</contentType>
       <mandatory v="true" />
-      <stateProcess>%aditoprj%/entity/ClassificationAdmin_entity/entityfields/classificationtype/stateProcess.js</stateProcess>
-      <valueProcess>%aditoprj%/entity/ClassificationAdmin_entity/entityfields/classificationtype/valueProcess.js</valueProcess>
-      <displayValueProcess>%aditoprj%/entity/ClassificationAdmin_entity/entityfields/classificationtype/displayValueProcess.js</displayValueProcess>
+      <stateProcess>%aditoprj%/entity/ClassificationAdmin_entity/entityfields/sorting/stateProcess.js</stateProcess>
+      <valueProcess>%aditoprj%/entity/ClassificationAdmin_entity/entityfields/sorting/valueProcess.js</valueProcess>
     </entityField>
     <entityField>
-      <name>SCORETYPE</name>
-      <title>Scoretype</title>
+      <name>CLASSIFICATIONTYPEIDDISPLAYVALUE</name>
+      <title>Indicator</title>
       <mandatory v="true" />
-      <displayValueProcess>%aditoprj%/entity/ClassificationAdmin_entity/entityfields/scoretype/displayValueProcess.js</displayValueProcess>
+      <stateProcess>%aditoprj%/entity/ClassificationAdmin_entity/entityfields/classificationtypeiddisplayvalue/stateProcess.js</stateProcess>
+      <valueProcess>%aditoprj%/entity/ClassificationAdmin_entity/entityfields/classificationtypeiddisplayvalue/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>recordCategory</name>
+      <valueProcess>%aditoprj%/entity/ClassificationAdmin_entity/entityfields/recordcategory/valueProcess.js</valueProcess>
     </entityField>
-    <entityConsumer>
-      <name>ClassificationGradings</name>
-      <dependency>
-        <name>dependency</name>
-        <entityName>ClassificationGrading_entity</entityName>
-        <fieldName>ClassificationGradings</fieldName>
-      </dependency>
-      <children>
-        <entityParameter>
-          <name>ClassificationTypeId_param</name>
-          <valueProcess>%aditoprj%/entity/ClassificationAdmin_entity/entityfields/classificationgradings/children/classificationtypeid_param/valueProcess.js</valueProcess>
-        </entityParameter>
-      </children>
-    </entityConsumer>
-    <entityParameter>
-      <name>group_param</name>
-      <expose v="true" />
-    </entityParameter>
     <entityProvider>
       <name>#PROVIDER_AGGREGATES</name>
       <useAggregates v="true" />
     </entityProvider>
   </entityFields>
   <recordContainers>
-    <dbRecordContainer>
-      <name>db</name>
-      <alias>Data_alias</alias>
-      <orderClauseProcess>%aditoprj%/entity/ClassificationAdmin_entity/recordcontainers/db/orderClauseProcess.js</orderClauseProcess>
-      <linkInformation>
-        <linkInformation>
-          <name>2f70bf47-42e3-40a2-b076-0da34cfb80d9</name>
-          <tableName>CLASSIFICATIONTYPE</tableName>
-          <primaryKey>CLASSIFICATIONTYPEID</primaryKey>
-          <isUIDTable v="true" />
-          <readonly v="false" />
-        </linkInformation>
-      </linkInformation>
+    <jDitoRecordContainer>
+      <name>jDito</name>
+      <jDitoRecordAlias>Data_alias</jDitoRecordAlias>
+      <contentProcess>%aditoprj%/entity/ClassificationAdmin_entity/recordcontainers/jdito/contentProcess.js</contentProcess>
+      <hasDependentRecords v="false" />
+      <onInsert>%aditoprj%/entity/ClassificationAdmin_entity/recordcontainers/jdito/onInsert.js</onInsert>
+      <onUpdate>%aditoprj%/entity/ClassificationAdmin_entity/recordcontainers/jdito/onUpdate.js</onUpdate>
+      <onDelete>%aditoprj%/entity/ClassificationAdmin_entity/recordcontainers/jdito/onDelete.js</onDelete>
       <recordFieldMappings>
-        <dbRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>UID.value</name>
+        </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>CLASSIFICATION_PARENT_ID.value</name>
+        </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
           <name>CLASSIFICATIONGROUP.value</name>
-          <recordfield>CLASSIFICATIONTYPE.CLASSIFICATIONGROUP</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>SCORETYPE.value</name>
-          <recordfield>CLASSIFICATIONTYPE.SCORETYPE</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>CLASSIFICATIONTYPE.value</name>
-          <recordfield>CLASSIFICATIONTYPE.CLASSIFICATIONTYPE</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
+        </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>CLASSIFICATIONGROUP.displayValue</name>
+        </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
           <name>CLASSIFICATIONTYPEID.value</name>
-          <recordfield>CLASSIFICATIONTYPE.CLASSIFICATIONTYPEID</recordfield>
-        </dbRecordFieldMapping>
+        </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>CLASSIFICATIONTYPEID.displayValue</name>
+        </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>OBJECT_TYPE.value</name>
+        </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>OBJECT_TYPE.displayValue</name>
+        </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>SORTING.value</name>
+        </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>recordCategory.value</name>
+        </jDitoRecordFieldMapping>
       </recordFieldMappings>
-    </dbRecordContainer>
+    </jDitoRecordContainer>
   </recordContainers>
 </entity>
diff --git a/entity/ClassificationAdmin_entity/contentTitleProcess.js b/entity/ClassificationAdmin_entity/contentTitleProcess.js
deleted file mode 100644
index 2031cfeaec..0000000000
--- a/entity/ClassificationAdmin_entity/contentTitleProcess.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import("system.vars");
-import("system.result");
-
-result.string(vars.get("$field.CLASSIFICATIONTYPE.displayValue"))
\ No newline at end of file
diff --git a/entity/ClassificationAdmin_entity/documentation.adoc b/entity/ClassificationAdmin_entity/documentation.adoc
index f54fafb397..390fb4c5dc 100644
--- a/entity/ClassificationAdmin_entity/documentation.adoc
+++ b/entity/ClassificationAdmin_entity/documentation.adoc
@@ -1,3 +1,75 @@
 = ClassificationAdmin_entity
 
-The administrative representation of the classification which is used among other things in the sales project (see also Classification_entity)
\ No newline at end of file
+Definition:
+
+    The administrative representation of the classification which is used among other things in the sales project and organisation (see also Classification_entity)
+    The classification can be dynamically configured at runtime.
+
+Purpose:
+
+    This Entity gives the administrators an easy way to change the classification.
+    Classifications get stored in the Classification table with their own uid, the ids of the classification type, classification score, object_rowId and object_type.
+
+    This entity displays the classifications (classificationGroup) and indicators (classificationType) grouped with the usage (object_type) in an treetable.
+    with the usage (object_type) as the first group, followed by the classifications (classificationgroup) of that group and it's indicators.
+    The grading of the classification can be changed in the preview of an classification.
+    The possible values of an indicator can be changed when opening the preview of the indicator.
+
+    TreeTable Example: 
+
+        USAGE           CLASSIFICATION      INDICATOR
+        Organisation
+                        1. Target Group     
+                                            Industry
+                                            Headquarters
+                                            Product preference
+                        2. Customer value   
+        Salesproject    
+                        1. Classification
+                        2. Classification
+                        3. Classification
+
+Particularities:
+    
+    The classification gets updated via the "updateClassifications_serverProcess", which runs periodically, 
+    you can also start it manually using the action of this entity (currently invisible).
+
+    The Classification consists of the following entities:
+    Classification_entity,
+    ClassificationAdmin_entity,
+    ClassificationGrading_entity,
+    ClassificationGroup_entity,
+    ClassificationScore_entity,
+    ClassificationType_entity
+
+    Our terms in the db and entity structure differ from the technical terms the user gets to see, to make it easier to understand 
+    for the developer that doesn't have the technical know-how:
+
+    Our term:               Technical term:                 Example:
+    Object_Type             Usage                           Organisation
+    ClassificationGroup     Classification                  1. Target Group
+    ClassificationType      Indicator                       Industry
+    ClassificationScore     (Possible-)Value/Selection      Service
+
+Adding the classification to other modules:
+
+    The Classification is only implemented for Organisation and Salesproject at the moment but can easily be used in other modules aswell by doing the following:
+
+    Add the Consumers "Classifications" and "ClassificationGroups" to the module you want to add the classification functionality 
+    and configure them the same way as in organisation and salesproject.
+    If you want to also have the classification in the preview and Filterview you also have to add the field "CLASSIFICATIONSTORAGE_ID" 
+    and configure the following things:
+        -add CLASSIFICATIONSTORAGE at the Linkinformation of the recordContainer (Primary key: CLASSIFICATIONSTORAGEID, UID Table: false, Read only: true)
+        -add the left join in the fromClauseProcess to CLASSIFICATIONSTORAGE using CLASSIFICATIONSTORAGE.OBJECT_ROWID = TableName.TableUid 
+        -add the recordfieldmapping to the field (CLASSIFICATIONSTORAGE.CLASSIFICATIONSTORAGEID)
+        -add the CLASSIFICATIONSTORAGE_ID to the Filterview and Preview
+    Add the reference to the ClassificationView to the Mainview Context (see als organsiation and salesproject) 
+
+    Extend the Keywordregistry and the classificationTypes in AB_KEYWORD_ENTRY by the new Module you are implementing the classification for.
+    Also extend the CLASSIFICATIONADMIN_entity.CLASSIFICATIONTYPEPLACEOFUSE DropDownProcess.
+    Add ClassificationUtils.insertEmptyClassification() with the Uid und vars.get("$sys.currentcontextname") to the onInsert of the Module 
+    and also add the delete conditon to the onDelete (newWhere("CLASSIFICATIONSTORAGE.OBJECT_ROWID", eigeneUid).deleteData();)
+    !Important: if you are adding or deleting these datasets you always have to also insert/delete the dataset into CLASSIFICATIONSTORAGE entry,
+     so add the above mentioned delete condition and onInsertFunction to all actions that delete/create those datasets.!
+
+    Now you can either configure your classifications in the client or via liquibase
\ No newline at end of file
diff --git a/entity/ClassificationAdmin_entity/entityfields/classificationgradings/children/classificationtypeid_param/valueProcess.js b/entity/ClassificationAdmin_entity/entityfields/classificationgradings/children/classificationtypeid_param/valueProcess.js
deleted file mode 100644
index 199c2e918d..0000000000
--- a/entity/ClassificationAdmin_entity/entityfields/classificationgradings/children/classificationtypeid_param/valueProcess.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import("system.vars");
-import("system.result");
-
-result.string(vars.get("$field.CLASSIFICATIONGROUP"));
\ No newline at end of file
diff --git a/entity/ClassificationAdmin_entity/entityfields/classificationgroup/displayValueProcess.js b/entity/ClassificationAdmin_entity/entityfields/classificationgroup/displayValueProcess.js
index 4fb0aeb79a..ebda1413e2 100644
--- a/entity/ClassificationAdmin_entity/entityfields/classificationgroup/displayValueProcess.js
+++ b/entity/ClassificationAdmin_entity/entityfields/classificationgroup/displayValueProcess.js
@@ -1,5 +1,9 @@
 import("system.vars");
-import("system.translate");
+import("Context_lib");
 import("system.result");
 
-result.string(translate.text(vars.get("$field.CLASSIFICATIONGROUP")));
\ No newline at end of file
+var groupId = vars.get("$field.CLASSIFICATIONGROUP");
+if(groupId != "" && groupId != undefined)
+    result.string(ContextUtils.loadContentTitle("ClassificationGroup_entity", groupId));
+else
+    result.string("")
\ No newline at end of file
diff --git a/entity/ClassificationAdmin_entity/entityfields/classificationgroup/dropDownProcess.js b/entity/ClassificationAdmin_entity/entityfields/classificationgroup/dropDownProcess.js
index 6c4ff0ba3d..917fbdf4fd 100644
--- a/entity/ClassificationAdmin_entity/entityfields/classificationgroup/dropDownProcess.js
+++ b/entity/ClassificationAdmin_entity/entityfields/classificationgroup/dropDownProcess.js
@@ -1,13 +1,16 @@
-import("system.logging");
 import("Classification_lib");
 import("system.neon");
 import("system.vars");
-import("system.db");
 import("system.result");
 
-if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
+//no Translation since the same logic as in the Keywords applies (Admin User is able to change the title)
+if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW || vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT)
 {
-    var classificationType = vars.get("$field.CLASSIFICATIONTYPE")
-    if (classificationType)
-        result.object(ClassificationUtils.getAllGroups(classificationType, true));
+    var objectType = vars.get("$field.OBJECT_TYPE")
+    if (objectType)
+    {
+        var obj = ClassificationUtils.getAllGroups(objectType);
+        
+        result.object(obj);
+    }
 }
\ No newline at end of file
diff --git a/entity/ClassificationAdmin_entity/entityfields/classificationgroup/mandatoryProcess.js b/entity/ClassificationAdmin_entity/entityfields/classificationgroup/mandatoryProcess.js
deleted file mode 100644
index 7bbc5aa02d..0000000000
--- a/entity/ClassificationAdmin_entity/entityfields/classificationgroup/mandatoryProcess.js
+++ /dev/null
@@ -1,5 +0,0 @@
-import("system.neon");
-import("system.result");
-import("system.vars");
-
-result.object(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW || vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT);
\ No newline at end of file
diff --git a/entity/ClassificationAdmin_entity/entityfields/classificationgroup/onValidation.js b/entity/ClassificationAdmin_entity/entityfields/classificationgroup/onValidation.js
deleted file mode 100644
index 52077bf9d4..0000000000
--- a/entity/ClassificationAdmin_entity/entityfields/classificationgroup/onValidation.js
+++ /dev/null
@@ -1,28 +0,0 @@
-import("system.neon");
-import("system.translate");
-import("system.result");
-import("system.vars");
-import("Classification_lib");
-import("Entity_lib");
-
-if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT)
-{
-    var newGroup = vars.get("local.value");
-    
-    // use param if available or current selectionRows
-    var classificationType = ClassificationUtils.getUsageType("$param.ClassificationType_param", "$sys.selectionRows");
-
-    if (classificationType)
-    {    
-        var groups = ClassificationUtils.getAllGroups(classificationType, false)
-
-        if (groups.indexOf(newGroup, 0) != -1 && ClassificationUtils.getGroupFromDb(vars.get("$field.CLASSIFICATIONTYPEID")) != newGroup)
-        {
-            //result.string(translate.text("The new Classification name already exists."));
-        }
-    }
-    else
-    {
-        result.string(translate.text("Could not determine the current Classification type (usage)."));
-    }
-}
diff --git a/entity/ClassificationAdmin_entity/entityfields/classificationgroup/titleProcess.js b/entity/ClassificationAdmin_entity/entityfields/classificationgroup/titleProcess.js
deleted file mode 100644
index de080516af..0000000000
--- a/entity/ClassificationAdmin_entity/entityfields/classificationgroup/titleProcess.js
+++ /dev/null
@@ -1,13 +0,0 @@
-import("system.neon");
-import("system.translate");
-import("system.vars");
-import("system.result");
-
-if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW) 
-{
-    result.string(translate.text("Group"));
-}
-else
-{
-    result.string(translate.text("Group name"));
-}
\ No newline at end of file
diff --git a/entity/ClassificationAdmin_entity/entityfields/classificationgroup/valueProcess.js b/entity/ClassificationAdmin_entity/entityfields/classificationgroup/valueProcess.js
index dbfd2f7ec7..cffd6f2044 100644
--- a/entity/ClassificationAdmin_entity/entityfields/classificationgroup/valueProcess.js
+++ b/entity/ClassificationAdmin_entity/entityfields/classificationgroup/valueProcess.js
@@ -1,5 +1,34 @@
+import("system.neon");
 import("system.vars");
 import("system.result");
+import("system.text");
+import("Sql_lib");
 
-if(vars.get("$param.group_param"))
-    result.string(vars.get("$param.group_param"));
+if(!vars.get("$this.value") && vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_EDIT)
+{
+    var sysSelection = vars.get("$sys.selection");
+    var uid = vars.get("$field.UID");
+    var id;
+    if(sysSelection.length > 0)
+    {
+        var res;
+        var value = vars.get("$field.CLASSIFICATION_PARENT_ID");
+        if(value)
+        {
+            if(value.charAt(0) != ";" && value.charAt(value.length) != ";")
+                id = text.decodeMS(uid)[1];
+            else
+            {
+                decodedIdvalues = text.decodeMS(value);
+                if(decodedIdvalues[0].charAt(0) != ";" && decodedIdvalues[0].charAt(decodedIdvalues[0].length) != ";")
+                    id = text.decodeMS(text.decodeMS(uid)[0])[1];
+            }
+            var classificationGroupId = newSelect("CLASSIFICATIONGROUP.CLASSIFICATIONGROUPID")
+                                            .from("CLASSIFICATIONGROUP")
+                                            .where("CLASSIFICATIONGROUP.CLASSIFICATIONGROUPID", id)
+                                            .cell();
+
+            result.string(classificationGroupId);
+        }
+    }
+}
diff --git a/entity/ClassificationAdmin_entity/entityfields/classificationscores/children/classificationgroup_param/valueProcess.js b/entity/ClassificationAdmin_entity/entityfields/classificationscores/children/classificationgroup_param/valueProcess.js
deleted file mode 100644
index 199c2e918d..0000000000
--- a/entity/ClassificationAdmin_entity/entityfields/classificationscores/children/classificationgroup_param/valueProcess.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import("system.vars");
-import("system.result");
-
-result.string(vars.get("$field.CLASSIFICATIONGROUP"));
\ No newline at end of file
diff --git a/entity/ClassificationAdmin_entity/entityfields/classificationscores/children/classificationtype_param/valueProcess.js b/entity/ClassificationAdmin_entity/entityfields/classificationscores/children/classificationtype_param/valueProcess.js
deleted file mode 100644
index d3275a8eaa..0000000000
--- a/entity/ClassificationAdmin_entity/entityfields/classificationscores/children/classificationtype_param/valueProcess.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import("system.vars");
-import("system.result");
-
-result.string(vars.get("$field.CLASSIFICATIONTYPE"))
\ No newline at end of file
diff --git a/entity/ClassificationAdmin_entity/entityfields/classificationtype/displayValueProcess.js b/entity/ClassificationAdmin_entity/entityfields/classificationtype/displayValueProcess.js
deleted file mode 100644
index 9a93d93828..0000000000
--- a/entity/ClassificationAdmin_entity/entityfields/classificationtype/displayValueProcess.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import("system.result");
-import("system.vars");
-import("Keyword_lib");
-import("KeywordRegistry_basic");
-
-result.string(KeywordUtils.getViewValue($KeywordRegistry.classificationType(), vars.get("$field.CLASSIFICATIONTYPE")));
\ No newline at end of file
diff --git a/entity/ClassificationAdmin_entity/entityfields/classificationtype/stateProcess.js b/entity/ClassificationAdmin_entity/entityfields/classificationtype/stateProcess.js
deleted file mode 100644
index bcc88cc57c..0000000000
--- a/entity/ClassificationAdmin_entity/entityfields/classificationtype/stateProcess.js
+++ /dev/null
@@ -1,11 +0,0 @@
-import("system.result");
-import("system.neon");
-import("system.vars");
-if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
-{
-    result.string(neon.COMPONENTSTATE_EDITABLE);
-}
-else
-{
-    result.string(neon.COMPONENTSTATE_READONLY);
-}
\ No newline at end of file
diff --git a/entity/ClassificationAdmin_entity/entityfields/classificationtypeid/displayValueProcess.js b/entity/ClassificationAdmin_entity/entityfields/classificationtypeid/displayValueProcess.js
new file mode 100644
index 0000000000..b340e81667
--- /dev/null
+++ b/entity/ClassificationAdmin_entity/entityfields/classificationtypeid/displayValueProcess.js
@@ -0,0 +1,5 @@
+import("system.vars");
+import("Context_lib");
+import("system.result");
+
+result.string(ContextUtils.loadContentTitle("ClassificationType_entity", vars.get("$this.value")));
\ No newline at end of file
diff --git a/entity/ClassificationAdmin_entity/entityfields/classificationtypeid/stateProcess.js b/entity/ClassificationAdmin_entity/entityfields/classificationtypeid/stateProcess.js
new file mode 100644
index 0000000000..04d6ba3c02
--- /dev/null
+++ b/entity/ClassificationAdmin_entity/entityfields/classificationtypeid/stateProcess.js
@@ -0,0 +1,8 @@
+import("system.vars");
+import("system.result");
+import("system.neon");
+
+if(vars.get("$sys.operatingstate") != neon.OPERATINGSTATE_EDIT && vars.get("$sys.operatingstate") != neon.OPERATINGSTATE_NEW)
+    result.string(neon.COMPONENTSTATE_EDITABLE)
+else
+    result.string(neon.COMPONENTSTATE_INVISIBLE)
\ No newline at end of file
diff --git a/entity/ClassificationAdmin_entity/entityfields/classificationtypeid/valueProcess.js b/entity/ClassificationAdmin_entity/entityfields/classificationtypeid/valueProcess.js
new file mode 100644
index 0000000000..97abbd1464
--- /dev/null
+++ b/entity/ClassificationAdmin_entity/entityfields/classificationtypeid/valueProcess.js
@@ -0,0 +1,10 @@
+import("system.util");
+import("system.result");
+import("system.neon");
+import("system.vars");
+import("Classification_lib");
+
+if(vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_NEW && !vars.get("$this.value"))
+    result.string(util.getNewUUID());
+else if(vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_EDIT && !vars.get("$this.value"))
+    result.string($ClassificationPlaceholder.TOPSECRETPLACEHOLDER());
\ No newline at end of file
diff --git a/entity/ClassificationAdmin_entity/entityfields/classificationtypeiddisplayvalue/stateProcess.js b/entity/ClassificationAdmin_entity/entityfields/classificationtypeiddisplayvalue/stateProcess.js
new file mode 100644
index 0000000000..9366c2e0e8
--- /dev/null
+++ b/entity/ClassificationAdmin_entity/entityfields/classificationtypeiddisplayvalue/stateProcess.js
@@ -0,0 +1,12 @@
+import("Classification_lib");
+import("system.vars");
+import("system.result");
+import("system.neon");
+
+if((vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_EDIT || vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_NEW) 
+        && vars.get("$this.value") != $ClassificationPlaceholder.TOPSECRETPLACEHOLDER())
+{
+    result.string(neon.COMPONENTSTATE_EDITABLE)
+}
+else
+    result.string(neon.COMPONENTSTATE_INVISIBLE)
\ No newline at end of file
diff --git a/entity/ClassificationAdmin_entity/entityfields/classificationtypeiddisplayvalue/valueProcess.js b/entity/ClassificationAdmin_entity/entityfields/classificationtypeiddisplayvalue/valueProcess.js
new file mode 100644
index 0000000000..85208cfbe4
--- /dev/null
+++ b/entity/ClassificationAdmin_entity/entityfields/classificationtypeiddisplayvalue/valueProcess.js
@@ -0,0 +1,21 @@
+import("system.result");
+import("system.vars");
+import("system.translate");
+import("Sql_lib");
+import("Classification_lib");
+
+var res = vars.get("$this.value");
+if(!res)
+{
+    var classificationTypeId = vars.get("$field.CLASSIFICATIONTYPEID");
+    if(classificationTypeId != $ClassificationPlaceholder.TOPSECRETPLACEHOLDER())
+    {
+        res = newSelect("CLASSIFICATIONTYPE.SCORETYPE")
+                            .from("CLASSIFICATIONTYPE")
+                            .where("CLASSIFICATIONTYPE.CLASSIFICATIONTYPEID", classificationTypeId)
+                            .cell();
+    }
+    else
+        res = $ClassificationPlaceholder.TOPSECRETPLACEHOLDER();
+}
+result.string(res);
\ No newline at end of file
diff --git a/entity/ClassificationAdmin_entity/entityfields/filterviewactiongroup/children/updateclassification/onActionProcess.js b/entity/ClassificationAdmin_entity/entityfields/filterviewactiongroup/children/updateclassification/onActionProcess.js
new file mode 100644
index 0000000000..f1a169ba0e
--- /dev/null
+++ b/entity/ClassificationAdmin_entity/entityfields/filterviewactiongroup/children/updateclassification/onActionProcess.js
@@ -0,0 +1,21 @@
+import("system.process");
+import("system.question");
+import("system.text");
+import("system.translate");
+import("system.util");
+import("system.vars");
+
+var execute = question.askYesNo(translate.text("Start Serveprocess"), translate.text("Are you sure you want to reload all classifications using the current classificationgradings?"), false);
+if(execute)
+{
+    var processConfig = process.createStartAsyncConfig()
+                                                        .setName("updateClassifications_serverProcess")
+                                                        .setUser( vars.get("$sys.user"))
+                                                        .setThreadPriority(process.THREADPRIORITY_LOW)
+                                                        .setTimerType(process.TIMERTYPE_SERVER);
+                                                        
+
+    process.startAsync(processConfig);
+
+    question.showMessage(translate.text("Serverprocess has been started"), question.INFORMATION, translate.text("Classification"));
+}
diff --git a/entity/ClassificationAdmin_entity/entityfields/keywordclassificationtypes/children/containername_param/valueProcess.js b/entity/ClassificationAdmin_entity/entityfields/keywordclassificationtypes/children/containername_param/valueProcess.js
deleted file mode 100644
index b5e82ac383..0000000000
--- a/entity/ClassificationAdmin_entity/entityfields/keywordclassificationtypes/children/containername_param/valueProcess.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import("system.result");
-import("KeywordRegistry_basic")
-
-result.string($KeywordRegistry.classificationType())
\ No newline at end of file
diff --git a/entity/ClassificationAdmin_entity/entityfields/object_type/dropDownProcess.js b/entity/ClassificationAdmin_entity/entityfields/object_type/dropDownProcess.js
new file mode 100644
index 0000000000..560b0480a1
--- /dev/null
+++ b/entity/ClassificationAdmin_entity/entityfields/object_type/dropDownProcess.js
@@ -0,0 +1,6 @@
+import("system.result");
+import("system.translate");
+import("Context_lib");
+
+result.object([["Salesproject", ContextUtils.getTitle("Salesproject", true)], 
+                ["Organisation", ContextUtils.getTitle("Organisation", true)]]);
\ No newline at end of file
diff --git a/entity/ClassificationAdmin_entity/entityfields/object_type/onValueChange.js b/entity/ClassificationAdmin_entity/entityfields/object_type/onValueChange.js
new file mode 100644
index 0000000000..a2973102df
--- /dev/null
+++ b/entity/ClassificationAdmin_entity/entityfields/object_type/onValueChange.js
@@ -0,0 +1,4 @@
+import("system.neon");
+
+neon.setFieldValue("$field.CLASSIFICATIONGROUP", "");
+neon.refresh("$field.CLASSIFICATIONGROUP")
\ No newline at end of file
diff --git a/entity/ClassificationAdmin_entity/entityfields/object_type/valueProcess.js b/entity/ClassificationAdmin_entity/entityfields/object_type/valueProcess.js
new file mode 100644
index 0000000000..66c794c838
--- /dev/null
+++ b/entity/ClassificationAdmin_entity/entityfields/object_type/valueProcess.js
@@ -0,0 +1,27 @@
+import("system.neon");
+import("system.vars");
+import("system.result");
+import("system.text");
+import("Sql_lib");
+
+if(!vars.get("$this.value") && vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_EDIT)
+{
+    var sysSelection = vars.get("$sys.selection");
+    var uid = vars.get("$field.UID");
+    var id;
+    if(sysSelection.length > 0)
+    {
+        var res;
+        var value = vars.get("$field.CLASSIFICATION_PARENT_ID");
+        if(value.charAt(0) != ";" && value.charAt(value.length) != ";")
+            res = text.decodeMS(uid)[0];
+        else
+        {
+            decodedIdvalues = text.decodeMS(value);
+            if(decodedIdvalues[0].charAt(0) != ";" && decodedIdvalues[0].charAt(decodedIdvalues[0].length) != ";")
+                res = text.decodeMS(text.decodeMS(uid)[0])[0];
+        }
+
+        result.string(res);
+    }
+}
diff --git a/entity/ClassificationAdmin_entity/entityfields/recordcategory/valueProcess.js b/entity/ClassificationAdmin_entity/entityfields/recordcategory/valueProcess.js
new file mode 100644
index 0000000000..ec5e2a1a83
--- /dev/null
+++ b/entity/ClassificationAdmin_entity/entityfields/recordcategory/valueProcess.js
@@ -0,0 +1,34 @@
+import("Classification_lib");
+import("system.util");
+import("system.result");
+import("system.neon");
+import("system.vars");
+
+var res;
+
+if(vars.get("$sys.operatingstate") != neon.OPERATINGSTATE_NEW)
+{
+    if(vars.get("$field.CLASSIFICATIONTYPEID") && vars.get("$field.CLASSIFICATIONTYPEID") != $ClassificationPlaceholder.TOPSECRETPLACEHOLDER())
+    {
+        res = $ClassificationRecordCategories.CLASSIFICATION_CLASSIFICATION_TYPE();
+    }
+    else if(vars.get("$field.CLASSIFICATIONGROUP"))
+    {
+        res = $ClassificationRecordCategories.CLASSIFICATION_CLASSIFICATION_GROUP();
+    }
+    else
+    {
+        res = $ClassificationRecordCategories.CLASSIFICATION_OBJECT_TYPE();
+    }
+}
+else if(vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_NEW)
+{
+    var classificationGroup = vars.get("$field.CLASSIFICATIONGROUP");
+    if(classificationGroup.length == 36 && ((classificationGroup.match(/-/g) || []).length == 4))
+        res = $ClassificationRecordCategories.CLASSIFICATION_GROUP_EXISTS();
+    else
+        res = $ClassificationRecordCategories.CLASSIFICATION_GROUP_EXISTS();
+}
+
+if(res)
+    result.string(res);
\ No newline at end of file
diff --git a/entity/ClassificationAdmin_entity/entityfields/sorting/stateProcess.js b/entity/ClassificationAdmin_entity/entityfields/sorting/stateProcess.js
new file mode 100644
index 0000000000..2cd13f04b8
--- /dev/null
+++ b/entity/ClassificationAdmin_entity/entityfields/sorting/stateProcess.js
@@ -0,0 +1,16 @@
+import("system.vars");
+import("system.result");
+import("system.neon");
+import("Classification_lib");
+
+var state;
+var recordCategory = vars.get("$field.recordCategory");
+
+if(recordCategory == $ClassificationRecordCategories.CLASSIFICATION_CLASSIFICATION_TYPE())
+    state = neon.COMPONENTSTATE_INVISIBLE;
+else if(recordCategory == $ClassificationRecordCategories.CLASSIFICATION_GROUP_EXISTS())
+    state = neon.COMPONENTSTATE_DISABLED;
+else
+    state = neon.COMPONENTSTATE_EDITABLE;
+    
+result.string(state);
\ No newline at end of file
diff --git a/entity/ClassificationAdmin_entity/entityfields/sorting/valueProcess.js b/entity/ClassificationAdmin_entity/entityfields/sorting/valueProcess.js
new file mode 100644
index 0000000000..6eaad20db1
--- /dev/null
+++ b/entity/ClassificationAdmin_entity/entityfields/sorting/valueProcess.js
@@ -0,0 +1,43 @@
+import("system.neon");
+import("system.vars");
+import("system.result");
+import("system.text");
+import("Sql_lib");
+
+if(!vars.get("$this.value"))
+{
+    var sysSelection = vars.get("$sys.selection");
+    var uid = vars.get("$field.UID");
+    var id;
+    if(vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_EDIT )
+    {
+        if(sysSelection.length > 0)
+        {
+            var res;
+            var value = vars.get("$field.CLASSIFICATION_PARENT_ID");
+            if(value)
+            {
+                if(value.charAt(0) != ";" && value.charAt(value.length) != ";")
+                    id = text.decodeMS(uid)[1];
+                else
+                {
+                    decodedIdvalues = text.decodeMS(value);
+                    if(decodedIdvalues[0].charAt(0) != ";" && decodedIdvalues[0].charAt(decodedIdvalues[0].length) != ";")
+                        id = text.decodeMS(text.decodeMS(uid)[0])[1];
+                }
+            }
+        }
+    }
+    else if(vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_NEW)
+        id = vars.get("$field.CLASSIFICATIONGROUP");
+        
+    var sorting = newSelect("CLASSIFICATIONGROUP.SORTING")
+                                .from("CLASSIFICATIONGROUP")
+                                .where("CLASSIFICATIONGROUP.CLASSIFICATIONGROUPID", id)
+                                .cell();
+    if(sorting)
+        result.string(sorting);
+    else
+        result.string("1");
+}
+
diff --git a/entity/ClassificationAdmin_entity/entityfields/target_context/valueProcess.js b/entity/ClassificationAdmin_entity/entityfields/target_context/valueProcess.js
new file mode 100644
index 0000000000..163b952b72
--- /dev/null
+++ b/entity/ClassificationAdmin_entity/entityfields/target_context/valueProcess.js
@@ -0,0 +1,16 @@
+import("system.neon");
+import("Classification_lib");
+import("system.result");
+import("system.vars");
+
+var sysSelection = vars.get("$sys.selection");
+
+if(sysSelection.length > 0)
+{
+    var value = vars.get("$field.CLASSIFICATION_PARENT_ID");
+    
+    res = ClassificationUtils.decode(value)
+    if(res)
+        result.string(res);
+}
+
diff --git a/entity/ClassificationAdmin_entity/entityfields/target_id/valueProcess.js b/entity/ClassificationAdmin_entity/entityfields/target_id/valueProcess.js
new file mode 100644
index 0000000000..b6727d8fca
--- /dev/null
+++ b/entity/ClassificationAdmin_entity/entityfields/target_id/valueProcess.js
@@ -0,0 +1,28 @@
+import("system.neon");
+import("system.result");
+import("system.text");
+import("system.vars");
+import("Classification_lib");
+
+if(vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_VIEW)
+{
+    var recordCategory = vars.get("$field.recordCategory");
+    var sysSelection = vars.get("$sys.selection");
+    if(sysSelection.length > 0)
+    {
+        var res;
+        switch(recordCategory) 
+        {
+            case $ClassificationRecordCategories.CLASSIFICATION_CLASSIFICATION_GROUP():
+              res = vars.get("$field.CLASSIFICATIONGROUP");
+              break;
+            case $ClassificationRecordCategories.CLASSIFICATION_CLASSIFICATION_TYPE():
+              res = vars.get("$field.CLASSIFICATIONTYPEID");
+              break;
+            default:
+              break;
+        }
+        if(res)
+            result.string(res);
+    }
+}
\ No newline at end of file
diff --git a/entity/ClassificationAdmin_entity/entityfields/uid/linkedContextProcess.js b/entity/ClassificationAdmin_entity/entityfields/uid/linkedContextProcess.js
new file mode 100644
index 0000000000..7f329d1a50
--- /dev/null
+++ b/entity/ClassificationAdmin_entity/entityfields/uid/linkedContextProcess.js
@@ -0,0 +1,24 @@
+//import("system.neon");
+//import("system.text");
+//import("system.vars");
+//import("system.result");
+//import("system.logging");
+//
+//var value = vars.get("$this.value");
+//
+//if(value)
+//{
+//    var res;
+//    if(value.charAt(0) != ";" && value.charAt(value.length) != ";")
+//        res = "ClassificationGroup";
+//    else
+//    {
+//        decodedIdvalues = text.decodeMS(value);
+//        if(decodedIdvalues[0].charAt(0) != ";" && decodedIdvalues[0].charAt(decodedIdvalues[0].length) != ";")
+//            res = "ClassificationGrading";
+//        else
+//            res = "ClassificationScore";
+//    }
+//    neon.setFieldValue("$field.TARGET_CONTEXT" , res)
+//    logging.log(res)
+//}
\ No newline at end of file
diff --git a/entity/ClassificationAdmin_entity/grantDeleteProcess.js b/entity/ClassificationAdmin_entity/grantDeleteProcess.js
index 4e17fa5f17..8cec151643 100644
--- a/entity/ClassificationAdmin_entity/grantDeleteProcess.js
+++ b/entity/ClassificationAdmin_entity/grantDeleteProcess.js
@@ -1,11 +1,9 @@
 import("system.result");
-import("system.db");
 import("system.vars");
-import("Sql_lib");
+import("Classification_lib");
 
-var count = newSelect("count(*)")
-                .from("CLASSIFICATION")
-                .whereIfSet("CLASSIFICATION.CLASSIFICATIONTYPE_ID", "$field.CLASSIFICATIONTYPEID")
-                .cell(true, "0");
-
-result.object(parseInt(count) <= 0);
\ No newline at end of file
+var recordCategory = vars.get("$field.recordCategory");
+if(recordCategory != $ClassificationRecordCategories.CLASSIFICATION_OBJECT_TYPE())
+    result.string(true);
+else
+    result.string(false);
\ No newline at end of file
diff --git a/entity/ClassificationAdmin_entity/grantUpdateProcess.js b/entity/ClassificationAdmin_entity/grantUpdateProcess.js
new file mode 100644
index 0000000000..8cec151643
--- /dev/null
+++ b/entity/ClassificationAdmin_entity/grantUpdateProcess.js
@@ -0,0 +1,9 @@
+import("system.result");
+import("system.vars");
+import("Classification_lib");
+
+var recordCategory = vars.get("$field.recordCategory");
+if(recordCategory != $ClassificationRecordCategories.CLASSIFICATION_OBJECT_TYPE())
+    result.string(true);
+else
+    result.string(false);
\ No newline at end of file
diff --git a/entity/ClassificationAdmin_entity/recordcontainers/db/orderClauseProcess.js b/entity/ClassificationAdmin_entity/recordcontainers/db/orderClauseProcess.js
deleted file mode 100644
index 519d6f1ab4..0000000000
--- a/entity/ClassificationAdmin_entity/recordcontainers/db/orderClauseProcess.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import("system.result");
-import("system.db");
-
-result.object({
-    "CLASSIFICATIONTYPE.CLASSIFICATIONGROUP": db.ASCENDING
-})
\ No newline at end of file
diff --git a/entity/ClassificationAdmin_entity/recordcontainers/jdito/contentProcess.js b/entity/ClassificationAdmin_entity/recordcontainers/jdito/contentProcess.js
new file mode 100644
index 0000000000..62e3899f1b
--- /dev/null
+++ b/entity/ClassificationAdmin_entity/recordcontainers/jdito/contentProcess.js
@@ -0,0 +1,81 @@
+import("Classification_lib");
+import("Sql_lib");
+import("system.result");
+import("system.text");
+import("system.translate");
+import("system.util");
+import("system.vars");
+
+var idvalues = vars.get("$local.idvalues");
+var decodedIdvalues;
+var res = [];
+if(idvalues)
+{
+    if(idvalues[0].charAt(0) != ";" && idvalues[0].charAt(idvalues[0].length) != ";")
+        res.push([idvalues[0], "", "", "", "", "", idvalues[0], translate.text(idvalues[0]), 
+            "", $ClassificationRecordCategories.CLASSIFICATION_OBJECT_TYPE()])
+    else
+    {
+        decodedIdvalues = text.decodeMS(idvalues[0]);
+        if(decodedIdvalues[0].charAt(0) != ";" && decodedIdvalues[0].charAt(decodedIdvalues[0].length) != ";")
+        {
+            var groupName = newSelect("CLASSIFICATIONGROUP.TITLE")
+                                    .from("CLASSIFICATIONGROUP")
+                                    .where("CLASSIFICATIONGROUP.CLASSIFICATIONGROUPID", decodedIdvalues[1])
+                                    .cell();
+            res.push([idvalues[0], decodedIdvalues[0], decodedIdvalues[1], translate.text(groupName), "", "", "", 
+                "", "", $ClassificationRecordCategories.CLASSIFICATION_CLASSIFICATION_GROUP()]);
+        }
+        
+        else
+        {
+            var scoreType = newSelect("CLASSIFICATIONTYPE.SCORETYPE")
+                                    .from("CLASSIFICATIONTYPE")
+                                    .where("CLASSIFICATIONTYPE.CLASSIFICATIONTYPEID", decodedIdvalues[1])
+                                    .orderBy("CLASSIFICATIONTYPE.SCORETYPE")
+                                    .cell();
+            res.push([idvalues[0], decodedIdvalues[0], "", "",decodedIdvalues[1], translate.text(scoreType), 
+                "", "","", $ClassificationRecordCategories.CLASSIFICATION_CLASSIFICATION_TYPE()]);
+        }
+    }
+}
+else
+{
+    var savedData = {};
+    var classificationData = newSelect("CLASSIFICATIONTYPE.OBJECT_TYPE, CLASSIFICATIONGROUP.CLASSIFICATIONGROUPID, \n\
+                                            CLASSIFICATIONGROUP.TITLE, CLASSIFICATIONTYPE.CLASSIFICATIONTYPEID,  CLASSIFICATIONTYPE.SCORETYPE")
+                                            .from("CLASSIFICATIONGROUP")
+                                            .join("CLASSIFICATIONTYPE", "CLASSIFICATIONTYPE.CLASSIFICATIONGROUP_ID = CLASSIFICATIONGROUP.CLASSIFICATIONGROUPID")
+                                            .orderBy("CLASSIFICATIONTYPE.OBJECT_TYPE, CLASSIFICATIONGROUP.SORTING")
+                                            .table()
+                                            
+    var objectType, classificationGroupId, classificationGroupName, classificationTypeId, classificationScoreType, uidClassificationGroup, uidClassificationType;
+    for (let  i = 0; i < classificationData.length; i++) 
+        {
+        [objectType, classificationGroupId, classificationGroupName, classificationTypeId, classificationScoreType] = classificationData[i];
+                
+        uidClassificationGroup = text.encodeMS([objectType, classificationGroupId]);
+        uidClassificationType = text.encodeMS([uidClassificationGroup, classificationTypeId]);
+        
+        
+        if(!savedData.hasOwnProperty(classificationData[i][0])) //objectType
+        { 
+            res.push([objectType, "", "", "", "", "", objectType, translate.text(objectType), 
+                "", $ClassificationRecordCategories.CLASSIFICATION_OBJECT_TYPE()]);
+            savedData[classificationData[i][0]] = "";
+        }
+        if(!savedData.hasOwnProperty(classificationData[i][1])) //classificationGroup
+        {
+            res.push([uidClassificationGroup, objectType, classificationGroupId, translate.text(classificationGroupName), "", "", "",
+                "", "", $ClassificationRecordCategories.CLASSIFICATION_CLASSIFICATION_GROUP()]);
+            savedData[classificationData[i][1]] = "";
+        }
+        if(!savedData.hasOwnProperty(classificationData[i][3])) //classificationType
+        {
+            res.push([uidClassificationType, uidClassificationGroup, "", "", classificationTypeId, translate.text(classificationScoreType), 
+                "", "", "", $ClassificationRecordCategories.CLASSIFICATION_CLASSIFICATION_TYPE()]);
+            savedData[classificationData[i][3]] = "";
+        }
+    }
+}
+result.object(res);
\ No newline at end of file
diff --git a/entity/ClassificationAdmin_entity/recordcontainers/jdito/onDelete.js b/entity/ClassificationAdmin_entity/recordcontainers/jdito/onDelete.js
new file mode 100644
index 0000000000..b0b953dde1
--- /dev/null
+++ b/entity/ClassificationAdmin_entity/recordcontainers/jdito/onDelete.js
@@ -0,0 +1,78 @@
+import("system.entities");
+import("Classification_lib");
+import("Sql_lib");
+import("system.util");
+import("system.db");
+import("system.vars");
+
+try
+{
+    _delete();
+}
+finally //always make sure that the cache is as valid as possible
+{
+    //ClassificationType_entity accesses the CLASSIFICATIONSCORE (max value of scores) so we need to update the cache to prevent inconsesty
+    entities.invalidateCache("ClassificationType_entity", "db");
+    //dependecies are deleted so the cache needs to be updated
+    entities.invalidateCache("ClassificationGrading_entity", "db");
+    entities.invalidateCache("ClassificationGroup_entity", "db");
+    entities.invalidateCache("ClassificationScore_entity", "db");
+}
+
+//private helper function for better code readability
+function _delete()
+{
+    var rowData = vars.get("$local.rowdata");
+    var groupID;
+    var groupValue = rowData["CLASSIFICATIONGROUP.value"];
+    var classificationType = rowData["CLASSIFICATIONTYPEID.value"];
+    var objectType = rowData["OBJECT_TYPE.value"];
+    var table;
+    var columns;
+    var values;
+    var classificationGroup = rowData["CLASSIFICATIONGROUP.value"];
+    var recordCategory = rowData["recordCategory.value"];
+
+
+    if(recordCategory == $ClassificationRecordCategories.CLASSIFICATION_CLASSIFICATION_TYPE()) // the deleted dataset must be an classificationType
+    {
+        classificationGroup = ClassificationUtils.getClassificationGroup(classificationType); //get the group before deleting the classificationtype dataset
+        newWhere("CLASSIFICATIONSCORE.CLASSIFICATIONTYPE_ID", classificationType).deleteData(); //deletes the classificationscores that are linked to the classificationtype
+        newWhere("CLASSIFICATIONTYPE.CLASSIFICATIONTYPEID", classificationType).deleteData(); //deletes the classificationtype
+        newWhere("CLASSIFICATION.CLASSIFICATIONTYPE_ID", classificationType).deleteData(); //deletes all the classifications
+    
+        var gradingTable = ClassificationUtils.getGradingTableByGroupId(classificationGroup); 
+
+        var maxScore = ClassificationUtils.getMaxScore(classificationGroup) //important to do this AFTER deleting the classificationscores to get the new value
+
+        if(gradingTable[0][1] != maxScore)
+        {
+            var column = ["MAXGRADEFORSCORE"];
+            table = ["CLASSIFICATIONGRADING"];
+            var multiplicand = maxScore/gradingTable[0][1];
+            var update = newWhere("CLASSIFICATIONGRADING.CLASSIFICATIONGRADINGID", gradingTable[0][0])
+            .updateData(true, table, column,  db.getColumnTypes("CLASSIFICATIONGRADING", column, db.getCurrentAlias()), [maxScore]);
+
+            for (let i = 1; i < gradingTable.length; i++) 
+            {
+                update = newWhere("CLASSIFICATIONGRADING.CLASSIFICATIONGRADINGID", gradingTable[i][0])
+                .updateData(true, table, column,  db.getColumnTypes("CLASSIFICATIONGRADING", column, db.getCurrentAlias()), [parseInt(gradingTable[i][1] * multiplicand)]);
+            }
+        }
+    }
+
+    else if(recordCategory == $ClassificationRecordCategories.CLASSIFICATION_CLASSIFICATION_GROUP()) //the deleted dataset must be an classificationGroup
+    {
+        var classificationTypes = newSelect("CLASSIFICATIONTYPE.CLASSIFICATIONTYPEID")
+        .from("CLASSIFICATIONTYPE")
+        .where("CLASSIFICATIONTYPE.CLASSIFICATIONGROUP_ID", classificationGroup)
+                                            
+        //delete the classificationscores, types and  that are linked to the classificationtypes of te classificationgroup
+        newWhere("CLASSIFICATIONSCORE.CLASSIFICATIONTYPE_ID", classificationTypes, SqlBuilder.IN()).deleteData(true, "CLASSIFICATIONSCORE"); 
+        newWhere("CLASSIFICATION.CLASSIFICATIONTYPE_ID", classificationTypes, SqlBuilder.IN()).deleteData(true, "CLASSIFICATION"); 
+        classificationTypes.deleteData(true, "CLASSIFICATIONTYPE"); 
+    
+        newWhere("CLASSIFICATIONGRADING.CLASSIFICATIONGROUP_ID", classificationGroup).deleteData(); 
+        newWhere("CLASSIFICATIONGROUP.CLASSIFICATIONGROUPID", classificationGroup).deleteData(); 
+    }
+}
\ No newline at end of file
diff --git a/entity/ClassificationAdmin_entity/recordcontainers/jdito/onInsert.js b/entity/ClassificationAdmin_entity/recordcontainers/jdito/onInsert.js
new file mode 100644
index 0000000000..62d83bc056
--- /dev/null
+++ b/entity/ClassificationAdmin_entity/recordcontainers/jdito/onInsert.js
@@ -0,0 +1,78 @@
+import("system.entities");
+import("system.util");
+import("system.db");
+import("system.vars");
+
+try
+{
+    _insert();
+}
+finally //always make sure that the cache is as valid as possible
+{
+    //ClassificationType_entity accesses the CLASSIFICATIONSCORE (max value of scores) so we need to update the cache to prevent inconsesty
+    entities.invalidateCache("ClassificationType_entity", "db");
+    //Grading-values are dependent since they are inserted within this process (maxgrade)
+    entities.invalidateCache("ClassificationGrading_entity", "db");
+    //groups are dependent since they are inserted within this process
+    entities.invalidateCache("ClassificationGroup_entity", "db");
+}
+
+//private helper function for better code readability
+function _insert()
+{
+    var rowData = vars.get("$local.rowdata");
+    var groupID;
+    var groupValue = rowData["CLASSIFICATIONGROUP.value"];
+    if(groupValue.length != 36 && (groupValue.match(/-/g) || []).length != 4) //if classificationGroup is no Id -> insert new group
+    {
+        groupID = util.getNewUUID();
+        var groupValues = [
+            groupValue,
+            groupID,
+            rowData["SORTING.value"]
+        ];
+        
+        var groupColumns = [
+            "TITLE",
+            "CLASSIFICATIONGROUPID",
+            "SORTING"
+        ];
+        
+        db.insertData("CLASSIFICATIONGROUP", groupColumns, null, groupValues);
+        
+        var gradingColumns = [
+            "CLASSIFICATIONGRADINGID",
+            "GRADING",
+            "MAXGRADEFORSCORE",
+            "CLASSIFICATIONGROUP_ID"
+        ];
+        
+        var gradingValues = [
+            util.getNewUUID(),
+            "A",
+            0,
+            groupID
+        ];
+        
+        db.insertData("CLASSIFICATIONGRADING", gradingColumns, null, gradingValues); // insert a "dummy" classificationGradingValue
+    }
+    else{
+        groupID = groupValue; //else the groupValue is the groupId
+    }
+    
+    var typeValues = [
+        vars.get("$field.CLASSIFICATIONTYPEIDDISPLAYVALUE"),
+        util.getNewUUID(),
+        groupID,
+        rowData["OBJECT_TYPE.value"]
+    ]
+    
+    var typeColumns = [
+        "SCORETYPE",
+        "CLASSIFICATIONTYPEID",
+        "CLASSIFICATIONGROUP_ID",
+        "OBJECT_TYPE"
+    ];
+    
+    db.insertData("CLASSIFICATIONTYPE", typeColumns, null, typeValues); // always insert the classificationtype
+}
\ No newline at end of file
diff --git a/entity/ClassificationAdmin_entity/recordcontainers/jdito/onUpdate.js b/entity/ClassificationAdmin_entity/recordcontainers/jdito/onUpdate.js
new file mode 100644
index 0000000000..b5eae575a4
--- /dev/null
+++ b/entity/ClassificationAdmin_entity/recordcontainers/jdito/onUpdate.js
@@ -0,0 +1,203 @@
+import("system.entities");
+import("system.util");
+import("system.text");
+import("system.neon");
+import("system.db");
+import("Sql_lib");
+import("system.vars");
+import("Classification_lib");
+import("system.eMath");
+
+try
+{
+    _update();
+}
+finally //always make sure that the cache is as valid as possible
+{
+    //ClassificationType_entity accesses the CLASSIFICATIONSCORE (max value of scores) so we need to update the cache to prevent inconsesty
+    entities.invalidateCache("ClassificationType_entity", "db");
+    //Grading-values are dependent since they are modified within this process (maxgrade)
+    entities.invalidateCache("ClassificationGrading_entity", "db");
+    //groups are dependent since they are modified within this process
+    entities.invalidateCache("ClassificationGroup_entity", "db");
+}
+
+//private helper function for better code readability
+function _update()
+{
+    var rowdata = vars.get("$local.rowdata");
+    var uid = vars.get("$field.UID");
+
+    //for changes of the place of use (object_type), group, and title of an scoretpye dataset
+    var dbFields = {
+        "OBJECT_TYPE.value": "OBJECT_TYPE",
+        "CLASSIFICATIONTYPEID.value" : "CLASSIFICATIONTYPEID",
+        "CLASSIFICATIONGROUP.value": "CLASSIFICATIONGROUP_ID",
+        "CLASSIFICATIONTYPEID.displayValue": "SCORETYPE",
+        "SORTING.value": "SORTING",
+        "CLASSIFICATIONTYPEIDDISPLAYVALUE.value": "CLASSIFICATIONTYPEID"
+    };
+
+    var table = "CLASSIFICATIONTYPE";
+    var cond;
+    var values = [];
+    var columns = [];
+
+    var i;
+    var isGroupDataSet = false;
+    if(rowdata["CLASSIFICATIONTYPEID.value"] == $ClassificationPlaceholder.TOPSECRETPLACEHOLDER())
+        isGroupDataSet = true;
+
+
+
+    vars.get("$local.changed").forEach(function (field, i)
+    {
+        var dbField = dbFields[field];
+        if (dbField)
+        {
+            columns[i] = dbField;
+            values[i] = rowdata[field] || "";
+        }
+    });
+
+
+    if(!isGroupDataSet) //-> update the classification type dataset
+    {
+        var groupIds = ClassificationUtils.getAllGroups(vars.get("$field.OBJECT_TYPE"));
+        var newGroupId;
+        var newGroupName;
+        var insertGroup = false;
+        var groupchange = true;
+        var newId;
+        for (i = 0; i < columns.length; i++) {
+            if(columns[i] == "CLASSIFICATIONGROUP_ID")
+            {
+                if(!groupIds.toString().includes(values[i]))
+                {
+                    newGroupName = values[i];
+                    newGroupId = util.getNewUUID();
+                    values[i] = newGroupId;
+                    insertGroup = true;
+                    groupchange = true;
+                }
+                else if(values[i] == text.decodeMS(text.decodeMS(uid)[0])[1])
+                {
+                    groupchange = false;
+                    insertGroup = true;
+                    break;
+                }
+            }
+            else if(columns[i] == "CLASSIFICATIONTYPEID")
+                {
+                    columns.splice(i, 1);
+                    values.splice(i, 1);
+                    i = i-1
+                }
+            else if(columns[i] == "SORTING")
+                {
+                    columns.splice(i, 1);
+                    values.splice(i, 1);
+                    i = i-1
+                }
+        }
+
+
+        if(groupchange == true)
+        {
+            var gradeColumn, gradeTable, multiplicand, update, gradingTable;
+            var oldGroup = ClassificationUtils.getClassificationGroup(text.decodeMS(uid)[1]);
+            var newMax = ClassificationUtils.getMaxScoreExcludeType(oldGroup, text.decodeMS(uid)[1]);
+            gradingTable = ClassificationUtils.getGradingTableByGroupId(oldGroup); 
+            var lostScore = parseInt(newSelect("max(SCORE)").from("CLASSIFICATIONSCORE").where("CLASSIFICATIONSCORE.CLASSIFICATIONTYPE_ID", text.decodeMS(uid)[1]).cell());
+            if(insertGroup)
+            {
+                var maxSorting = newSelect("distinct CLASSIFICATIONGROUP.CLASSIFICATIONGROUPID, CLASSIFICATIONGROUP.SORTING")
+                                            .from("CLASSIFICATIONGROUP")
+                                            .join("CLASSIFICATIONTYPE", "CLASSIFICATIONTYPE.CLASSIFICATIONGROUP_ID = CLASSIFICATIONGROUP.CLASSIFICATIONGROUPID")
+                                            .where("CLASSIFICATIONTYPE.OBJECT_TYPE", vars.get("$field.OBJECT_TYPE"))
+                                            .orderBy("CLASSIFICATIONGROUP.SORTING desc")
+                                            .table()[0][1];
+                db.insertData("CLASSIFICATIONGROUP", ["CLASSIFICATIONGROUPID", "TITLE", "SORTING"], null, [newGroupId, newGroupName, eMath.addInt(maxSorting, 1)]) //insert the new group
+
+                var gradingColumns = [
+                "CLASSIFICATIONGRADINGID",
+                "GRADING",
+                "MAXGRADEFORSCORE",
+                "CLASSIFICATIONGROUP_ID"
+                ];
+
+                var gradingValues = [
+                util.getNewUUID(),
+                "A",
+                lostScore,
+                newGroupId
+                ];
+
+                db.insertData("CLASSIFICATIONGRADING", gradingColumns, null, gradingValues); // insert a "dummy" classificationGradingValue
+            }
+            else
+            {
+                newId = vars.get("$field.CLASSIFICATIONGROUP");
+                newGradingTable = ClassificationUtils.getGradingTableByGroupId(newId); 
+                newNewMax = eMath.addInt(newMax, lostScore)
+                if(newGradingTable[0][1] != newNewMax) //update existing classificationGrading if the maxValue has changed
+                {
+                    gradeColumn = ["MAXGRADEFORSCORE"];
+                    gradeTable = "CLASSIFICATIONGRADING";
+                    multiplicand = newNewMax/newGradingTable[0][1];
+                    update = newWhere("CLASSIFICATIONGRADING.CLASSIFICATIONGRADINGID", newGradingTable[0][0])
+                                            .updateData(true, gradeTable, gradeColumn,  null, [parseInt(newGradingTable[0][1] * multiplicand)]);
+
+                    for (i = 1; i < newGradingTable.length; i++) 
+                    {
+                        update = newWhere("CLASSIFICATIONGRADING.CLASSIFICATIONGRADINGID", newGradingTable[i][0])
+                                        .updateData(true, gradeTable, gradeColumn,  null, [parseInt(newGradingTable[i][1] * multiplicand)]);
+                    }
+                }
+
+            }
+
+            if(gradingTable[0][1] != newMax) //update old classificationGrading if the maxValue has changed
+            {
+                gradeColumn = ["MAXGRADEFORSCORE"];
+                gradeTable = "CLASSIFICATIONGRADING";
+                multiplicand = newMax/gradingTable[0][1];
+                update = newWhere("CLASSIFICATIONGRADING.CLASSIFICATIONGRADINGID", gradingTable[0][0])
+                                        .updateData(true, gradeTable, gradeColumn,  null, [newMax]);
+
+                for (i = 0; i < gradingTable.length; i++) 
+                {
+                    update = newWhere("CLASSIFICATIONGRADING.CLASSIFICATIONGRADINGID", gradingTable[i][0])
+                                    .updateData(true, gradeTable, gradeColumn,  null, [parseInt(gradingTable[i][1] * multiplicand)]);
+                }
+            }
+        }
+
+
+        cond = newWhereIfSet("CLASSIFICATIONTYPE.CLASSIFICATIONTYPEID = '" + text.decodeMS(uid)[1] + "'");
+        columns.push("SCORETYPE");
+        values.push(vars.get("$field.CLASSIFICATIONTYPEIDDISPLAYVALUE"));
+        cond.updateData(true, table, columns, null, values);
+    }
+    else //-> update the classification group dataset
+    {
+        var value = vars.get("$field.CLASSIFICATION_PARENT_ID");
+
+        if(value.charAt(0) != ";" && value.charAt(value.length) != ";")
+            id = text.decodeMS(uid)[1];
+
+        var classificationGroupId = newSelect("CLASSIFICATIONGROUP.CLASSIFICATIONGROUPID")
+                                                .from("CLASSIFICATIONGROUP")
+                                                .where("CLASSIFICATIONGROUP.CLASSIFICATIONGROUPID", id)
+                                                .cell();
+
+        cond = newWhereIfSet("CLASSIFICATIONTYPE.CLASSIFICATIONGROUP_ID = '" + classificationGroupId + "'");
+
+        var groupTable = "CLASSIFICATIONGROUP";
+        var groupColumns = ["SORTING", "TITLE"];
+        var groupName = rowdata["CLASSIFICATIONGROUP.value"] == classificationGroupId ? rowdata["CLASSIFICATIONGROUP.displayValue"] : rowdata["CLASSIFICATIONGROUP.value"];
+        var groupValues = [vars.get("$field.SORTING"), groupName];
+        var groupCond = newWhereIfSet("CLASSIFICATIONGROUP.CLASSIFICATIONGROUPID = '" + classificationGroupId + "'");
+        groupCond.updateData(true, groupTable, groupColumns, null, groupValues);
+    }
+}
\ No newline at end of file
diff --git a/entity/ClassificationGrading_entity/ClassificationGrading_entity.aod b/entity/ClassificationGrading_entity/ClassificationGrading_entity.aod
index 891ee3d613..e82162ec53 100644
--- a/entity/ClassificationGrading_entity/ClassificationGrading_entity.aod
+++ b/entity/ClassificationGrading_entity/ClassificationGrading_entity.aod
@@ -20,8 +20,7 @@
     </entityField>
     <entityField>
       <name>MAXGRADEFORSCORE</name>
-      <documentation>%aditoprj%/entity/ClassificationGrading_entity/entityfields/maxgradeforscore/documentation.adoc</documentation>
-      <title>Till Score</title>
+      <title>Max Value</title>
       <contentType>NUMBER</contentType>
       <outputFormat>#####</outputFormat>
       <inputFormat>#####</inputFormat>
@@ -29,9 +28,9 @@
       <onValidation>%aditoprj%/entity/ClassificationGrading_entity/entityfields/maxgradeforscore/onValidation.js</onValidation>
     </entityField>
     <entityField>
-      <name>CLASSIFICATIONTYPE_GROUP</name>
-      <title>Group</title>
-      <valueProcess>%aditoprj%/entity/ClassificationGrading_entity/entityfields/classificationtype_group/valueProcess.js</valueProcess>
+      <name>CLASSIFICATIONGROUP_ID</name>
+      <title>Classification</title>
+      <valueProcess>%aditoprj%/entity/ClassificationGrading_entity/entityfields/classificationgroup_id/valueProcess.js</valueProcess>
     </entityField>
     <entityParameter>
       <name>ClassificationTypeId_param</name>
@@ -42,8 +41,8 @@
       <documentation>%aditoprj%/entity/ClassificationGrading_entity/entityfields/classificationgradings/documentation.adoc</documentation>
       <dependencies>
         <entityDependency>
-          <name>31a0ee6d-b6e3-4a7c-82a7-598c9a12c4aa</name>
-          <entityName>ClassificationAdmin_entity</entityName>
+          <name>e0c6b86e-dcc1-43e1-9581-2b10c5c3d0cd</name>
+          <entityName>ClassificationGroup_entity</entityName>
           <fieldName>ClassificationGradings</fieldName>
           <isConsumer v="false" />
         </entityDependency>
@@ -65,8 +64,11 @@
     <dbRecordContainer>
       <name>db</name>
       <alias>Data_alias</alias>
+      <isPageable v="false" />
       <conditionProcess>%aditoprj%/entity/ClassificationGrading_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
       <orderClauseProcess>%aditoprj%/entity/ClassificationGrading_entity/recordcontainers/db/orderClauseProcess.js</orderClauseProcess>
+      <cacheType>GLOBAL</cacheType>
+      <cacheKeyProcess>%aditoprj%/entity/ClassificationGrading_entity/recordcontainers/db/cacheKeyProcess.js</cacheKeyProcess>
       <linkInformation>
         <linkInformation>
           <name>9a9482d5-005a-4dc5-8b58-e07c44420b64</name>
@@ -77,22 +79,22 @@
         </linkInformation>
       </linkInformation>
       <recordFieldMappings>
-        <dbRecordFieldMapping>
-          <name>CLASSIFICATIONTYPE_GROUP.value</name>
-          <recordfield>CLASSIFICATIONGRADING.CLASSIFICATIONTYPE_GROUP</recordfield>
-        </dbRecordFieldMapping>
         <dbRecordFieldMapping>
           <name>MAXGRADEFORSCORE.value</name>
           <recordfield>CLASSIFICATIONGRADING.MAXGRADEFORSCORE</recordfield>
         </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>CLASSIFICATIONGRADINGID.value</name>
-          <recordfield>CLASSIFICATIONGRADING.CLASSIFICATIONGRADINGID</recordfield>
-        </dbRecordFieldMapping>
         <dbRecordFieldMapping>
           <name>GRADING.value</name>
           <recordfield>CLASSIFICATIONGRADING.GRADING</recordfield>
         </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>CLASSIFICATIONGROUP_ID.value</name>
+          <recordfield>CLASSIFICATIONGRADING.CLASSIFICATIONGROUP_ID</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>CLASSIFICATIONGRADINGID.value</name>
+          <recordfield>CLASSIFICATIONGRADING.CLASSIFICATIONGRADINGID</recordfield>
+        </dbRecordFieldMapping>
       </recordFieldMappings>
     </dbRecordContainer>
   </recordContainers>
diff --git a/entity/ClassificationGrading_entity/documentation.adoc b/entity/ClassificationGrading_entity/documentation.adoc
index f87c483ab8..faa566900d 100644
--- a/entity/ClassificationGrading_entity/documentation.adoc
+++ b/entity/ClassificationGrading_entity/documentation.adoc
@@ -1,3 +1,56 @@
 = ClassificationGrading_entity
 
-This entity is used for storing the classification grading and making it possible for the admin to change the grading of the classification scores.
\ No newline at end of file
+Definition:
+
+    This entity is used for storing the classification grading and making it possible for the admin to change the grading of the clasification (classificationGroup).
+    The classification can be dynamically configured at runtime.
+    (For more information about the classification see also Classification_entity)
+
+Purpose:
+
+    This Entity gives the administrators an easy way to change the classification grading in the preview of classificationAdmin 
+    when selecting a classification (classificationGroup).
+    The classificationgrading gets stored in the table classificationgrading with it's own classificationgradingId, the classificationGroup_id, 
+    the grading (e.g. "A", "B", "C") and the max score you this grade for.
+
+    This entity only has one view: the ClassificationGradingMultipleEdit_view which has both the MaxGradeForScore and the grading column.
+    making it possible for the admin to configure something like this:
+
+    ClassificationAdminPreviewOfClassification Example: 
+
+        USAGE:          Organisation
+        CLASSIFICATION: 1. Target Group
+        SORTING:        1
+         A               100
+         B               75
+         C               50
+         D               25
+
+    --> The Score "72" would lead to the grade "B" (<<<not included in the preview, just for easier understanding of how this works)
+
+Particularities:
+    
+    The MaxGradeForScore of the best possible score (in our example for "A") has to always be the largest possibly achievable value, 
+    otherwise it would lead to errors, which is why this field always get's the maximum value set as default 
+    and it's not possible to save something greater than that (validationProcess).
+    
+    Also, since the indicators under the classification and the possible values of those indicators can be changed:
+    The grading get's updated automatically after changes to the maximum possible value, 
+    using the rule of three (see onInsert-, onUpdate- and onDelete- processes of classificationScore).
+
+    The Classification consists of the following entities:
+    Classification_entity,
+    ClassificationAdmin_entity,
+    ClassificationGrading_entity,
+    ClassificationGroup_entity,
+    ClassificationScore_entity,
+    ClassificationType_entity
+
+    Our terms in the db and entity structure differ from the technical terms the user gets to see, to make it easier to understand 
+    for the developer that doesn't have the technical know-how:
+
+    Our term:               Technical term:                 Example:
+    Object_Type             Usage                           Organisation
+    ClassificationGroup     Classification                  1. Target Group
+    ClassificationType      Indicator                       Industry
+    ClassificationScore     (Possible-)Value/Selection      Service
\ No newline at end of file
diff --git a/entity/ClassificationGrading_entity/entityfields/classificationtype_group/valueProcess.js b/entity/ClassificationGrading_entity/entityfields/classificationgroup_id/valueProcess.js
similarity index 100%
rename from entity/ClassificationGrading_entity/entityfields/classificationtype_group/valueProcess.js
rename to entity/ClassificationGrading_entity/entityfields/classificationgroup_id/valueProcess.js
diff --git a/entity/ClassificationGrading_entity/entityfields/maxgradeforscore/onValidation.js b/entity/ClassificationGrading_entity/entityfields/maxgradeforscore/onValidation.js
index 7d3a67af63..1e60bc18fd 100644
--- a/entity/ClassificationGrading_entity/entityfields/maxgradeforscore/onValidation.js
+++ b/entity/ClassificationGrading_entity/entityfields/maxgradeforscore/onValidation.js
@@ -1,12 +1,13 @@
 import("Classification_lib");
-import("Entity_lib");
-import("system.translate");
 import("system.result");
+import("system.translate");
 import("system.vars");
 
-var classificationTypeGroup = vars.get("$field.CLASSIFICATIONTYPE_GROUP");
+var classificationTypeGroup = vars.get("$field.CLASSIFICATIONGROUP_ID");
 var maxValue = ClassificationUtils.getMaxScore(classificationTypeGroup);
+
 if (maxValue == "")
     maxValue = 100;
         
-if (parseFloat(vars.get("local.value")) > maxValue)
\ No newline at end of file
+if (parseFloat(vars.get("local.value")) > maxValue)
+    result.string(translate.withArguments("${HIGHER_THAN_MAX} max: %0", [maxValue]));
\ No newline at end of file
diff --git a/entity/ClassificationGrading_entity/entityfields/maxgradeforscore/valueProcess.js b/entity/ClassificationGrading_entity/entityfields/maxgradeforscore/valueProcess.js
index 6e8504b68f..24571535a8 100644
--- a/entity/ClassificationGrading_entity/entityfields/maxgradeforscore/valueProcess.js
+++ b/entity/ClassificationGrading_entity/entityfields/maxgradeforscore/valueProcess.js
@@ -6,6 +6,6 @@ import("system.result");
 if(((vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW || vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT) && 
     (vars.get("$this.value") == null || vars.get("$this.value") == undefined)))
 {
-    var group = vars.getString("$param.ClassificationTypeId_param")
+    var group = vars.getString("$param.ClassificationTypeId_param");
     result.string(ClassificationUtils.getMaxScore(group));
 }
\ No newline at end of file
diff --git a/entity/ClassificationGrading_entity/recordcontainers/db/cacheKeyProcess.js b/entity/ClassificationGrading_entity/recordcontainers/db/cacheKeyProcess.js
new file mode 100644
index 0000000000..2bf96b8a4f
--- /dev/null
+++ b/entity/ClassificationGrading_entity/recordcontainers/db/cacheKeyProcess.js
@@ -0,0 +1,5 @@
+import("CachedRecordContainer_lib");
+import("system.result")
+
+var res = CachedRecordContainerUtils.getCommonKey("$param.ClassificationTypeId_param");
+result.string(res);
diff --git a/entity/ClassificationGrading_entity/recordcontainers/db/conditionProcess.js b/entity/ClassificationGrading_entity/recordcontainers/db/conditionProcess.js
index 8739d3dce8..83116f2723 100644
--- a/entity/ClassificationGrading_entity/recordcontainers/db/conditionProcess.js
+++ b/entity/ClassificationGrading_entity/recordcontainers/db/conditionProcess.js
@@ -2,6 +2,6 @@ import("system.vars");
 import("system.result");
 import("Sql_lib");
 
-var cond = newWhereIfSet("CLASSIFICATIONGRADING.CLASSIFICATIONTYPE_GROUP", "$param.ClassificationTypeId_param");
+var cond = newWhereIfSet("CLASSIFICATIONGRADING.CLASSIFICATIONGROUP_ID", "$param.ClassificationTypeId_param");
 result.string(cond.toString());
 
diff --git a/entity/ClassificationGroupAnalyses_entity/ClassificationGroupAnalyses_entity.aod b/entity/ClassificationGroupAnalyses_entity/ClassificationGroupAnalyses_entity.aod
deleted file mode 100644
index c43b27125f..0000000000
--- a/entity/ClassificationGroupAnalyses_entity/ClassificationGroupAnalyses_entity.aod
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
-  <name>ClassificationGroupAnalyses_entity</name>
-  <majorModelMode>DISTRIBUTED</majorModelMode>
-  <documentation>%aditoprj%/entity/ClassificationGroupAnalyses_entity/documentation.adoc</documentation>
-  <contentTitleProcess>%aditoprj%/entity/ClassificationGroupAnalyses_entity/contentTitleProcess.js</contentTitleProcess>
-  <recordContainer>jdito</recordContainer>
-  <entityFields>
-    <entityProvider>
-      <name>#PROVIDER</name>
-    </entityProvider>
-    <entityField>
-      <name>UID</name>
-    </entityField>
-    <entityParameter>
-      <name>ClassificationType_param</name>
-      <expose v="true" />
-      <mandatory v="true" />
-      <description>PARAMETER</description>
-    </entityParameter>
-    <entityParameter>
-      <name>ObjectType_param</name>
-      <expose v="true" />
-      <mandatory v="true" />
-      <description>PARAMETER</description>
-    </entityParameter>
-    <entityParameter>
-      <name>ObjectRowid_param</name>
-      <expose v="true" />
-      <mandatory v="true" />
-      <description>PARAMETER</description>
-    </entityParameter>
-    <entityProvider>
-      <name>GroupAnalyses</name>
-      <documentation>%aditoprj%/entity/ClassificationGroupAnalyses_entity/entityfields/groupanalyses/documentation.adoc</documentation>
-      <dependencies>
-        <entityDependency>
-          <name>8dfbe502-aa7a-4514-aaed-a1decf2b4344</name>
-          <entityName>Salesproject_entity</entityName>
-          <fieldName>ClassificationGroups</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
-        <entityDependency>
-          <name>ccd9d58a-6175-4f67-a80a-88aeac1cad3a</name>
-          <entityName>Organisation_entity</entityName>
-          <fieldName>ClassificationGroups</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
-      </dependencies>
-    </entityProvider>
-    <entityField>
-      <name>SCORE</name>
-    </entityField>
-    <entityField>
-      <name>GROUP</name>
-    </entityField>
-    <entityProvider>
-      <name>#PROVIDER_AGGREGATES</name>
-      <useAggregates v="true" />
-    </entityProvider>
-  </entityFields>
-  <recordContainers>
-    <jDitoRecordContainer>
-      <name>jdito</name>
-      <jDitoRecordAlias>Data_alias</jDitoRecordAlias>
-      <contentProcess>%aditoprj%/entity/ClassificationGroupAnalyses_entity/recordcontainers/jdito/contentProcess.js</contentProcess>
-      <recordFieldMappings>
-        <jDitoRecordFieldMapping>
-          <name>UID.value</name>
-        </jDitoRecordFieldMapping>
-        <jDitoRecordFieldMapping>
-          <name>GROUP.value</name>
-        </jDitoRecordFieldMapping>
-        <jDitoRecordFieldMapping>
-          <name>GROUP.displayValue</name>
-        </jDitoRecordFieldMapping>
-        <jDitoRecordFieldMapping>
-          <name>SCORE.value</name>
-        </jDitoRecordFieldMapping>
-      </recordFieldMappings>
-    </jDitoRecordContainer>
-  </recordContainers>
-</entity>
diff --git a/entity/ClassificationGroupAnalyses_entity/contentTitleProcess.js b/entity/ClassificationGroupAnalyses_entity/contentTitleProcess.js
deleted file mode 100644
index ce766e6646..0000000000
--- a/entity/ClassificationGroupAnalyses_entity/contentTitleProcess.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import("system.vars");
-import("system.result");
-result.string(vars.get("$field.UID"))
\ No newline at end of file
diff --git a/entity/ClassificationGroupAnalyses_entity/documentation.adoc b/entity/ClassificationGroupAnalyses_entity/documentation.adoc
deleted file mode 100644
index ba6c7d1f31..0000000000
--- a/entity/ClassificationGroupAnalyses_entity/documentation.adoc
+++ /dev/null
@@ -1,3 +0,0 @@
-= ClassificationGroupAnalyses_entity
-
-This entity is there for grouping the information in the classification_entity
\ No newline at end of file
diff --git a/entity/ClassificationGroupAnalyses_entity/entityfields/groupanalyses/documentation.adoc b/entity/ClassificationGroupAnalyses_entity/entityfields/groupanalyses/documentation.adoc
deleted file mode 100644
index f5014870cb..0000000000
--- a/entity/ClassificationGroupAnalyses_entity/entityfields/groupanalyses/documentation.adoc
+++ /dev/null
@@ -1,3 +0,0 @@
-= ClassificationGroupAnalyses_entity - GroupAnalyses
-
-Provides the information to display them in the Classification
\ No newline at end of file
diff --git a/entity/ClassificationGroupAnalyses_entity/recordcontainers/jdito/contentProcess.js b/entity/ClassificationGroupAnalyses_entity/recordcontainers/jdito/contentProcess.js
deleted file mode 100644
index 160dc5a4c4..0000000000
--- a/entity/ClassificationGroupAnalyses_entity/recordcontainers/jdito/contentProcess.js
+++ /dev/null
@@ -1,13 +0,0 @@
-import("system.translate");
-import("system.result");
-import("system.vars");
-import("Classification_lib");
-
-var scores = ClassificationUtils.getScore(vars.get("$param.ClassificationType_param"), vars.get("$param.ObjectType_param"), vars.get("$param.ObjectRowid_param"));
-var data = [];
-
-for (var i = 0; i < scores.length; i++) {
-    data.push([scores[i][1], scores[i][1], translate.text(scores[i][1]), scores[i][0]]);
-}
-
-result.object(data);
\ No newline at end of file
diff --git a/entity/ClassificationGroup_entity/ClassificationGroup_entity.aod b/entity/ClassificationGroup_entity/ClassificationGroup_entity.aod
new file mode 100644
index 0000000000..546a64d948
--- /dev/null
+++ b/entity/ClassificationGroup_entity/ClassificationGroup_entity.aod
@@ -0,0 +1,112 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
+  <name>ClassificationGroup_entity</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <documentation>%aditoprj%/entity/ClassificationGroup_entity/documentation.adoc</documentation>
+  <title>Classification</title>
+  <contentTitleProcess>%aditoprj%/entity/ClassificationGroup_entity/contentTitleProcess.js</contentTitleProcess>
+  <titlePlural>Classifications</titlePlural>
+  <recordContainer>db</recordContainer>
+  <entityFields>
+    <entityProvider>
+      <name>#PROVIDER</name>
+    </entityProvider>
+    <entityField>
+      <name>CLASSIFICATIONGROUPID</name>
+      <valueProcess>%aditoprj%/entity/ClassificationGroup_entity/entityfields/classificationgroupid/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>TITLE</name>
+      <title>Classification</title>
+      <displayValueProcess>%aditoprj%/entity/ClassificationGroup_entity/entityfields/title/displayValueProcess.js</displayValueProcess>
+    </entityField>
+    <entityConsumer>
+      <name>ClassificationGroups</name>
+      <dependency>
+        <name>dependency</name>
+        <entityName>ClassificationType_entity</entityName>
+        <fieldName>#PROVIDER</fieldName>
+      </dependency>
+    </entityConsumer>
+    <entityConsumer>
+      <name>ClassificationGradings</name>
+      <dependency>
+        <name>dependency</name>
+        <entityName>ClassificationGrading_entity</entityName>
+        <fieldName>ClassificationGradings</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>ClassificationTypeId_param</name>
+          <valueProcess>%aditoprj%/entity/ClassificationGroup_entity/entityfields/classificationgradings/children/classificationtypeid_param/valueProcess.js</valueProcess>
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityField>
+      <name>SORTING</name>
+      <title>Sorting</title>
+    </entityField>
+    <entityField>
+      <name>object_type</name>
+      <title>Place Of Use</title>
+      <valueProcess>%aditoprj%/entity/ClassificationGroup_entity/entityfields/object_type/valueProcess.js</valueProcess>
+    </entityField>
+    <entityProvider>
+      <name>#PROVIDER_AGGREGATES</name>
+      <useAggregates v="true" />
+    </entityProvider>
+    <entityParameter>
+      <name>ObjectType_param</name>
+      <expose v="true" />
+    </entityParameter>
+    <entityProvider>
+      <name>SpecificObjectTypeGroups</name>
+      <documentation>%aditoprj%/entity/ClassificationGroup_entity/entityfields/specificobjecttypegroups/documentation.adoc</documentation>
+      <children>
+        <entityParameter>
+          <name>ObjectType_param</name>
+          <expose v="true" />
+          <mandatory v="true" />
+        </entityParameter>
+      </children>
+    </entityProvider>
+    <entityField>
+      <name>translatedTitle</name>
+      <valueProcess>%aditoprj%/entity/ClassificationGroup_entity/entityfields/translatedtitle/valueProcess.js</valueProcess>
+    </entityField>
+  </entityFields>
+  <recordContainers>
+    <dbRecordContainer>
+      <name>db</name>
+      <alias>Data_alias</alias>
+      <isPageable v="false" />
+      <conditionProcess>%aditoprj%/entity/ClassificationGroup_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
+      <orderClauseProcess>%aditoprj%/entity/ClassificationGroup_entity/recordcontainers/db/orderClauseProcess.js</orderClauseProcess>
+      <cacheType>GLOBAL</cacheType>
+      <cacheKeyProcess>%aditoprj%/entity/ClassificationGroup_entity/recordcontainers/db/cacheKeyProcess.js</cacheKeyProcess>
+      <linkInformation>
+        <linkInformation>
+          <name>b0606861-e080-4441-94ac-fce33bbf7747</name>
+          <tableName>CLASSIFICATIONGROUP</tableName>
+          <primaryKey>CLASSIFICATIONGROUPID</primaryKey>
+          <isUIDTable v="true" />
+          <readonly v="false" />
+        </linkInformation>
+      </linkInformation>
+      <recordFieldMappings>
+        <dbRecordFieldMapping>
+          <name>TITLE.value</name>
+          <recordfield>CLASSIFICATIONGROUP.TITLE</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>SORTING.value</name>
+          <recordfield>CLASSIFICATIONGROUP.SORTING</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>CLASSIFICATIONGROUPID.value</name>
+          <recordfield>CLASSIFICATIONGROUP.CLASSIFICATIONGROUPID</recordfield>
+        </dbRecordFieldMapping>
+      </recordFieldMappings>
+    </dbRecordContainer>
+  </recordContainers>
+</entity>
diff --git a/entity/ClassificationGroup_entity/contentTitleProcess.js b/entity/ClassificationGroup_entity/contentTitleProcess.js
new file mode 100644
index 0000000000..1f578714f7
--- /dev/null
+++ b/entity/ClassificationGroup_entity/contentTitleProcess.js
@@ -0,0 +1,4 @@
+import("system.vars");
+import("system.result");
+
+result.string(vars.get("$field.translatedTitle"));
\ No newline at end of file
diff --git a/entity/ClassificationGroup_entity/documentation.adoc b/entity/ClassificationGroup_entity/documentation.adoc
new file mode 100644
index 0000000000..457450a735
--- /dev/null
+++ b/entity/ClassificationGroup_entity/documentation.adoc
@@ -0,0 +1,49 @@
+= ClassificationGroup_entity
+
+Definition:
+
+    Used to make it possible to store the classification groups in their own table with their own UUID instead of using the title as the key.
+    The classification can be dynamically configured at runtime.
+    (For more information about the classification see also Classification_entity)
+
+Purpose:
+
+    This entity is used for storing the classification groups and making it possible for the admin to change 
+    the details of the clasification (classificationGroup) like the name, sorting or it's usage 
+    or to change the classification of an indicator without affecting the classification itself.
+    In the past the classificationgroup was only a name, which limited the functionality, which is why it got changed.
+
+    This entity only has one view: the ClassificationGroupPreview which has the usage (object_type), title, and sorting fields
+    and the ClassificationGradingMultipleEdit_view.
+    making it possible for the admin to configure something like this:
+
+    ClassificationAdminPreviewOfClassification Example: 
+
+        USAGE:          Organisation
+        CLASSIFICATION: 1. Target Group
+        SORTING:        1
+         A               100
+         B               75
+         C               50
+         D               25
+
+   (For more information about the grading see also ClassifiactionGrading_entity)
+
+Particularities:
+
+    The Classification consists of the following entities:
+    Classification_entity,
+    ClassificationAdmin_entity,
+    ClassificationGrading_entity,
+    ClassificationGroup_entity,
+    ClassificationScore_entity,
+    ClassificationType_entity
+
+    Our terms in the db and entity structure differ from the technical terms the user gets to see, to make it easier to understand 
+    for the developer that doesn't have the technical know-how:
+
+    Our term:               Technical term:                 Example:
+    Object_Type             Usage                           Organisation
+    ClassificationGroup     Classification                  1. Target Group
+    ClassificationType      Indicator                       Industry
+    ClassificationScore     (Possible-)Value/Selection      Service
\ No newline at end of file
diff --git a/entity/ClassificationGroup_entity/entityfields/classificationgradings/children/classificationtypeid_param/valueProcess.js b/entity/ClassificationGroup_entity/entityfields/classificationgradings/children/classificationtypeid_param/valueProcess.js
new file mode 100644
index 0000000000..955830d8a9
--- /dev/null
+++ b/entity/ClassificationGroup_entity/entityfields/classificationgradings/children/classificationtypeid_param/valueProcess.js
@@ -0,0 +1,4 @@
+import("system.result");
+import("system.vars");
+
+result.string(vars.get("$field.CLASSIFICATIONGROUPID"));
\ No newline at end of file
diff --git a/entity/ClassificationAdmin_entity/entityfields/classificationtype/valueProcess.js b/entity/ClassificationGroup_entity/entityfields/classificationgroupid/valueProcess.js
similarity index 61%
rename from entity/ClassificationAdmin_entity/entityfields/classificationtype/valueProcess.js
rename to entity/ClassificationGroup_entity/entityfields/classificationgroupid/valueProcess.js
index 2bccd5eb7f..16c47d8b58 100644
--- a/entity/ClassificationAdmin_entity/entityfields/classificationtype/valueProcess.js
+++ b/entity/ClassificationGroup_entity/entityfields/classificationgroupid/valueProcess.js
@@ -1,8 +1,10 @@
+import("system.util");
 import("system.result");
 import("system.neon");
 import("system.vars");
 
 if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
 {
-    result.string(vars.get("$param.ClassificationType_param"));
+    var newId = util.getNewUUID();
+    result.string(newId);
 }
\ No newline at end of file
diff --git a/entity/ClassificationGroup_entity/entityfields/object_type/valueProcess.js b/entity/ClassificationGroup_entity/entityfields/object_type/valueProcess.js
new file mode 100644
index 0000000000..d24b532449
--- /dev/null
+++ b/entity/ClassificationGroup_entity/entityfields/object_type/valueProcess.js
@@ -0,0 +1,14 @@
+import("Sql_lib");
+import("system.result");
+import("system.vars");
+
+var groupId = vars.get("$field.CLASSIFICATIONGROUPID")
+
+if(groupId)
+{
+    var res = newSelect("distinct CLASSIFICATIONTYPE.OBJECT_TYPE")
+                            .from("CLASSIFICATIONTYPE")
+                            .where("CLASSIFICATIONTYPE.CLASSIFICATIONGROUP_ID", vars.get("$field.CLASSIFICATIONGROUPID"))
+                            .cell();
+    result.string(res);
+}
\ No newline at end of file
diff --git a/entity/ClassificationGroup_entity/entityfields/specificobjecttypegroups/documentation.adoc b/entity/ClassificationGroup_entity/entityfields/specificobjecttypegroups/documentation.adoc
new file mode 100644
index 0000000000..69ef470010
--- /dev/null
+++ b/entity/ClassificationGroup_entity/entityfields/specificobjecttypegroups/documentation.adoc
@@ -0,0 +1,2 @@
+Provider that returns ClassificationGroups of one given Object_type (e.g. `Organisation`)
+This may be used for `entities.getRows`.
\ No newline at end of file
diff --git a/entity/ClassificationGroup_entity/entityfields/title/displayValueProcess.js b/entity/ClassificationGroup_entity/entityfields/title/displayValueProcess.js
new file mode 100644
index 0000000000..1bd5882b79
--- /dev/null
+++ b/entity/ClassificationGroup_entity/entityfields/title/displayValueProcess.js
@@ -0,0 +1,4 @@
+import("system.result")
+import("system.vars")
+
+result.string(vars.get("$this.value"));
\ No newline at end of file
diff --git a/entity/ClassificationGroup_entity/entityfields/translatedtitle/valueProcess.js b/entity/ClassificationGroup_entity/entityfields/translatedtitle/valueProcess.js
new file mode 100644
index 0000000000..c7ea27ae7a
--- /dev/null
+++ b/entity/ClassificationGroup_entity/entityfields/translatedtitle/valueProcess.js
@@ -0,0 +1,11 @@
+import("system.vars");
+import("system.result");
+import("system.translate");
+
+var res;
+var title = vars.get("$field.TITLE");
+if (title)
+    res = translate.text(title);
+else
+    res = "";
+result.string(res);
\ No newline at end of file
diff --git a/entity/ClassificationGroup_entity/recordcontainers/db/cacheKeyProcess.js b/entity/ClassificationGroup_entity/recordcontainers/db/cacheKeyProcess.js
new file mode 100644
index 0000000000..944498d6bd
--- /dev/null
+++ b/entity/ClassificationGroup_entity/recordcontainers/db/cacheKeyProcess.js
@@ -0,0 +1,5 @@
+import("CachedRecordContainer_lib");
+import("system.result")
+
+var res = CachedRecordContainerUtils.getCommonKey("$param.ObjectType_param");
+result.string(res);
diff --git a/entity/ClassificationGroup_entity/recordcontainers/db/conditionProcess.js b/entity/ClassificationGroup_entity/recordcontainers/db/conditionProcess.js
new file mode 100644
index 0000000000..2d43dba815
--- /dev/null
+++ b/entity/ClassificationGroup_entity/recordcontainers/db/conditionProcess.js
@@ -0,0 +1,20 @@
+import("Employee_lib");
+import("AttributeRegistry_basic");
+import("Attribute_lib");
+import("system.logging");
+import("system.vars");
+import("system.db");
+import("system.result");
+import("Sql_lib");
+import("Context_lib");
+
+var cond = newWhere();
+
+var objectType = vars.get("$param.ObjectType_param");
+if (objectType)
+    cond.and("CLASSIFICATIONGROUP.CLASSIFICATIONGROUPID", newSelect("CLASSIFICATIONTYPE.CLASSIFICATIONGROUP_ID")
+                                                            .from("CLASSIFICATIONTYPE")
+                                                            .where("CLASSIFICATIONTYPE.OBJECT_TYPE", objectType), SqlBuilder.IN());
+
+//TODO: use a preparedCondition (.build instead of .toString) when available #1030812 #1034026
+result.string(cond.toString());
\ No newline at end of file
diff --git a/entity/ClassificationGroup_entity/recordcontainers/db/orderClauseProcess.js b/entity/ClassificationGroup_entity/recordcontainers/db/orderClauseProcess.js
new file mode 100644
index 0000000000..d4100626b3
--- /dev/null
+++ b/entity/ClassificationGroup_entity/recordcontainers/db/orderClauseProcess.js
@@ -0,0 +1,7 @@
+import("system.db");
+import("system.result");
+
+var res = {
+    "CLASSIFICATIONGROUP.TITLE": db.ASCENDING
+};
+result.object(res);
\ No newline at end of file
diff --git a/entity/ClassificationScore_entity/ClassificationScore_entity.aod b/entity/ClassificationScore_entity/ClassificationScore_entity.aod
index 4d930ad8b0..51332fbd2e 100644
--- a/entity/ClassificationScore_entity/ClassificationScore_entity.aod
+++ b/entity/ClassificationScore_entity/ClassificationScore_entity.aod
@@ -33,11 +33,12 @@
     </entityField>
     <entityField>
       <name>SCORE</name>
-      <title>Score</title>
+      <title>Points</title>
       <contentType>NUMBER</contentType>
       <outputFormat>#,##0.00</outputFormat>
       <inputFormat>#,##0.00</inputFormat>
       <mandatory v="true" />
+      <onValidation>%aditoprj%/entity/ClassificationScore_entity/entityfields/score/onValidation.js</onValidation>
     </entityField>
     <entityProvider>
       <name>ClassificationScores</name>
@@ -51,6 +52,7 @@
         </entityParameter>
         <entityParameter>
           <name>ClassificationTypeId_param</name>
+          <valueProcess>%aditoprj%/entity/ClassificationScore_entity/entityfields/classificationscores/children/classificationtypeid_param/valueProcess.js</valueProcess>
           <expose v="true" />
           <mandatory v="true" />
         </entityParameter>
@@ -66,10 +68,6 @@
       <expose v="true" />
       <description>PARAMETER</description>
     </entityParameter>
-    <entityField>
-      <name>MaxValue</name>
-      <valueProcess>%aditoprj%/entity/ClassificationScore_entity/entityfields/maxvalue/valueProcess.js</valueProcess>
-    </entityField>
     <entityParameter>
       <name>ClassificationGroup_param</name>
       <expose v="true" />
@@ -84,16 +82,28 @@
       <name>#PROVIDER_AGGREGATES</name>
       <useAggregates v="true" />
     </entityProvider>
+    <entityField>
+      <name>classificationgroup_id</name>
+      <valueProcess>%aditoprj%/entity/ClassificationScore_entity/entityfields/classificationgroup_id/valueProcess.js</valueProcess>
+      <displayValueProcess>%aditoprj%/entity/ClassificationScore_entity/entityfields/classificationgroup_id/displayValueProcess.js</displayValueProcess>
+    </entityField>
+    <entityField>
+      <name>translatedTitle</name>
+      <valueProcess>%aditoprj%/entity/ClassificationScore_entity/entityfields/translatedtitle/valueProcess.js</valueProcess>
+    </entityField>
   </entityFields>
   <recordContainers>
     <dbRecordContainer>
       <name>db</name>
       <alias>Data_alias</alias>
+      <isPageable v="false" />
       <conditionProcess>%aditoprj%/entity/ClassificationScore_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
       <orderClauseProcess>%aditoprj%/entity/ClassificationScore_entity/recordcontainers/db/orderClauseProcess.js</orderClauseProcess>
       <onDBInsert>%aditoprj%/entity/ClassificationScore_entity/recordcontainers/db/onDBInsert.js</onDBInsert>
       <onDBUpdate>%aditoprj%/entity/ClassificationScore_entity/recordcontainers/db/onDBUpdate.js</onDBUpdate>
       <onDBDelete>%aditoprj%/entity/ClassificationScore_entity/recordcontainers/db/onDBDelete.js</onDBDelete>
+      <cacheType>GLOBAL</cacheType>
+      <cacheKeyProcess>%aditoprj%/entity/ClassificationScore_entity/recordcontainers/db/cacheKeyProcess.js</cacheKeyProcess>
       <linkInformation>
         <linkInformation>
           <name>e2fecaf8-bc95-4a4d-bd96-88731568b1a4</name>
diff --git a/entity/ClassificationScore_entity/documentation.adoc b/entity/ClassificationScore_entity/documentation.adoc
index 89c3ea4f99..b726994060 100644
--- a/entity/ClassificationScore_entity/documentation.adoc
+++ b/entity/ClassificationScore_entity/documentation.adoc
@@ -1,3 +1,47 @@
 = ClassificationScore_entity
 
-Presentation of the grouping via ScoreCard
\ No newline at end of file
+Definition:
+
+    Stores the possible Values of Classification score types and their score and the sorting value.
+    (For more information about the classification see also Classification_entity)
+
+Purpose:
+
+    This Entity gives the administrators an easy way to edit the possible values, their scoring and sorting in the preview of classificationAdmin 
+    when selecting a indicator (classificationType).
+    The values gets stored in the table classificationscore with their own classificationScoreId, the classificationType_Id, title, score und sort.
+
+    This entity only has one view: the ClassificationScoreMultipleEdit_view which has title as the title field and score and sort as columns
+    making it possible for the admin to configure something like this:
+
+    ClassificationAdminPreviewOfIndicator Example: 
+
+        USAGE:          Organisation
+        CLASSIFICATION: 1. Target Group
+        INDICATOR:      Headquarters
+         Germany         35,00, 10
+         Austria         35,00 20
+         Switzerland     25,00, 30
+         Other            0,00, 40
+
+Particularities:
+
+    The biggest possible score is being used by classificationGrading to calculate the value for the best possible grade, 
+    if this value is changed the grading get's updated using the rule of three (see onInsert-, onUpdate- and onDelete- processes).
+    
+    The Classification consists of the following entities:
+    Classification_entity,
+    ClassificationAdmin_entity,
+    ClassificationGrading_entity,
+    ClassificationGroup_entity,
+    ClassificationScore_entity,
+    ClassificationType_entity
+
+    Our terms in the db and entity structure differ from the technical terms the user gets to see, to make it easier to understand 
+    for the developer that doesn't have the technical know-how:
+
+    Our term:               Technical term:                 Example:
+    Object_Type             Usage                           Organisation
+    ClassificationGroup     Classification                  1. Target Group
+    ClassificationType      Indicator                       Industry
+    ClassificationScore     (Possible-)Value/Selection      Service
\ No newline at end of file
diff --git a/entity/ClassificationScore_entity/entityfields/classificationgroup_id/displayValueProcess.js b/entity/ClassificationScore_entity/entityfields/classificationgroup_id/displayValueProcess.js
new file mode 100644
index 0000000000..98e4c5bc2b
--- /dev/null
+++ b/entity/ClassificationScore_entity/entityfields/classificationgroup_id/displayValueProcess.js
@@ -0,0 +1,9 @@
+import("system.vars");
+import("Context_lib");
+import("system.result");
+
+var groupId = vars.get("$field.classificationgroup_id");
+if(groupId != "" && groupId != undefined)
+    result.string(ContextUtils.loadContentTitle("ClassificationGroup_entity", groupId));
+else
+    result.string("")
\ No newline at end of file
diff --git a/entity/ClassificationScore_entity/entityfields/classificationgroup_id/valueProcess.js b/entity/ClassificationScore_entity/entityfields/classificationgroup_id/valueProcess.js
new file mode 100644
index 0000000000..65f65e7104
--- /dev/null
+++ b/entity/ClassificationScore_entity/entityfields/classificationgroup_id/valueProcess.js
@@ -0,0 +1,7 @@
+import("system.vars");
+import("Sql_lib");
+import("system.result");
+
+var groupId = vars.get("$param.ClassificationGroup_param");
+if(groupId)
+    result.string(groupId);
\ No newline at end of file
diff --git a/entity/ClassificationScore_entity/entityfields/classificationscoreid/valueProcess.js b/entity/ClassificationScore_entity/entityfields/classificationscoreid/valueProcess.js
index 2e1eadc780..394e2a4a03 100644
--- a/entity/ClassificationScore_entity/entityfields/classificationscoreid/valueProcess.js
+++ b/entity/ClassificationScore_entity/entityfields/classificationscoreid/valueProcess.js
@@ -3,7 +3,5 @@ import("system.util");
 import("system.result");
 import("system.vars");
 
-if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
-{
-    result.string(util.getNewUUID());
-}
\ No newline at end of file
+if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && !vars.get("$this.value"))
+    result.string(util.getNewUUID());
\ No newline at end of file
diff --git a/entity/ClassificationScore_entity/entityfields/classificationscores/children/classificationtypeid_param/valueProcess.js b/entity/ClassificationScore_entity/entityfields/classificationscores/children/classificationtypeid_param/valueProcess.js
new file mode 100644
index 0000000000..f87c7071f1
--- /dev/null
+++ b/entity/ClassificationScore_entity/entityfields/classificationscores/children/classificationtypeid_param/valueProcess.js
@@ -0,0 +1,4 @@
+import("system.vars");
+import("system.result");
+
+result.string(vars.get("$field.CLASSIFICATIONTYPE_ID"));
\ No newline at end of file
diff --git a/entity/ClassificationScore_entity/entityfields/classificationtype_id/valueProcess.js b/entity/ClassificationScore_entity/entityfields/classificationtype_id/valueProcess.js
index 419fe78a30..8806f470d9 100644
--- a/entity/ClassificationScore_entity/entityfields/classificationtype_id/valueProcess.js
+++ b/entity/ClassificationScore_entity/entityfields/classificationtype_id/valueProcess.js
@@ -3,6 +3,4 @@ import("system.neon");
 import("system.vars");
 
 if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
-{
-    result.string(vars.get("$param.ClassificationTypeId_param"));
-}
\ No newline at end of file
+    result.string(vars.get("$param.ClassificationTypeId_param"));
\ No newline at end of file
diff --git a/entity/ClassificationScore_entity/entityfields/maxvalue/valueProcess.js b/entity/ClassificationScore_entity/entityfields/maxvalue/valueProcess.js
deleted file mode 100644
index d46b81f5b8..0000000000
--- a/entity/ClassificationScore_entity/entityfields/maxvalue/valueProcess.js
+++ /dev/null
@@ -1,22 +0,0 @@
-import("system.vars");
-import("system.result");
-import("system.db");
-import("Sql_lib");
-
-if (!vars.get("$this.value"))
-{    
-    var classificationTypeId = vars.get("$param.ClassificationTypeId_param");
-    var maxValue = newSelect("100.0 - sum(maxScore)")
-                        .from(newSelect("max(SCORE) maxScore")
-                                .from("CLASSIFICATIONTYPE")
-                                .join("CLASSIFICATIONSCORE", "CLASSIFICATIONSCORE.CLASSIFICATIONTYPE_ID = CLASSIFICATIONTYPE.CLASSIFICATIONTYPEID")
-                                .whereIfSet("CLASSIFICATIONTYPE.CLASSIFICATIONTYPEID", classificationTypeId, SqlBuilder.NOT_EQUAL())
-                                .andIfSet("CLASSIFICATIONTYPE.CLASSIFICATIONGROUP", "$param.ClassificationGroup_param")
-                                .andIfSet("CLASSIFICATIONTYPE.CLASSIFICATIONTYPE", "$param.ClassificationType_param")
-                                .groupBy("CLASSIFICATIONTYPE.SCORETYPE"), "maxScores")
-                        .cell();
-    if (maxValue == "")
-        maxValue = 100;
-    
-    result.string(maxValue);
-}
\ No newline at end of file
diff --git a/entity/ClassificationScore_entity/entityfields/score/onValidation.js b/entity/ClassificationScore_entity/entityfields/score/onValidation.js
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/entity/ClassificationScore_entity/entityfields/translatedtitle/valueProcess.js b/entity/ClassificationScore_entity/entityfields/translatedtitle/valueProcess.js
new file mode 100644
index 0000000000..c6340e758d
--- /dev/null
+++ b/entity/ClassificationScore_entity/entityfields/translatedtitle/valueProcess.js
@@ -0,0 +1,5 @@
+import("system.result");
+import("system.translate");
+import("system.vars");
+
+result.string(translate.text(vars.get("$field.TITLE")));
\ No newline at end of file
diff --git a/entity/ClassificationScore_entity/recordcontainers/db/cacheKeyProcess.js b/entity/ClassificationScore_entity/recordcontainers/db/cacheKeyProcess.js
new file mode 100644
index 0000000000..1edaa2e881
--- /dev/null
+++ b/entity/ClassificationScore_entity/recordcontainers/db/cacheKeyProcess.js
@@ -0,0 +1,5 @@
+import("CachedRecordContainer_lib");
+import("system.result")
+
+var res = CachedRecordContainerUtils.getCommonKey("$param.ClassificationGroup_param", "$param.ClassificationTypeId_param", "$param.ClassificationType_param");
+result.string(res);
diff --git a/entity/ClassificationScore_entity/recordcontainers/db/onDBDelete.js b/entity/ClassificationScore_entity/recordcontainers/db/onDBDelete.js
index 6f34bda69d..4feb1dc307 100644
--- a/entity/ClassificationScore_entity/recordcontainers/db/onDBDelete.js
+++ b/entity/ClassificationScore_entity/recordcontainers/db/onDBDelete.js
@@ -3,27 +3,37 @@ import("system.db");
 import("system.vars");
 import("Classification_lib");
 import("system.eMath");
+import("system.entities");
 
-newWhere("CLASSIFICATION.CLASSIFICATIONSCORE_ID", "$field.CLASSIFICATIONSCOREID").deleteData();
-
-var classificationScoreId = vars.get("$field.CLASSIFICATIONSCOREID");
+try
+{
+    newWhere("CLASSIFICATION.CLASSIFICATIONSCORE_ID", "$field.CLASSIFICATIONSCOREID").deleteData();
+    var classificationScoreId = vars.get("$field.CLASSIFICATIONSCOREID")
 
-var gradingTable = ClassificationUtils.getGradingTableByScoreId(classificationScoreId);
-var classificationGroup = ClassificationUtils.getClassificationGroup(classificationScoreId);
-var maxScore = ClassificationUtils.getMaxScore(classificationGroup);
+    var classificationType = ClassificationUtils.getClassificationType(classificationScoreId);
+    var classificationGroup = ClassificationUtils.getClassificationGroup(classificationType);
+    var gradingTable = ClassificationUtils.getGradingTableByGroupId(classificationGroup);
+    var maxScore = ClassificationUtils.getMaxScore(classificationGroup)
 
-//checks if the maxscore has to be updated after the data has been deleted
-if(gradingTable[0][1] != maxScore)
-{
-    var column = ["MAXGRADEFORSCORE"];
-    var table = ["CLASSIFICATIONGRADING"];
-    var multiplier = maxScore/gradingTable[0][1];
-    var update = newWhere("CLASSIFICATIONGRADING.CLASSIFICATIONGRADINGID", gradingTable[0][0])
-                            .updateData(true, table, column,  db.getColumnTypes("CLASSIFICATIONGRADING", column, db.getCurrentAlias()), [maxScore]);
-                        
-    for (var i = 1; i < gradingTable.length; i++) 
+    if(gradingTable[0][1] != maxScore) //the gradingTable is already sorted, so gradingTable[0][1] is the maxGradeForScore of the best possible Grade
     {
-        update = newWhere("CLASSIFICATIONGRADING.CLASSIFICATIONGRADINGID", gradingTable[i][0])
-                        .updateData(true, table, column,  db.getColumnTypes("CLASSIFICATIONGRADING", column, db.getCurrentAlias()), [parseInt(gradingTable[i][1] * multiplier)]);
+        var column = ["MAXGRADEFORSCORE"];
+        var table = ["CLASSIFICATIONGRADING"];
+        var multiplicand = maxScore/gradingTable[0][1];
+        var update = newWhere("CLASSIFICATIONGRADING.CLASSIFICATIONGRADINGID", gradingTable[0][0])
+                                .updateData(true, table, column,  db.getColumnTypes("CLASSIFICATIONGRADING", column, db.getCurrentAlias()), [maxScore]);
+
+        for (let i = 1; i < gradingTable.length; i++) 
+        {
+            update = newWhere("CLASSIFICATIONGRADING.CLASSIFICATIONGRADINGID", gradingTable[i][0])
+                            .updateData(true, table, column,  db.getColumnTypes("CLASSIFICATIONGRADING", column, db.getCurrentAlias()), [parseInt(gradingTable[i][1] * multiplicand)]);
+        }
     }
-}
\ No newline at end of file
+}
+finally //always make sure that the cache is as valid as possible
+{
+    //ClassificationType_entity accesses the CLASSIFICATIONSCORE (max value of scores) so we need to update the cache to prevent inconsesty
+    entities.invalidateCache("ClassificationType_entity", "db");
+    //Grading-values are dependent since they are modified within this process (maxgrade)
+    entities.invalidateCache("ClassificationGrading_entity", "db");
+}
diff --git a/entity/ClassificationScore_entity/recordcontainers/db/onDBInsert.js b/entity/ClassificationScore_entity/recordcontainers/db/onDBInsert.js
index eddf0f09ff..0dfe964c1e 100644
--- a/entity/ClassificationScore_entity/recordcontainers/db/onDBInsert.js
+++ b/entity/ClassificationScore_entity/recordcontainers/db/onDBInsert.js
@@ -1,30 +1,41 @@
+import("system.entities");
 import("system.db");
 import("Sql_lib");
 import("system.vars");
 import("Classification_lib");
-import("system.eMath");
+import("system.eMath")
 
-var classificationScoreId = vars.get("$field.CLASSIFICATIONSCOREID");
+try
+{
+    var classificationScoreId = vars.get("$field.CLASSIFICATIONSCOREID")
 
-var gradingTable = ClassificationUtils.getGradingTableByScoreId(classificationScoreId);
-var classificationGroup = ClassificationUtils.getClassificationGroup(classificationScoreId);
-var maxScore = ClassificationUtils.getMaxScore(classificationGroup);
+    var classificationType = ClassificationUtils.getClassificationType(classificationScoreId);
+    var classificationGroup = ClassificationUtils.getClassificationGroup(classificationType);
+    var gradingTable = ClassificationUtils.getGradingTableByGroupId(classificationGroup);
+    var maxScore = ClassificationUtils.getMaxScore(classificationGroup)
 
-//checks if the maxscore has to be updated after inserting data
-if(gradingTable.length > 0 && gradingTable != undefined && gradingTable != null)
-{
-    if(gradingTable[0][1] != maxScore)
+    if(gradingTable.length > 0 && gradingTable != undefined && gradingTable != null)
     {
-        var column = ["MAXGRADEFORSCORE"];
-        var table = ["CLASSIFICATIONGRADING"];
-        var multiplier = maxScore/gradingTable[0][1];
-        var update = newWhere("CLASSIFICATIONGRADING.CLASSIFICATIONGRADINGID", gradingTable[0][0])
-                                .updateData(true, table, column,  db.getColumnTypes("CLASSIFICATIONGRADING", column, db.getCurrentAlias()), [maxScore]);
-
-        for (var i = 1; i < gradingTable.length; i++) 
+        if(gradingTable[0][1] != maxScore)
         {
-            update = newWhere("CLASSIFICATIONGRADING.CLASSIFICATIONGRADINGID", gradingTable[i][0])
-                            .updateData(true, table, column,  db.getColumnTypes("CLASSIFICATIONGRADING", column, db.getCurrentAlias()), [parseInt(gradengTable[i][1] * multiplier)]);
+            var column = ["MAXGRADEFORSCORE"];
+            var table = ["CLASSIFICATIONGRADING"];
+            var multiplicand = maxScore/gradingTable[0][1];
+            var update = newWhere("CLASSIFICATIONGRADING.CLASSIFICATIONGRADINGID", gradingTable[0][0])
+                                    .updateData(true, table, column,  null, [maxScore]);
+
+            for (let i = 1; i < gradingTable.length; i++) 
+            {
+                update = newWhere("CLASSIFICATIONGRADING.CLASSIFICATIONGRADINGID", gradingTable[i][0])
+                                .updateData(true, table, column,  null, [parseInt(gradingTable[i][1] * multiplicand)]);
+            }
         }
     }
+}
+finally //always make sure that the cache is as valid as possible
+{
+    //ClassificationType_entity accesses the CLASSIFICATIONSCORE (max value of scores) so we need to update the cache to prevent inconsesty
+    entities.invalidateCache("ClassificationType_entity", "db");
+    //Grading-values are dependent since they are modified within this process (maxgrade)
+    entities.invalidateCache("ClassificationGrading_entity", "db");
 }
\ No newline at end of file
diff --git a/entity/ClassificationScore_entity/recordcontainers/db/onDBUpdate.js b/entity/ClassificationScore_entity/recordcontainers/db/onDBUpdate.js
index fb8657adbc..5cfa69ab83 100644
--- a/entity/ClassificationScore_entity/recordcontainers/db/onDBUpdate.js
+++ b/entity/ClassificationScore_entity/recordcontainers/db/onDBUpdate.js
@@ -1,27 +1,38 @@
+import("system.entities");
 import("system.db");
 import("Sql_lib");
 import("system.vars");
 import("Classification_lib");
-import("system.eMath");
+import("system.eMath")
 
-var classificationScoreId = vars.get("$field.CLASSIFICATIONSCOREID");
+try
+{
+    var classificationScoreId = vars.get("$field.CLASSIFICATIONSCOREID")
 
-var gradingTable = ClassificationUtils.getGradingTableByScoreId(classificationScoreId);
-var classificationGroup = ClassificationUtils.getClassificationGroup(classificationScoreId);
-var maxScore = ClassificationUtils.getMaxScore(classificationGroup);
+    var classificationType = ClassificationUtils.getClassificationType(classificationScoreId);
+    var classificationGroup = ClassificationUtils.getClassificationGroup(classificationType);
+    var gradingTable = ClassificationUtils.getGradingTableByGroupId(classificationGroup);
+    var maxScore = ClassificationUtils.getMaxScore(classificationGroup)
 
-//checks if the maxscore has to be updated after updating data
-if(gradingTable[0][1] != maxScore)
-{
-    var column = ["MAXGRADEFORSCORE"];
-    var table = ["CLASSIFICATIONGRADING"];
-    var multiplier = maxScore/gradingTable[0][1];
-    var update = newWhere("CLASSIFICATIONGRADING.CLASSIFICATIONGRADINGID", gradingTable[0][0])
-                            .updateData(true, table, column,  db.getColumnTypes("CLASSIFICATIONGRADING", column, db.getCurrentAlias()), [maxScore]);
-                        
-    for (var i = 1; i < gradingTable.length; i++) 
+    if(gradingTable[0][1] != maxScore)
     {
-        update = newWhere("CLASSIFICATIONGRADING.CLASSIFICATIONGRADINGID", gradingTable[i][0])
-                        .updateData(true, table, column,  db.getColumnTypes("CLASSIFICATIONGRADING", column, db.getCurrentAlias()), [parseInt(gradingTable[i][1] * multiplier)]);
+        var column = ["MAXGRADEFORSCORE"];
+        var table = ["CLASSIFICATIONGRADING"];
+        var multiplicand = maxScore/gradingTable[0][1];
+        var update = newWhere("CLASSIFICATIONGRADING.CLASSIFICATIONGRADINGID", gradingTable[0][0])
+                                .updateData(true, table, column,  db.getColumnTypes("CLASSIFICATIONGRADING", column, db.getCurrentAlias()), [maxScore]);
+
+        for (let i = 1; i < gradingTable.length; i++) 
+        {
+            update = newWhere("CLASSIFICATIONGRADING.CLASSIFICATIONGRADINGID", gradingTable[i][0])
+                            .updateData(true, table, column,  db.getColumnTypes("CLASSIFICATIONGRADING", column, db.getCurrentAlias()), [parseInt(gradingTable[i][1] * multiplicand)]);
+        }
     }
+}
+finally //always make sure that the cache is as valid as possible
+{
+    //ClassificationType_entity accesses the CLASSIFICATIONSCORE (max value of scores) so we need to update the cache to prevent inconsesty
+    entities.invalidateCache("ClassificationType_entity", "db");
+    //Grading-values are dependent since they are modified within this process (maxgrade)
+    entities.invalidateCache("ClassificationGrading_entity", "db");
 }
\ No newline at end of file
diff --git a/entity/ClassificationType_entity/ClassificationType_entity.aod b/entity/ClassificationType_entity/ClassificationType_entity.aod
index 016b698256..d86c079f7b 100644
--- a/entity/ClassificationType_entity/ClassificationType_entity.aod
+++ b/entity/ClassificationType_entity/ClassificationType_entity.aod
@@ -3,36 +3,97 @@
   <name>ClassificationType_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/ClassificationType_entity/documentation.adoc</documentation>
+  <title>Indicator</title>
+  <contentTitleProcess>%aditoprj%/entity/ClassificationType_entity/contentTitleProcess.js</contentTitleProcess>
   <recordContainer>db</recordContainer>
   <entityFields>
     <entityProvider>
       <name>#PROVIDER</name>
+      <dependencies>
+        <entityDependency>
+          <name>908ca339-4dca-41c6-a32b-472617e1742e</name>
+          <entityName>ClassificationGroup_entity</entityName>
+          <fieldName>ClassificationGroups</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+      </dependencies>
     </entityProvider>
     <entityField>
       <name>CLASSIFICATIONTYPEID</name>
+      <valueProcess>%aditoprj%/entity/ClassificationType_entity/entityfields/classificationtypeid/valueProcess.js</valueProcess>
     </entityField>
     <entityField>
-      <name>TYPE</name>
+      <name>OBJECT_TYPE</name>
+      <title>Place Of Use</title>
+      <displayValueProcess>%aditoprj%/entity/ClassificationType_entity/entityfields/object_type/displayValueProcess.js</displayValueProcess>
     </entityField>
     <entityField>
-      <name>CLASS</name>
+      <name>SCORETYPE</name>
+      <title>Indicator</title>
+      <displayValueProcess>%aditoprj%/entity/ClassificationType_entity/entityfields/scoretype/displayValueProcess.js</displayValueProcess>
+    </entityField>
+    <entityField>
+      <name>CLASSIFICATIONGROUP_ID</name>
+      <title>Classification</title>
+      <displayValueProcess>%aditoprj%/entity/ClassificationType_entity/entityfields/classificationgroup_id/displayValueProcess.js</displayValueProcess>
+    </entityField>
+    <entityConsumer>
+      <name>ClassificationScores</name>
+      <dependency>
+        <name>dependency</name>
+        <entityName>ClassificationScore_entity</entityName>
+        <fieldName>ClassificationScores</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>ClassificationTypeId_param</name>
+          <valueProcess>%aditoprj%/entity/ClassificationType_entity/entityfields/classificationscores/children/classificationtypeid_param/valueProcess.js</valueProcess>
+        </entityParameter>
+        <entityParameter>
+          <name>ClassificationGroup_param</name>
+          <valueProcess>%aditoprj%/entity/ClassificationType_entity/entityfields/classificationscores/children/classificationgroup_param/valueProcess.js</valueProcess>
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityField>
+      <name>infoField</name>
+      <title>Hint</title>
+      <valueProcess>%aditoprj%/entity/ClassificationType_entity/entityfields/infofield/valueProcess.js</valueProcess>
+    </entityField>
+    <entityProvider>
+      <name>#PROVIDER_AGGREGATES</name>
+      <useAggregates v="true" />
+    </entityProvider>
+    <entityField>
+      <name>maxScore</name>
+      <valueProcess>%aditoprj%/entity/ClassificationType_entity/entityfields/maxscore/valueProcess.js</valueProcess>
     </entityField>
     <entityParameter>
-      <name>ClassificationTypeIds_param</name>
+      <name>ClassificationGroupId_param</name>
       <expose v="true" />
     </entityParameter>
     <entityProvider>
-      <name>#PROVIDER_AGGREGATES</name>
-      <useAggregates v="true" />
+      <name>ClassificationTypesForGroup</name>
+      <documentation>%aditoprj%/entity/ClassificationType_entity/entityfields/classificationtypesforgroup/documentation.adoc</documentation>
+      <children>
+        <entityParameter>
+          <name>ClassificationGroupId_param</name>
+          <mandatory v="true" />
+        </entityParameter>
+      </children>
     </entityProvider>
   </entityFields>
   <recordContainers>
     <dbRecordContainer>
       <name>db</name>
       <alias>Data_alias</alias>
+      <isPageable v="false" />
+      <conditionProcess>%aditoprj%/entity/ClassificationType_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
+      <cacheType>GLOBAL</cacheType>
+      <cacheKeyProcess>%aditoprj%/entity/ClassificationType_entity/recordcontainers/db/cacheKeyProcess.js</cacheKeyProcess>
       <linkInformation>
         <linkInformation>
-          <name>0a0944fd-a72f-4c95-8c42-b1e7d3e17721</name>
+          <name>0c764b72-f55b-4b87-8dc1-9a491a143f44</name>
           <tableName>CLASSIFICATIONTYPE</tableName>
           <primaryKey>CLASSIFICATIONTYPEID</primaryKey>
           <isUIDTable v="true" />
@@ -45,12 +106,20 @@
           <recordfield>CLASSIFICATIONTYPE.CLASSIFICATIONTYPEID</recordfield>
         </dbRecordFieldMapping>
         <dbRecordFieldMapping>
-          <name>CLASS.value</name>
-          <recordfield>CLASSIFICATIONTYPE.CLASS</recordfield>
+          <name>OBJECT_TYPE.value</name>
+          <recordfield>CLASSIFICATIONTYPE.OBJECT_TYPE</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>CLASSIFICATIONGROUP_ID.value</name>
+          <recordfield>CLASSIFICATIONTYPE.CLASSIFICATIONGROUP_ID</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>SCORETYPE.value</name>
+          <recordfield>CLASSIFICATIONTYPE.SCORETYPE</recordfield>
         </dbRecordFieldMapping>
         <dbRecordFieldMapping>
-          <name>TYPE.value</name>
-          <recordfield>CLASSIFICATIONTYPE.TYPE</recordfield>
+          <name>maxScore.value</name>
+          <expression>%aditoprj%/entity/ClassificationType_entity/recordcontainers/db/recordfieldmappings/maxscore.value/expression.js</expression>
         </dbRecordFieldMapping>
       </recordFieldMappings>
     </dbRecordContainer>
diff --git a/entity/ClassificationAdmin_entity/entityfields/scoretype/displayValueProcess.js b/entity/ClassificationType_entity/contentTitleProcess.js
similarity index 100%
rename from entity/ClassificationAdmin_entity/entityfields/scoretype/displayValueProcess.js
rename to entity/ClassificationType_entity/contentTitleProcess.js
index 87d569a0e2..4bb76faf06 100644
--- a/entity/ClassificationAdmin_entity/entityfields/scoretype/displayValueProcess.js
+++ b/entity/ClassificationType_entity/contentTitleProcess.js
@@ -1,5 +1,5 @@
-import("system.vars");
 import("system.translate");
+import("system.vars");
 import("system.result");
 
 result.string(translate.text(vars.get("$field.SCORETYPE")));
\ No newline at end of file
diff --git a/entity/ClassificationType_entity/documentation.adoc b/entity/ClassificationType_entity/documentation.adoc
index 4b63abbd0e..a09562ce3a 100644
--- a/entity/ClassificationType_entity/documentation.adoc
+++ b/entity/ClassificationType_entity/documentation.adoc
@@ -1,3 +1,48 @@
 = ClassificationType_entity
 
-Defines types for the classifications (see Classification_entity)
\ No newline at end of file
+Definition:
+
+    Stores the possible Indicators (classificationTypes).
+    (For more information about the classification see also Classification_entity)
+
+Purpose:
+
+    This entity is used for storing the indicators and making it possible for the admin to change 
+    the details of the indicator (classificationType) like the name, it's usage or it's classification (classificationGroup)
+
+    This entity only has one view: the ClassificationTypePreview which has the usage (object_type), 
+    classification (classificationgroup_Id), and title (scoretype)
+    and the ClassificationScoreMultipleEdit_view.
+    making it possible for the admin to configure something like this:
+
+    ClassificationAdminPreviewOfIndicator Example: 
+
+        USAGE:          Organisation
+        CLASSIFICATION: 1. Target Group
+        INDICATOR:      Headquarters
+         Germany         35,00, 10
+         Austria         35,00 20
+         Switzerland     25,00, 30
+         Other            0,00, 40
+
+Particularities:
+
+    The biggest possible score of the subordinated classificationScores is being used by classificationGrading to calculate the value for the best possible grade, 
+    if this value is changed the grading get's updated using the rule of three (see onInsert-, onUpdate- and onDelete- processes of classificationScore_entity).
+    
+    The Classification consists of the following entities:
+    Classification_entity,
+    ClassificationAdmin_entity,
+    ClassificationGrading_entity,
+    ClassificationGroup_entity,
+    ClassificationScore_entity,
+    ClassificationType_entity
+
+    Our terms in the db and entity structure differ from the technical terms the user gets to see, to make it easier to understand 
+    for the developer that doesn't have the technical know-how:
+
+    Our term:               Technical term:                 Example:
+    Object_Type             Usage                           Organisation
+    ClassificationGroup     Classification                  1. Target Group
+    ClassificationType      Indicator                       Industry
+    ClassificationScore     (Possible-)Value/Selection      Service
\ No newline at end of file
diff --git a/entity/ClassificationType_entity/entityfields/classificationgroup_id/displayValueProcess.js b/entity/ClassificationType_entity/entityfields/classificationgroup_id/displayValueProcess.js
new file mode 100644
index 0000000000..dcd3cf5a9c
--- /dev/null
+++ b/entity/ClassificationType_entity/entityfields/classificationgroup_id/displayValueProcess.js
@@ -0,0 +1,9 @@
+import("system.vars");
+import("Context_lib");
+import("system.result");
+
+var groupId = vars.get("$field.CLASSIFICATIONGROUP_ID");
+if(groupId != "" && groupId != undefined)
+    result.string(ContextUtils.loadContentTitle("ClassificationGroup_entity", groupId));
+else
+    result.string("")
\ No newline at end of file
diff --git a/entity/ClassificationType_entity/entityfields/classificationscores/children/classificationgroup_param/valueProcess.js b/entity/ClassificationType_entity/entityfields/classificationscores/children/classificationgroup_param/valueProcess.js
new file mode 100644
index 0000000000..83df30fd1c
--- /dev/null
+++ b/entity/ClassificationType_entity/entityfields/classificationscores/children/classificationgroup_param/valueProcess.js
@@ -0,0 +1,4 @@
+import("system.vars");
+import("system.result");
+
+result.string(vars.get("$field.CLASSIFICATIONGROUP_ID"));
\ No newline at end of file
diff --git a/entity/ClassificationAdmin_entity/entityfields/classificationscores/children/classificationtypeid_param/valueProcess.js b/entity/ClassificationType_entity/entityfields/classificationscores/children/classificationtypeid_param/valueProcess.js
similarity index 100%
rename from entity/ClassificationAdmin_entity/entityfields/classificationscores/children/classificationtypeid_param/valueProcess.js
rename to entity/ClassificationType_entity/entityfields/classificationscores/children/classificationtypeid_param/valueProcess.js
diff --git a/entity/ClassificationType_entity/entityfields/classificationtypeid/valueProcess.js b/entity/ClassificationType_entity/entityfields/classificationtypeid/valueProcess.js
new file mode 100644
index 0000000000..268ab03c9a
--- /dev/null
+++ b/entity/ClassificationType_entity/entityfields/classificationtypeid/valueProcess.js
@@ -0,0 +1,5 @@
+import("system.result")
+import("system.vars")
+
+if(vars.exists("ObjectRowid_param"))
+    result.string(vars.get("ObjectRowid_param"));
\ No newline at end of file
diff --git a/entity/ClassificationType_entity/entityfields/classificationtypesforgroup/documentation.adoc b/entity/ClassificationType_entity/entityfields/classificationtypesforgroup/documentation.adoc
new file mode 100644
index 0000000000..15bbce2b2e
--- /dev/null
+++ b/entity/ClassificationType_entity/entityfields/classificationtypesforgroup/documentation.adoc
@@ -0,0 +1 @@
+Used for providing classification types per group.
\ No newline at end of file
diff --git a/entity/ClassificationType_entity/entityfields/infofield/valueProcess.js b/entity/ClassificationType_entity/entityfields/infofield/valueProcess.js
new file mode 100644
index 0000000000..07815a1f88
--- /dev/null
+++ b/entity/ClassificationType_entity/entityfields/infofield/valueProcess.js
@@ -0,0 +1,75 @@
+import("system.translate");
+import("Entity_lib");
+import("system.result");
+import("Sql_lib");
+import("system.vars");
+import("Classification_lib");
+import("system.eMath");
+
+//references needed for auto refresh:
+"$field.ClassificationScores.insertedRows";
+"$field.ClassificationScores.changedRows";
+"$field.ClassificationScores.deletedRows";
+
+var rows = EntityConsumerRowsHelper.getCurrentConsumerRows("ClassificationScores", ["SCORE"]);
+var maxScore = 0;
+var i;
+var randomScoreId;
+
+result.string(translate.text("Keep in Mind that changes to the Value with the greatest score directly affect the Classification Gradings of the Classification!"))
+if(rows.length > 0)
+{
+    for (i = 0; i < rows.length; i++) 
+    {
+        randomScoreId = rows[i]["#UID"];
+        break;
+    }
+    var classificationGroup = vars.get("$field.CLASSIFICATIONGROUP_ID");
+    var classificationType = ClassificationUtils.getClassificationType(randomScoreId);
+    var gradingTable = ClassificationUtils.getGradingTableByGroupId(classificationGroup);
+    for (i = 0; i < rows.length; i++) 
+        {
+            if(parseFloat(rows[i]["SCORE"]) > maxScore)
+                maxScore = parseFloat(rows[i]["SCORE"]);
+        }
+    if(classificationType.length > 0)
+    {
+        maxScore = eMath.addDec(parseFloat(maxScore), parseFloat(ClassificationUtils.getMaxScoreExcludeType(classificationGroup, classificationType)));
+    }
+    else
+    {
+        maxScore = eMath.addDec(parseFloat(maxScore), parseFloat(ClassificationUtils.getMaxScore(classificationGroup)));
+    }
+    
+    if(gradingTable.length > 0 && gradingTable != undefined && gradingTable != null)
+    {
+        var greatestGrading = gradingTable[0][1];
+        if(gradingTable[0][1] != maxScore)
+        {
+            var multiplicand;
+            var oldToNewValueString = "";
+            if(greatestGrading != 0)
+            {
+                multiplicand = maxScore/greatestGrading;
+                for (i = 0; i < gradingTable.length; i++) 
+                {
+                    oldToNewValueString += gradingTable[i][2] + ": " + gradingTable[i][1] + "->" + parseInt(gradingTable[i][1] * multiplicand) + "\n\
+            ";
+                }
+            }
+            else 
+            {
+                greatestGrading = maxScore;
+                multiplicand = 1;
+                for (i = 0; i < gradingTable.length; i++) 
+                {
+                    oldToNewValueString += gradingTable[i][2] + ": " + gradingTable[i][1] + "->" + greatestGrading * multiplicand + "\n\
+            ";
+                }
+            }
+            var resString = translate.text("This is how the Classification Gradings of the Classification will get affected by these changes:") + "\n\
+    "+ oldToNewValueString;
+            result.string(resString);
+        }
+    }
+}
\ No newline at end of file
diff --git a/entity/ClassificationType_entity/entityfields/maxscore/valueProcess.js b/entity/ClassificationType_entity/entityfields/maxscore/valueProcess.js
new file mode 100644
index 0000000000..49d9c5de79
--- /dev/null
+++ b/entity/ClassificationType_entity/entityfields/maxscore/valueProcess.js
@@ -0,0 +1,16 @@
+import("system.result");
+import("Sql_lib");
+import("system.vars");
+
+var classificationTypeId = vars.get("$field.CLASSIFICATIONTYPEID");
+
+var score = null;
+if (classificationTypeId)
+{
+    score = newSelect("max(CLASSIFICATIONSCORE.SCORE)")
+        .from("CLASSIFICATIONSCORE")
+        .where("CLASSIFICATIONSCORE.CLASSIFICATIONTYPE_ID", classificationTypeId)
+        .cell();
+}
+
+result.string(score);
\ No newline at end of file
diff --git a/entity/ClassificationType_entity/entityfields/object_type/displayValueProcess.js b/entity/ClassificationType_entity/entityfields/object_type/displayValueProcess.js
new file mode 100644
index 0000000000..86c8786764
--- /dev/null
+++ b/entity/ClassificationType_entity/entityfields/object_type/displayValueProcess.js
@@ -0,0 +1,9 @@
+import("system.translate");
+import("Sql_lib");
+import("Classification_lib");
+import("system.result");
+import("system.vars");
+
+var classificationType = vars.get("$this.value");
+                                
+result.string(translate.text(classificationType));
\ No newline at end of file
diff --git a/entity/ClassificationType_entity/entityfields/scoretype/displayValueProcess.js b/entity/ClassificationType_entity/entityfields/scoretype/displayValueProcess.js
new file mode 100644
index 0000000000..29c6cf6dc2
--- /dev/null
+++ b/entity/ClassificationType_entity/entityfields/scoretype/displayValueProcess.js
@@ -0,0 +1,5 @@
+import("system.result");
+import("system.translate");
+import("system.vars");
+
+result.string(translate.text(vars.get("$this.value")));
\ No newline at end of file
diff --git a/entity/ClassificationType_entity/recordcontainers/db/cacheKeyProcess.js b/entity/ClassificationType_entity/recordcontainers/db/cacheKeyProcess.js
new file mode 100644
index 0000000000..d6595b8140
--- /dev/null
+++ b/entity/ClassificationType_entity/recordcontainers/db/cacheKeyProcess.js
@@ -0,0 +1,5 @@
+import("CachedRecordContainer_lib");
+import("system.result")
+
+var res = CachedRecordContainerUtils.getCommonKey("$param.ClassificationGroupId_param");
+result.string(res);
diff --git a/entity/ClassificationType_entity/recordcontainers/db/conditionProcess.js b/entity/ClassificationType_entity/recordcontainers/db/conditionProcess.js
new file mode 100644
index 0000000000..14721e02d3
--- /dev/null
+++ b/entity/ClassificationType_entity/recordcontainers/db/conditionProcess.js
@@ -0,0 +1,7 @@
+import("system.vars");
+import("system.result");
+import("Sql_lib");
+
+var cond = newWhereIfSet("CLASSIFICATIONTYPE.CLASSIFICATIONGROUP_ID", "$param.ClassificationGroupId_param");
+result.string(cond.toString());
+
diff --git a/entity/ClassificationType_entity/recordcontainers/db/recordfieldmappings/maxscore.value/expression.js b/entity/ClassificationType_entity/recordcontainers/db/recordfieldmappings/maxscore.value/expression.js
new file mode 100644
index 0000000000..80e8d7e14a
--- /dev/null
+++ b/entity/ClassificationType_entity/recordcontainers/db/recordfieldmappings/maxscore.value/expression.js
@@ -0,0 +1,10 @@
+import("system.result");
+import("system.result");
+import("Sql_lib");
+
+var statement = newSelect("max(CLASSIFICATIONSCORE.SCORE)")
+        .from("CLASSIFICATIONSCORE")
+        .where("CLASSIFICATIONSCORE.CLASSIFICATIONTYPE_ID = CLASSIFICATIONTYPE.CLASSIFICATIONTYPEID");
+
+logging.log("statement.toString()>>" + statement.toString())
+result.string(statement.toString());
\ No newline at end of file
diff --git a/entity/Classification_entity/Classification_entity.aod b/entity/Classification_entity/Classification_entity.aod
index 5cdeeb7889..011426f28c 100644
--- a/entity/Classification_entity/Classification_entity.aod
+++ b/entity/Classification_entity/Classification_entity.aod
@@ -51,7 +51,7 @@
           <isConsumer v="false" />
         </entityDependency>
         <entityDependency>
-          <name>c1521dc3-ba97-4e00-8d9b-a6fa46bef42d</name>
+          <name>ed17d4ca-1bdd-45b2-8a38-d7a73b1669e7</name>
           <entityName>Organisation_entity</entityName>
           <fieldName>Classifications</fieldName>
           <isConsumer v="false" />
@@ -64,7 +64,8 @@
     </entityField>
     <entityField>
       <name>CLASSIFICATIONGROUP</name>
-      <title>Group name</title>
+      <documentation>%aditoprj%/entity/Classification_entity/entityfields/classificationgroup/documentation.adoc</documentation>
+      <title>Classification</title>
       <contentType>TEXT</contentType>
       <groupable v="true" />
       <mandatoryProcess>%aditoprj%/entity/Classification_entity/entityfields/classificationgroup/mandatoryProcess.js</mandatoryProcess>
@@ -144,7 +145,7 @@
     </entityConsumer>
     <entityField>
       <name>SCORETYPE</name>
-      <title>Scoretype</title>
+      <title>Indicator</title>
       <mandatory v="true" />
       <displayValueProcess>%aditoprj%/entity/Classification_entity/entityfields/scoretype/displayValueProcess.js</displayValueProcess>
     </entityField>
@@ -159,6 +160,9 @@
       <name>#PROVIDER_AGGREGATES</name>
       <useAggregates v="true" />
     </entityProvider>
+    <entityField>
+      <name>CLASSIFICATIONGROUP_ID</name>
+    </entityField>
   </entityFields>
   <recordContainers>
     <jDitoRecordContainer>
@@ -178,9 +182,18 @@
         <jDitoRecordFieldMapping>
           <name>CLASSIFICATIONGROUP.value</name>
         </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>CLASSIFICATIONGROUP.displayValue</name>
+        </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>CLASSIFICATIONGROUP_ID.displayValue</name>
+        </jDitoRecordFieldMapping>
         <jDitoRecordFieldMapping>
           <name>CLASSIFICATIONSCORE_ID.value</name>
         </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>CLASSIFICATIONSCORE_ID.displayValue</name>
+        </jDitoRecordFieldMapping>
         <jDitoRecordFieldMapping>
           <name>CLASSIFICATIONTYPEID.value</name>
         </jDitoRecordFieldMapping>
@@ -188,10 +201,10 @@
           <name>CLASSIFICATIONTYPE_ID.value</name>
         </jDitoRecordFieldMapping>
         <jDitoRecordFieldMapping>
-          <name>OBJECT_ROWID.value</name>
+          <name>OBJECT_TYPE.value</name>
         </jDitoRecordFieldMapping>
         <jDitoRecordFieldMapping>
-          <name>OBJECT_TYPE.value</name>
+          <name>OBJECT_ROWID.value</name>
         </jDitoRecordFieldMapping>
         <jDitoRecordFieldMapping>
           <name>SCORETYPE.value</name>
@@ -202,6 +215,9 @@
         <jDitoRecordFieldMapping>
           <name>SCORE_RESULTS.value</name>
         </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>GroupScore.value</name>
+        </jDitoRecordFieldMapping>
       </recordFieldMappings>
     </jDitoRecordContainer>
   </recordContainers>
diff --git a/entity/Classification_entity/afterOperatingState.js b/entity/Classification_entity/afterOperatingState.js
index 09213cf561..6ce8bdeeee 100644
--- a/entity/Classification_entity/afterOperatingState.js
+++ b/entity/Classification_entity/afterOperatingState.js
@@ -1,8 +1,9 @@
-import("system.vars");
-import("system.neon");
+/*
+ *this refresh should not be necessary:
+ */
 
-// "$local.value" contains the previous operationg state
-if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_VIEW && vars.get("$local.value") == neon.OPERATINGSTATE_EDIT) 
-{
-    neon.refreshAll()
-}
+//// "$local.value" contains the previous operationg state
+//if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_VIEW && vars.get("$local.value") == neon.OPERATINGSTATE_EDIT) 
+//{
+//    neon.refreshAll();
+//}
diff --git a/entity/Classification_entity/documentation.adoc b/entity/Classification_entity/documentation.adoc
index a233f0ddd6..6fb30333ca 100644
--- a/entity/Classification_entity/documentation.adoc
+++ b/entity/Classification_entity/documentation.adoc
@@ -1,3 +1,45 @@
 = Classification_entity
 
-Offers the possibility to flexibly classify sales projects. The classification can be dynamically configured at runtime.
\ No newline at end of file
+Definition:
+
+    Offers the possibility to flexibly classify sales projects, organisations, or any other data. 
+    The classification can be dynamically configured at runtime.
+
+Purpose:
+
+    Classifications get stored in the Classification table with their own uid, the ids of the classification type, classification score, object_rowId and object_type.
+
+    This entity displays the classification of an dataset in an treetable,
+    with the classification (classificationgroup), including the archieved and possible points and the resulting grading, as the groupfield.
+    And Columns for the indicators (classificationtype) and the selected values (selection).
+
+    Example: 
+                                                INDICATOR                   SELECTION
+        1. Target Group: 60/100Points = B
+                                                Industry                    Service
+                                                Headquarters                Germany
+                                                Product preference          Commodity group 1
+
+        2. Customer value: 15/100Points = D
+                                                Current supply share        High
+                                                Purchasing potential p. a.  100-199 D?
+                                                Loyalty                     Low
+
+Particularities:
+
+    The Classification consists of the following entities:
+    Classification_entity,
+    ClassificationAdmin_entity,
+    ClassificationGrading_entity,
+    ClassificationGroup_entity,
+    ClassificationScore_entity,
+    ClassificationType_entity
+
+    Our terms in the db and entity structure differ from the technical terms the user gets to see, to make it easier to understand 
+    for the developer that doesn't have the technical know-how:
+
+    Our term:               Technical term:                 Example:
+    Object_Type             Usage                           Organisation
+    ClassificationGroup     Classification                  1. Target Group
+    ClassificationType      Indicator                       Industry
+    ClassificationScore     (Possible-)Value/Selection      Service
diff --git a/entity/Classification_entity/entityfields/classificationgroup/displayValueProcess.js b/entity/Classification_entity/entityfields/classificationgroup/displayValueProcess.js
index deb00e8d5e..d0b202c003 100644
--- a/entity/Classification_entity/entityfields/classificationgroup/displayValueProcess.js
+++ b/entity/Classification_entity/entityfields/classificationgroup/displayValueProcess.js
@@ -1,3 +1,4 @@
+import("Sql_lib");
 import("Classification_lib");
 import("system.translate");
 import("system.result");
@@ -7,8 +8,7 @@ if (vars.getString("$field.CLASSIFICATIONGROUP"))
 {
     var score = vars.getString("$field.GroupScore");
     var group = vars.getString("$field.CLASSIFICATIONGROUP");
-    var maxScore = ClassificationUtils.getMaxScore(group);
-    var classifications = ClassificationUtils.getClassifications(score, group);
-    
-    result.string(translate.withArguments("%0: %1/%2points = %3", [group, score, maxScore, classifications]));
+    var groupName = vars.getString("$field.CLASSIFICATIONGROUP_ID.displayValue");
+    var res = ClassificationUtils.formatDisplaySummaryForGroup(score, group, groupName);
+    result.string(res);
 }
diff --git a/entity/Classification_entity/entityfields/classificationgroup/documentation.adoc b/entity/Classification_entity/entityfields/classificationgroup/documentation.adoc
new file mode 100644
index 0000000000..93bd1542a9
--- /dev/null
+++ b/entity/Classification_entity/entityfields/classificationgroup/documentation.adoc
@@ -0,0 +1 @@
+This is the field that is used for automatic grouping.
\ No newline at end of file
diff --git a/entity/Classification_entity/entityfields/classificationscore_id/titleProcess.js b/entity/Classification_entity/entityfields/classificationscore_id/titleProcess.js
index 7865e4544c..5f69ddae0e 100644
--- a/entity/Classification_entity/entityfields/classificationscore_id/titleProcess.js
+++ b/entity/Classification_entity/entityfields/classificationscore_id/titleProcess.js
@@ -6,4 +6,4 @@ import("system.translate");
 if (vars.get("$sys.recordstate") && vars.get("$sys.recordstate") != neon.OPERATINGSTATE_VIEW)
 {
     result.string(translate.text(vars.get("$field.SCORETYPE")));
-}
\ No newline at end of file
+}
diff --git a/entity/Classification_entity/entityfields/classificationscores/children/classificationtype_param/valueProcess.js b/entity/Classification_entity/entityfields/classificationscores/children/classificationtype_param/valueProcess.js
index d3275a8eaa..66d1a9ae5a 100644
--- a/entity/Classification_entity/entityfields/classificationscores/children/classificationtype_param/valueProcess.js
+++ b/entity/Classification_entity/entityfields/classificationscores/children/classificationtype_param/valueProcess.js
@@ -1,4 +1,4 @@
 import("system.vars");
 import("system.result");
 
-result.string(vars.get("$field.CLASSIFICATIONTYPE"))
\ No newline at end of file
+result.string(vars.get("$field.OBJECT_TYPE"))
\ No newline at end of file
diff --git a/entity/Classification_entity/entityfields/classificationtype/displayValueProcess.js b/entity/Classification_entity/entityfields/classificationtype/displayValueProcess.js
index 9a93d93828..55fc33359a 100644
--- a/entity/Classification_entity/entityfields/classificationtype/displayValueProcess.js
+++ b/entity/Classification_entity/entityfields/classificationtype/displayValueProcess.js
@@ -3,4 +3,4 @@ import("system.vars");
 import("Keyword_lib");
 import("KeywordRegistry_basic");
 
-result.string(KeywordUtils.getViewValue($KeywordRegistry.classificationType(), vars.get("$field.CLASSIFICATIONTYPE")));
\ No newline at end of file
+result.string(KeywordUtils.getViewValue($KeywordRegistry.classificationType(), vars.get("$field.OBJECT_TYPE")));
\ No newline at end of file
diff --git a/entity/Classification_entity/entityfields/classificationtype/stateProcess.js b/entity/Classification_entity/entityfields/classificationtype/stateProcess.js
index bcc88cc57c..2a616f4edf 100644
--- a/entity/Classification_entity/entityfields/classificationtype/stateProcess.js
+++ b/entity/Classification_entity/entityfields/classificationtype/stateProcess.js
@@ -1,11 +1,9 @@
 import("system.result");
 import("system.neon");
 import("system.vars");
+
 if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
-{
     result.string(neon.COMPONENTSTATE_EDITABLE);
-}
+
 else
-{
-    result.string(neon.COMPONENTSTATE_READONLY);
-}
\ No newline at end of file
+    result.string(neon.COMPONENTSTATE_READONLY);
\ No newline at end of file
diff --git a/entity/Classification_entity/entityfields/classificationtype_id/valueProcess.js b/entity/Classification_entity/entityfields/classificationtype_id/valueProcess.js
index aaef9be6b3..e294cffd16 100644
--- a/entity/Classification_entity/entityfields/classificationtype_id/valueProcess.js
+++ b/entity/Classification_entity/entityfields/classificationtype_id/valueProcess.js
@@ -2,7 +2,6 @@ import("system.result");
 import("system.neon");
 import("system.vars");
 
-if ((vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT || vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW) && vars.get("$this.value") == null)
-{
-    result.string(vars.get("$field.CLASSIFICATIONTYPEID"));
-}
\ No newline at end of file
+if ((vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT || vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW) 
+        && vars.get("$this.value") == null)
+    result.string(vars.get("$field.CLASSIFICATIONTYPEID"));
\ No newline at end of file
diff --git a/entity/Classification_entity/entityfields/object_rowid/valueProcess.js b/entity/Classification_entity/entityfields/object_rowid/valueProcess.js
index 00c91dc0b7..fe14f896ec 100644
--- a/entity/Classification_entity/entityfields/object_rowid/valueProcess.js
+++ b/entity/Classification_entity/entityfields/object_rowid/valueProcess.js
@@ -2,7 +2,7 @@ import("system.result");
 import("system.neon");
 import("system.vars");
 
-if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT && vars.get("$this.value") == null)
+if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT && vars.get("$this.value") == null && vars.get("$param.ObjectRowid_param"))
 {
     result.string(vars.get("$param.ObjectRowid_param"));
 }
\ No newline at end of file
diff --git a/entity/Classification_entity/entityfields/object_type/valueProcess.js b/entity/Classification_entity/entityfields/object_type/valueProcess.js
index 6a34068808..f51252e64a 100644
--- a/entity/Classification_entity/entityfields/object_type/valueProcess.js
+++ b/entity/Classification_entity/entityfields/object_type/valueProcess.js
@@ -3,6 +3,4 @@ import("system.neon");
 import("system.vars");
 
 if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT && vars.get("$this.value") == null)
-{
-    result.string(vars.get("$param.ObjectType_param"));
-}
\ No newline at end of file
+    result.string(vars.get("$param.ObjectType_param"));
\ No newline at end of file
diff --git a/entity/Classification_entity/recordcontainers/jdito/contentProcess.js b/entity/Classification_entity/recordcontainers/jdito/contentProcess.js
index 3c8b450298..0827f9f533 100644
--- a/entity/Classification_entity/recordcontainers/jdito/contentProcess.js
+++ b/entity/Classification_entity/recordcontainers/jdito/contentProcess.js
@@ -1,62 +1,165 @@
-import("JditoFilter_lib");
+import("system.text");
 import("Classification_lib");
-import("system.vars");
+import("Contact_lib");
+import("JditoFilter_lib");
 import("Sql_lib");
 import("system.db");
 import("system.result");
+import("system.util");
+import("system.vars");
+import("system.translate");
 
-var scores = JSON.stringify(ClassificationUtils.getScoreAsObject(vars.get("$param.ClassificationType_param"), vars.get("$param.ObjectType_param"), vars.get("$param.ObjectRowid_param")));
+//helper object for coding/decoding the uid of a record in this entity
+function _UidEncoder(){}
 
-var classificationId = null;
-var classificationTypeId = null;
+_UidEncoder.encode = function (pClassifactionTypeId, pObjectRowId, pObjectType)
+{
+    var res = text.encodeMS(Array.from(arguments));
+    return res;
+}
 
-// if the id starts with "C," it is a classificationId. If it starts with "T,", it is a classificationtypeId
-if (vars.exists("$local.idvalues") && vars.get("$local.idvalues") && vars.get("$local.idvalues").length > 0)
+_UidEncoder.decode = function (pEncodedUid)
 {
-    var selected = vars.get("$local.idvalues")[0].split(",");
-    if (selected.length == 2)
-    {
-        if (selected[0] == 'C')
-            classificationId = selected[1]
-        else if (selected[0] == 'T')
-            classificationTypeId = selected[1]
-    }
+    var vals = text.decodeMS(pEncodedUid);
+    return {
+        classifactionTypeId: vals[0],
+        objectRowId: vals[1],
+        objectType: vals[2]
+    };
 }
 
+//grouping is not done in this recordContainer but in it is done in the ClassificaitonTree_view via the defaultGroupFields
+
+var objectRowIdParam = vars.get("$param.ObjectRowid_param");
+var objectTypeParam = vars.get("$param.ObjectType_param");
+var scoresPerGroup = ClassificationUtils.getScoreAsObject(objectTypeParam, objectRowIdParam);
+
 var masking = new SqlMaskingUtils();
 
-var select = newSelect("case when CLASSIFICATIONID is not null then " + masking.concat(["'C,'", "CLASSIFICATIONID"], "", false) + " else " + masking.concat(["'T,'", "CLASSIFICATIONTYPEID"], "", false) + " end, CLASSIFICATIONID, CLASSIFICATIONGROUP, CLASSIFICATIONSCORE_ID, CLASSIFICATIONTYPEID, CLASSIFICATIONTYPE_ID, OBJECT_TYPE, OBJECT_ROWID, SCORETYPE, CLASSIFICATIONTYPE.CLASSIFICATIONTYPE")
+//store the content of $local.idValues depending on the provided type in the idvalues
+var filterClassificationIds = [];
+var filterClassificationTypeIds = [];
+// if the id starts with "C," it is a classificationId. If it starts with "T,", it is a classificationtypeId
+if (vars.exists("$local.idvalues") && vars.get("$local.idvalues"))
+{
+    vars.get("$local.idvalues").forEach(function (pIdValue) {
+        var decodedId = _UidEncoder.decode(pIdValue);
+        filterClassificationTypeIds.push(decodedId.classifactionTypeId);
+    });
+}
+
+//this is the main select for the data
+var select = newSelect("CLASSIFICATIONTYPE.CLASSIFICATIONTYPEID \n\
+                    ,CLASSIFICATION.CLASSIFICATIONID, CLASSIFICATION.CLASSIFICATIONSCORE_ID, CLASSIFICATION.OBJECT_ROWID \n\
+                    ,CLASSIFICATIONTYPE.CLASSIFICATIONGROUP_ID, CLASSIFICATIONTYPE.CLASSIFICATIONTYPEID, CLASSIFICATIONTYPE.OBJECT_TYPE, CLASSIFICATIONTYPE.SCORETYPE \n\
+                    ,CLASSIFICATIONSCORE.TITLE\n\
+                    ,CLASSIFICATIONGROUP.TITLE ")
                 .from("CLASSIFICATION")
                 .rightJoin("CLASSIFICATIONTYPE", newWhere()
-                    .and("CLASSIFICATIONTYPE_ID = CLASSIFICATIONTYPEID")
+                    .and("CLASSIFICATION.CLASSIFICATIONTYPE_ID = CLASSIFICATIONTYPE.CLASSIFICATIONTYPEID")
                     .andIfSet("CLASSIFICATION.OBJECT_TYPE", "$param.ObjectType_param")
-                    .andIfSet("CLASSIFICATION.OBJECT_ROWID", "$param.ObjectRowid_param"))
-                .orderBy("CLASSIFICATIONGROUP asc")
-                .whereIfSet("CLASSIFICATIONTYPE.CLASSIFICATIONTYPE", "$param.ClassificationType_param")
-                .andIfSet("CLASSIFICATION.CLASSIFICATIONID", classificationId)
+                    .andIfSet("CLASSIFICATION.OBJECT_ROWID", objectRowIdParam))
+                .join("CLASSIFICATIONGROUP", "CLASSIFICATIONTYPE.CLASSIFICATIONGROUP_ID = CLASSIFICATIONGROUP.CLASSIFICATIONGROUPID")
+                .leftJoin("CLASSIFICATIONSCORE", "CLASSIFICATIONSCORE.CLASSIFICATIONSCOREID = CLASSIFICATION.CLASSIFICATIONSCORE_ID")
+                .whereIfSet("CLASSIFICATIONTYPE.OBJECT_TYPE", "$param.ClassificationType_param")
+                .andIfSet(
+                        newWhereIfSet("CLASSIFICATION.CLASSIFICATIONID", filterClassificationIds, SqlBuilder.IN())
+                             .orIfSet("CLASSIFICATIONTYPE.CLASSIFICATIONTYPEID", filterClassificationTypeIds, SqlBuilder.IN())
+                    )
+                .orderBy("CLASSIFICATIONGROUP.SORTING");
 
 
-if (!classificationId)
+if (filterClassificationIds.length == 0 && filterClassificationTypeIds.length == 0)//no idvalues for filtering
 {
-    select.andIfSet("CLASSIFICATIONTYPE.CLASSIFICATIONTYPEID", classificationTypeId)
-        .and(newWhereIfSet("CLASSIFICATION.OBJECT_TYPE", "$param.ObjectType_param")
+    select.and(newWhereIfSet("CLASSIFICATION.OBJECT_TYPE", "$param.ObjectType_param")
                     .or("CLASSIFICATION.OBJECT_TYPE is null"))
-        .and(newWhereIfSet("CLASSIFICATION.OBJECT_ROWID", "$param.ObjectRowid_param")
+            .and(newWhereIfSet("CLASSIFICATION.OBJECT_ROWID", objectRowIdParam)
                     .or("CLASSIFICATION.OBJECT_ROWID is null"));
 }
 
-if (vars.exists("$local.filter") && vars.get("$local.filter"))
+_addLocalFilter();
+_updateScore();
+
+/* After loading the data from the database the data some preparation for the record container is done like translating display values into the 
+ * correct locale or calculating some values
+ */
+var classificationTypeGroupDisplayCache = {};
+var resultSet = [];
+//declaration needs to be separated because if declaration is done in the deconstructioning the IDE (designer) autocomplete does not work anymore
+var uid, classificationId, classificationScoreId, classificationObjectRowId, classificationTypeGroupId, classificationTypeId
+    , classificationTypeObjectType, classificationTypeScoreType, classificationScoreTitle, classificationGroupTitle;
+select.table().forEach(function (pRow){
+    //deconstructioning for easy access when the selected data changes
+    [uid, classificationId, classificationScoreId, classificationObjectRowId, classificationTypeGroupId, classificationTypeId
+    , classificationTypeObjectType, classificationTypeScoreType, classificationScoreTitle, classificationGroupTitle] = pRow;
+    
+    uid = _UidEncoder.encode(uid, objectRowIdParam, objectTypeParam);
+    if (classificationScoreTitle)
+        classificationScoreTitle = translate.text(classificationScoreTitle);
+    if (classificationGroupTitle)
+        classificationGroupTitle = translate.text(classificationGroupTitle);
+
+    var currentGroupScore = scoresPerGroup[classificationTypeGroupId] || 0;
+
+    //display value is the same for every groupId, so let's cache it that we do not need to load it in every row  => better performance
+    if (classificationTypeGroupDisplayCache[classificationTypeGroupId] == undefined)
+    {
+        classificationTypeGroupDisplayCache[classificationTypeGroupId] = ClassificationUtils.formatDisplaySummaryForGroup(currentGroupScore
+                , classificationTypeGroupId, classificationGroupTitle);
+    }
+    var classificationTypeGroupDisplay = classificationTypeGroupDisplayCache[classificationTypeGroupId];
+
+    //a field can only contain a string so format complex data into string
+    scoresPerGroup = JSON.stringify(scoresPerGroup);
+
+    resultSet.push([uid, classificationId, classificationTypeGroupId, classificationTypeGroupDisplay, classificationGroupTitle
+        , classificationScoreId, classificationScoreTitle, classificationTypeId, classificationTypeId, classificationTypeObjectType
+        , objectRowIdParam, classificationTypeScoreType, classificationTypeObjectType, scoresPerGroup, currentGroupScore]);
+});
+
+result.object(resultSet);
+
+/* private helper functions for better readability are following now
+ * variable scope is shared so there is no need to pass the values as parameters
+ */
+
+/**
+ * adds the $local.filter to the sql condition
+ */
+function _addLocalFilter()
 {
-    var filter = vars.get("$local.filter");
-    if (filter.filter)
-        select.andIfSet((JditoFilterUtils.getSqlCondition(filter.filter, "CLASSIFICATION", undefined, {
-             CLASSIFICATIONTYPE : "CLASSIFICATIONTYPE.CLASSIFICATIONTYPE"
-        })));
+    if (vars.exists("$local.filter") && vars.get("$local.filter"))
+    {
+        var filter = vars.get("$local.filter");
+        if (filter.filter)
+            select.andIfSet((JditoFilterUtils.getSqlCondition(filter.filter, "CLASSIFICATION", undefined, {
+                OBJECT_TYPE : "CLASSIFICATIONTYPE.OBJECT_TYPE"
+            })));
+    }
 }
 
-result.object(select.table()
-                    .map(function(pRow)
-                    {
-                        pRow.push(scores);
-                        return pRow;
-                    }));
\ No newline at end of file
+
+/**
+ * performs an update in  the precalculated classification-stoarge information if there is a missmatch between the IS-value and the SHOULD-BE-value
+ */
+function _updateScore()
+{
+    var calculatedScore = ClassificationUtils.getScore(objectTypeParam, objectRowIdParam)
+
+    var calculatedClassification = "";
+    for (let i = 0; i < calculatedScore.length; i++) {
+        calculatedClassification += ClassificationUtils.getClassifications(calculatedScore[i][0], calculatedScore[i][1]);
+    }
+
+    var storedClassification = newSelect("CLASSIFICATIONSTORAGE.CLASSIFICATIONSTORAGEID, CLASSIFICATIONSTORAGE.CLASSIFICATIONVALUE ")
+    .from("CLASSIFICATIONSTORAGE")
+    .where("CLASSIFICATIONSTORAGE.OBJECT_ROWID", objectRowIdParam)
+    .arrayRow();
+
+    var table = "CLASSIFICATIONSTORAGE";
+    var columns = ["CLASSIFICATIONVALUE"];
+    var values = [calculatedClassification];
+
+    if(storedClassification[1] != undefined && calculatedClassification != storedClassification[1]) //Update the stored classification if the freshly calculated one differs
+        newWhere("CLASSIFICATIONSTORAGE.CLASSIFICATIONSTORAGEID", storedClassification[0]).updateData(true, table, columns, null, values);
+}
\ No newline at end of file
diff --git a/entity/KeywordEntry_entity/KeywordEntry_entity.aod b/entity/KeywordEntry_entity/KeywordEntry_entity.aod
index 4a37e03e28..2d7eb1b4f1 100644
--- a/entity/KeywordEntry_entity/KeywordEntry_entity.aod
+++ b/entity/KeywordEntry_entity/KeywordEntry_entity.aod
@@ -385,12 +385,6 @@
           <fieldName>KeywordCampaignManagementCostCategory</fieldName>
           <isConsumer v="false" />
         </entityDependency>
-        <entityDependency>
-          <name>63bd7284-e9a0-4576-afe8-299d412e8def</name>
-          <entityName>ClassificationAdmin_entity</entityName>
-          <fieldName>KeywordClassificationTypes</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
         <entityDependency>
           <name>3a81e886-0d83-47f0-9ec7-c864ffc57cda</name>
           <entityName>Classification_entity</entityName>
diff --git a/entity/KeywordEntry_entity/entityfields/expanded/valueProcess.js b/entity/KeywordEntry_entity/entityfields/expanded/valueProcess.js
index dcb435b5f5..c2ad10b5f0 100644
--- a/entity/KeywordEntry_entity/entityfields/expanded/valueProcess.js
+++ b/entity/KeywordEntry_entity/entityfields/expanded/valueProcess.js
@@ -1,3 +1,3 @@
 import("system.result");
 
-result.object(false);
\ No newline at end of file
+result.object(true);
\ No newline at end of file
diff --git a/entity/Notification_entity/Notification_entity.aod b/entity/Notification_entity/Notification_entity.aod
index 0f90322477..c6d31ac7fd 100644
--- a/entity/Notification_entity/Notification_entity.aod
+++ b/entity/Notification_entity/Notification_entity.aod
@@ -176,13 +176,6 @@
       <orderClauseProcess>%aditoprj%/entity/Notification_entity/recordcontainers/db/orderClauseProcess.js</orderClauseProcess>
       <onDBDelete>%aditoprj%/entity/Notification_entity/recordcontainers/db/onDBDelete.js</onDBDelete>
       <linkInformation>
-        <linkInformation>
-          <name>c4e34b96-6081-4d04-8377-040a8ed3e14c</name>
-          <tableName>ASYS_NOTIFICATIONS</tableName>
-          <primaryKey>ID</primaryKey>
-          <isUIDTable v="true" />
-          <readonly v="false" />
-        </linkInformation>
         <linkInformation>
           <name>38bfb16c-bfe9-45dd-8ce7-692ebba030a9</name>
           <tableName>ASYS_NOTIFICATIONCONTENTS</tableName>
diff --git a/entity/Organisation_entity/Organisation_entity.aod b/entity/Organisation_entity/Organisation_entity.aod
index 8a881b9f62..c46cee54a6 100644
--- a/entity/Organisation_entity/Organisation_entity.aod
+++ b/entity/Organisation_entity/Organisation_entity.aod
@@ -248,6 +248,7 @@
     </entityConsumer>
     <entityProvider>
       <name>#PROVIDER</name>
+      <sortingField>NAME</sortingField>
       <dependencies>
         <entityDependency>
           <name>1a472ca0-4d27-453c-8de5-a046b86f22fb</name>
@@ -825,11 +826,6 @@
       <colorProcess>%aditoprj%/entity/Organisation_entity/entityfields/lastactivity/colorProcess.js</colorProcess>
       <valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/lastactivity/valueProcess.js</valueProcess>
     </entityField>
-    <entityField>
-      <name>OpenTasks</name>
-      <title>Open tasks</title>
-      <valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/opentasks/valueProcess.js</valueProcess>
-    </entityField>
     <entityActionField>
       <name>openEditDefaultsView</name>
       <documentation>%aditoprj%/entity/Organisation_entity/entityfields/openeditdefaultsview/documentation.adoc</documentation>
@@ -1112,6 +1108,7 @@
     </entityActionField>
     <entityConsumer>
       <name>Classifications</name>
+      <refreshParent v="false" />
       <dependency>
         <name>dependency</name>
         <entityName>Classification_entity</entityName>
@@ -1135,31 +1132,6 @@
         </entityParameter>
       </children>
     </entityConsumer>
-    <entityConsumer>
-      <name>ClassificationGroups</name>
-      <dependency>
-        <name>dependency</name>
-        <entityName>ClassificationGroupAnalyses_entity</entityName>
-        <fieldName>GroupAnalyses</fieldName>
-      </dependency>
-      <children>
-        <entityParameter>
-          <name>ClassificationType_param</name>
-          <valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/classificationgroups/children/classificationtype_param/valueProcess.js</valueProcess>
-          <expose v="true" />
-        </entityParameter>
-        <entityParameter>
-          <name>ObjectRowid_param</name>
-          <valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/classificationgroups/children/objectrowid_param/valueProcess.js</valueProcess>
-          <expose v="true" />
-        </entityParameter>
-        <entityParameter>
-          <name>ObjectType_param</name>
-          <valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/classificationgroups/children/objecttype_param/valueProcess.js</valueProcess>
-          <expose v="true" />
-        </entityParameter>
-      </children>
-    </entityConsumer>
     <entityField>
       <name>COUNT</name>
       <title>Count</title>
@@ -1170,6 +1142,11 @@
       <parentField>COUNT</parentField>
       <title>Count</title>
     </entityAggregateField>
+    <entityField>
+      <name>CLASSIFICATIONSTORAGE_ID</name>
+      <title>Classification</title>
+      <groupable v="true" />
+    </entityField>
     <entityProvider>
       <name>OrganisationsViaIndex</name>
       <documentation>%aditoprj%/entity/Organisation_entity/entityfields/organisationsviaindex/documentation.adoc</documentation>
@@ -1267,26 +1244,33 @@
       <onDBDelete>%aditoprj%/entity/Organisation_entity/recordcontainers/db/onDBDelete.js</onDBDelete>
       <linkInformation>
         <linkInformation>
-          <name>5808a4a3-f2c1-4ccd-bad1-4e8a834ec7a4</name>
+          <name>f63d7d1a-118a-4cc1-9963-495f57468f8d</name>
           <tableName>ORGANISATION</tableName>
           <primaryKey>ORGANISATIONID</primaryKey>
           <isUIDTable v="false" />
           <readonly v="false" />
         </linkInformation>
         <linkInformation>
-          <name>5cd93c60-47e5-4eaa-90a4-69990f6a7d00</name>
+          <name>3cca93ac-fb3b-4dae-933e-0ee1e8c84260</name>
           <tableName>CONTACT</tableName>
           <primaryKey>CONTACTID</primaryKey>
           <isUIDTable v="true" />
           <readonly v="false" />
         </linkInformation>
         <linkInformation>
-          <name>23fa4717-b401-48db-92ed-285aeab71f08</name>
+          <name>c0bcece8-306a-47ac-a406-7e42014fa4d7</name>
           <tableName>ADDRESS</tableName>
           <primaryKey>ADDRESSID</primaryKey>
           <isUIDTable v="false" />
           <readonly v="true" />
         </linkInformation>
+        <linkInformation>
+          <name>c00213e6-4f5d-41df-a5f3-fd751a46e94b</name>
+          <tableName>CLASSIFICATIONSTORAGE</tableName>
+          <primaryKey>CLASSIFICATIONSTORAGEID</primaryKey>
+          <isUIDTable v="false" />
+          <readonly v="true" />
+        </linkInformation>
       </linkInformation>
       <recordFieldMappings>
         <dbRecordFieldMapping>
@@ -1465,6 +1449,12 @@
           <recordfield>ORGANISATION.ORGANISATIONID</recordfield>
           <aggregateType>COUNT</aggregateType>
         </aggregateFieldDbMapping>
+        <dbRecordFieldMapping>
+          <name>CLASSIFICATIONSTORAGE_ID.value</name>
+          <recordfield>CLASSIFICATIONSTORAGE.CLASSIFICATIONVALUE</recordfield>
+          <isFilterable v="true" />
+          <isLookupFilter v="true" />
+        </dbRecordFieldMapping>
         <dbRecordFieldMapping>
           <name>STANDARD_LAT.value</name>
           <recordfield>ADDRESS.LAT</recordfield>
@@ -1482,6 +1472,24 @@
           <filterConditionProcess>%aditoprj%/entity/Organisation_entity/recordcontainers/db/filterextensions/attribute_filter/filterConditionProcess.js</filterConditionProcess>
           <filtertype>BASIC</filtertype>
         </filterExtensionSet>
+        <filterExtensionSet>
+          <name>ClassificationType_filter</name>
+          <filterFieldsProcess>%aditoprj%/entity/Organisation_entity/recordcontainers/db/filterextensions/classificationtype_filter/filterFieldsProcess.js</filterFieldsProcess>
+          <filterValuesProcess>%aditoprj%/entity/Organisation_entity/recordcontainers/db/filterextensions/classificationtype_filter/filterValuesProcess.js</filterValuesProcess>
+          <filterConditionProcess>%aditoprj%/entity/Organisation_entity/recordcontainers/db/filterextensions/classificationtype_filter/filterConditionProcess.js</filterConditionProcess>
+          <isGroupable v="true" />
+          <groupQueryProcess>%aditoprj%/entity/Organisation_entity/recordcontainers/db/filterextensions/classificationtype_filter/groupQueryProcess.js</groupQueryProcess>
+          <filtertype>BASIC</filtertype>
+        </filterExtensionSet>
+        <filterExtensionSet>
+          <name>ClassificationGroup_filter</name>
+          <filterFieldsProcess>%aditoprj%/entity/Organisation_entity/recordcontainers/db/filterextensions/classificationgroup_filter/filterFieldsProcess.js</filterFieldsProcess>
+          <filterValuesProcess>%aditoprj%/entity/Organisation_entity/recordcontainers/db/filterextensions/classificationgroup_filter/filterValuesProcess.js</filterValuesProcess>
+          <filterConditionProcess>%aditoprj%/entity/Organisation_entity/recordcontainers/db/filterextensions/classificationgroup_filter/filterConditionProcess.js</filterConditionProcess>
+          <isGroupable v="true" />
+          <groupQueryProcess>%aditoprj%/entity/Organisation_entity/recordcontainers/db/filterextensions/classificationgroup_filter/groupQueryProcess.js</groupQueryProcess>
+          <filtertype>BASIC</filtertype>
+        </filterExtensionSet>
       </filterExtensions>
     </dbRecordContainer>
     <indexRecordContainer>
diff --git a/entity/Organisation_entity/entityfields/classificationgroups/children/classificationtype_param/valueProcess.js b/entity/Organisation_entity/entityfields/classificationgroups/children/classificationtype_param/valueProcess.js
deleted file mode 100644
index 051bc0a827..0000000000
--- a/entity/Organisation_entity/entityfields/classificationgroups/children/classificationtype_param/valueProcess.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import("KeywordRegistry_basic");
-import("system.result");
-
-result.string($KeywordRegistry.classificationType$organisation());
\ No newline at end of file
diff --git a/entity/Organisation_entity/entityfields/classificationgroups/children/objectrowid_param/valueProcess.js b/entity/Organisation_entity/entityfields/classificationgroups/children/objectrowid_param/valueProcess.js
deleted file mode 100644
index 533f8ec837..0000000000
--- a/entity/Organisation_entity/entityfields/classificationgroups/children/objectrowid_param/valueProcess.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import("system.vars");
-import("system.result");
-
-result.string(vars.get("$sys.uid"));
\ No newline at end of file
diff --git a/entity/Organisation_entity/entityfields/classificationgroups/children/objecttype_param/valueProcess.js b/entity/Organisation_entity/entityfields/classificationgroups/children/objecttype_param/valueProcess.js
deleted file mode 100644
index 008915f61d..0000000000
--- a/entity/Organisation_entity/entityfields/classificationgroups/children/objecttype_param/valueProcess.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import("system.result");
-import("Context_lib");
-
-result.string(ContextUtils.getCurrentContextId());
\ No newline at end of file
diff --git a/entity/Organisation_entity/entityfields/classifications/children/objectrowid_param/valueProcess.js b/entity/Organisation_entity/entityfields/classifications/children/objectrowid_param/valueProcess.js
index 533f8ec837..7b6137b4d1 100644
--- a/entity/Organisation_entity/entityfields/classifications/children/objectrowid_param/valueProcess.js
+++ b/entity/Organisation_entity/entityfields/classifications/children/objectrowid_param/valueProcess.js
@@ -1,4 +1,4 @@
 import("system.vars");
 import("system.result");
 
-result.string(vars.get("$sys.uid"));
\ No newline at end of file
+result.string(vars.get("$field.CONTACTID"));
\ No newline at end of file
diff --git a/entity/Organisation_entity/entityfields/classificationstorage_id/valueProcess.js b/entity/Organisation_entity/entityfields/classificationstorage_id/valueProcess.js
new file mode 100644
index 0000000000..f7db7e7050
--- /dev/null
+++ b/entity/Organisation_entity/entityfields/classificationstorage_id/valueProcess.js
@@ -0,0 +1,10 @@
+//import("Sql_lib");
+//import("system.result");
+//import("system.vars");
+//
+//var classification = newSelect("CLASSIFICATIONSTORAGE.CLASSIFICATIONVALUE")
+//                                .from("CLASSIFICATIONSTORAGE")
+//                                .where("CLASSIFICATIONSTORAGE.OBJECT_ROWID", vars.get("$field.ORGANISATIONID"))
+//                                .cell();
+//                                
+//result.string(classification);
diff --git a/entity/Organisation_entity/entityfields/opentasks/valueProcess.js b/entity/Organisation_entity/entityfields/opentasks/valueProcess.js
deleted file mode 100644
index 496146a737..0000000000
--- a/entity/Organisation_entity/entityfields/opentasks/valueProcess.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import("system.vars");
-import("Context_lib");
-import("ActivityTask_lib");
-import("system.result");
-
-result.string(TaskUtils.getOpenTaskCount(vars.get("$field.CONTACTID"), ContextUtils.getCurrentContextId()));
\ No newline at end of file
diff --git a/entity/Organisation_entity/recordcontainers/db/filterextensions/classificationgroup_filter/filterConditionProcess.js b/entity/Organisation_entity/recordcontainers/db/filterextensions/classificationgroup_filter/filterConditionProcess.js
new file mode 100644
index 0000000000..ef0d44ef34
--- /dev/null
+++ b/entity/Organisation_entity/recordcontainers/db/filterextensions/classificationgroup_filter/filterConditionProcess.js
@@ -0,0 +1,6 @@
+import("system.result");
+import("ClassificationFilter_lib");
+
+var sqlCond = ClassificationGroupFilterUtils.makeFilterConditionSql();
+
+result.string(sqlCond);
\ No newline at end of file
diff --git a/entity/Organisation_entity/recordcontainers/db/filterextensions/classificationgroup_filter/filterFieldsProcess.js b/entity/Organisation_entity/recordcontainers/db/filterextensions/classificationgroup_filter/filterFieldsProcess.js
new file mode 100644
index 0000000000..f4082997e0
--- /dev/null
+++ b/entity/Organisation_entity/recordcontainers/db/filterextensions/classificationgroup_filter/filterFieldsProcess.js
@@ -0,0 +1,7 @@
+import("system.result");
+import("ClassificationFilter_lib");
+
+//this filterExtensionSet is for the Classifications (ClassificationGroups, e.g. 1. Target Group, Customer Value...)
+var fields = ClassificationGroupFilterUtils.makeFilterFields();
+
+result.string(fields);
\ No newline at end of file
diff --git a/entity/Organisation_entity/recordcontainers/db/filterextensions/classificationgroup_filter/filterValuesProcess.js b/entity/Organisation_entity/recordcontainers/db/filterextensions/classificationgroup_filter/filterValuesProcess.js
new file mode 100644
index 0000000000..447f4c0372
--- /dev/null
+++ b/entity/Organisation_entity/recordcontainers/db/filterextensions/classificationgroup_filter/filterValuesProcess.js
@@ -0,0 +1,5 @@
+import("system.result");
+import("ClassificationFilter_lib");
+
+var values = ClassificationGroupFilterUtils.makeFilterValues();
+result.object(values);
\ No newline at end of file
diff --git a/entity/Organisation_entity/recordcontainers/db/filterextensions/classificationgroup_filter/groupQueryProcess.js b/entity/Organisation_entity/recordcontainers/db/filterextensions/classificationgroup_filter/groupQueryProcess.js
new file mode 100644
index 0000000000..343227e54a
--- /dev/null
+++ b/entity/Organisation_entity/recordcontainers/db/filterextensions/classificationgroup_filter/groupQueryProcess.js
@@ -0,0 +1,23 @@
+import("system.translate");
+import("Sql_lib");
+import("system.result");
+import("system.vars");
+import("system.logging");
+logging.log("classificationgroup_filter.groupQueryProcess");
+var isCount = vars.get("$local.count");             // TRUE if the count of the records is needed
+var columns = vars.get("$local.columnlist");        // The column, expected from the querry, see also AttributeFilter_lib
+var condition = vars.get("$local.condition");       // The Condition that's beeing used, includes the grouphirachy
+var groupedColumns = vars.get("$local.groupedlist") // The coloumns, used for grouping
+var order = vars.get("$local.order");               // The order of the result
+var classificationId = vars.get("$local.name");
+classificationId = classificationId.slice(classificationId.lastIndexOf(".") + 1, classificationId.length);
+
+var stmt = newSelect(isCount ? groupedColumns : columns)
+                    .from("ORGANISATION")
+                    .join("CONTACT", "ORGANISATIONID = ORGANISATION_ID  and PERSON_ID is null")
+                    .leftJoin("CLASSIFICATIONSTORAGE", "CLASSIFICATIONSTORAGE.OBJECT_ROWID = CONTACT.CONTACTID and OBJECT_TYPE = 'Organisation'")
+                    .where(condition)
+                    .groupBy(groupedColumns)
+                    .toString();
+                    
+result.string(stmt);
\ No newline at end of file
diff --git a/entity/Organisation_entity/recordcontainers/db/filterextensions/classificationtype_filter/filterConditionProcess.js b/entity/Organisation_entity/recordcontainers/db/filterextensions/classificationtype_filter/filterConditionProcess.js
new file mode 100644
index 0000000000..5875efb769
--- /dev/null
+++ b/entity/Organisation_entity/recordcontainers/db/filterextensions/classificationtype_filter/filterConditionProcess.js
@@ -0,0 +1,6 @@
+import("system.result");
+import("ClassificationFilter_lib");
+
+var sqlCond = ClassificationTypeFilterUtils.makeFilterConditionSql();
+
+result.string(sqlCond);
\ No newline at end of file
diff --git a/entity/Organisation_entity/recordcontainers/db/filterextensions/classificationtype_filter/filterFieldsProcess.js b/entity/Organisation_entity/recordcontainers/db/filterextensions/classificationtype_filter/filterFieldsProcess.js
new file mode 100644
index 0000000000..eebe4d8382
--- /dev/null
+++ b/entity/Organisation_entity/recordcontainers/db/filterextensions/classificationtype_filter/filterFieldsProcess.js
@@ -0,0 +1,8 @@
+import("system.vars");
+import("system.result");
+import("ClassificationFilter_lib");
+
+//this filterExtensionSet is for the Indicators (ClassificationTypes, e.g. Industry, Loyality, Number of employees...)
+var fields = ClassificationTypeFilterUtils.getFilterFields(vars.get("$sys.currentcontextname"));
+
+result.string(fields);
\ No newline at end of file
diff --git a/entity/Organisation_entity/recordcontainers/db/filterextensions/classificationtype_filter/filterValuesProcess.js b/entity/Organisation_entity/recordcontainers/db/filterextensions/classificationtype_filter/filterValuesProcess.js
new file mode 100644
index 0000000000..488499064a
--- /dev/null
+++ b/entity/Organisation_entity/recordcontainers/db/filterextensions/classificationtype_filter/filterValuesProcess.js
@@ -0,0 +1,5 @@
+import("system.result");
+import("ClassificationFilter_lib");
+
+var values = ClassificationTypeFilterUtils.makeFilterFields();
+result.object(values);
\ No newline at end of file
diff --git a/entity/Organisation_entity/recordcontainers/db/filterextensions/classificationtype_filter/groupQueryProcess.js b/entity/Organisation_entity/recordcontainers/db/filterextensions/classificationtype_filter/groupQueryProcess.js
new file mode 100644
index 0000000000..ccf8f498ce
--- /dev/null
+++ b/entity/Organisation_entity/recordcontainers/db/filterextensions/classificationtype_filter/groupQueryProcess.js
@@ -0,0 +1,25 @@
+import("system.translate");
+import("Sql_lib");
+import("system.result");
+import("system.vars");
+import("system.logging");
+
+var isCount = vars.get("$local.count");             // TRUE if the count of the records is needed
+var columns = vars.get("$local.columnlist");        // The column, expected from the querry, see also AttributeFilter_lib
+var condition = vars.get("$local.condition");       // The Condition that's beeing used, includes the grouphirachy
+var groupedColumns = vars.get("$local.groupedlist") // The coloumns, used for grouping
+var order = vars.get("$local.order");               // The order of the result
+var classificationId = vars.get("$local.name");
+classificationId = classificationId.slice(classificationId.lastIndexOf(".") + 1, classificationId.length);
+var valuefield = "''"
+var stmt = "";
+
+stmt = newSelect(isCount ? "1" : columns)
+                    .from("ORGANISATION")
+                    .join("CONTACT", "ORGANISATIONID = ORGANISATION_ID  and PERSON_ID is null")
+                    .leftJoin("CLASSIFICATION", "CLASSIFICATION.OBJECT_ROWID = CONTACT.CONTACTID and OBJECT_TYPE = 'Organisation' and CLASSIFICATION.CLASSIFICATIONTYPE_ID = '" + classificationId + "' ")
+                    .leftJoin("CLASSIFICATIONSCORE", "CLASSIFICATIONSCOREID = CLASSIFICATION.CLASSIFICATIONSCORE_ID " +  (condition != "  " ? " WHERE " + condition : ""))
+                    .groupBy(groupedColumns + (order != null && !isCount ? " ORDER BY " + order : ""))
+                    .toString();
+
+result.string(stmt);
\ No newline at end of file
diff --git a/entity/Organisation_entity/recordcontainers/db/fromClauseProcess.js b/entity/Organisation_entity/recordcontainers/db/fromClauseProcess.js
index 81779a42ee..f743fde17b 100644
--- a/entity/Organisation_entity/recordcontainers/db/fromClauseProcess.js
+++ b/entity/Organisation_entity/recordcontainers/db/fromClauseProcess.js
@@ -1,6 +1,8 @@
 import("system.result");
 
 //ADDRESS is necessary to display standard address fast within organisation lists
+//CLASSIFICATIONSTORAGE is necessaray to make it possible to get the classifications of the organisations and making it possible to group by them
 result.string("ORGANISATION \n\
     join CONTACT on (ORGANISATION.ORGANISATIONID = CONTACT.ORGANISATION_ID and CONTACT.PERSON_ID is null)\n\
-    left join ADDRESS on (ADDRESS.ADDRESSID = CONTACT.ADDRESS_ID)");
\ No newline at end of file
+    left join ADDRESS on (ADDRESS.ADDRESSID = CONTACT.ADDRESS_ID)\n\
+    left join CLASSIFICATIONSTORAGE on (CLASSIFICATIONSTORAGE.OBJECT_ROWID = CONTACT.CONTACTID)");
\ No newline at end of file
diff --git a/entity/Organisation_entity/recordcontainers/db/onDBDelete.js b/entity/Organisation_entity/recordcontainers/db/onDBDelete.js
index ea3ae0e08a..4286e03eb2 100644
--- a/entity/Organisation_entity/recordcontainers/db/onDBDelete.js
+++ b/entity/Organisation_entity/recordcontainers/db/onDBDelete.js
@@ -15,5 +15,6 @@ new AttributeRelationQuery(contactId, null, ContextUtils.getCurrentContextId())
 newWhere("COMMUNICATION.CONTACT_ID", contactId).deleteData();
 newWhere("ADDRESS.CONTACT_ID", contactId).deleteData();
 newWhere("COMMRESTRICTION.CONTACT_ID", contactId).deleteData();
+newWhere("CLASSIFICATIONSTORAGE.OBJECT_ROWID", vars.get("$field.CONTACTID")).deleteData();
 
 WorkflowSignalSender.deleted();
\ No newline at end of file
diff --git a/entity/Organisation_entity/recordcontainers/db/onDBInsert.js b/entity/Organisation_entity/recordcontainers/db/onDBInsert.js
index 54f0349c9f..434601a60b 100644
--- a/entity/Organisation_entity/recordcontainers/db/onDBInsert.js
+++ b/entity/Organisation_entity/recordcontainers/db/onDBInsert.js
@@ -1,3 +1,13 @@
+import("system.vars");
+import("Classification_lib");
 import("Workflow_lib");
 
+
+var uid = vars.get("$sys.uid");
+var contextname = vars.get("$sys.currentcontextname");
+
+ClassificationUtils.insertEmptyClassification(uid, contextname);
+
+//start the execution in afterOperatingState, because here the dataset is not yet inserted
+vars.set("$context.workflowQueue", {});
 WorkflowSignalSender.inserted();
\ No newline at end of file
diff --git a/entity/Organisation_entity/recordcontainers/index/query.js b/entity/Organisation_entity/recordcontainers/index/query.js
index b42325af7f..e860656afa 100644
--- a/entity/Organisation_entity/recordcontainers/index/query.js
+++ b/entity/Organisation_entity/recordcontainers/index/query.js
@@ -50,7 +50,7 @@ var querySelect = newSelect([
         .and(["COMMUNICATION", "MEDIUM_ID", "phone"], commMediumPhoneIds, SqlBuilder.IN()), "phone")
     .where("CONTACT.STATUS", $KeywordRegistry.contactStatus$inactive(), SqlBuilder.NOT_EQUAL());
 
-if (vars.exists("$local.idvalue"))
-    querySelect.whereIfSet("CONTACT.CONTACTID", "$local.idvalue");
+if (vars.exists("$local.idvalue") && vars.get("$local.idvalue") && vars.get("$local.idvalue").length > 0) 
+    querySelect.and("CONTACT.CONTACTID", "$local.idvalue");
 
 result.string(querySelect.toString());
diff --git a/entity/Salesproject_entity/Salesproject_entity.aod b/entity/Salesproject_entity/Salesproject_entity.aod
index e176d14951..cdbe5d0856 100644
--- a/entity/Salesproject_entity/Salesproject_entity.aod
+++ b/entity/Salesproject_entity/Salesproject_entity.aod
@@ -595,6 +595,7 @@
     </entityConsumer>
     <entityConsumer>
       <name>Classifications</name>
+      <refreshParent v="true" />
       <dependency>
         <name>dependency</name>
         <entityName>Classification_entity</entityName>
@@ -625,13 +626,6 @@
       <title>Days running</title>
       <valueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/runtime/valueProcess.js</valueProcess>
     </entityField>
-    <entityField>
-      <name>ClassificationResult</name>
-      <title>Classification</title>
-      <groupable v="false" />
-      <state>READONLY</state>
-      <valueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/classificationresult/valueProcess.js</valueProcess>
-    </entityField>
     <entityConsumer>
       <name>SalesprojectForecastCharts</name>
       <dependency>
@@ -676,8 +670,6 @@
       <name>ClassificationGroups</name>
       <dependency>
         <name>dependency</name>
-        <entityName>ClassificationGroupAnalyses_entity</entityName>
-        <fieldName>GroupAnalyses</fieldName>
       </dependency>
       <children>
         <entityParameter>
@@ -774,6 +766,10 @@
       <name>#PROVIDER_AGGREGATES</name>
       <useAggregates v="true" />
     </entityProvider>
+    <entityField>
+      <name>CLASSIFICATIONSTORAGE_ID</name>
+      <title>Classification</title>
+    </entityField>
   </entityFields>
   <recordContainers>
     <dbRecordContainer>
@@ -787,19 +783,26 @@
       <onDBDelete>%aditoprj%/entity/Salesproject_entity/recordcontainers/db/onDBDelete.js</onDBDelete>
       <linkInformation>
         <linkInformation>
-          <name>02eb2f4c-3b85-409f-ac13-c8b26804da44</name>
+          <name>c8b6f1e0-630c-45d1-bdfb-d1eb3f6d6bef</name>
           <tableName>SALESPROJECT</tableName>
           <primaryKey>SALESPROJECTID</primaryKey>
           <isUIDTable v="true" />
           <readonly v="false" />
         </linkInformation>
         <linkInformation>
-          <name>485af2f8-d91d-442f-89c7-c44915dda990</name>
+          <name>5f687ee0-15eb-4e19-aa5a-461c446e7d91</name>
           <tableName>ORGANISATION</tableName>
           <primaryKey>ORGANISATIONID</primaryKey>
           <isUIDTable v="false" />
           <readonly v="true" />
         </linkInformation>
+        <linkInformation>
+          <name>1c73b0de-0e70-421e-a8aa-660dbd177f81</name>
+          <tableName>CLASSIFICATIONSTORAGE</tableName>
+          <primaryKey>CLASSIFICATIONSTORAGEID</primaryKey>
+          <isUIDTable v="false" />
+          <readonly v="true" />
+        </linkInformation>
       </linkInformation>
       <recordFieldMappings>
         <dbRecordFieldMapping>
@@ -906,6 +909,12 @@
           <recordfield>SALESPROJECT.SALESPROJECTID</recordfield>
           <aggregateType>COUNT</aggregateType>
         </aggregateFieldDbMapping>
+        <dbRecordFieldMapping>
+          <name>CLASSIFICATIONSTORAGE_ID.value</name>
+          <recordfield>CLASSIFICATIONSTORAGE.CLASSIFICATIONVALUE</recordfield>
+          <isFilterable v="true" />
+          <isLookupFilter v="true" />
+        </dbRecordFieldMapping>
       </recordFieldMappings>
       <filterExtensions>
         <filterExtensionSet>
@@ -916,17 +925,20 @@
           <filtertype>BASIC</filtertype>
         </filterExtensionSet>
         <filterExtensionSet>
-          <name>ClassificationSummary_filter</name>
-          <filterFieldsProcess>%aditoprj%/entity/Salesproject_entity/recordcontainers/db/filterextensions/classificationsummary_filter/filterFieldsProcess.js</filterFieldsProcess>
-          <filterValuesProcess>%aditoprj%/entity/Salesproject_entity/recordcontainers/db/filterextensions/classificationsummary_filter/filterValuesProcess.js</filterValuesProcess>
-          <filterConditionProcess>%aditoprj%/entity/Salesproject_entity/recordcontainers/db/filterextensions/classificationsummary_filter/filterConditionProcess.js</filterConditionProcess>
+          <name>ClassificationType_filter</name>
+          <filterFieldsProcess>%aditoprj%/entity/Salesproject_entity/recordcontainers/db/filterextensions/classificationtype_filter/filterFieldsProcess.js</filterFieldsProcess>
+          <filterValuesProcess>%aditoprj%/entity/Salesproject_entity/recordcontainers/db/filterextensions/classificationtype_filter/filterValuesProcess.js</filterValuesProcess>
+          <filterConditionProcess>%aditoprj%/entity/Salesproject_entity/recordcontainers/db/filterextensions/classificationtype_filter/filterConditionProcess.js</filterConditionProcess>
+          <isGroupable v="true" />
+          <groupQueryProcess>%aditoprj%/entity/Salesproject_entity/recordcontainers/db/filterextensions/classificationtype_filter/groupQueryProcess.js</groupQueryProcess>
           <filtertype>BASIC</filtertype>
         </filterExtensionSet>
         <filterExtensionSet>
-          <name>ClassificationScore_filter</name>
-          <filterFieldsProcess>%aditoprj%/entity/Salesproject_entity/recordcontainers/db/filterextensions/classificationscore_filter/filterFieldsProcess.js</filterFieldsProcess>
-          <filterValuesProcess>%aditoprj%/entity/Salesproject_entity/recordcontainers/db/filterextensions/classificationscore_filter/filterValuesProcess.js</filterValuesProcess>
-          <filterConditionProcess>%aditoprj%/entity/Salesproject_entity/recordcontainers/db/filterextensions/classificationscore_filter/filterConditionProcess.js</filterConditionProcess>
+          <name>ClassificationGroup_filter</name>
+          <filterFieldsProcess>%aditoprj%/entity/Salesproject_entity/recordcontainers/db/filterextensions/classificationgroup_filter/filterFieldsProcess.js</filterFieldsProcess>
+          <filterValuesProcess>%aditoprj%/entity/Salesproject_entity/recordcontainers/db/filterextensions/classificationgroup_filter/filterValuesProcess.js</filterValuesProcess>
+          <filterConditionProcess>%aditoprj%/entity/Salesproject_entity/recordcontainers/db/filterextensions/classificationgroup_filter/filterConditionProcess.js</filterConditionProcess>
+          <isGroupable v="true" />
           <filtertype>BASIC</filtertype>
         </filterExtensionSet>
       </filterExtensions>
diff --git a/entity/Salesproject_entity/entityfields/classificationresult/valueProcess.js b/entity/Salesproject_entity/entityfields/classificationresult/valueProcess.js
deleted file mode 100644
index ec7e306ee9..0000000000
--- a/entity/Salesproject_entity/entityfields/classificationresult/valueProcess.js
+++ /dev/null
@@ -1,8 +0,0 @@
-import("KeywordRegistry_basic");
-import("system.vars");
-import("system.result");
-import("Classification_lib")
-import("Context_lib")
-
-var classes = ClassificationUtils.getClass($KeywordRegistry.classificationType$salesproject(), ContextUtils.getCurrentContextId(), vars.get("$sys.uid"))
-result.string(classes);
\ No newline at end of file
diff --git a/entity/Salesproject_entity/recordcontainers/db/filterextensions/classificationgroup_filter/filterConditionProcess.js b/entity/Salesproject_entity/recordcontainers/db/filterextensions/classificationgroup_filter/filterConditionProcess.js
new file mode 100644
index 0000000000..4d7f34b4b3
--- /dev/null
+++ b/entity/Salesproject_entity/recordcontainers/db/filterextensions/classificationgroup_filter/filterConditionProcess.js
@@ -0,0 +1,7 @@
+import("system.vars");
+import("system.result");
+import("ClassificationFilter_lib");
+
+var sqlCond = ClassificationGroupFilterUtils.makeFilterConditionSql(vars.get("$sys.currentcontextname"));
+
+result.string(sqlCond);
\ No newline at end of file
diff --git a/entity/Salesproject_entity/recordcontainers/db/filterextensions/classificationgroup_filter/filterFieldsProcess.js b/entity/Salesproject_entity/recordcontainers/db/filterextensions/classificationgroup_filter/filterFieldsProcess.js
new file mode 100644
index 0000000000..b066dbd2bd
--- /dev/null
+++ b/entity/Salesproject_entity/recordcontainers/db/filterextensions/classificationgroup_filter/filterFieldsProcess.js
@@ -0,0 +1,8 @@
+import("system.vars");
+import("system.result");
+import("ClassificationFilter_lib");
+
+//this filterExtensionSet is for the Classifications (ClassificationGroups, e.g. 1. Target Group, Customer Value...)
+var fields = ClassificationTypeFilterUtils.getFilterFieldsGroup(vars.get("$sys.currentcontextname"));
+
+result.string(fields);
\ No newline at end of file
diff --git a/entity/Salesproject_entity/recordcontainers/db/filterextensions/classificationgroup_filter/filterValuesProcess.js b/entity/Salesproject_entity/recordcontainers/db/filterextensions/classificationgroup_filter/filterValuesProcess.js
new file mode 100644
index 0000000000..0b91eddce8
--- /dev/null
+++ b/entity/Salesproject_entity/recordcontainers/db/filterextensions/classificationgroup_filter/filterValuesProcess.js
@@ -0,0 +1,6 @@
+import("system.vars");
+import("system.result");
+import("ClassificationFilter_lib");
+
+var values = ClassificationGroupFilterUtils.makeFilterValues(vars.get("$sys.currentcontextname"));
+result.object(values);
\ No newline at end of file
diff --git a/entity/Salesproject_entity/recordcontainers/db/filterextensions/classificationscore_filter/filterConditionProcess.js b/entity/Salesproject_entity/recordcontainers/db/filterextensions/classificationscore_filter/filterConditionProcess.js
deleted file mode 100644
index a9a81e734d..0000000000
--- a/entity/Salesproject_entity/recordcontainers/db/filterextensions/classificationscore_filter/filterConditionProcess.js
+++ /dev/null
@@ -1,33 +0,0 @@
-import("Sql_lib");
-import("system.logging");
-import("AttributeFilter_lib");
-import("Entity_lib");
-import("Context_lib");
-import("system.vars");
-import("system.result");
-
-
-var operator = vars.get("$local.operator");
-var rawvalue = vars.get("$local.rawvalue");
-var columnPlaceholder = vars.get("$local.columnPlaceholder");
-var filterCond = vars.get("$local.condition");
-var classificationtypeid = AttributeSearchNameCoder.decode(vars.getString("$local.name")).id;
-var sqlCond;
-
-
-var subsqlclosed = newSelect("OBJECT_ROWID").from("CLASSIFICATION").where("CLASSIFICATION.OBJECT_TYPE", "Salesproject");
-var subsqlExtra2 =  subsqlclosed.andIfSet("CLASSIFICATION.CLASSIFICATIONTYPE_ID", classificationtypeid);
-var subsqlExtra = subsqlclosed.andIfSet("CLASSIFICATION.CLASSIFICATIONSCORE_ID", rawvalue);
-
-if (operator == "1")//equal
-    sqlCond = newWhere("SALESPROJECT.SALESPROJECTID", subsqlExtra, SqlBuilder.IN()).toString();
-else if (operator == "2")//not equal 
-    sqlCond = newWhere("SALESPROJECT.SALESPROJECTID", subsqlExtra, SqlBuilder.NOT_IN()).toString();
-else if (operator == "11")//is not empty
-    sqlCond = newWhere("SALESPROJECT.SALESPROJECTID", subsqlExtra2, SqlBuilder.IN()).toString();
-else if (operator == "12")//is empty
-    sqlCond = newWhere("SALESPROJECT.SALESPROJECTID", subsqlExtra2, SqlBuilder.NOT_IN()).toString();
-else sqlCond = "1=1";
-
-
-result.string(sqlCond);
\ No newline at end of file
diff --git a/entity/Salesproject_entity/recordcontainers/db/filterextensions/classificationscore_filter/filterFieldsProcess.js b/entity/Salesproject_entity/recordcontainers/db/filterextensions/classificationscore_filter/filterFieldsProcess.js
deleted file mode 100644
index a273326204..0000000000
--- a/entity/Salesproject_entity/recordcontainers/db/filterextensions/classificationscore_filter/filterFieldsProcess.js
+++ /dev/null
@@ -1,28 +0,0 @@
-import("Sql_lib");
-import("system.translate");
-import("system.logging");
-import("system.util");
-import("KeywordRegistry_basic");
-import("system.entities");
-import("Attribute_lib");
-import("AttributeFilter_lib");
-import("system.result");
-
-var res = [];
-
-var data = newSelect("CLASSIFICATIONTYPEID, CLASSIFICATIONGROUP, SCORETYPE") 
-          .from("classificationtype") 
-          .orderBy("CLASSIFICATIONGROUP").table();
-
-data.forEach(function(row){
-    var name = AttributeSearchNameCoder.encode(row[0], row[2]);
-    res.push({
-        name: name,
-        title: translate.text(row[1]) + " / " + translate.text(row[2]),
-        contentType: "TEXT",
-        hasDropDownValues: true 
-    });
-})
-
-res = JSON.stringify(res);
-result.string(res);
\ No newline at end of file
diff --git a/entity/Salesproject_entity/recordcontainers/db/filterextensions/classificationscore_filter/filterValuesProcess.js b/entity/Salesproject_entity/recordcontainers/db/filterextensions/classificationscore_filter/filterValuesProcess.js
deleted file mode 100644
index 6750d045cc..0000000000
--- a/entity/Salesproject_entity/recordcontainers/db/filterextensions/classificationscore_filter/filterValuesProcess.js
+++ /dev/null
@@ -1,27 +0,0 @@
-import("IndexSearch_lib");
-import("system.logging");
-import("system.vars");
-import("Sql_lib");
-import("AttributeFilter_lib");
-import("Attribute_lib");
-import("system.result");
-import("system.translate");
-
-var filter = JSON.parse(vars.get("$local.filter"));
-var nameObject = AttributeSearchNameCoder.decode(filter.name); 
-var classID = nameObject.id;
-
-
-var res = newSelect("CLASSIFICATIONSCOREID , TITLE")
-          .from("CLASSIFICATIONSCORE")
-          .where("CLASSIFICATIONSCORE.CLASSIFICATIONTYPE_ID", classID)
-          .table();
-
-for(var i = 0; i < res.length; i++)
-{
-    res[i][1] = translate.text(res[i][1])
-}
-
-if (res == null)
-    res = [];
-result.object(res);
\ No newline at end of file
diff --git a/entity/Salesproject_entity/recordcontainers/db/filterextensions/classificationsummary_filter/filterConditionProcess.js b/entity/Salesproject_entity/recordcontainers/db/filterextensions/classificationsummary_filter/filterConditionProcess.js
deleted file mode 100644
index 2f086c699f..0000000000
--- a/entity/Salesproject_entity/recordcontainers/db/filterextensions/classificationsummary_filter/filterConditionProcess.js
+++ /dev/null
@@ -1,49 +0,0 @@
-//
-//
-////ToDo: This FilterProcess used to work with the old classification system, it's useless now. 
-//It's gonna get updated soon (#1061442)
-//
-//
-////import("Sql_lib");
-//import("Classification_lib");
-//import("system.logging");
-//import("AttributeFilter_lib");
-//import("Entity_lib");
-//import("Context_lib");
-//import("system.vars");
-//import("system.result");
-//
-//
-//var operator = vars.get("$local.operator");
-//var rawvalue = vars.get("$local.rawvalue");
-//var columnPlaceholder = vars.get("$local.columnPlaceholder");
-//var filterCond = vars.get("$local.condition");
-//var classificationTypeID = AttributeSearchNameCoder.decode(vars.getString("$local.name")).id;
-//var sqlCond;
-//
-////[["A","A"],["B","B"],["C","C"],["D","D"]]
-//var scoreValue = ClassificationUtils.mapClassLetter(rawvalue);
-//var havingCase;
-//if(scoreValue[0] == 0)
-//    havingCase = "sum(SCORE) >= " + scoreValue[0];
-//else
-//    havingCase = "sum(SCORE) > " + scoreValue[0];
-//            
-//var having = havingCase + " and sum(SCORE) <= " + scoreValue[1];  
-//
-//
-//var subSqlCond = newSelect("OBJECT_ROWID").from("classification").join("classificationscore", "classiFICATIONSCOREID = CLASSIFICATIONSCORE_ID")
-//    .where("classificationscore.CLASSIFICATIONTYPE_ID", newSelect("classificationtypeId").from("classificationtype")
-//    .where("classificationtype.CLASSIFICATIONGROUP", classificationTypeID), SqlBuilder.IN()).groupBy("classification.OBJECT_ROWID");
-//
-//if (operator == "1")//equal
-//    sqlCond = newWhere("SALESPROJECT.SALESPROJECTID", subSqlCond.having(having), SqlBuilder.IN()).toString();
-//else if (operator == "2")//not equal
-//    sqlCond = newWhere("SALESPROJECT.SALESPROJECTID", subSqlCond.having(having), SqlBuilder.NOT_IN()).toString();
-//else if (operator == "11")//is not empty
-//    sqlCond = newWhere("SALESPROJECT.SALESPROJECTID", subSqlCond, SqlBuilder.IN()).toString();
-//else if (operator == "12")//is empty
-//    sqlCond = newWhere("SALESPROJECT.SALESPROJECTID", subSqlCond, SqlBuilder.NOT_IN()).or("SALESPROJECT.SALESPROJECTID", newSelect("OBJECT_ROWID").from("classification"), SqlBuilder.NOT_IN()).toString();
-//else sqlCond = "1=1";
-//
-//result.string(sqlCond);
diff --git a/entity/Salesproject_entity/recordcontainers/db/filterextensions/classificationsummary_filter/filterFieldsProcess.js b/entity/Salesproject_entity/recordcontainers/db/filterextensions/classificationsummary_filter/filterFieldsProcess.js
deleted file mode 100644
index 2ea352cf1d..0000000000
--- a/entity/Salesproject_entity/recordcontainers/db/filterextensions/classificationsummary_filter/filterFieldsProcess.js
+++ /dev/null
@@ -1,34 +0,0 @@
-//
-//
-////ToDo: This FilterProcess used to work with the old classification system, it's useless now. 
-//It's gonna get updated soon (#1061442)
-//
-////import("Sql_lib");
-//import("system.translate");
-//import("system.logging");
-//import("system.util");
-//import("KeywordRegistry_basic");
-//import("system.entities");
-//import("Attribute_lib");
-//import("AttributeFilter_lib");
-//import("system.result");
-//
-//var res = [];
-//
-//var data = newSelect("distinct CLASSIFICATIONGROUP, CLASSIFICATIONGROUP") 
-//          .from("classificationtype") 
-//          .orderBy("CLASSIFICATIONGROUP").table();
-//
-//
-//data.forEach(function(row){
-//    var name = AttributeSearchNameCoder.encode(row[0], row[1]);
-//    res.push({
-//        name: name,
-//        title: translate.text(row[1]),
-//        contentType: "TEXT",
-//        hasDropDownValues: true 
-//    });
-//})
-//
-//res = JSON.stringify(res);
-//result.string(res);
\ No newline at end of file
diff --git a/entity/Salesproject_entity/recordcontainers/db/filterextensions/classificationsummary_filter/filterValuesProcess.js b/entity/Salesproject_entity/recordcontainers/db/filterextensions/classificationsummary_filter/filterValuesProcess.js
deleted file mode 100644
index f4b34eb8c3..0000000000
--- a/entity/Salesproject_entity/recordcontainers/db/filterextensions/classificationsummary_filter/filterValuesProcess.js
+++ /dev/null
@@ -1,6 +0,0 @@
-////ToDo: This FilterProcess used to work with the old classification system, it's useless now. 
-//It's gonna get updated soon (#1061442)
-//
-//
-////import("system.result");
-//result.object([["A","A"],["B","B"],["C","C"],["D","D"]]);
\ No newline at end of file
diff --git a/entity/Salesproject_entity/recordcontainers/db/filterextensions/classificationtype_filter/filterConditionProcess.js b/entity/Salesproject_entity/recordcontainers/db/filterextensions/classificationtype_filter/filterConditionProcess.js
new file mode 100644
index 0000000000..5875efb769
--- /dev/null
+++ b/entity/Salesproject_entity/recordcontainers/db/filterextensions/classificationtype_filter/filterConditionProcess.js
@@ -0,0 +1,6 @@
+import("system.result");
+import("ClassificationFilter_lib");
+
+var sqlCond = ClassificationTypeFilterUtils.makeFilterConditionSql();
+
+result.string(sqlCond);
\ No newline at end of file
diff --git a/entity/Salesproject_entity/recordcontainers/db/filterextensions/classificationtype_filter/filterFieldsProcess.js b/entity/Salesproject_entity/recordcontainers/db/filterextensions/classificationtype_filter/filterFieldsProcess.js
new file mode 100644
index 0000000000..b2cf16be60
--- /dev/null
+++ b/entity/Salesproject_entity/recordcontainers/db/filterextensions/classificationtype_filter/filterFieldsProcess.js
@@ -0,0 +1,7 @@
+import("system.vars");
+import("system.result");
+import("ClassificationFilter_lib");
+
+var fields = ClassificationTypeFilterUtils.getFilterFields(vars.get("$sys.currentcontextname"));
+
+result.string(fields);
\ No newline at end of file
diff --git a/entity/Salesproject_entity/recordcontainers/db/filterextensions/classificationtype_filter/filterValuesProcess.js b/entity/Salesproject_entity/recordcontainers/db/filterextensions/classificationtype_filter/filterValuesProcess.js
new file mode 100644
index 0000000000..541cc6c67c
--- /dev/null
+++ b/entity/Salesproject_entity/recordcontainers/db/filterextensions/classificationtype_filter/filterValuesProcess.js
@@ -0,0 +1,5 @@
+import("system.result");
+import("ClassificationFilter_lib");
+
+var values = ClassificationTypeFilterUtils.makeFilterFields();
+result.object(values);
diff --git a/entity/Salesproject_entity/recordcontainers/db/filterextensions/classificationtype_filter/groupQueryProcess.js b/entity/Salesproject_entity/recordcontainers/db/filterextensions/classificationtype_filter/groupQueryProcess.js
new file mode 100644
index 0000000000..524e35692a
--- /dev/null
+++ b/entity/Salesproject_entity/recordcontainers/db/filterextensions/classificationtype_filter/groupQueryProcess.js
@@ -0,0 +1,22 @@
+import("system.translate");
+import("Sql_lib");
+import("system.result");
+import("system.vars");
+
+var isCount = vars.get("$local.count");             // TRUE if the count of the records is needed
+var columns = vars.get("$local.columnlist");        // The column, expected from the querry, see also AttributeFilter_lib
+var condition = vars.get("$local.condition");       // The Condition that's beeing used, includes the grouphirachy
+var groupedColumns = vars.get("$local.groupedlist") // The coloumns, used for grouping
+var order = vars.get("$local.order");               // The order of the result
+var classificationId = vars.get("$local.name");
+classificationId = classificationId.slice(classificationId.lastIndexOf(".") + 1, classificationId.length);
+var valuefield = "''"
+var stmt = "";
+
+stmt = newSelect(isCount ? "1" : columns)
+                    .from("SALESPROJECT")
+                    .leftJoin("CLASSIFICATION", "CLASSIFICATION.OBJECT_ROWID = SALESPROJECT.SALESPROJECTID and CLASSIFICATION.OBJECT_TYPE = 'Salesproject' and CLASSIFICATION.CLASSIFICATIONTYPE_ID = '" + classificationId + "' ")
+                    .leftJoin("CLASSIFICATIONSCORE", "CLASSIFICATIONSCORE.CLASSIFICATIONSCOREID = CLASSIFICATION.CLASSIFICATIONSCORE_ID" +  (condition != "  " ? " WHERE " + condition : ""))
+                    .groupBy(groupedColumns + (order != null && !isCount ? " ORDER BY " + order : ""))
+                    .toString();
+result.string(stmt);
\ No newline at end of file
diff --git a/entity/Salesproject_entity/recordcontainers/db/fromClauseProcess.js b/entity/Salesproject_entity/recordcontainers/db/fromClauseProcess.js
index 3537c33492..f7c4fec24f 100644
--- a/entity/Salesproject_entity/recordcontainers/db/fromClauseProcess.js
+++ b/entity/Salesproject_entity/recordcontainers/db/fromClauseProcess.js
@@ -1,6 +1,8 @@
 import("system.vars");
 import("system.result");
 
+//CLASSIFICATIONSTORAGE is necessaray to make it possible to get the classifications of the organisations and making it possible to group by them
 result.string("SALESPROJECT \n\
     left join CONTACT on (SALESPROJECT.CONTACT_ID = CONTACT.CONTACTID) \n\
-    left join ORGANISATION on (CONTACT.ORGANISATION_ID = ORGANISATION.ORGANISATIONID)");
\ No newline at end of file
+    left join ORGANISATION on (CONTACT.ORGANISATION_ID = ORGANISATION.ORGANISATIONID)\n\
+    left join CLASSIFICATIONSTORAGE on (CLASSIFICATIONSTORAGE.OBJECT_ROWID = SALESPROJECT.SALESPROJECTID)");
\ No newline at end of file
diff --git a/entity/Salesproject_entity/recordcontainers/db/onDBDelete.js b/entity/Salesproject_entity/recordcontainers/db/onDBDelete.js
index c292d0299c..169c88c898 100644
--- a/entity/Salesproject_entity/recordcontainers/db/onDBDelete.js
+++ b/entity/Salesproject_entity/recordcontainers/db/onDBDelete.js
@@ -11,12 +11,18 @@ if (currentId)
 {
     var toDelete = [
     "SALESPROJECT_MILESTONE",
-    "SALESPROJECT_TOUCHPOINT"
+    "SALESPROJECT_TOUCHPOINT",
+    "CLASSIFICATIONSTORAGE"
     ];
     
     toDelete = toDelete.map(function(pTable)
     {
-        var cond = newWhere(pTable + ".SALESPROJECT_ID", currentId)
+        var cond;
+        if(pTable != "CLASSIFICATIONSTORAGE")
+            cond = newWhere(pTable + ".SALESPROJECT_ID", currentId)
+        else 
+            cond = newWhere(pTable + ".OBJECT_ROWID", currentId)
+        
         return [pTable, cond.build()];
     });
     
diff --git a/entity/Salesproject_entity/recordcontainers/db/onDBInsert.js b/entity/Salesproject_entity/recordcontainers/db/onDBInsert.js
index 4d90164110..38fe969803 100644
--- a/entity/Salesproject_entity/recordcontainers/db/onDBInsert.js
+++ b/entity/Salesproject_entity/recordcontainers/db/onDBInsert.js
@@ -1,3 +1,4 @@
+import("Classification_lib");
 import("Workflow_lib");
 import("Context_lib");
 import("Attribute_lib");
@@ -16,4 +17,11 @@ if (vars.get("$field.PROJECTTYPE"))
         .insertAttribute(vars.get("$field.PROJECTTYPE"), true);
 }
 
+var salesprojectId = vars.get("$field.SALESPROJECTID");
+var contextname = vars.get("$sys.currentcontextname");
+
+ClassificationUtils.insertEmptyClassification(salesprojectId, contextname);
+
+//start the execution in afterOperatingState, because here the dataset is not yet inserted
+vars.set("$context.workflowQueue", {});
 WorkflowSignalSender.inserted();
\ No newline at end of file
diff --git a/entity/VisitPlanEntry_entity/entityfields/contact_id/displayValueProcess.js b/entity/VisitPlanEntry_entity/entityfields/contact_id/displayValueProcess.js
index 2c0374c939..c86af17417 100644
--- a/entity/VisitPlanEntry_entity/entityfields/contact_id/displayValueProcess.js
+++ b/entity/VisitPlanEntry_entity/entityfields/contact_id/displayValueProcess.js
@@ -3,7 +3,6 @@ import("system.db");
 import("system.result");
 import("system.vars");
 
-
 var contactId = vars.get("$field.CONTACT_ID");
 var res = ContactUtils.getFullTitleByContactId(contactId);
 
diff --git a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
index bab1be7ecc..9c60e9838e 100644
--- a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
+++ b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
@@ -7056,6 +7056,9 @@
     <entry>
       <key>Extend</key>
     </entry>
+    <entry>
+      <key>%0: %1/%2points = %3</key>
+    </entry>
     <entry>
       <key>ab 350 T€</key>
     </entry>
@@ -7095,9 +7098,33 @@
     <entry>
       <key>Calendar maintime end</key>
     </entry>
+    <entry>
+      <key>%0: %1/%2 points = %3</key>
+    </entry>
+    <entry>
+      <key>Classification: </key>
+    </entry>
+    <entry>
+      <key>Classificationgroup</key>
+    </entry>
+    <entry>
+      <key>Classificationgroups</key>
+    </entry>
+    <entry>
+      <key>Indicator</key>
+    </entry>
     <entry>
       <key>green</key>
     </entry>
+    <entry>
+      <key>favorites</key>
+    </entry>
+    <entry>
+      <key>Refresh</key>
+    </entry>
+    <entry>
+      <key>Run ServerProcess</key>
+    </entry>
     <entry>
       <key>1. Target group</key>
     </entry>
@@ -7140,9 +7167,6 @@
     <entry>
       <key>Password must contain spaces</key>
     </entry>
-    <entry>
-      <key>favorites</key>
-    </entry>
     <entry>
       <key>The use of any of your previous %0 passwords is prohibited</key>
     </entry>
@@ -7224,6 +7248,60 @@
     <entry>
       <key>Enter current password to verify</key>
     </entry>
+    <entry>
+      <key>Serverprocess has been started</key>
+    </entry>
+    <entry>
+      <key>Run Serverprocess</key>
+    </entry>
+    <entry>
+      <key>ab 350 D€</key>
+    </entry>
+    <entry>
+      <key>200-349 D€</key>
+    </entry>
+    <entry>
+      <key>0-49 D€</key>
+    </entry>
+    <entry>
+      <key>100-199 D€</key>
+    </entry>
+    <entry>
+      <key>50-99 D€</key>
+    </entry>
+    <entry>
+      <key>Max Value</key>
+    </entry>
+    <entry>
+      <key>Points</key>
+    </entry>
+    <entry>
+      <key>OLDACTION</key>
+    </entry>
+    <entry>
+      <key>Run Upgrade Serverprocess</key>
+    </entry>
+    <entry>
+      <key>Child Attributes</key>
+    </entry>
+    <entry>
+      <key>Recalculate all Classifications</key>
+    </entry>
+    <entry>
+      <key>Reminder:</key>
+    </entry>
+    <entry>
+      <key>Start Serveprocess</key>
+    </entry>
+    <entry>
+      <key>Keep in Mind that changes to the Value with the greatest score directly affect the Classification Gradings of the Classification!</key>
+    </entry>
+    <entry>
+      <key>This is how the Classification Gradings of the Classification will get affected by these changes:</key>
+    </entry>
+    <entry>
+      <key>Hint</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 3df93124ed..a4e4d93591 100644
--- a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
+++ b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
@@ -2858,7 +2858,7 @@
     </entry>
     <entry>
       <key>unassigned</key>
-      <value>nicht zugewiesen</value>
+      <value>nicht zugeordnet</value>
     </entry>
     <entry>
       <key>Lithuania</key>
@@ -3227,6 +3227,10 @@
       <key>Montenegro</key>
       <value>Montenegro</value>
     </entry>
+    <entry>
+      <key>Indicator</key>
+      <value>Kenngröße</value>
+    </entry>
     <entry>
       <key>Quarterly</key>
       <value>vierteljährlich</value>
@@ -8838,10 +8842,10 @@ Bitte Datumseingabe prüfen</value>
       <key>Full Permissions</key>
     </entry>
     <entry>
-      <key>200-349 T€</key>
+      <key>200-349 D€</key>
     </entry>
     <entry>
-      <key>100-199 T€</key>
+      <key>100-199 D€</key>
     </entry>
     <entry>
       <key>Full permissions already assigned</key>
@@ -8853,10 +8857,10 @@ Bitte Datumseingabe prüfen</value>
       <key>Import Daten</key>
     </entry>
     <entry>
-      <key>ab 350 T€</key>
+      <key>ab 350 D€</key>
     </entry>
     <entry>
-      <key>0-49 T€</key>
+      <key>0-49 D€</key>
     </entry>
     <entry>
       <key>Grading</key>
@@ -8869,7 +8873,7 @@ Bitte Datumseingabe prüfen</value>
       <key>Transferdaten</key>
     </entry>
     <entry>
-      <key>50-99 T€</key>
+      <key>50-99 D€</key>
     </entry>
     <entry>
       <key>101-250</key>
@@ -8944,18 +8948,48 @@ Bitte Datumseingabe prüfen</value>
       <key>Workflow Model</key>
     </entry>
     <entry>
-      <key>No new recipients found that can be added to the bulk mail.</key>
-      <value>Keine neuen Teilnehmer gefunden die zur Serienmail hinzugefügt werden können.</value>
+      <key>Workflow deploy failed</key>
     </entry>
     <entry>
       <key>Current Recipients</key>
       <value>Aktuelle Empfänger</value>
     </entry>
     <entry>
-      <key>The workflow could not be deployed</key>
+      <key>%0: %1/%2points = %3</key>
+      <value>%0: %1/%2Punkte = %3</value>
     </entry>
     <entry>
-      <key>Workflow deploy failed</key>
+      <key>%0: %1/%2 points = %3</key>
+    </entry>
+    <entry>
+      <key>Classification: </key>
+      <value>Klassifizierung: </value>
+    </entry>
+    <entry>
+      <key>Classificationgroup</key>
+      <value>Klassifizierungsgruppe</value>
+    </entry>
+    <entry>
+      <key>Classificationgroups</key>
+      <value>Klassifizierungsgruppen</value>
+    </entry>
+    <entry>
+      <key>Add Participants</key>
+    </entry>
+    <entry>
+      <key>and open Report</key>
+    </entry>
+    <entry>
+      <key>Add Recipients</key>
+    </entry>
+    <entry>
+      <key>{SEND_MAIL}</key>
+    </entry>
+    <entry>
+      <key>Total in euros</key>
+    </entry>
+    <entry>
+      <key>The workflow could not be deployed</key>
     </entry>
     <entry>
       <key>Create model</key>
@@ -9015,10 +9049,17 @@ Bitte Datumseingabe prüfen</value>
       <key>Current password</key>
       <value>Aktuelles Passwort</value>
     </entry>
+    <entry>
+      <key>Serverprocess has been started</key>
+      <value>Serverprozess wurde gestartet</value>
+    </entry>
     <entry>
       <key>Calendar maintime start</key>
       <value>Kalender Kernzeit Beginn</value>
     </entry>
+    <entry>
+      <key>favorite</key>
+    </entry>
     <entry>
       <key>New password</key>
       <value>Neues Passwort</value>
@@ -9045,7 +9086,7 @@ Bitte Datumseingabe prüfen</value>
     </entry>
     <entry>
       <key>SELECTION_PREFIX</key>
-      <value>Vorne</value>
+      <value>Die Verwendung eines Ihrer vorherigen %0 Passwörter ist untersagt</value>
     </entry>
     <entry>
       <key>SELECTION_BOTH</key>
@@ -9088,9 +9129,6 @@ Bitte Datumseingabe prüfen</value>
       <key>Permission Procurer Department</key>
       <value>Rechteempfänger Abteilung</value>
     </entry>
-    <entry>
-      <key>favorite</key>
-    </entry>
     <entry>
       <key>Release</key>
     </entry>
@@ -9105,24 +9143,16 @@ Bitte Datumseingabe prüfen</value>
       <value>Rechteempfänger Benutzer</value>
     </entry>
     <entry>
-      <key>and open Report</key>
-    </entry>
-    <entry>
-      <key>The Sales Project can only be filled when a company has been specified</key>
+      <key>Latitude</key>
+      <value>Teilnehmer hinzufügen</value>
     </entry>
     <entry>
-      <key>Add Recipients</key>
+      <key>No new recipients found that can be added to the bulk mail.</key>
     </entry>
     <entry>
       <key>Grant new User Permission</key>
       <value>Neue Benutzer-Berechtigung vergeben</value>
     </entry>
-    <entry>
-      <key>{SEND_MAIL}</key>
-    </entry>
-    <entry>
-      <key>Latitude</key>
-    </entry>
     <entry>
       <key>Password must contain spaces</key>
       <value>Passwort muss Leerzeichen enhalten</value>
@@ -9145,10 +9175,6 @@ Bitte Datumseingabe prüfen</value>
     <entry>
       <key>Mapping</key>
     </entry>
-    <entry>
-      <key>The use of any of your previous %0 passwords is prohibited</key>
-      <value>Die Verwendung eines Ihrer vorherigen %0 Passwörter ist untersagt</value>
-    </entry>
     <entry>
       <key>Mappings</key>
     </entry>
@@ -9163,6 +9189,10 @@ Bitte Datumseingabe prüfen</value>
       <key>${DISPLAY_AND_OPEN_ONE_HIT}</key>
       <value>Ein Ergebnis wurde gefunden und kann geöffnet werden.</value>
     </entry>
+    <entry>
+      <key>Run Serverprocess</key>
+      <value>Serverprozess ausführen</value>
+    </entry>
     <entry>
       <key>${DISPLAY_AND_OPEN_%0_OF_%1_HITS}</key>
       <value>%0 von insgesamt %1  Ergebnissen werden derzeit angezeigt und können geöffnet werden.</value>
@@ -9203,13 +9233,74 @@ Bitte Datumseingabe prüfen</value>
       <key>Sort down</key>
     </entry>
     <entry>
-      <key>Total in euros</key>
+      <key>Longitude</key>
     </entry>
     <entry>
-      <key>Add Participants</key>
+      <key>0-49 T€</key>
     </entry>
     <entry>
-      <key>Longitude</key>
+      <key>Refresh</key>
+    </entry>
+    <entry>
+      <key>Run ServerProcess</key>
+    </entry>
+    <entry>
+      <key>50-99 T€</key>
+    </entry>
+    <entry>
+      <key>Max Value</key>
+      <value>Maximalwert</value>
+    </entry>
+    <entry>
+      <key>Points</key>
+      <value>Punkte</value>
+    </entry>
+    <entry>
+      <key>OLDACTION</key>
+    </entry>
+    <entry>
+      <key>Run Upgrade Serverprocess</key>
+    </entry>
+    <entry>
+      <key>The Sales Project can only be filled when a company has been specified</key>
+    </entry>
+    <entry>
+      <key>Child Attributes</key>
+    </entry>
+    <entry>
+      <key>Recalculate all Classifications</key>
+      <value>Alle Klassifizierungen neuberechnen</value>
+    </entry>
+    <entry>
+      <key>Reminder:</key>
+    </entry>
+    <entry>
+      <key>Start Serveprocess</key>
+      <value>Serverprozess starten</value>
+    </entry>
+    <entry>
+      <key>This is how the Classification Gradings of the Classification will get affected by these changes:</key>
+      <value>Die Klassifizierungsbewertungen der klassifizierung werden durch diese Änderungen folgendermaßen beeinflußt:</value>
+    </entry>
+    <entry>
+      <key>Keep in Mind that changes to the Value with the greatest score directly affect the Classification Gradings of the Classification!</key>
+      <value>Änderungen an dem Wert mit der höchsten Punktzahl beeinflußen die Klassifizierungsbewertungen der Klassifizierung!</value>
+    </entry>
+    <entry>
+      <key>Hint</key>
+      <value>Hinweis</value>
+    </entry>
+    <entry>
+      <key>200-349 T€</key>
+    </entry>
+    <entry>
+      <key>100-199 T€</key>
+    </entry>
+    <entry>
+      <key>ab 350 T€</key>
+    </entry>
+    <entry>
+      <key>The use of any of your previous %0 passwords is prohibited</key>
     </entry>
   </keyValueMap>
   <font name="Dialog" style="0" size="11" />
diff --git a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
index 1b29727a41..cf687d9006 100644
--- a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
+++ b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
@@ -6936,12 +6936,6 @@
     <entry>
       <key>Full Permissions</key>
     </entry>
-    <entry>
-      <key>200-349 T€</key>
-    </entry>
-    <entry>
-      <key>100-199 T€</key>
-    </entry>
     <entry>
       <key>Full permissions already assigned</key>
     </entry>
@@ -6951,12 +6945,6 @@
     <entry>
       <key>Import Daten</key>
     </entry>
-    <entry>
-      <key>ab 350 T€</key>
-    </entry>
-    <entry>
-      <key>0-49 T€</key>
-    </entry>
     <entry>
       <key>Grading</key>
     </entry>
@@ -6966,9 +6954,6 @@
     <entry>
       <key>Transferdaten</key>
     </entry>
-    <entry>
-      <key>50-99 T€</key>
-    </entry>
     <entry>
       <key>101-250</key>
     </entry>
@@ -7113,23 +7098,59 @@
       <value>Send mail</value>
     </entry>
     <entry>
-      <key>Probability AI</key>
+      <key>Classification: </key>
     </entry>
     <entry>
-      <key>New</key>
+      <key>Classificationgroup</key>
     </entry>
     <entry>
-      <key>Release</key>
+      <key>Classificationgroups</key>
     </entry>
     <entry>
-      <key>Archived</key>
+      <key>%0: %1/%2points = %3</key>
     </entry>
     <entry>
-      <key>asdf</key>
+      <key>%0: %1/%2 points = %3</key>
+    </entry>
+    <entry>
+      <key>Indicator</key>
+    </entry>
+    <entry>
+      <key>Probability AI</key>
     </entry>
     <entry>
       <key>{SENT_MAIL}</key>
     </entry>
+    <entry>
+      <key>favorites</key>
+    </entry>
+    <entry>
+      <key>Refresh</key>
+    </entry>
+    <entry>
+      <key>Run ServerProcess</key>
+    </entry>
+    <entry>
+      <key>favorite</key>
+    </entry>
+    <entry>
+      <key>favorties</key>
+    </entry>
+    <entry>
+      <key>Serverprocess has been started</key>
+    </entry>
+    <entry>
+      <key>Run Serverprocess</key>
+    </entry>
+    <entry>
+      <key>New</key>
+    </entry>
+    <entry>
+      <key>Release</key>
+    </entry>
+    <entry>
+      <key>Archived</key>
+    </entry>
     <entry>
       <key>Settings</key>
     </entry>
@@ -7172,18 +7193,12 @@
     <entry>
       <key>Calendar maintime start</key>
     </entry>
-    <entry>
-      <key>favorties</key>
-    </entry>
     <entry>
       <key>Password must contain special characters</key>
     </entry>
     <entry>
       <key>Password must be at least %0 characters</key>
     </entry>
-    <entry>
-      <key>favorite</key>
-    </entry>
     <entry>
       <key>Repeat password</key>
     </entry>
@@ -7223,9 +7238,6 @@
     <entry>
       <key>Password must contain spaces</key>
     </entry>
-    <entry>
-      <key>favorites</key>
-    </entry>
     <entry>
       <key>The use of any of your previous %0 passwords is prohibited</key>
     </entry>
@@ -7295,6 +7307,72 @@
     <entry>
       <key>Enter current password to verify</key>
     </entry>
+    <entry>
+      <key>ab 350 D€</key>
+    </entry>
+    <entry>
+      <key>200-349 D€</key>
+    </entry>
+    <entry>
+      <key>0-49 D€</key>
+    </entry>
+    <entry>
+      <key>100-199 D€</key>
+    </entry>
+    <entry>
+      <key>50-99 D€</key>
+    </entry>
+    <entry>
+      <key>asdf</key>
+    </entry>
+    <entry>
+      <key>OLDACTION</key>
+    </entry>
+    <entry>
+      <key>200-349 T€</key>
+    </entry>
+    <entry>
+      <key>100-199 T€</key>
+    </entry>
+    <entry>
+      <key>ab 350 T€</key>
+    </entry>
+    <entry>
+      <key>0-49 T€</key>
+    </entry>
+    <entry>
+      <key>50-99 T€</key>
+    </entry>
+    <entry>
+      <key>Max Value</key>
+    </entry>
+    <entry>
+      <key>Points</key>
+    </entry>
+    <entry>
+      <key>Run Upgrade Serverprocess</key>
+    </entry>
+    <entry>
+      <key>Child Attributes</key>
+    </entry>
+    <entry>
+      <key>Recalculate all Classifications</key>
+    </entry>
+    <entry>
+      <key>Reminder:</key>
+    </entry>
+    <entry>
+      <key>Start Serveprocess</key>
+    </entry>
+    <entry>
+      <key>Keep in Mind that changes to the Value with the greatest score directly affect the Classification Gradings of the Classification!</key>
+    </entry>
+    <entry>
+      <key>This is how the Classification Gradings of the Classification will get affected by these changes:</key>
+    </entry>
+    <entry>
+      <key>Hint</key>
+    </entry>
   </keyValueMap>
   <font name="Dialog" style="0" size="11" />
 </language>
diff --git a/neonContext/Classification/Classification.aod b/neonContext/Classification/Classification.aod
index aa3443a0f9..9bf4ba49ac 100644
--- a/neonContext/Classification/Classification.aod
+++ b/neonContext/Classification/Classification.aod
@@ -14,13 +14,5 @@
       <name>50c0d5c5-c84f-452d-9f77-41b82ac0319f</name>
       <view>ClassificatonPreview_view</view>
     </neonViewReference>
-    <neonViewReference>
-      <name>cabdb49c-4faf-4581-8bb5-8a409f27ac3f</name>
-      <view>ClassificationDrawer_view</view>
-    </neonViewReference>
-    <neonViewReference>
-      <name>4e367ebf-3da3-4252-949c-a5793fd15384</name>
-      <view>ClassificationChart_view</view>
-    </neonViewReference>
   </references>
 </neonContext>
diff --git a/neonContext/ClassificationAdmin/ClassificationAdmin.aod b/neonContext/ClassificationAdmin/ClassificationAdmin.aod
index dc900dcb04..63467269d2 100644
--- a/neonContext/ClassificationAdmin/ClassificationAdmin.aod
+++ b/neonContext/ClassificationAdmin/ClassificationAdmin.aod
@@ -4,26 +4,17 @@
   <title></title>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/neonContext/ClassificationAdmin/documentation.adoc</documentation>
-  <filterView>ClassificationAdminTree_view</filterView>
+  <filterView>ClassificationAdminFilter_view</filterView>
   <editView>ClassificationAdminEdit_view</editView>
-  <previewView>ClassificatonAdminPreview_view</previewView>
   <entity>ClassificationAdmin_entity</entity>
   <references>
-    <neonViewReference>
-      <name>d2a900f6-8860-4bd6-bc8a-3a8261fb9b3d</name>
-      <view>ClassificationAdminTree_view</view>
-    </neonViewReference>
-    <neonViewReference>
-      <name>3d860a00-13a4-45ef-8087-487ea80bb84b</name>
-      <view>ClassificatonAdminPreview_view</view>
-    </neonViewReference>
     <neonViewReference>
       <name>2c6e2b30-0fd1-4f12-bf9f-d4bbcfbed8aa</name>
       <view>ClassificationAdminEdit_view</view>
     </neonViewReference>
     <neonViewReference>
-      <name>8c79aba8-f87b-4ac6-b59b-1bbc65df2cee</name>
-      <view>ClassificationAdminGrading</view>
+      <name>664dbc06-1ec3-4c6c-ba4f-ed1ed13a1d4b</name>
+      <view>ClassificationAdminFilter_view</view>
     </neonViewReference>
   </references>
 </neonContext>
diff --git a/neonContext/ClassificationGrading/ClassificationGrading.aod b/neonContext/ClassificationGrading/ClassificationGrading.aod
index 8f4192c31d..4c4e4c60ea 100644
--- a/neonContext/ClassificationGrading/ClassificationGrading.aod
+++ b/neonContext/ClassificationGrading/ClassificationGrading.aod
@@ -2,11 +2,14 @@
 <neonContext xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonContext/1.1.1">
   <name>ClassificationGrading</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
+  <mainView>ClassificationGradingMultipleEdit_view</mainView>
+  <previewView>ClassificationGradingMultipleEdit_view</previewView>
+  <lookupView>ClassificationGradingMultipleEdit_view</lookupView>
   <entity>ClassificationGrading_entity</entity>
   <references>
     <neonViewReference>
       <name>9209d983-8388-4a72-96a8-905cdc8fd454</name>
-      <view>ClassificationGradingMultiplePreview_view</view>
+      <view>ClassificationGradingMultipleEdit_view</view>
     </neonViewReference>
   </references>
 </neonContext>
diff --git a/neonContext/ClassificationGroup/ClassificationGroup.aod b/neonContext/ClassificationGroup/ClassificationGroup.aod
new file mode 100644
index 0000000000..fee41ed5eb
--- /dev/null
+++ b/neonContext/ClassificationGroup/ClassificationGroup.aod
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<neonContext xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonContext/1.1.1">
+  <name>ClassificationGroup</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <previewView>ClassificationGroupPreview_view</previewView>
+  <entity>ClassificationGroup_entity</entity>
+  <references>
+    <neonViewReference>
+      <name>4d074481-d3cc-4809-b1ee-1c83698146c6</name>
+      <view>ClassificationGroupPreview_view</view>
+    </neonViewReference>
+  </references>
+</neonContext>
diff --git a/neonContext/ClassificationScore/ClassificationScore.aod b/neonContext/ClassificationScore/ClassificationScore.aod
index b3b46da3a9..d8069cffe9 100644
--- a/neonContext/ClassificationScore/ClassificationScore.aod
+++ b/neonContext/ClassificationScore/ClassificationScore.aod
@@ -2,14 +2,11 @@
 <neonContext xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonContext/1.1.1">
   <name>ClassificationScore</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
+  <previewView>ClassificationScoreMultipleEdit_view</previewView>
   <entity>ClassificationScore_entity</entity>
   <references>
     <neonViewReference>
       <name>ccaf4443-07e0-4e29-a73d-2073d132fbe6</name>
-      <view>ClassificationScoreMultiplePreview_view</view>
-    </neonViewReference>
-    <neonViewReference>
-      <name>e857034a-2e2c-4026-8833-12ba4ce597d0</name>
       <view>ClassificationScoreMultipleEdit_view</view>
     </neonViewReference>
   </references>
diff --git a/neonContext/ClassificationGroupAnalyses/ClassificationGroupAnalyses.aod b/neonContext/ClassificationType/ClassificationType.aod
similarity index 61%
rename from neonContext/ClassificationGroupAnalyses/ClassificationGroupAnalyses.aod
rename to neonContext/ClassificationType/ClassificationType.aod
index 65aaf6ffe9..bad9b9b514 100644
--- a/neonContext/ClassificationGroupAnalyses/ClassificationGroupAnalyses.aod
+++ b/neonContext/ClassificationType/ClassificationType.aod
@@ -1,12 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <neonContext xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonContext/1.1.1">
-  <name>ClassificationGroupAnalyses</name>
+  <name>ClassificationType</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
-  <entity>ClassificationGroupAnalyses_entity</entity>
+  <previewView>ClassificationTypePreview_View</previewView>
+  <entity>ClassificationType_entity</entity>
   <references>
     <neonViewReference>
-      <name>7f1a88f1-c5de-4657-aa44-8309a61422be</name>
-      <view>ClassificationGroupAnalysesChart_view</view>
+      <name>2cf0a9e0-a9ed-47c9-9543-7cf580e99e99</name>
+      <view>ClassificationTypePreview_View</view>
     </neonViewReference>
   </references>
 </neonContext>
diff --git a/neonContext/Organisation/Organisation.aod b/neonContext/Organisation/Organisation.aod
index 90ec3706d7..5303c6b55c 100644
--- a/neonContext/Organisation/Organisation.aod
+++ b/neonContext/Organisation/Organisation.aod
@@ -61,11 +61,7 @@
     </neonViewReference>
     <neonViewReference>
       <name>d27a8b2d-2fcf-4626-843c-e709c2ed71b0</name>
-      <view>OrganisationtClassificationAndChart_view</view>
-    </neonViewReference>
-    <neonViewReference>
-      <name>1efa420b-42f4-4d4d-8c23-aba7e6824f4b</name>
-      <view>OrganisationClassificationDrawer_view</view>
+      <view>OrganisationClassification</view>
     </neonViewReference>
     <neonViewReference>
       <name>0b052872-d6b4-41ac-ad0b-580575893e1b</name>
diff --git a/neonContext/Salesproject/Salesproject.aod b/neonContext/Salesproject/Salesproject.aod
index 70d024650c..fc51006101 100644
--- a/neonContext/Salesproject/Salesproject.aod
+++ b/neonContext/Salesproject/Salesproject.aod
@@ -31,10 +31,6 @@
       <name>9d4603e0-6e0e-4c9e-af97-f5c059debe9e</name>
       <view>SalesprojectMilestone_view</view>
     </neonViewReference>
-    <neonViewReference>
-      <name>5990b9d2-b9b8-495e-85de-68a765d09b7f</name>
-      <view>SalesprojectClassification_view</view>
-    </neonViewReference>
     <neonViewReference>
       <name>6640a2aa-cd7f-41d0-ab55-30a99256c2c6</name>
       <view>SalesprojectMemberActivity_view</view>
@@ -51,14 +47,6 @@
       <name>d878f3b7-1de6-4319-93c7-0fff621c0458</name>
       <view>SalesprojectFurtherInfo_view</view>
     </neonViewReference>
-    <neonViewReference>
-      <name>68e9257b-d402-4edc-8345-7da46c3b63f9</name>
-      <view>SalesprojectClassificationAndChart_view</view>
-    </neonViewReference>
-    <neonViewReference>
-      <name>99f70216-c195-4c08-a6ab-3a4d5acc759b</name>
-      <view>SalesprojectClassificationAttribute_view</view>
-    </neonViewReference>
     <neonViewReference>
       <name>b3e34681-eef6-48d3-a4e6-975a6fe77e7b</name>
       <view>SalesprojectOfferForecastChart_view</view>
@@ -71,14 +59,6 @@
       <name>589b0f12-a4d9-4108-9da1-4ddb418c3991</name>
       <view>SalesprojectOverview_view</view>
     </neonViewReference>
-    <neonViewReference>
-      <name>1c957028-bf6b-4b9c-9b46-60f8b53f9edd</name>
-      <view>SaleprojectOverviewCharts_view</view>
-    </neonViewReference>
-    <neonViewReference>
-      <name>42bc01e0-ba80-4e7f-bcf9-30b3d647f565</name>
-      <view>SalesprojectClassificationDrawer_view</view>
-    </neonViewReference>
     <neonViewReference>
       <name>8db978be-4362-48e2-9cc9-6b6774d92f5a</name>
       <view>SalesprojectForecastDrawer_view</view>
diff --git a/neonView/AttributeRelationTree_view/AttributeRelationTree_view.aod b/neonView/AttributeRelationTree_view/AttributeRelationTree_view.aod
index fa91f1febe..f0161b804b 100644
--- a/neonView/AttributeRelationTree_view/AttributeRelationTree_view.aod
+++ b/neonView/AttributeRelationTree_view/AttributeRelationTree_view.aod
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.6">
   <name>AttributeRelationTree_view</name>
+  <title>Attributes</title>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <layout>
     <boxLayout>
diff --git a/neonView/ClassificationAdminEdit_view/ClassificationAdminEdit_view.aod b/neonView/ClassificationAdminEdit_view/ClassificationAdminEdit_view.aod
index 8fdb484409..43fd31c31a 100644
--- a/neonView/ClassificationAdminEdit_view/ClassificationAdminEdit_view.aod
+++ b/neonView/ClassificationAdminEdit_view/ClassificationAdminEdit_view.aod
@@ -19,23 +19,26 @@
       <entityField>#ENTITY</entityField>
       <fields>
         <entityFieldLink>
-          <name>c702f17c-af6c-4674-bbef-9586adfa3f3b</name>
-          <entityField>CLASSIFICATIONTYPE</entityField>
+          <name>d7a7faff-5693-41ce-ae4d-2f847fa46c18</name>
+          <entityField>OBJECT_TYPE</entityField>
         </entityFieldLink>
         <entityFieldLink>
           <name>66ce2c02-1cd3-4867-91a6-825655d6d16a</name>
           <entityField>CLASSIFICATIONGROUP</entityField>
         </entityFieldLink>
         <entityFieldLink>
-          <name>85cf625b-8ea4-4e6f-8b21-2e42314b46d6</name>
-          <entityField>SCORETYPE</entityField>
+          <name>5493520c-27d9-4333-a804-02c07b0b0747</name>
+          <entityField>SORTING</entityField>
+        </entityFieldLink>
+        <entityFieldLink>
+          <name>502ba6a6-f3bd-4c10-80a5-d6c779b9adb1</name>
+          <entityField>CLASSIFICATIONTYPEID</entityField>
+        </entityFieldLink>
+        <entityFieldLink>
+          <name>91f2555e-214c-44f0-8798-029b94be9c00</name>
+          <entityField>CLASSIFICATIONTYPEIDDISPLAYVALUE</entityField>
         </entityFieldLink>
       </fields>
     </genericViewTemplate>
-    <neonViewReference>
-      <name>cedafb39-a59c-480f-aeff-e6276ea4fb9e</name>
-      <entityField>ClassificationScores</entityField>
-      <view>ClassificationScoreMultipleEdit_view</view>
-    </neonViewReference>
   </children>
 </neonView>
diff --git a/neonView/ClassificationAdminFilter_view/ClassificationAdminFilter_view.aod b/neonView/ClassificationAdminFilter_view/ClassificationAdminFilter_view.aod
new file mode 100644
index 0000000000..0fd065096d
--- /dev/null
+++ b/neonView/ClassificationAdminFilter_view/ClassificationAdminFilter_view.aod
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.6">
+  <name>ClassificationAdminFilter_view</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <layout>
+    <noneLayout>
+      <name>layout</name>
+    </noneLayout>
+  </layout>
+  <children>
+    <treeTableViewTemplate>
+      <name>treetable</name>
+      <parentField>CLASSIFICATION_PARENT_ID</parentField>
+      <favoriteActionGroup1>FilterviewActionGroup</favoriteActionGroup1>
+      <entityField>#ENTITY</entityField>
+      <linkedColumns />
+      <defaultGroupFields />
+      <fixedFilterFields />
+      <columns>
+        <neonTreeTableColumn>
+          <name>825a461f-65a1-4483-ae97-655b1f87bc0a</name>
+          <entityField>OBJECT_TYPE</entityField>
+        </neonTreeTableColumn>
+        <neonTreeTableColumn>
+          <name>4d53ba6d-f0a0-4f04-afaa-3278a45cce86</name>
+          <entityField>CLASSIFICATIONGROUP</entityField>
+        </neonTreeTableColumn>
+        <neonTreeTableColumn>
+          <name>299d5ef1-31a5-47d2-ae41-573e05a0b6c7</name>
+          <entityField>CLASSIFICATIONTYPEID</entityField>
+        </neonTreeTableColumn>
+      </columns>
+    </treeTableViewTemplate>
+  </children>
+</neonView>
diff --git a/neonView/ClassificationAdminGrading/ClassificationAdminGrading.aod b/neonView/ClassificationAdminGrading/ClassificationAdminGrading.aod
deleted file mode 100644
index 7ca55318be..0000000000
--- a/neonView/ClassificationAdminGrading/ClassificationAdminGrading.aod
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.6">
-  <name>ClassificationAdminGrading</name>
-  <majorModelMode>DISTRIBUTED</majorModelMode>
-  <layout>
-    <noneLayout>
-      <name>layout</name>
-    </noneLayout>
-  </layout>
-  <children>
-    <genericViewTemplate>
-      <name>generic</name>
-      <entityField>#ENTITY</entityField>
-      <title>Classification</title>
-      <fields>
-        <entityFieldLink>
-          <name>ea58623d-4950-40cc-9027-5e2277703353</name>
-          <entityField>CLASSIFICATIONTYPE</entityField>
-        </entityFieldLink>
-        <entityFieldLink>
-          <name>27c5198d-9330-4617-addf-c7aabac6fa7b</name>
-          <entityField>CLASSIFICATIONGROUP</entityField>
-        </entityFieldLink>
-      </fields>
-    </genericViewTemplate>
-    <genericMultipleViewTemplate>
-      <name>genericMultiple</name>
-      <entityField>#ENTITY</entityField>
-      <title>Grading</title>
-      <columns>
-        <neonGenericMultipleTableColumn>
-          <name>cd98ae70-e37f-42f3-bbab-03ba67b65f49</name>
-          <entityField>SCORETYPE</entityField>
-        </neonGenericMultipleTableColumn>
-        <neonGenericMultipleTableColumn>
-          <name>d861661c-c1d2-4240-9a31-ab4e2ad0cb97</name>
-          <entityField>GRADINGVALUE</entityField>
-        </neonGenericMultipleTableColumn>
-      </columns>
-    </genericMultipleViewTemplate>
-  </children>
-</neonView>
diff --git a/neonView/ClassificationAdminTree_view/ClassificationAdminTree_view.aod b/neonView/ClassificationAdminTree_view/ClassificationAdminTree_view.aod
deleted file mode 100644
index e9cb5c6bed..0000000000
--- a/neonView/ClassificationAdminTree_view/ClassificationAdminTree_view.aod
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.6">
-  <name>ClassificationAdminTree_view</name>
-  <majorModelMode>DISTRIBUTED</majorModelMode>
-  <filterable v="true" />
-  <layout>
-    <boxLayout>
-      <name>layout</name>
-    </boxLayout>
-  </layout>
-  <children>
-    <treeViewTemplate>
-      <name>classificationTree</name>
-      <titleField>SCORETYPE</titleField>
-      <defaultGroupFields>
-        <element>CLASSIFICATIONTYPE</element>
-        <element>CLASSIFICATIONGROUP</element>
-      </defaultGroupFields>
-      <showChildrenCount v="false" />
-      <entityField>#ENTITY</entityField>
-    </treeViewTemplate>
-  </children>
-</neonView>
diff --git a/neonView/ClassificationChart_view/ClassificationChart_view.aod b/neonView/ClassificationChart_view/ClassificationChart_view.aod
deleted file mode 100644
index f7be2063e2..0000000000
--- a/neonView/ClassificationChart_view/ClassificationChart_view.aod
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.6">
-  <name>ClassificationChart_view</name>
-  <majorModelMode>DISTRIBUTED</majorModelMode>
-  <layout>
-    <boxLayout>
-      <name>layout</name>
-    </boxLayout>
-  </layout>
-  <children>
-    <multiDataChartViewTemplate>
-      <name>classificationPoints</name>
-      <xAxis>CLASSIFICATIONGROUP</xAxis>
-      <yAxis>GroupScore</yAxis>
-      <entityField>#ENTITY</entityField>
-    </multiDataChartViewTemplate>
-  </children>
-</neonView>
diff --git a/neonView/ClassificationDrawer_view/ClassificationDrawer_view.aod b/neonView/ClassificationDrawer_view/ClassificationDrawer_view.aod
deleted file mode 100644
index 3d71c2d3c9..0000000000
--- a/neonView/ClassificationDrawer_view/ClassificationDrawer_view.aod
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.6">
-  <name>ClassificationDrawer_view</name>
-  <majorModelMode>DISTRIBUTED</majorModelMode>
-  <layout>
-    <drawerLayout>
-      <name>layout</name>
-      <layoutCaption>Classification</layoutCaption>
-    </drawerLayout>
-  </layout>
-  <children>
-    <neonViewReference>
-      <name>ddde18ed-2617-4f7e-9a6b-71e4625e2cdc</name>
-      <entityField>#ENTITY</entityField>
-      <view>ClassificationTree_view</view>
-    </neonViewReference>
-  </children>
-</neonView>
diff --git a/neonView/ClassificationGradingMultiplePreview_view/ClassificationGradingMultiplePreview_view.aod b/neonView/ClassificationGradingMultipleEdit_view/ClassificationGradingMultipleEdit_view.aod
similarity index 90%
rename from neonView/ClassificationGradingMultiplePreview_view/ClassificationGradingMultiplePreview_view.aod
rename to neonView/ClassificationGradingMultipleEdit_view/ClassificationGradingMultipleEdit_view.aod
index a1e792129a..6ba9ff49ef 100644
--- a/neonView/ClassificationGradingMultiplePreview_view/ClassificationGradingMultiplePreview_view.aod
+++ b/neonView/ClassificationGradingMultipleEdit_view/ClassificationGradingMultipleEdit_view.aod
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.6">
-  <name>ClassificationGradingMultiplePreview_view</name>
+  <name>ClassificationGradingMultipleEdit_view</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <size>SMALL</size>
   <layout>
     <headerFooterLayout>
       <name>layout</name>
+      <header>titledList</header>
     </headerFooterLayout>
   </layout>
   <children>
diff --git a/neonView/ClassificationGroupAnalysesChart_view/ClassificationGroupAnalysesChart_view.aod b/neonView/ClassificationGroupAnalysesChart_view/ClassificationGroupAnalysesChart_view.aod
deleted file mode 100644
index 40d2afea5d..0000000000
--- a/neonView/ClassificationGroupAnalysesChart_view/ClassificationGroupAnalysesChart_view.aod
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.6">
-  <name>ClassificationGroupAnalysesChart_view</name>
-  <majorModelMode>DISTRIBUTED</majorModelMode>
-  <layout>
-    <drawerLayout>
-      <name>layout</name>
-      <layoutCaption>Classification</layoutCaption>
-      <fixedDrawer v="true" />
-    </drawerLayout>
-  </layout>
-  <children>
-    <singleDataChartViewTemplate>
-      <name>Groups</name>
-      <chartType>PIE</chartType>
-      <xAxis>GROUP</xAxis>
-      <yAxis>SCORE</yAxis>
-      <entityField>#ENTITY</entityField>
-      <title></title>
-    </singleDataChartViewTemplate>
-  </children>
-</neonView>
diff --git a/neonView/ClassificationGroupPreview_view/ClassificationGroupPreview_view.aod b/neonView/ClassificationGroupPreview_view/ClassificationGroupPreview_view.aod
new file mode 100644
index 0000000000..ac701fd79b
--- /dev/null
+++ b/neonView/ClassificationGroupPreview_view/ClassificationGroupPreview_view.aod
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.6">
+  <name>ClassificationGroupPreview_view</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <layout>
+    <headerFooterLayout>
+      <name>layout</name>
+      <header>generic</header>
+    </headerFooterLayout>
+  </layout>
+  <children>
+    <genericViewTemplate>
+      <name>generic</name>
+      <entityField>#ENTITY</entityField>
+      <fields>
+        <entityFieldLink>
+          <name>856aa380-f737-4e33-b97a-fdc9230cddaa</name>
+          <entityField>object_type</entityField>
+        </entityFieldLink>
+        <entityFieldLink>
+          <name>9c5775b3-8000-4d2f-9400-e049afba2f60</name>
+          <entityField>TITLE</entityField>
+        </entityFieldLink>
+        <entityFieldLink>
+          <name>7a847889-24f7-4cfd-8dbc-786eaf9db963</name>
+          <entityField>SORTING</entityField>
+        </entityFieldLink>
+      </fields>
+    </genericViewTemplate>
+    <neonViewReference>
+      <name>83bafcf6-7329-4fe8-b5dd-a3cb88babbd3</name>
+      <entityField>ClassificationGradings</entityField>
+      <view>ClassificationGradingMultipleEdit_view</view>
+    </neonViewReference>
+  </children>
+</neonView>
diff --git a/neonView/ClassificationScoreMultipleEdit_view/ClassificationScoreMultipleEdit_view.aod b/neonView/ClassificationScoreMultipleEdit_view/ClassificationScoreMultipleEdit_view.aod
index 80c1c9c1d2..add9fa3873 100644
--- a/neonView/ClassificationScoreMultipleEdit_view/ClassificationScoreMultipleEdit_view.aod
+++ b/neonView/ClassificationScoreMultipleEdit_view/ClassificationScoreMultipleEdit_view.aod
@@ -3,25 +3,22 @@
   <name>ClassificationScoreMultipleEdit_view</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <layout>
-    <drawerLayout>
+    <noneLayout>
       <name>layout</name>
-      <layoutCaption>Possible Values</layoutCaption>
-    </drawerLayout>
+    </noneLayout>
   </layout>
   <children>
-    <genericMultipleViewTemplate>
+    <titledListViewTemplate>
       <name>scores</name>
+      <titleField>TITLE</titleField>
+      <autoNewRow v="true" />
       <entityField>#ENTITY</entityField>
       <columns>
-        <neonGenericMultipleTableColumn>
-          <name>7d49c1b4-3525-410c-92d2-b21a69fd8dec</name>
-          <entityField>TITLE</entityField>
-        </neonGenericMultipleTableColumn>
-        <neonGenericMultipleTableColumn>
-          <name>db21eec0-16c6-4267-a785-cb63f15e43b3</name>
+        <neonTitledListTableColumn>
+          <name>d56f97c1-a634-4b12-8dd3-c2c32a9e16f1</name>
           <entityField>SCORE</entityField>
-        </neonGenericMultipleTableColumn>
+        </neonTitledListTableColumn>
       </columns>
-    </genericMultipleViewTemplate>
+    </titledListViewTemplate>
   </children>
 </neonView>
diff --git a/neonView/ClassificationScoreMultiplePreview_view/ClassificationScoreMultiplePreview_view.aod b/neonView/ClassificationScoreMultiplePreview_view/ClassificationScoreMultiplePreview_view.aod
deleted file mode 100644
index 2bd84028e0..0000000000
--- a/neonView/ClassificationScoreMultiplePreview_view/ClassificationScoreMultiplePreview_view.aod
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.6">
-  <name>ClassificationScoreMultiplePreview_view</name>
-  <majorModelMode>DISTRIBUTED</majorModelMode>
-  <layout>
-    <noneLayout>
-      <name>layout</name>
-    </noneLayout>
-  </layout>
-  <children>
-    <titledListViewTemplate>
-      <name>scores</name>
-      <titleField>TITLE</titleField>
-      <autoNewRow v="true" />
-      <entityField>#ENTITY</entityField>
-      <columns>
-        <neonTitledListTableColumn>
-          <name>d56f97c1-a634-4b12-8dd3-c2c32a9e16f1</name>
-          <entityField>SCORE</entityField>
-        </neonTitledListTableColumn>
-      </columns>
-    </titledListViewTemplate>
-  </children>
-</neonView>
diff --git a/neonView/ClassificationTree_view/ClassificationTree_view.aod b/neonView/ClassificationTree_view/ClassificationTree_view.aod
index d8b43717e9..ca36f8fd5f 100644
--- a/neonView/ClassificationTree_view/ClassificationTree_view.aod
+++ b/neonView/ClassificationTree_view/ClassificationTree_view.aod
@@ -10,12 +10,12 @@
   <children>
     <treeTableViewTemplate>
       <name>ClassificationTreeTable</name>
-      <defaultGroupFields>
-        <element>CLASSIFICATIONGROUP</element>
-      </defaultGroupFields>
       <hideActions v="true" />
       <showChildrenCount v="false" />
       <entityField>#ENTITY</entityField>
+      <defaultGroupFields>
+        <element>CLASSIFICATIONGROUP</element>
+      </defaultGroupFields>
       <columns>
         <neonTreeTableColumn>
           <name>246c0212-dadb-4d71-9567-ceab37e9ef10</name>
diff --git a/neonView/ClassificationTypePreview_View/ClassificationTypePreview_View.aod b/neonView/ClassificationTypePreview_View/ClassificationTypePreview_View.aod
new file mode 100644
index 0000000000..9b7072fc51
--- /dev/null
+++ b/neonView/ClassificationTypePreview_View/ClassificationTypePreview_View.aod
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.6">
+  <name>ClassificationTypePreview_View</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <layout>
+    <headerFooterLayout>
+      <name>layout</name>
+      <header>generic</header>
+    </headerFooterLayout>
+  </layout>
+  <children>
+    <genericViewTemplate>
+      <name>generic</name>
+      <entityField>#ENTITY</entityField>
+      <fields>
+        <entityFieldLink>
+          <name>108530e0-ba87-4db3-9053-6bab10973cb9</name>
+          <entityField>OBJECT_TYPE</entityField>
+        </entityFieldLink>
+        <entityFieldLink>
+          <name>4aac1cf8-9ada-4459-b831-02064b43bc24</name>
+          <entityField>CLASSIFICATIONGROUP_ID</entityField>
+        </entityFieldLink>
+        <entityFieldLink>
+          <name>8853a07b-0a5e-468a-84a4-c59bfd8eec9c</name>
+          <entityField>SCORETYPE</entityField>
+        </entityFieldLink>
+        <entityFieldLink>
+          <name>d070599e-2a60-4de2-ae65-efda4943d199</name>
+          <entityField>infoField</entityField>
+        </entityFieldLink>
+      </fields>
+    </genericViewTemplate>
+    <neonViewReference>
+      <name>6b9f9dc6-8fbf-4f8a-8ba2-250178f1dd1e</name>
+      <entityField>ClassificationScores</entityField>
+      <view>ClassificationScoreMultipleEdit_view</view>
+    </neonViewReference>
+  </children>
+</neonView>
diff --git a/neonView/ClassificatonAdminPreview_view/ClassificatonAdminPreview_view.aod b/neonView/ClassificatonAdminPreview_view/ClassificatonAdminPreview_view.aod
deleted file mode 100644
index 1a9bbcdc8b..0000000000
--- a/neonView/ClassificatonAdminPreview_view/ClassificatonAdminPreview_view.aod
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.6">
-  <name>ClassificatonAdminPreview_view</name>
-  <majorModelMode>DISTRIBUTED</majorModelMode>
-  <isOverlay v="false" />
-  <overlayOrientation>PORTRAIT</overlayOrientation>
-  <layout>
-    <boxLayout>
-      <name>layout</name>
-      <autoHeight v="true" />
-    </boxLayout>
-  </layout>
-  <children>
-    <genericViewTemplate>
-      <name>classification</name>
-      <showDrawer v="true" />
-      <drawerCaption>Classification</drawerCaption>
-      <entityField>#ENTITY</entityField>
-      <fields>
-        <entityFieldLink>
-          <name>31662c73-7352-4eb2-889d-3f63bff25686</name>
-          <entityField>CLASSIFICATIONTYPE</entityField>
-        </entityFieldLink>
-        <entityFieldLink>
-          <name>7fddc4d4-6bdc-4c7a-9d69-bba4a9506707</name>
-          <entityField>CLASSIFICATIONGROUP</entityField>
-        </entityFieldLink>
-        <entityFieldLink>
-          <name>cb6e8f64-b2a4-4cc4-88b7-2f64f56b83dc</name>
-          <entityField>SCORETYPE</entityField>
-        </entityFieldLink>
-      </fields>
-    </genericViewTemplate>
-    <neonViewReference>
-      <name>97143b3d-9b13-4ad9-8f17-c134821d7a80</name>
-      <entityField>ClassificationGradings</entityField>
-      <view>ClassificationGradingMultiplePreview_view</view>
-    </neonViewReference>
-    <neonViewReference>
-      <name>214fbe22-378d-404e-99f8-f175e037f196</name>
-      <entityField>ClassificationScores</entityField>
-      <view>ClassificationScoreMultiplePreview_view</view>
-    </neonViewReference>
-  </children>
-</neonView>
diff --git a/neonView/ClassificatonPreview_view/ClassificatonPreview_view.aod b/neonView/ClassificatonPreview_view/ClassificatonPreview_view.aod
index 29ebb148c7..c66526bd77 100644
--- a/neonView/ClassificatonPreview_view/ClassificatonPreview_view.aod
+++ b/neonView/ClassificatonPreview_view/ClassificatonPreview_view.aod
@@ -14,7 +14,9 @@
     <genericViewTemplate>
       <name>classification</name>
       <showDrawer v="true" />
-      <drawerCaption>Classification</drawerCaption>
+      <fixedDrawer v="true" />
+      <hideLabels v="false" />
+      <hideEmptyFields v="false" />
       <entityField>#ENTITY</entityField>
       <fields>
         <entityFieldLink>
@@ -25,7 +27,10 @@
     </genericViewTemplate>
     <genericViewTemplate>
       <name>info</name>
+      <showDrawer v="true" />
+      <fixedDrawer v="true" />
       <entityField>#ENTITY</entityField>
+      <isEditable v="false" />
       <title></title>
       <fields>
         <entityFieldLink>
diff --git a/neonView/KeywordEntryFilter_view/KeywordEntryFilter_view.aod b/neonView/KeywordEntryFilter_view/KeywordEntryFilter_view.aod
index 19ec98e97d..874bbf3c62 100644
--- a/neonView/KeywordEntryFilter_view/KeywordEntryFilter_view.aod
+++ b/neonView/KeywordEntryFilter_view/KeywordEntryFilter_view.aod
@@ -11,12 +11,12 @@
   <children>
     <treeTableViewTemplate>
       <name>EntriesTreeTable</name>
-      <nodeExpandedField>expanded</nodeExpandedField>
+      <nodeExpandedField></nodeExpandedField>
+      <hideContentSearch v="false" />
+      <entityField>#ENTITY</entityField>
       <defaultGroupFields>
         <element>CONTAINER</element>
       </defaultGroupFields>
-      <hideContentSearch v="false" />
-      <entityField>#ENTITY</entityField>
       <columns>
         <neonTreeTableColumn>
           <name>6100879d-dc6a-4c7e-b750-f5b7e627f48a</name>
diff --git a/neonView/OrganisationtClassificationAndChart_view/OrganisationtClassificationAndChart_view.aod b/neonView/OrganisationClassification/OrganisationClassification.aod
similarity index 73%
rename from neonView/OrganisationtClassificationAndChart_view/OrganisationtClassificationAndChart_view.aod
rename to neonView/OrganisationClassification/OrganisationClassification.aod
index 5af287813a..9019bf34d2 100644
--- a/neonView/OrganisationtClassificationAndChart_view/OrganisationtClassificationAndChart_view.aod
+++ b/neonView/OrganisationClassification/OrganisationClassification.aod
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.6">
-  <name>OrganisationtClassificationAndChart_view</name>
+  <name>OrganisationClassification</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <layout>
     <boxLayout>
@@ -15,10 +15,5 @@
       <entityField>Classifications</entityField>
       <view>ClassificationTree_view</view>
     </neonViewReference>
-    <neonViewReference>
-      <name>427a8f25-63e5-44fd-98b9-49553f02e38d</name>
-      <entityField>Classifications</entityField>
-      <view>ClassificationChart_view</view>
-    </neonViewReference>
   </children>
 </neonView>
diff --git a/neonView/OrganisationClassificationDrawer_view/OrganisationClassificationDrawer_view.aod b/neonView/OrganisationClassificationDrawer_view/OrganisationClassificationDrawer_view.aod
index 23aaa04349..3f81db3f2e 100644
--- a/neonView/OrganisationClassificationDrawer_view/OrganisationClassificationDrawer_view.aod
+++ b/neonView/OrganisationClassificationDrawer_view/OrganisationClassificationDrawer_view.aod
@@ -14,7 +14,7 @@
     <neonViewReference>
       <name>b49a0291-89cc-4962-8706-5044aa2f9e21</name>
       <entityField>#ENTITY</entityField>
-      <view>OrganisationtClassificationAndChart_view</view>
+      <view>OrganisationClassification</view>
     </neonViewReference>
   </children>
 </neonView>
diff --git a/neonView/OrganisationFilter_view/OrganisationFilter_view.aod b/neonView/OrganisationFilter_view/OrganisationFilter_view.aod
index 1cc87b9732..b969a541b7 100644
--- a/neonView/OrganisationFilter_view/OrganisationFilter_view.aod
+++ b/neonView/OrganisationFilter_view/OrganisationFilter_view.aod
@@ -77,6 +77,10 @@
           <name>1908e7ac-9e6a-4104-9d5b-da60a10a1c02</name>
           <entityField>STATUS</entityField>
         </neonTableColumn>
+        <neonTableColumn>
+          <name>c935dcaf-d1eb-4b2c-afee-a58f3f63458d</name>
+          <entityField>CLASSIFICATIONSTORAGE_ID</entityField>
+        </neonTableColumn>
         <neonTableColumn>
           <name>2a82ed1e-05bf-408a-82e0-4de6195dad49</name>
           <entityField>STANDARD_EMAIL_COMMUNICATION</entityField>
@@ -120,6 +124,10 @@
           <name>2c8450d2-a8a5-49d3-92c5-bf08d32a46db</name>
           <entityField>STATUS</entityField>
         </neonTreeTableColumn>
+        <neonTreeTableColumn>
+          <name>3aedcc38-0313-43d7-9c84-67f03e28038a</name>
+          <entityField>CLASSIFICATIONSTORAGE_ID</entityField>
+        </neonTreeTableColumn>
         <neonTreeTableColumn>
           <name>d134034c-e391-4df3-9205-465d8a390996</name>
           <entityField>STANDARD_EMAIL_COMMUNICATION</entityField>
diff --git a/neonView/OrganisationMain_view/OrganisationMain_view.aod b/neonView/OrganisationMain_view/OrganisationMain_view.aod
index 7c31d30da5..4b49bf017e 100644
--- a/neonView/OrganisationMain_view/OrganisationMain_view.aod
+++ b/neonView/OrganisationMain_view/OrganisationMain_view.aod
@@ -40,6 +40,11 @@
       <entityField>ObjectTrees</entityField>
       <view>ObjectTreeFilter_view</view>
     </neonViewReference>
+    <neonViewReference>
+      <name>0b618d7e-61e0-42f3-ad0b-176afb9f6da4</name>
+      <entityField>Classifications</entityField>
+      <view>ClassificationTree_view</view>
+    </neonViewReference>
     <neonViewReference>
       <name>45c0f486-e7df-48ac-a201-661ac07f5fed</name>
       <entityField>#ENTITY</entityField>
@@ -50,11 +55,6 @@
       <entityField>#ENTITY</entityField>
       <view>OrganisationAttributeRestriction_view</view>
     </neonViewReference>
-    <neonViewReference>
-      <name>cdd8e4b8-b3aa-445f-affc-e1fc5b0c03cd</name>
-      <entityField>#ENTITY</entityField>
-      <view>OrganisationClassificationDrawer_view</view>
-    </neonViewReference>
     <neonViewReference>
       <name>eba90ed2-5e55-4cdb-9e0b-5a09feeb7536</name>
       <entityField>Documents</entityField>
diff --git a/neonView/OrganisationPreview_view/OrganisationPreview_view.aod b/neonView/OrganisationPreview_view/OrganisationPreview_view.aod
index bf5ee6388f..b57cbbcf2f 100644
--- a/neonView/OrganisationPreview_view/OrganisationPreview_view.aod
+++ b/neonView/OrganisationPreview_view/OrganisationPreview_view.aod
@@ -102,8 +102,8 @@
           <entityField>LastActivity</entityField>
         </entityFieldLink>
         <entityFieldLink>
-          <name>f367d831-d594-4dc1-8e1e-b7c3bf45e2ad</name>
-          <entityField>OpenTasks</entityField>
+          <name>7699811a-42f2-48d4-833d-1425db5ba5d0</name>
+          <entityField>CLASSIFICATIONSTORAGE_ID</entityField>
         </entityFieldLink>
       </fields>
     </scoreCardViewTemplate>
diff --git a/neonView/SaleprojectOverviewCharts_view/SaleprojectOverviewCharts_view.aod b/neonView/SaleprojectOverviewCharts_view/SaleprojectOverviewCharts_view.aod
deleted file mode 100644
index cf426058ce..0000000000
--- a/neonView/SaleprojectOverviewCharts_view/SaleprojectOverviewCharts_view.aod
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.6">
-  <name>SaleprojectOverviewCharts_view</name>
-  <majorModelMode>DISTRIBUTED</majorModelMode>
-  <layout>
-    <boxLayout>
-      <name>layout</name>
-      <direction>HORIZONTAL</direction>
-      <maxDirectionElements v="3" />
-    </boxLayout>
-  </layout>
-  <children>
-    <neonViewReference>
-      <name>4191cb26-76aa-4094-8ff4-b0cfc17bda2c</name>
-      <entityField>ClassificationGroups</entityField>
-      <view>ClassificationGroupAnalysesChart_view</view>
-    </neonViewReference>
-    <neonViewReference>
-      <name>a5583507-7e5a-40dd-9af8-a227b6be5af3</name>
-      <entityField>SalesprojectForecastCharts</entityField>
-      <view>TurnoverChartForcastDrawer_view</view>
-    </neonViewReference>
-  </children>
-</neonView>
diff --git a/neonView/SalesprojectClassificationAndChart_view/SalesprojectClassificationAndChart_view.aod b/neonView/SalesprojectClassificationAndChart_view/SalesprojectClassificationAndChart_view.aod
deleted file mode 100644
index 912611206d..0000000000
--- a/neonView/SalesprojectClassificationAndChart_view/SalesprojectClassificationAndChart_view.aod
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.6">
-  <name>SalesprojectClassificationAndChart_view</name>
-  <title></title>
-  <majorModelMode>DISTRIBUTED</majorModelMode>
-  <layout>
-    <boxLayout>
-      <name>layout</name>
-      <direction>HORIZONTAL</direction>
-      <maxDirectionElements v="2" />
-    </boxLayout>
-  </layout>
-  <children>
-    <neonViewReference>
-      <name>b2bbddb9-1a44-4926-9707-7052f96e5963</name>
-      <entityField>Classifications</entityField>
-      <view>ClassificationTree_view</view>
-    </neonViewReference>
-    <neonViewReference>
-      <name>0442c345-d0a3-4778-a906-c5ef86dacd16</name>
-      <entityField>Classifications</entityField>
-      <view>ClassificationChart_view</view>
-    </neonViewReference>
-  </children>
-</neonView>
diff --git a/neonView/SalesprojectClassificationAttribute_view/SalesprojectClassificationAttribute_view.aod b/neonView/SalesprojectClassificationAttribute_view/SalesprojectClassificationAttribute_view.aod
deleted file mode 100644
index 6097fe64b2..0000000000
--- a/neonView/SalesprojectClassificationAttribute_view/SalesprojectClassificationAttribute_view.aod
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.6">
-  <name>SalesprojectClassificationAttribute_view</name>
-  <title>Categorization</title>
-  <majorModelMode>DISTRIBUTED</majorModelMode>
-  <layout>
-    <boxLayout>
-      <name>layout</name>
-    </boxLayout>
-  </layout>
-  <children>
-    <neonViewReference>
-      <name>2cb777a4-cf46-4337-9b17-fc8b6026209b</name>
-      <entityField>#ENTITY</entityField>
-      <view>SalesprojectClassificationDrawer_view</view>
-    </neonViewReference>
-    <neonViewReference>
-      <name>523e3855-eade-4cce-842d-9b272b028cbb</name>
-      <entityField>AttributeTree</entityField>
-      <view>AttributeRelationTreeDrawer_view</view>
-    </neonViewReference>
-  </children>
-</neonView>
diff --git a/neonView/SalesprojectClassificationDrawer_view/SalesprojectClassificationDrawer_view.aod b/neonView/SalesprojectClassificationDrawer_view/SalesprojectClassificationDrawer_view.aod
deleted file mode 100644
index a51cbe2ee8..0000000000
--- a/neonView/SalesprojectClassificationDrawer_view/SalesprojectClassificationDrawer_view.aod
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.6">
-  <name>SalesprojectClassificationDrawer_view</name>
-  <majorModelMode>DISTRIBUTED</majorModelMode>
-  <layout>
-    <drawerLayout>
-      <name>layout</name>
-      <layoutCaption>Classification</layoutCaption>
-      <fixedDrawer v="true" />
-    </drawerLayout>
-  </layout>
-  <children>
-    <neonViewReference>
-      <name>8cec9c22-7304-47f3-9d46-909dec12ca2a</name>
-      <entityField>#ENTITY</entityField>
-      <view>SalesprojectClassificationAndChart_view</view>
-    </neonViewReference>
-  </children>
-</neonView>
diff --git a/neonView/SalesprojectClassification_view/SalesprojectClassification_view.aod b/neonView/SalesprojectClassification_view/SalesprojectClassification_view.aod
deleted file mode 100644
index b6a3767d13..0000000000
--- a/neonView/SalesprojectClassification_view/SalesprojectClassification_view.aod
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.6">
-  <name>SalesprojectClassification_view</name>
-  <title>Classifications</title>
-  <majorModelMode>DISTRIBUTED</majorModelMode>
-  <layout>
-    <noneLayout>
-      <name>layout</name>
-    </noneLayout>
-  </layout>
-  <children>
-    <scoreCardViewTemplate>
-      <name>ClassificationResult</name>
-      <entityField>#ENTITY</entityField>
-      <fields>
-        <entityFieldLink>
-          <name>c9fef1fc-21d2-4b6d-913f-a4507fde4dcb</name>
-          <entityField>ClassificationResult</entityField>
-        </entityFieldLink>
-      </fields>
-    </scoreCardViewTemplate>
-    <neonViewReference>
-      <name>e8de8288-df16-4deb-9ce0-6554a669724f</name>
-      <entityField>Classifications</entityField>
-      <view>ClassificationTree_view</view>
-    </neonViewReference>
-  </children>
-</neonView>
diff --git a/neonView/SalesprojectFilter_view/SalesprojectFilter_view.aod b/neonView/SalesprojectFilter_view/SalesprojectFilter_view.aod
index d0ac5d4dec..2713e11d76 100644
--- a/neonView/SalesprojectFilter_view/SalesprojectFilter_view.aod
+++ b/neonView/SalesprojectFilter_view/SalesprojectFilter_view.aod
@@ -60,6 +60,7 @@
         <element>PROJECTCODE</element>
         <element>PROJECTTITLE</element>
       </linkedColumns>
+      <fixedFilterFields />
       <title></title>
       <columns>
         <neonTableColumn>
@@ -82,6 +83,10 @@
           <name>20f132ef-161e-4b84-b6ae-1f4daf016d16</name>
           <entityField>PROBABILITY_AI</entityField>
         </neonTableColumn>
+        <neonTableColumn>
+          <name>88e6bebb-e83d-43ec-82f1-cc778fac458e</name>
+          <entityField>CLASSIFICATIONSTORAGE_ID</entityField>
+        </neonTableColumn>
         <neonTableColumn>
           <name>fec843c3-f7c0-42c7-8295-50386651edb2</name>
           <entityField>STARTDATE</entityField>
@@ -102,11 +107,13 @@
     </tableViewTemplate>
     <treeTableViewTemplate>
       <name>Treetable</name>
+      <defaultGroupFields />
       <entityField>#ENTITY</entityField>
       <linkedColumns>
         <element>PROJECTCODE</element>
         <element>PROJECTTITLE</element>
       </linkedColumns>
+      <fixedFilterFields />
       <columns>
         <neonTreeTableColumn>
           <name>c3c8cd94-5bb4-46bb-a61b-fec67fcc4841</name>
@@ -124,6 +131,10 @@
           <name>9b7b8a15-4a8d-41cb-bb46-3b1ed573dc6e</name>
           <entityField>CONTACT_ID</entityField>
         </neonTreeTableColumn>
+        <neonTreeTableColumn>
+          <name>6d9d1365-985a-4357-8ecc-16ddcc201ea8</name>
+          <entityField>CLASSIFICATIONSTORAGE_ID</entityField>
+        </neonTreeTableColumn>
         <neonTreeTableColumn>
           <name>745d6192-4817-49e6-8cb2-8470c9c25f4d</name>
           <entityField>STARTDATE</entityField>
diff --git a/neonView/SalesprojectMain_view/SalesprojectMain_view.aod b/neonView/SalesprojectMain_view/SalesprojectMain_view.aod
index 51150b360d..9098e124f3 100644
--- a/neonView/SalesprojectMain_view/SalesprojectMain_view.aod
+++ b/neonView/SalesprojectMain_view/SalesprojectMain_view.aod
@@ -30,9 +30,14 @@
       <view>SalesprojectMemberActivity_view</view>
     </neonViewReference>
     <neonViewReference>
-      <name>67659a20-068f-4522-ad33-2c35e29f929a</name>
-      <entityField>#ENTITY</entityField>
-      <view>SalesprojectClassificationAttribute_view</view>
+      <name>7ac103ea-1131-41e0-85ce-e7d2fc86dfd8</name>
+      <entityField>Attributes</entityField>
+      <view>AttributeRelationTree_view</view>
+    </neonViewReference>
+    <neonViewReference>
+      <name>d0c1344f-c143-43b4-9c44-f823fb525eff</name>
+      <entityField>Classifications</entityField>
+      <view>ClassificationTree_view</view>
     </neonViewReference>
     <neonViewReference>
       <name>8a83afee-e02c-4714-9641-13b62c95cea1</name>
diff --git a/neonView/SalesprojectOverview_view/SalesprojectOverview_view.aod b/neonView/SalesprojectOverview_view/SalesprojectOverview_view.aod
index 6385f42110..9a84bbb876 100644
--- a/neonView/SalesprojectOverview_view/SalesprojectOverview_view.aod
+++ b/neonView/SalesprojectOverview_view/SalesprojectOverview_view.aod
@@ -24,9 +24,9 @@
       </devices>
     </neonViewReference>
     <neonViewReference>
-      <name>dd0dd64f-1135-46c5-82d7-9d1e67cf4810</name>
-      <entityField>#ENTITY</entityField>
-      <view>SaleprojectOverviewCharts_view</view>
+      <name>729108f8-a054-4ea7-9ef8-14b686c6340b</name>
+      <entityField>SalesprojectForecastCharts</entityField>
+      <view>TurnoverChartForcastDrawer_view</view>
     </neonViewReference>
   </children>
 </neonView>
diff --git a/neonView/SalesprojectPreview_view/SalesprojectPreview_view.aod b/neonView/SalesprojectPreview_view/SalesprojectPreview_view.aod
index dbf8adad57..97bfa5d73f 100644
--- a/neonView/SalesprojectPreview_view/SalesprojectPreview_view.aod
+++ b/neonView/SalesprojectPreview_view/SalesprojectPreview_view.aod
@@ -99,6 +99,7 @@
     </neonViewReference>
     <scoreCardViewTemplate>
       <name>AdditionalInfo</name>
+      <fieldActions />
       <entityField>#ENTITY</entityField>
       <fields>
         <entityFieldLink>
@@ -106,8 +107,8 @@
           <entityField>InactiveTime</entityField>
         </entityFieldLink>
         <entityFieldLink>
-          <name>838cc7e2-6d6a-484a-92ad-d01adc2504df</name>
-          <entityField>ClassificationResult</entityField>
+          <name>49513dd7-f19a-450b-9fcf-d320e2f72c42</name>
+          <entityField>CLASSIFICATIONSTORAGE_ID</entityField>
         </entityFieldLink>
         <entityFieldLink>
           <name>ce670b75-346e-4aeb-b72d-5ef68dd77e71</name>
diff --git a/process/AISalesproject_lib/process.js b/process/AISalesproject_lib/process.js
index c1a63392f2..e0ceec91ec 100644
--- a/process/AISalesproject_lib/process.js
+++ b/process/AISalesproject_lib/process.js
@@ -202,7 +202,7 @@ AISalesprojectUtil.getClassificationValues = function (pClassificationType, pObj
             .and("CLASSIFICATION.OBJECT_TYPE", pObjectType)
             .and("CLASSIFICATION.OBJECT_ROWID", pObjectRowid))
         .leftJoin("CLASSIFICATIONSCORE", "CLASSIFICATIONSCORE_ID = CLASSIFICATIONSCOREID")
-        .where("CLASSIFICATIONTYPE.CLASSIFICATIONTYPE", pClassificationType)
+        .where("CLASSIFICATIONTYPE.OBJECT_TYPE", pClassificationType)
         .andIfSet("CLASSIFICATIONTYPE.SCORETYPE", pScoreType)
         .cell()
 
diff --git a/process/AttributeFilter_lib/process.js b/process/AttributeFilter_lib/process.js
index 81a5208ba9..d70501cef8 100644
--- a/process/AttributeFilter_lib/process.js
+++ b/process/AttributeFilter_lib/process.js
@@ -25,7 +25,7 @@ function AttributeSearchNameCoder(){}
  * 
  * @param {String} pUid                 <p/> attribute uid of the attribute that has to be encoded
  * @param {String} pAttributeType       <p/> attribute type of the attribute that has to be encoded 
- *                                      <br /> while you may able to specify any string, only values of $AttributeTypes.*** are useful
+ *                                      <br/> while you may able to specify any string, only values of $AttributeTypes.*** are useful
  *                                      
  * @return {String}                     <p/> an encoded string of the given parametervalues 
  *                                      <br/> this is basically a serialized object which is base64 encoded
diff --git a/process/ClassificationFilter_lib/ClassificationFilter_lib.aod b/process/ClassificationFilter_lib/ClassificationFilter_lib.aod
new file mode 100644
index 0000000000..9b182044a8
--- /dev/null
+++ b/process/ClassificationFilter_lib/ClassificationFilter_lib.aod
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.1">
+  <name>ClassificationFilter_lib</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <process>%aditoprj%/process/ClassificationFilter_lib/process.js</process>
+  <variants>
+    <element>LIBRARY</element>
+  </variants>
+</process>
diff --git a/process/ClassificationFilter_lib/process.js b/process/ClassificationFilter_lib/process.js
new file mode 100644
index 0000000000..ed71bb867c
--- /dev/null
+++ b/process/ClassificationFilter_lib/process.js
@@ -0,0 +1,343 @@
+import("system.logging");
+import("Context_lib");
+import("Classification_lib");
+import("Entity_lib");
+import("Sql_lib");
+import("system.entities");
+import("system.SQLTYPES");
+import("system.translate");
+import("system.util");
+import("system.vars");
+import("Util_lib");
+
+/**
+ * Methods used for the classification type filter extension set 
+ * Do not create an instance of this!
+ * 
+ * @class
+ */
+function ClassificationTypeFilterUtils() {}
+
+/**
+ * fetches classificationtypes and transforms them into filter fields
+ * 
+ * @param {String} pObjectType       <p/> contextId of the context whoes attributes are used for providing the filter fields
+ *                                      
+ * @return {String}                  <p/> field-definitions (array of objects) that are ready to use for a filterExtensionSet in a stringified form
+ *                                   <br/> The object within the array contains the following properties:
+ *                                   <ul>
+ *                                      <li>name - classificationtypeid (UUID of the classificationtype)</li>
+ *                                      <li>title - "classification: " + string of the classificationtype translated (for the end user)</li>
+ *                                      <li>contentType - string of the neon-contentType (TEXT)</li>
+ *                                      <li>hasDropDownValues - boolean if possible values have to be calculated or not (always true atm)</li>
+ *                                   </ul>
+ * @static 
+ */
+ClassificationTypeFilterUtils.getFilterFields = function(pObjectType) 
+{
+    var res = [];
+    var scoreTypes = newSelect("CLASSIFICATIONTYPE.CLASSIFICATIONTYPEID, CLASSIFICATIONTYPE.SCORETYPE, CLASSIFICATIONGROUP.TITLE")
+                            .from("CLASSIFICATIONTYPE")
+                            .join("CLASSIFICATIONGROUP", "CLASSIFICATIONGROUP.CLASSIFICATIONGROUPID = CLASSIFICATIONTYPE.CLASSIFICATIONGROUP_ID")
+                            .where("CLASSIFICATIONTYPE.OBJECT_TYPE", pObjectType)
+                            .orderBy("CLASSIFICATIONTYPE.SCORETYPE asc")
+                            .table();
+
+    var titleField = SqlUtils.translateStatementWithQuotes(ClassificationTypeFilterUtils.getTranslationSql());
+    for (let i = 0; i < scoreTypes.length; i++)
+    {
+        res.push({
+                name: scoreTypes[i][0],
+                title: translate.text(scoreTypes[i][2])+ ": " + translate.text(scoreTypes[i][1]),
+                contentType: "TEXT",
+                hasDropDownValues: true,
+                isGroupable: true,          // These Fields are also able to be grouped
+                groupedRecordField: "CLASSIFICATION.CLASSIFICATIONSCORE_ID",  // The DB-field that is being grouped by (see also groupQueryProcess)
+                titleRecordField: titleField     // The displayname (see also groupQueryProcess)
+            });
+    }
+
+    return JSON.stringify(res);
+}
+
+/**
+ * fetches classificationscores that are filterable and transforms them into filter fields for the current context
+ * 
+ * @see ClassificationTypeFilterUtils.getFilterFields for more details
+ * @static 
+ */
+ClassificationTypeFilterUtils.makeFilterFields = function()
+{
+var filter = JSON.parse(vars.getString("$local.filter"));
+  
+var classificationTypeId = filter.name;
+
+var classificationValue = newSelect("CLASSIFICATIONSCORE.CLASSIFICATIONSCOREID, CLASSIFICATIONSCORE.TITLE")
+                                        .from("CLASSIFICATIONSCORE")
+                                        .where("CLASSIFICATIONSCORE.CLASSIFICATIONTYPE_ID", classificationTypeId)
+                                        .orderBy("CLASSIFICATIONSCORE.TITLE")
+                                        .table();
+                                        
+for (let i = 0; i < classificationValue.length; i++) 
+    classificationValue[i][1] = translate.text(classificationValue[i][1])
+
+return classificationValue;
+}
+
+/**
+ * Builds a Sql-condition for a classification filter extension set. This allows to filter for classificationtypes within a db-table
+ *
+ * @see ClassificationTypeFilterUtils.getFilterCondition for more details
+ * @static 
+ */
+ClassificationTypeFilterUtils.makeFilterConditionSql = function()
+{
+    var filterCond = vars.get("$local.condition");
+    var uidInfo = EntityUtils.parseUidColumn(vars.get("$sys.uidcolumn"));
+    var columnPlaceholder = vars.get("$local.columnPlaceholder");
+    var res = ClassificationTypeFilterUtils.getFilterCondition(filterCond, uidInfo.table, uidInfo.column, columnPlaceholder);
+    
+    return res;
+}
+
+/**
+ * Builds a Sql-condition that may be used in a filter extension set and allows to filter for classificationtypes within a db-table
+ * 
+ * @param {String} pCondition           <p/> a SQL-condition like it is given in the "$local.condition"-variable in filter extension sets
+ * @param {String} pIdTableName         <p/> name of the db-table where the data shall be filtered
+ * @param {String} pIdColumnName        <p/> name of the primarykey-column of the table that was given via pIdTablename
+ * @param {String} pColumnPlaceholder   <p/> name of the placeholder where the columnname should be like it is given in the 
+ *                                           "$local.columnPlaceholder"-variable in filter extension sets
+ *                                     
+ * @return {SqlBuilder}                 <p/> a SqlBuilder-condition that contains a sub-select and may be used for filtering data
+ * @static 
+ */
+ClassificationTypeFilterUtils.getFilterCondition = function(pCondition, pIdTableName, pIdColumnName, pColumnPlaceholder) 
+{
+    var resSql;   
+    
+    var condition = StringUtils.replaceAll(pCondition, pColumnPlaceholder, "CLASSIFICATIONSCORE.CLASSIFICATIONSCOREID");
+        
+    //a SqlBuilder.IN() in a newWhere is not used here since the subselect can contain a placeholder
+    //(the variable condition) that would break the function
+    resSql = pIdTableName + "." + pIdColumnName + " in (" + newSelect(pIdTableName + "." + pIdColumnName)
+            .from(pIdTableName)
+            .leftJoin("CLASSIFICATION", newWhere("CLASSIFICATION.OBJECT_ROWID = " + pIdTableName + "." + pIdColumnName))
+            .leftJoin("CLASSIFICATIONSCORE", "CLASSIFICATION.CLASSIFICATIONSCORE_ID = CLASSIFICATIONSCORE.CLASSIFICATIONSCOREID")
+            .where(condition) + ")";
+
+    return resSql;
+};
+
+/**
+* gets all titletranslations of the classification scores
+* 
+* 
+* @return {String} a SQL-expression (case-when-statement) that resolves the KEYID into the title -> as preparedSatement-elements
+*/
+ClassificationTypeFilterUtils.getTranslationSql = function()
+{
+    
+    var config = entities.createConfigForLoadingRows().entity("ClassificationScore_entity")
+        .fields(["CLASSIFICATIONSCOREID", "translatedTitle"]);
+        
+
+        var rows = entities.getRows(config);
+        var res = SqlUtils.getResolvingCaseWhenFromObject(rows, "CLASSIFICATIONSCOREID", "translatedTitle", "CLASSIFICATIONSCORE_ID");
+        return res;
+}
+
+
+
+/**
+ * Procides static methods for en- or decoding classification group filter names
+ * AttributeFilter names are shared over several processes and contain therefore various information
+ * The infomration needs to be encoded to be able to transfer it over the different processes
+ * 
+ * @class
+ * 
+ */
+function ClassificationGroupFilterNameCoder(){}
+
+/**
+ * encodes several parameters into one string that can be used as classification group filter-name
+ * 
+ * @param {String} pUid                 <p/> attribute uid of the attribute that has to be encoded
+ * @param {String} pAttributeType       <p/> attribute type of the attribute that has to be encoded 
+ *                                      <br/> while you may able to specify any string, only values of $AttributeTypes.*** are useful
+ *                                      
+ * @return {String}                     <p/> an encoded string of the given parametervalues 
+ *                                      <br/> this is basically a serialized object which is base64 encoded
+ * @static 
+ */
+ClassificationGroupFilterNameCoder.encode = function (pClassificationGroupId, pRepresentingSqlExpression)
+{
+    var res = {
+        classificationGroupId: pClassificationGroupId, 
+        representingSqlExpression: pRepresentingSqlExpression
+    };
+    res = JSON.stringify(res);
+    res = util.encodeBase64String(res);
+    return res;
+};
+
+/**
+ * decodes a string that was encoded with AttributeSearchNameCoder.encode
+ * 
+ * 
+ * @param {String} pEncodedString       <p/> string that shall be decoded; the origin of the name has to be a filter-object
+ *                                      
+ * @return {Object}                     <p/> an object that contains all keys and values that have been encoded with AttributeSearchNameCoder.encode
+ * @static 
+ */
+ClassificationGroupFilterNameCoder.decode = function (pEncodedString)
+{
+    var res = pEncodedString.substr(pEncodedString.lastIndexOf(".") + 1);
+    res = util.decodeBase64String(res);
+    res = JSON.parse(res);
+    return res;
+};
+
+/**
+ * Methods used for the classification group filter extension set 
+ * Do not create an instance of this!
+ * 
+ * @class
+ */
+function ClassificationGroupFilterUtils() {}
+
+
+/**
+ * fetches classificationgroups and transforms them into filter fields
+ * 
+ * @param {String} pObjectType       <p/> contextId of the context whoes attributes are used for providing the filter fields
+ *                                      
+ * @return {String}                  <p/> field-definitions (array of objects) that are ready to use for a filterExtensionSet in a stringified form
+ *                                   <br/> The object within the array contains the following properties:
+ *                                   <ul>
+ *                                      <li>name - classificationtypeid (UUID of the classificationtype)</li>
+ *                                      <li>title - "classification: " + string of the classificationtype translated (for the end user)</li>
+ *                                      <li>contentType - string of the neon-contentType (TEXT)</li>
+ *                                      <li>hasDropDownValues - boolean if possible values have to be calculated or not (always true atm)</li>
+ *                                   </ul>
+ * @static 
+ */
+ClassificationGroupFilterUtils.getFilterFields = function(pObjectType)
+{
+    var sqlHelper = new SqlMaskingUtils();
+    var res = [];
+
+    var config = entities.createConfigForLoadingRows()
+        .entity("ClassificationGroup_entity")
+        .fields(["CLASSIFICATIONGROUPID", "#CONTENTTITLE"])
+        .provider("SpecificObjectTypeGroups")
+        .addParameter("ObjectType_param", pObjectType);
+    var classificationGroups = entities.getRows(config);
+    logging.log("classificationGroups>>" + JSON.stringify(classificationGroups));
+    classificationGroups = ArrayUtils.sortArrayOfObjects(classificationGroups, "#CONTENTTITLE", true, false);
+
+    classificationGroups.forEach(function(classificationGroup, idx){
+        var classificationGroupId = classificationGroup["CLASSIFICATIONGROUPID"];
+        var classificationGroupTitle = classificationGroup["#CONTENTTITLE"];
+        
+        var representingSqlExpression = sqlHelper.substring("CLASSIFICATIONVALUE", idx+1, 1);
+        var name = ClassificationGroupFilterNameCoder.encode(classificationGroupId, sqlHelper.substring("CLASSIFICATIONVALUE", idx+1, 1));
+        res.push({
+            name: name,
+            title: classificationGroupTitle,
+            contentType: "TEXT",
+            hasDropDownValues: true,
+            isGroupable: true,
+            groupedRecordField: representingSqlExpression  //title and group valure are the same (for example a resulting "A")
+        });
+    });
+    return JSON.stringify(res);
+};
+
+ClassificationGroupFilterUtils.makeFilterFields = function()
+{
+    var objectType = ContextUtils.getCurrentContextId();
+    var res = ClassificationGroupFilterUtils.getFilterFields(objectType);
+    return res;
+};
+
+
+/**
+ * fetches classificationscores that are filterable and transforms them into filter fields for the current context
+ * 
+ * @see ClassificationTypeFilterUtils.getFilterFields for more details
+ * @static 
+ */
+ClassificationGroupFilterUtils.getFilterValues = function(pFilter)
+{
+    var filter = JSON.parse(pFilter);
+    var filterName = filter.name;
+    var classificationGroupId = ClassificationGroupFilterNameCoder.decode(filterName).classificationGroupId;
+
+    var classificationValue = newSelect("CLASSIFICATIONGRADING.GRADING, CLASSIFICATIONGRADING.GRADING")
+        .from("CLASSIFICATIONGRADING")
+        .where("CLASSIFICATIONGRADING.CLASSIFICATIONGROUP_ID", classificationGroupId)
+        .orderBy("CLASSIFICATIONGRADING.MAXGRADEFORSCORE desc")
+        .table();
+
+    return classificationValue;
+};
+
+
+/**
+ * fetches classificationscores that are filterable and transforms them into filter fields for the current context
+ * 
+ * @see ClassificationTypeFilterUtils.getFilterFields for more details
+ * @static 
+ */
+ClassificationGroupFilterUtils.makeFilterValues = function()
+{
+    var filter = vars.getString("$local.filter")
+    var res = ClassificationGroupFilterUtils.getFilterValues(filter);
+    return res;
+};
+
+/**
+ * Builds a Sql-condition that may be used in a filter extension set and allows to filter for classificationtypes within a db-table
+ * 
+ * @param {String} pCondition           <p/> a SQL-condition like it is given in the "$local.condition"-variable in filter extension sets
+ * @param {String} pIdTableName         <p/> name of the db-table where the data shall be filtered
+ * @param {String} pIdColumnName        <p/> name of the primarykey-column of the table that was given via pIdTablename
+ * @param {String} pColumnPlaceholder   <p/> name of the placeholder where the columnname should be like it is given in the 
+ *                                           "$local.columnPlaceholder"-variable in filter extension sets
+ *                                     
+ * @return {SqlBuilder}                 <p/> a SqlBuilder-condition that contains a sub-select and may be used for filtering data
+ * @static 
+ */
+ClassificationGroupFilterUtils.getFilterCondition = function(pObjectType, pFilterName, pCondition, pRawValue, pOperatorName, pIdTableName,
+    pIdColumnName, pColumnPlaceholder)
+{
+    var decodedFilterName = ClassificationGroupFilterNameCoder.decode(pFilterName);
+    var condition = StringUtils.replaceAll(pCondition, pColumnPlaceholder, decodedFilterName.representingSqlExpression);
+            
+    return condition;
+};
+
+
+/**
+ * Builds a Sql-condition for a classification group filter extension set. This allows to filter for classificationgroups within a db-table
+ * 
+ *                                      
+ * @see ClassificationGroupFilterUtils.getFilterCondition for more details
+ * @static 
+ */
+ClassificationGroupFilterUtils.makeFilterConditionSql = function()
+{
+    var objectType = ContextUtils.getCurrentContextId();
+    var filterName = vars.get("$local.name");
+    var filterCond = vars.get("$local.condition");
+    var filterRawValue = vars.get("$local.rawvalue");
+    var filterOpratorName = vars.get("$local.operator2").trim();
+    var uidInfo = EntityUtils.parseUidColumn(vars.get("$sys.uidcolumn"));
+    var columnPlaceholder = vars.get("$local.columnPlaceholder");
+    
+    var res = ClassificationGroupFilterUtils.getFilterCondition(objectType, filterName, filterCond, filterRawValue, filterOpratorName, 
+        uidInfo.table, uidInfo.column, columnPlaceholder);
+    
+    return res;
+};
\ No newline at end of file
diff --git a/process/Classification_lib/process.js b/process/Classification_lib/process.js
index 0970b047c9..baa8bf0808 100644
--- a/process/Classification_lib/process.js
+++ b/process/Classification_lib/process.js
@@ -1,8 +1,13 @@
+import("system.text");
+import("system.translate");
+import("system.result");
+import("system.entities");
 import("system.eMath");
 import("system.util");
 import("system.vars");
 import("system.db");
 import("Sql_lib");
+import("Util_lib");
 
 /**
  * Methods to manage classifications.<br>
@@ -12,12 +17,35 @@ import("Sql_lib");
  */
 function ClassificationUtils() {}
 
+/**
+ * Formats the summary title for one specific group <br/>
+ * This is done by 
+ * 
+
+ * @param {Number|String} pCurrentScore     <p/>Current score that is reached for a group, e.g. 45
+ * @param {String} pGroupId                 <p/>UID of the classification group where the display value is determined. <br/>
+ *                                          This is used for determing the maximum value of the group and the resulting 
+ *                                          classificaiton value (for example: "B")
+ * @param {String} pGroupName               <p/>Name of the group that was passed as ID. This is used as display value and will not be translated,
+ *                                          you have to pass this value already translated to the target locale. <br/>
+ *                                          The reason for not loading this value based on the groupId is: better performance optimization
+ * @return {String}                         <p/>formated and translated title, e.g.: "1. Target Group: 45/120 points = B"
+ */
+ClassificationUtils.formatDisplaySummaryForGroup = function(pCurrentScore, pGroupId, pGroupName) 
+{
+    var maxScore = ClassificationUtils.getMaxScore(pGroupId);
+    var classifications = ClassificationUtils.getClassifications(pCurrentScore, pGroupId);
+
+    pCurrentScore = text.formatDouble(pCurrentScore, "#");
+    maxScore = text.formatDouble(maxScore, "#");
+    var res = translate.withArguments("%0: %1/%2 points = %3", [pGroupName, pCurrentScore, maxScore, classifications]);
+    return res;
+};
+
 /**
  * Get the score of the classification. You can get all groups at once or only the score for one group.
  * 
- * @param {String} pClassificationType                          <p>
- *                                                              The classification-type (usage) e.g. the key id<br>
- *                                                              from keyword 'ClassificationType'.<br>
+
  * @param {String} pObjectType                                  <p>
  *                                                              The object type.<br>
  * @param {String} pObjectRowid                                 <p>
@@ -30,18 +58,18 @@ function ClassificationUtils() {}
  *                                                              Returns all scores as object-map.<br>
  *                                                              (e.g. {"scoreGroup1": 0, "scoreGroup2": 20})
  */
-ClassificationUtils.getScoreAsObject = function(pClassificationType, pObjectType, pObjectRowid, pClassificationGroup)
+ClassificationUtils.getScoreAsObject = function(pObjectType, pObjectRowid, pClassificationGroup)
 {
-    var score = newSelect("CLASSIFICATIONTYPE.CLASSIFICATIONGROUP, case when sum(score) is not null then sum(score) else 0 end")
+    var score = newSelect("CLASSIFICATIONTYPE.CLASSIFICATIONGROUP_ID, case when sum(score) is not null then sum(score) else 0 end")
         .from("CLASSIFICATIONTYPE")
         .leftJoin("CLASSIFICATION", newWhere("CLASSIFICATIONTYPEID = CLASSIFICATIONTYPE_ID")
             .and("CLASSIFICATION.OBJECT_TYPE", pObjectType)
             .and("CLASSIFICATION.OBJECT_ROWID", pObjectRowid))
         .leftJoin("CLASSIFICATIONSCORE", "CLASSIFICATIONSCORE_ID = CLASSIFICATIONSCOREID")
-        .where("CLASSIFICATIONTYPE.CLASSIFICATIONTYPE", pClassificationType)
-        .andIfSet("CLASSIFICATIONTYPE.CLASSIFICATIONGROUP", pClassificationGroup)
-        .groupBy("CLASSIFICATIONGROUP")
-        .orderBy("CLASSIFICATIONGROUP")
+        .where("CLASSIFICATIONTYPE.OBJECT_TYPE", pObjectType)
+        .andIfSet("CLASSIFICATIONTYPE.CLASSIFICATIONGROUP_ID", pClassificationGroup)
+        .groupBy("CLASSIFICATIONGROUP_ID")
+        .orderBy("CLASSIFICATIONGROUP_ID")
         .table();
         
     var scores = {};
@@ -53,92 +81,77 @@ ClassificationUtils.getScoreAsObject = function(pClassificationType, pObjectType
 }
 
 /**
- * Get the score of the classification. You can get all groups at once or only the score for one group.
+ * Gets the scores of a Object, either for all of them or only for one group (depending on the pClassificationGroupId param, 
+ * if it's set you get only the score of that group)
  * 
- * @param {String} pClassificationType                          <p>
- *                                                              The classification-type (usage) e.g. the key id<br>
- *                                                              from keyword 'ClassificationType'.<br>
  * @param {String} pObjectType                                  <p>
  *                                                              The object type.<br>
  * @param {String} pObjectRowid                                 <p>
  *                                                              The row id. (UUID of the object, e.g: OrganisationId of Organisation)<br>
- * @param {String} pClassificationGroup=undefined (optional)    <p>
- *                                                              The classification group. If it is undefined,<br>
- *                                                              the classification for all groups are returned <br>
+ * @param {String} pClassificationGroupId (optional)    <p>
+ *                                                              The classification group id. If it is undefined,<br>
+ *                                                              the classificationScores for all groups are returned <br>
  *                                                              as Object(-map)<br>
  * @return {Array}                                             <p>
- *                                                              Returns all scores in a Array.<br>
- *                                                              (e.g. ["10,"30","70"] <br>
- *                                                              0 gets returned for null values)
+ *                                                              Returns all scores in a Array with this structure:<br>
+ *                                                              
+ *                                                              [[ID, SCORE], [ID, SCORE], [ID, SCORE]];
  */
-ClassificationUtils.getScore = function(pClassificationType, pObjectType, pObjectRowid, pClassificationGroup)
+ClassificationUtils.getScore = function(pObjectType, pObjectRowid, pClassificationGroupId)
 {
-    var score = newSelect("sum(score), CLASSIFICATIONTYPE.CLASSIFICATIONGROUP")
+    var scoreArray = [];
+    var score = newSelect("sum(score), CLASSIFICATIONTYPE.CLASSIFICATIONGROUP_ID")
         .from("CLASSIFICATIONTYPE")
         .leftJoin("CLASSIFICATION", newWhere("CLASSIFICATIONTYPEID = CLASSIFICATIONTYPE_ID")
             .and("CLASSIFICATION.OBJECT_TYPE", pObjectType)
             .and("CLASSIFICATION.OBJECT_ROWID", pObjectRowid))
         .leftJoin("CLASSIFICATIONSCORE", "CLASSIFICATIONSCORE_ID = CLASSIFICATIONSCOREID")
-        .where("CLASSIFICATIONTYPE.CLASSIFICATIONTYPE", pClassificationType)
-        .andIfSet("CLASSIFICATIONTYPE.CLASSIFICATIONGROUP", pClassificationGroup)
-        .groupBy("CLASSIFICATIONGROUP")
-        .orderBy("CLASSIFICATIONGROUP")
+        .where("CLASSIFICATIONTYPE.OBJECT_TYPE", pObjectType)
+        .andIfSet("CLASSIFICATIONTYPE.CLASSIFICATIONGROUP_ID", pClassificationGroupId)
+        .groupBy("CLASSIFICATIONGROUP_ID")
+        .orderBy("CLASSIFICATIONGROUP_ID")
         .table();
-        
-    for (let i = 0; i < score.length; i++)
+
+    var sorting = newSelect("distinct CLASSIFICATIONGROUP.CLASSIFICATIONGROUPID, CLASSIFICATIONGROUP.SORTING")
+                            .from("CLASSIFICATIONGROUP")
+                            .join("CLASSIFICATIONTYPE", "CLASSIFICATIONTYPE.CLASSIFICATIONGROUP_ID = CLASSIFICATIONGROUP.CLASSIFICATIONGROUPID")
+                            .where("CLASSIFICATIONTYPE.OBJECT_TYPE", pObjectType)
+                            .orderBy("CLASSIFICATIONGROUP.SORTING")
+                            .table();
+
+    for (var i = 0; i < sorting.length; i++)
     {
-        if(score[i][0] == "")
-            score[i][0] = 0;
+        for (var ii = 0; ii < score.length; ii++) {
+            if(score[ii][1] == sorting[i][0])
+            {
+                scoreArray[i] = score[ii]
+            }
+        }
     }
         
-    return score;
+    return scoreArray;
 }
 
 /**
  * Get all classifications for one dataset as String.<br>
  * Each char represents one classification.<br>
  * 
- * @param {String} pClassificationType                      <p>
- *                                                          The classification-type (usage)<br>
- *                                                          (e.g. the key id from keyword ClassificationType)
- * @param {String} pObjectType                              <p>
- *                                                          The object type.<br>
- * @param {String} pObjectRowid                             <p>
- *                                                          The row id.<br> 
-* @return {String}                                          <p>
-*                                                           The resulting classification. (e.g. "ACB")<br>
- */
-ClassificationUtils.getClass = function(pClassificationType, pObjectType, pObjectRowid)
-{
-    var classificationGrade = [];
-
-    var score = ClassificationUtils.getScore(pClassificationType, pObjectType, pObjectRowid);
-    for (var i = 0; i < score.length; i++)
-            classificationGrade[i] = ClassificationUtils.getClassifications(score[i][0], score[i][1]);
-        
-    return classificationGrade.join("")
-}
-
-/**
- * Get the classification relative to the max score.<br>
- * The classes calculated in percent of the max score like this:<br>
- * 
  * @param {String} pScore           <p>
- *                                  The archieved score (e.g. 42)
- * @param {String} pClassificationGroup  <p>     
- *                                  The Name of the Classification Group
+ *                                  The archieved score
+ * @param {String} pClassificationGroupId  <p>     
+ *                                  The Id of the Classification Group
  * @return {String}                 <p>
  *                                  Returns the corresponding classification.<br>
  */
-ClassificationUtils.getClassifications = function(pScore, pClassificationGroup) 
+ClassificationUtils.getClassifications = function(pScore, pClassificationGroupId) 
 {
     var score = pScore;
-    var classificationGroup = pClassificationGroup;
-    var gradingTable = ClassificationUtils.getClassificationGrading(classificationGroup);
+    var classificationGroupId = pClassificationGroupId
+    var gradingTable = ClassificationUtils.getClassificationGrading(classificationGroupId);
     var grade = "-";
 
         
-    for(var i = 0; i < gradingTable.length; i++)
+    for(let i = 0; i < gradingTable.length; i++)
     {
             if(Number(score) <= Number(gradingTable[i][0]) && score !=0 && grade == "-")
             {
@@ -148,48 +161,59 @@ ClassificationUtils.getClassifications = function(pScore, pClassificationGroup)
     }
     return grade;
 }
+
 /**
  * Gets the classification table <br>
  * 
- * @param {String} pClassificationGroup  <p>     
+ * @param {String} pClassificationGroupId  <p>     
  *                                  The Classification Group              
  * @return {String}                 <p>
  *                                  Returns the corresponding classification table, ordered by the maxscore ascending.<br>
  */
-ClassificationUtils.getClassificationGrading = function(pClassificationGroup) 
+ClassificationUtils.getClassificationGrading = function(pClassificationGroupId) 
 {
-    var gradingTable = newSelect("CLASSIFICATIONGRADING.MAXGRADEFORSCORE, CLASSIFICATIONGRADING.GRADING")
-                                    .from("CLASSIFICATIONGRADING")
-                                    .where("CLASSIFICATIONGRADING.CLASSIFICATIONTYPE_GROUP", pClassificationGroup)
-                                    .orderBy("MAXGRADEFORSCORE asc")
-                                    .table();
-    return gradingTable;
+    var config = entities.createConfigForLoadingRows()
+        .entity("ClassificationGrading_entity")
+        .addParameter("ClassificationTypeId_param", pClassificationGroupId)
+        .fields(["MAXGRADEFORSCORE", "GRADING"])
+        .ignorePermissions(true);
+        
+    var gradings = entities.getRows(config);
+    ArrayUtils.sortArrayOfObjects(gradings, "MAXGRADEFORSCORE", true, true);
+    gradings = gradings.map(function (row){
+        return [row["MAXGRADEFORSCORE"], row["GRADING"]];
+    });
+    return gradings;
 }
 
-
-/**
- * Gets the maximum score for one group depending on the pClassificationGroup param.
+/**@cl
+ * Gets the maximum score for one group depending on the pClassificationGroupId param.
  * 
- * @param {String} pClassificationGroup (optional)              <p>
+ * @param {String} pClassificationGroupId                       <p>
  *                                                              The classification groupname.<br>
  * @return {String}                                             <p>
  *                                                              Returns the maximum possible score of the chosen group.<br>
  *                                                              
  */
-ClassificationUtils.getMaxScore = function(pClassificationGroup)
+ClassificationUtils.getMaxScore = function(pClassificationGroupId)
 {
-    var maxScore = 0;
-    scores = newSelect("max(CLASSIFICATIONSCORE.SCORE)")
-                            .from("CLASSIFICATIONTYPE")
-                            .join("CLASSIFICATIONSCORE", "CLASSIFICATIONSCORE.CLASSIFICATIONTYPE_ID = CLASSIFICATIONTYPE.CLASSIFICATIONTYPEID")
-                            .where("CLASSIFICATIONTYPE.CLASSIFICATIONGROUP", pClassificationGroup)
-                            .groupBy("CLASSIFICATIONTYPE.CLASSIFICATIONTYPEID")
-                            .arrayColumn();
+    var sumMaxScore = 0;
+    
+    var config = entities.createConfigForLoadingRows()
+                    .entity("ClassificationType_entity")
+                    .ignorePermissions(true)
+                    .addParameter("ClassificationGroupId_param", pClassificationGroupId)
+                    .fields(["maxScore"]);
+    var scores = entities.getRows(config);
                             
     for (let i = 0; i < scores.length; i++)
-        maxScore = eMath.addInt(maxScore, parseInt(scores[i]));
+    {
+        var maxScore = scores[i]["maxScore"];
+        if (maxScore)
+            sumMaxScore = eMath.addInt(sumMaxScore, parseInt(maxScore));
+    }
     
-    return maxScore;
+    return sumMaxScore;
 }
 
 /**
@@ -197,102 +221,21 @@ ClassificationUtils.getMaxScore = function(pClassificationGroup)
  * Either as [["group", "group"]] (for the possible items process).
  * Or as [["group"]].<br>
  * 
- * @param {String} pClassificationtype              <p>
- *                                                  The classification type.<br>
- * @param {Boolean} pTwoCol                         <p>
- *                                                  Use two columns (for possible items process).<br>
+ * @param {String} pObjectType                      <p>
+ *                                                  The object type.<br>
  */
-ClassificationUtils.getAllGroups = function(pClassificationtype, pTwoCol)
+ClassificationUtils.getAllGroups = function(pObjectType)
 {
     var sql = new SqlBuilder()
-                    .select(["distinct CLASSIFICATIONGROUP", (pTwoCol ? "CLASSIFICATIONGROUP" : "")])
-                    .from("CLASSIFICATIONTYPE")
-                    .where("CLASSIFICATIONTYPE.CLASSIFICATIONTYPE", pClassificationtype)
-                    .orderBy("CLASSIFICATIONGROUP");
+                    .select(["distinct CLASSIFICATIONGROUP.CLASSIFICATIONGROUPID", "CLASSIFICATIONGROUP.TITLE"])
+                                .from("CLASSIFICATIONGROUP")
+                                .join("CLASSIFICATIONTYPE", "CLASSIFICATIONTYPE.CLASSIFICATIONGROUP_ID = CLASSIFICATIONGROUP.CLASSIFICATIONGROUPID")
+                                .where("CLASSIFICATIONTYPE.OBJECT_TYPE", pObjectType)
+                                .orderBy("CLASSIFICATIONGROUP.TITLE");
     
-    if (pTwoCol)
-        return sql.table();
-    else
-        return sql.arrayColumn();
+    return sql.table();
 }
 
-/**
- * Load the classification group for a classificaiton type<br>
- * id from the db.<br>
- * 
- * @param {String} pClassificationtypeId                <p>
- *                                                      The id of the classification type.<br>
- */
-ClassificationUtils.getGroupFromDb = function(pClassificationtypeId)
-{
-    return newSelect("CLASSIFICATIONGROUP")
-        .from("CLASSIFICATIONTYPE")
-        .where("CLASSIFICATIONTYPE.CLASSIFICATIONTYPEID", pClassificationtypeId)
-        .orderBy("CLASSIFICATIONGROUP")
-        .cell();
-}
-
-/**
- * Update the groupname. Checks if it is already used and only updates it, if not.
- * TODO: message to the user if it failed? (or return value - bool?)
- * 
- * @param {String} pOldName                         <p>
- *                                                  The old name, which shall be changed.<br>
- * @param {String} pNewName                         <p>
- *                                                  The new name.<br>
- * @param {String} pClassificationType              <p>
- *                                                  The classification type.<br>
- */
-ClassificationUtils.changeGroupName = function(pOldName, pNewName, pClassificationType)
-{
-    var groups = ClassificationUtils.getAllGroups(pClassificationType, false);
-                
-    if (groups.indexOf(pNewName, 0) == -1)
-    {
-        newWhere("CLASSIFICATIONTYPE.CLASSIFICATIONGROUP", pOldName)
-            .updateData(true, "CLASSIFICATIONTYPE", ["CLASSIFICATIONGROUP"], null, [pNewName]);
-    }
-}
-
-/**
- * Get the classificationType for the current classification (either from parameter or selection-variable)
- * 
- * @param {String} pParamField                      <p>
- *                                                  The parameter field name. (e.g.: "$param.ClassificationType_param")<br>
- * @param {String} pSelectionField                  <p>
- *                                                  The parameter field name. (e.g.: "$sys.selectionRows")<br>
- * @return {String}                                 <p>
- *                                                  The type (or undefined).<br>
- */
-ClassificationUtils.getUsageType = function(pParamField, pSelectionField)
-{
-    if (vars.exists(pParamField) && vars.get(pParamField))
-        classificationType = vars.get(pParamField);
-    else if (vars.exists(pSelectionField) && vars.get(pSelectionField))
-    {
-        var selection = vars.get(pSelectionField);
-        if (selection.length > 0 && selection[0]["CLASSIFICATIONTYPE"])
-        {
-            classificationType = selection[0]["CLASSIFICATIONTYPE"];
-        }
-    }
-    
-    return classificationType;
-}
-
-/**
- * Update the coreName of a type.<br>
- * 
- * @param {String} pNewScoreName                <p>
- *                                              The new score name.<br>
- * @param {String} pClassificationTypeId        <p>
- *                                              The id of the classification type.<br>
- */
-ClassificationUtils.changeScoreName = function(pNewScoreName, pClassificationTypeId)
-{
-    newWhere("CLASSIFICATIONTYPE.CLASSIFICATIONTYPEID", pClassificationTypeId)
-        .updateData(true, "CLASSIFICATIONTYPE", ["SCORETYPE"], null, [pNewScoreName]);
-}
 
 /**
  * Set a value for a classification type
@@ -316,51 +259,200 @@ ClassificationUtils.setClassificationValue = function(pObjectType, pObjectId, pC
 
 
 /**
- * Get all classifications for one dataset as String.<br>
- * Each char represents one classification.<br>
+ * Gets the classificationGradingTable for a classificationGroup as Array.<br>
+ * ordered by the MaxGradeForScore descending              <br>
  * 
- * @param {String} pScoreId                                 <p>
- *                                                          The classification score id you want the grading table for <br>
+ * @param {String} pClassificationGroupId                   <p>
+ *                                                          The classificationgroup you want the grading for <br>
  *                                                          
-* @return {String}                                          <p>
-*                                                           The resulting classification grading table. (e.g. "ACB")<br>
+* @return {Array}                                           <p>
+*                                                           The resulting gradingTable. <br>
  */
-ClassificationUtils.getGradingTableByScoreId = function(pScoreId)
+ClassificationUtils.getGradingTableByGroupId = function(pClassificationGroupId)
 {
 
-    var scoreId = pScoreId;
+    var classificationGroupId = pClassificationGroupId;
 
     var gradingTable = newSelect("CLASSIFICATIONGRADING.CLASSIFICATIONGRADINGID, CLASSIFICATIONGRADING.MAXGRADEFORSCORE, CLASSIFICATIONGRADING.GRADING")
-                            .from("CLASSIFICATIONGRADING")
-                            .where("CLASSIFICATIONGRADING.CLASSIFICATIONTYPE_GROUP", newSelect("CLASSIFICATIONTYPE.CLASSIFICATIONGROUP")
-                                                                                        .from("CLASSIFICATIONTYPE")
-                                                                                        .where("CLASSIFICATIONTYPE.CLASSIFICATIONTYPEID", newSelect("CLASSIFICATIONSCORE.CLASSIFICATIONTYPE_ID")
-                                                                                                                                                .from("CLASSIFICATIONSCORE")
-                                                                                                                                                .where("CLASSIFICATIONSCORE.CLASSIFICATIONSCOREID", scoreId).cell())
-                                                                                        .groupBy("CLASSIFICATIONGROUP").cell())
-                            .orderBy("MAXGRADEFORSCORE desc")
-                            .table();
+                                        .from("CLASSIFICATIONGRADING")
+                                        .where("CLASSIFICATIONGRADING.CLASSIFICATIONGROUP_ID", classificationGroupId)
+                                        .orderBy("MAXGRADEFORSCORE desc")
+                                        .table()
     return gradingTable;
 }
 
 /**
- * Gets the classificationgroup from a classification score id as String.<br>
+ * Gets the classificationgroupId of a classification type as String.<br>
+ * 
+ * @param {String} pClassificationType                   <p>
+ *                                                          The classification-type (usage)<br>
+ *                                                          (e.g. the key id from keyword ClassificationType)
+* @return {String}                                          <p>
+*                                                           The classificationgroupId of the chosen classificationtype<br>
+ */
+ClassificationUtils.getClassificationGroup = function(pClassificationType)
+{
+    var classificationGroupId = newSelect("CLASSIFICATIONTYPE.CLASSIFICATIONGROUP_ID")
+                                        .from("CLASSIFICATIONTYPE")
+                                        .where("CLASSIFICATIONTYPE.CLASSIFICATIONTYPEID", pClassificationType)
+                                        .groupBy("CLASSIFICATIONGROUP_ID")
+                                        .cell()
+    return classificationGroupId;                                        
+}
+
+/**
+ * Get all classification type ids for a score using it's unique classification score id.<br>
  * 
  * @param {String} pClassificationScoreId                   <p>
  *                                                          The classification score id 
- *                                                          
 * @return {String}                                          <p>
-*                                                           The classificationgroup of the chosen classificationtype<br>
+*                                                           The resulting classification type.<br>
  */
-ClassificationUtils.getClassificationGroup = function(pClassificationScoreId)
+ClassificationUtils.getClassificationType = function(pClassificationScoreId)
 {
-    var classificationGroup = newSelect("CLASSIFICATIONTYPE.CLASSIFICATIONGROUP")
-                                        .from("CLASSIFICATIONTYPE")
-                                        .where("CLASSIFICATIONTYPE.CLASSIFICATIONTYPEID", newSelect("CLASSIFICATIONSCORE.CLASSIFICATIONTYPE_ID")
-                                                                                            .from("CLASSIFICATIONSCORE")
-                                                                                            .where("CLASSIFICATIONSCORE.CLASSIFICATIONSCOREID", pClassificationScoreId)
-                                                                                            .cell())
-                                        .groupBy("CLASSIFICATIONGROUP")
-                                        .cell();
-    return classificationGroup;                                        
-}
\ No newline at end of file
+    var classificationType = newSelect("CLASSIFICATIONSCORE.CLASSIFICATIONTYPE_ID")
+                                        .from("CLASSIFICATIONSCORE")
+                                        .where("CLASSIFICATIONSCORE.CLASSIFICATIONSCOREID", pClassificationScoreId)
+                                        .arrayColumn();
+    return classificationType;
+}
+
+/**
+ * Gets the Grading of a score for a group using an object that contains all the gradings.<br>
+ * 
+ * @param {String} pGradingObject                          <p>
+ *                                                          The classification grading object 
+ * @param {String} pGroupId                                <p>
+ *                                                          The classification group id 
+ * @param {String} pScore                                  <p>
+ *                                                          The score 
+* @return {String}                                          <p>
+*                                                           The resulting classification grading.<br>
+ */
+ClassificationUtils.getGradingFromObject = function(pGradingObject, pGroupId, pScore)
+{
+    var gradingObject = pGradingObject;
+    var groupId = pGroupId;
+    var score = pScore;
+    var grading = "-";
+    for (var index in gradingObject[groupId])
+    {
+        if(Number(score) <= Number(gradingObject[groupId][index][0]) && score != 0)
+        {
+            grading = gradingObject[groupId][index][1];
+            break;
+        }
+    }
+    return grading;
+}
+
+/**
+ * Inserts a empty classification data set into Classificationstorage, since every dataset of a classifiable module has to have an entry 
+ * because the updateClassifications_serverProcess is only updating instead of inserting.<br>
+ * 
+ * @param {String or Array} pUid                          <p>
+ *                                                          The unique uid('s) of the inserted record
+ * @param {String} pObjectType                            <p>
+ *                                                          The object type
+ */
+ClassificationUtils.insertEmptyClassification = function(pUids, pObjectType)
+{
+    var classificationCount = newSelect("count(distinct CLASSIFICATIONTYPE.CLASSIFICATIONGROUP_ID)")
+                                            .from("CLASSIFICATIONTYPE")
+                                            .where("CLASSIFICATIONTYPE.OBJECT_TYPE", pObjectType)
+                                            .cell();
+    var classificationvalue = "-".repeat(classificationCount);  
+            
+    if(Utils.isString(pUids))
+        pUids = [pUids];
+    
+    var columns = ["CLASSIFICATIONSTORAGEID",
+            "CLASSIFICATIONVALUE",
+            "OBJECT_ROWID",
+            "OBJECT_TYPE"
+            ];
+    var types = db.getColumnTypes("CLASSIFICATIONSTORAGE", columns);
+    var inserts = [];
+    var values;
+    for (var i = 0; i < pUids.length; i++) 
+    {
+        values = [util.getNewUUID(),
+                classificationvalue,
+                pUids[i],
+                pObjectType];
+        inserts.push(["CLASSIFICATIONSTORAGE", columns, types, values]);
+    }
+    db.inserts(inserts);
+}
+
+/**
+ * Gets the maximum score for one group depending on the pClassificationGroupId param.
+ * 
+ * @param {String} pClassificationGroupId                       <p>
+ *                                                              The classification groupname.<br>
+ * @param {String} pClassificationType                          <p>
+ *                                                              The classification type id.<br>
+ * @return {String}                                             <p>
+ *                                                              Returns the maximum possible score of the chosen group.<br>
+ *                                                              
+ */
+ClassificationUtils.getMaxScoreExcludeType = function(pClassificationGroupId, pClassificationType)
+{
+    var classificationGroupId = pClassificationGroupId;
+    var classificationType = pClassificationType;
+    var maxScore = 0;
+    scores = newSelect("max(CLASSIFICATIONSCORE.SCORE)")
+                            .from("CLASSIFICATIONTYPE")
+                            .join("CLASSIFICATIONSCORE", "CLASSIFICATIONSCORE.CLASSIFICATIONTYPE_ID = CLASSIFICATIONTYPE.CLASSIFICATIONTYPEID")
+                            .where("CLASSIFICATIONTYPE.CLASSIFICATIONGROUP_ID", classificationGroupId)
+                            .and("CLASSIFICATIONTYPE.CLASSIFICATIONTYPEID", classificationType, SqlBuilder.NOT_EQUAL())
+                            .groupBy("CLASSIFICATIONTYPE.CLASSIFICATIONTYPEID")
+                            .arrayColumn();
+                            
+    for (let i = 0; i < scores.length; i++)
+        maxScore = eMath.addInt(maxScore, parseInt(scores[i]));
+    
+    return maxScore;
+}
+
+/**
+ * decodes a string that was encoded with AttributeSearchNameCoder.encode
+ * 
+ * 
+ * @param {String} pEncodedString       <p/> string that shall be decoded; the origin of the name has to be a filter-object
+ *                                      
+ * @return {Object}                     <p/> an object that contains all keys and values that have been encoded with AttributeSearchNameCoder.encode
+ * @static 
+ */
+ClassificationUtils.decode = function (pEncodedString)
+{
+    var value = pEncodedString;
+    if(value == undefined)
+        res = $ClassificationRecordCategories.CLASSIFICATION_OBJECT_TYPE;
+    else if(value.charAt(0) != ";" && value.charAt(value.length) != ";")
+        res = $ClassificationRecordCategories.CLASSIFICATION_CLASSIFICATION_GROUP();
+    else
+    {
+        var decodedIdvalues = text.decodeMS(value);
+        if(decodedIdvalues[0].charAt(0) != ";" && decodedIdvalues[0].charAt(decodedIdvalues[0].length) != ";")
+            res = $ClassificationRecordCategories.CLASSIFICATION_CLASSIFICATION_TYPE();
+    }
+    if(res)
+        result.string(res);
+    return res
+};
+
+/*this is right now (2020-08-15) the only way to get something like a constant with 
+ - a prober name
+ - autocomplete support within the ADITO Designer
+ - and proper packageing all constants together
+This may change in the future, if there is something better feel free to improve this */
+function $ClassificationRecordCategories(){}
+$ClassificationRecordCategories.CLASSIFICATION_OBJECT_TYPE =             function(){return "ClassificationObject_Type"};
+$ClassificationRecordCategories.CLASSIFICATION_CLASSIFICATION_GROUP =    function(){return "ClassificationGroup"};
+$ClassificationRecordCategories.CLASSIFICATION_CLASSIFICATION_TYPE =     function(){return "ClassificationType"};
+$ClassificationRecordCategories.CLASSIFICATION_GROUP_EXISTS =            function(){return "ClassificationGroupExists"};
+$ClassificationRecordCategories.CLASSIFICATION_GROUP_DOESNT_EXIST =      function(){return "ClassificationGroupDoesntExist"};
+
+function $ClassificationPlaceholder(){}
+$ClassificationPlaceholder.TOPSECRETPLACEHOLDER =                       function(){return "T0PS3CR3TPL4CEH0LD3R"};
\ No newline at end of file
diff --git a/process/Entity_lib/process.js b/process/Entity_lib/process.js
index cd17d5d9e2..afdfbfaa02 100644
--- a/process/Entity_lib/process.js
+++ b/process/Entity_lib/process.js
@@ -542,11 +542,11 @@ EntityConsumerRowsHelper.prototype.changeRows = function (pRowsToChange)
     pRowsToChange.forEach(function (changedRow)
     {
         changeCatalog[changedRow[this._uidField]] = changedRow;
-    });
+    }, this);
     this._rows = this._rows.map(function (row)
     {
         return row[this._uidField] in changeCatalog ? changeCatalog[row[this._uidField]] : row;
-    });
+    }, this);
     return this;
 }
 
@@ -562,11 +562,11 @@ EntityConsumerRowsHelper.prototype.removeRows = function (pRowsToRemove)
     pRowsToRemove.forEach(function (deletedRow)
     {
         deleteCatalog[deletedRow[this._uidField]] = true;
-    });
+    }, this);
     this._rows = this._rows.filter(function (row)
     {
         return !deleteCatalog[row[this._uidField]];
-    });
+    }, this);
     return this;
 }
 
diff --git a/process/KeywordRegistry_basic/process.js b/process/KeywordRegistry_basic/process.js
index eca66d022d..b36a20300d 100644
--- a/process/KeywordRegistry_basic/process.js
+++ b/process/KeywordRegistry_basic/process.js
@@ -172,8 +172,8 @@ $KeywordRegistry.documentTemplateTypeCategory$serial = function(){return "2";};
 $KeywordRegistry.documentTemplateTypeCategory$htmlTemplate = function(){return "7";};
 
 $KeywordRegistry.classificationType = function(){return "ClassificationType";};
-$KeywordRegistry.classificationType$salesproject = function(){return "SALESPROJ";};
-$KeywordRegistry.classificationType$organisation = function(){return "ORGANISATION";};
+$KeywordRegistry.classificationType$salesproject = function(){return "Salesproject";};
+$KeywordRegistry.classificationType$organisation = function(){return "Organisation";};
 
 $KeywordRegistry.personGender = function(){return "PersonGender";};
 $KeywordRegistry.personGender$other = function(){return "o";};
diff --git a/process/Sql_lib/process.js b/process/Sql_lib/process.js
index 9e9dfd908b..3600f01d4a 100644
--- a/process/Sql_lib/process.js
+++ b/process/Sql_lib/process.js
@@ -2886,8 +2886,11 @@ SqlBuilder.prototype.forEachPage = function (pCallBackFn, pExecuteOnlyIfConditio
         throw SqlBuilder._ERROR_NOT_A_FUNCTION();
     
     var run = true;
+    var idx = 0;
     while (run && this.hasMoreRows())
-        run = pCallBackFn.call(null, this.nextTablePage(pExecuteOnlyIfConditionExists, pTimeout)) != false;
+    {
+        run = pCallBackFn.call(null, this.nextTablePage(pExecuteOnlyIfConditionExists, pTimeout), idx++) != false;
+    }
 }
 
 /**
@@ -3965,6 +3968,41 @@ SqlUtils.getResolvingCaseWhen = function(pKeyValueArray, pDbFieldName, pLocale)
     return resSql;
 };
 
+/**
+* resolves key-value pairs (of strings) into a case when expression
+* 
+* @param {String[][]} pKeyValueArray you've to pass a 2D-Array where each element has at pos0 the key and pos1 the value
+* @param {String} pDbFieldName name fo the database field where the KEY-value is stored
+* @param {String} [pLocale=current client language] specifies the locale for translating the title; can be false if nothing shalle be translated
+* 
+* @return {String} a SQL-expression (case-when-statement) that resolves the KEYID into the title -> as preparedSatement-elements
+*/
+SqlUtils.getResolvingCaseWhenFromObject = function(pKeyValueObject, pUid, pTranslatedValue, pDbFieldName) 
+{
+    var keyData = pKeyValueObject;
+    if (keyData.length == 0)
+        return  ["''", []];
+    
+    var translateValue = pTranslatedValue;
+    var uid = pUid;
+    var unassigned = translate.text("unassigned")
+    
+    var resSql = "case ", preparedValues = [];
+    var colTypeKeyId = SQLTYPES.CHAR;
+    var colTypeTitle = SQLTYPES.NVARCHAR;
+    for (var i = 0, l = keyData.length; i < l; i++) 
+    {
+        var translatedTitle = keyData[i][translateValue];
+        resSql += " when " + pDbFieldName + " = ? then ? "
+        preparedValues.push([keyData[i][pUid], colTypeKeyId]);
+        preparedValues.push([translatedTitle, colTypeTitle]);
+
+    }
+    resSql += " else '"+ unassigned +"' end ";
+    resSql = [resSql, preparedValues];
+    return resSql;
+};
+
 /**
  * Will quote all prepared statement values from the given statement.
  * 
diff --git a/process/Util_lib/process.js b/process/Util_lib/process.js
index d5ea4793bd..2c687d66a4 100644
--- a/process/Util_lib/process.js
+++ b/process/Util_lib/process.js
@@ -472,7 +472,7 @@ ArrayUtils.distinct2d = function(p2dArray)
  * sorts a two dimensional array by the given index
  *
  * @param {Array} targetArray the Array to be sorted
- * @param {String} index the index of the field to sort by
+ * @param {Number} index the indexposistion of the field to sort by
  * @param {Boolean} [sortAsc=false] TRUE sorts ascending, FALSE sorts decending
  * @param {Boolean} [isNumber=false] TRUE sorts numerical, FALSE or undefined sorts alphanumerical
  *
@@ -488,6 +488,25 @@ ArrayUtils.sort2d = function(targetArray, index, sortAsc, isNumber) {
     if (index >= targetArray[0].length)
         throw new RangeError("Index Out Of Bounds: " + index + " >= " + targetArray[0].length);
 
+    var res = ArrayUtils.sortArrayOfObjects(targetArray, index, sortAsc, isNumber);
+    return res;
+};
+
+
+/**
+ * sorts an array of boject the given name index
+ *
+ * @param {Array} targetArray the Array to be sorted
+ * @param {String} key the key (index) of the field to sort by
+ * @param {Boolean} [sortAsc=false] TRUE sorts ascending, FALSE sorts decending
+ * @param {Boolean} [isNumber=false] TRUE sorts numerical, FALSE or undefined sorts alphanumerical
+ *
+ * @return targetArray
+ *
+ * @throws {RangeError} if index was not found
+ */
+ArrayUtils.sortArrayOfObjects = function(targetArray, key, sortAsc, isNumber) {
+    var index = key;
     var sortFn = function (x, y) {
         if ( isNumber ) {
             xx = Number(x[index]);
@@ -496,6 +515,11 @@ ArrayUtils.sort2d = function(targetArray, index, sortAsc, isNumber) {
         else {
             xx = x[index];
             yy = y[index];
+            
+            if (xx == undefined)
+                throw new RangeError("Index Out Of Bounds: The index " + index + " was not found while sorting.");
+            if (yy == undefined)
+                throw new RangeError("Index Out Of Bounds: The index " + index + " was not found while sorting.");
 
             xx = xx.toLowerCase();
             xx = xx.replace(/ä/g,"ae");
@@ -518,7 +542,7 @@ ArrayUtils.sort2d = function(targetArray, index, sortAsc, isNumber) {
 
     targetArray.sort(sortFn);
     return targetArray
-}
+};
 
 /**
 * sorts an array with columns
diff --git a/process/updateClassifications_serverProcess/process.js b/process/updateClassifications_serverProcess/process.js
new file mode 100644
index 0000000000..22f452a82d
--- /dev/null
+++ b/process/updateClassifications_serverProcess/process.js
@@ -0,0 +1,222 @@
+import("system.logging");
+import("Classification_lib");
+import("Sql_lib");
+import("Organisation_lib");
+import("system.db");
+import("system.eMath");
+
+var outputInformation = {};//information how much data has been modified
+var gradingObject = {};
+var helperObject = {}; //Used to check whether or not the data has already been added
+var scoreObject = {};
+var archievedScoresObject = {};
+var objectTypes = [];
+var orderedGroups = [];
+var object_type, classificationGroupId, classificationTypeId, classificationScoreId,  classificationScore, classificationGradingId, score, cond,
+classificationGradingMaxScore, classificationGrading, chainedGrading, currentObjectColumn, currentObjectTable, isOrganisation, idsWithoutStoredClassification;
+var groupString ={}
+var table = "CLASSIFICATIONSTORAGE";
+var column = ["CLASSIFICATIONVALUE"];
+
+//All the possible scores of the classification types
+var scoreArray = newSelect("CLASSIFICATIONTYPE.OBJECT_TYPE, CLASSIFICATIONGROUP.CLASSIFICATIONGROUPID, CLASSIFICATIONTYPE.CLASSIFICATIONTYPEID, CLASSIFICATIONSCORE.CLASSIFICATIONSCOREID, CLASSIFICATIONSCORE.SCORE")
+                                        .from("CLASSIFICATIONGROUP")
+                                        .join("CLASSIFICATIONTYPE", "CLASSIFICATIONTYPE.CLASSIFICATIONGROUP_ID = CLASSIFICATIONGROUP.CLASSIFICATIONGROUPID")
+                                        .join("CLASSIFICATIONSCORE", "CLASSIFICATIONSCORE.CLASSIFICATIONTYPE_ID = CLASSIFICATIONTYPE.CLASSIFICATIONTYPEID")
+                                        .orderBy("CLASSIFICATIONTYPE.OBJECT_TYPE, CLASSIFICATIONGROUP.TITLE, CLASSIFICATIONGROUP.SORTING, CLASSIFICATIONTYPE.SCORETYPE, CLASSIFICATIONSCORE.SORT")
+                                        .table();
+
+//build scoreObject out of scoreArray
+for (var i = 0; i < scoreArray.length; i++) 
+{
+    for (var ii = 0; ii < scoreArray[ii].length; ii++) 
+    {
+        [object_type, classificationGroupId, classificationTypeId, classificationScoreId, classificationScore] = scoreArray[i];
+
+        if(!helperObject.hasOwnProperty(scoreArray[i][0])) //objectType
+        {
+            scoreObject[scoreArray[i][0]] = {}; //puts objectType in scoreObject and already initializes the object that later get's filled with the groups and their types
+            helperObject[scoreArray[i][0]] = "";
+            objectTypes.push(scoreArray[i][0]); //also push all the objectTypes in an Array for later (the updating happens one objectType at a time)
+        }
+        if(!helperObject.hasOwnProperty(scoreArray[i][1])) //classificationGroup
+        {
+            scoreObject[scoreArray[i][0]][scoreArray[i][1]] = {}; //same logic as before
+            helperObject[scoreArray[i][1]] = "";
+        }
+        if(!helperObject.hasOwnProperty(scoreArray[i][2])) //classificationType
+        {            
+            scoreObject[scoreArray[i][0]][scoreArray[i][1]][scoreArray[i][2]] = {}; //same logic as before
+            helperObject[scoreArray[i][2]] = "";
+        }
+        if(!helperObject.hasOwnProperty(scoreArray[i][3])) //classificationScore
+        {
+            scoreObject[scoreArray[i][0]][scoreArray[i][1]][scoreArray[i][2]][scoreArray[i][3]] = scoreArray[i][4]; //score
+            helperObject[scoreArray[i][3]] = "";
+        }
+    }
+}
+
+helperObject = {}; //resets the helper object
+
+//All the gradings of the classification groups
+var gradingArray = newSelect("CLASSIFICATIONTYPE.OBJECT_TYPE, CLASSIFICATIONGROUP.CLASSIFICATIONGROUPID, \n\
+                                CLASSIFICATIONGRADING.CLASSIFICATIONGRADINGID, CLASSIFICATIONGRADING.MAXGRADEFORSCORE, CLASSIFICATIONGRADING.GRADING")
+                                .from("CLASSIFICATIONGROUP")
+                                .join("CLASSIFICATIONTYPE", "CLASSIFICATIONTYPE.CLASSIFICATIONGROUP_ID = CLASSIFICATIONGROUP.CLASSIFICATIONGROUPID")
+                                .join("CLASSIFICATIONGRADING", "CLASSIFICATIONGRADING.CLASSIFICATIONGROUP_ID = CLASSIFICATIONGROUP.CLASSIFICATIONGROUPID")
+                                .orderBy("CLASSIFICATIONTYPE.OBJECT_TYPE, CLASSIFICATIONGROUP.TITLE, CLASSIFICATIONGROUP.SORTING, \n\
+                                    CLASSIFICATIONTYPE.SCORETYPE, CLASSIFICATIONGRADING.MAXGRADEFORSCORE asc")
+                                .table();
+                                
+//logic from above applies here aswell
+for (i = 0; i < gradingArray.length; i++) 
+{
+    [object_type, classificationGroupId, classificationTypeId, classificationGradingId, classificationGradingMaxScore, classificationGrading] = gradingArray[i];
+
+    if(!helperObject.hasOwnProperty(gradingArray[i][0])) //objectType
+    {
+        gradingObject[gradingArray[i][0]] = {};
+        helperObject[gradingArray[i][0]] = "";
+    }
+    if(!helperObject.hasOwnProperty(gradingArray[i][1])) //classificationGroup
+    {
+        gradingObject[gradingArray[i][0]][gradingArray[i][1]] = {};
+        helperObject[gradingArray[i][1]] = "";
+    }
+    if(!helperObject.hasOwnProperty(gradingArray[i][2])) //classificationGrading
+    {
+        gradingObject[gradingArray[i][0]][gradingArray[i][1]][gradingArray[i][2]] = [gradingArray[i][3], gradingArray[i][4]]; //maxGradeForScore
+        helperObject[gradingArray[i][2]] = "";
+    }
+}
+
+for (i = 0; i < objectTypes.length; i++) //update for each object_type
+{
+    outputInformation[objectTypes[i]] = {
+        updatedElements: 0,
+        nonChangedElements: 0
+    };
+    isOrganisation = false;
+    if(objectTypes[i] == "Organisation")
+    {
+        currentObjectTable = "CONTACT";
+        currentObjectColumn = "CONTACT.CONTACTID";
+        isOrganisation = true;
+    }
+    else
+    {
+        currentObjectTable =  objectTypes[i];
+        currentObjectColumn = objectTypes[i] + "." + objectTypes[i] +"ID";
+    }
+    
+    //this is the "upgrade" part of this process:
+    //first: insert default values into the records that have no entries 
+    idsWithoutStoredClassification = newSelect(currentObjectColumn)
+        .from(currentObjectTable)
+        .where(currentObjectColumn, newSelect("CLASSIFICATIONSTORAGE.OBJECT_ROWID").from("CLASSIFICATIONSTORAGE").where("CLASSIFICATIONSTORAGE.OBJECT_TYPE", objectTypes[i]), SqlBuilder.NOT_IN())
+                                                                        
+    if(isOrganisation)
+    {
+        idsWithoutStoredClassification.and("CONTACT.PERSON_ID is null")
+                .and("CONTACT.ORGANISATION_ID", OrgUtils.getPrivateOrganisationId(), SqlBuilder.NOT_EQUAL());
+    }
+        
+    idsWithoutStoredClassification = idsWithoutStoredClassification.arrayColumn();
+
+    if(idsWithoutStoredClassification)
+        ClassificationUtils.insertEmptyClassification(idsWithoutStoredClassification, objectTypes[i]);
+    
+    //second: update all entries with correct classificaiton values
+    
+    //all groups of the objectType in the correct order, needed later to also add the "-" gradings if no classificationType has been set under that group
+    orderedGroups = newSelect("distinct CLASSIFICATIONGROUP.CLASSIFICATIONGROUPID, CLASSIFICATIONGROUP.SORTING")
+        .from("CLASSIFICATIONGROUP")
+        .join("CLASSIFICATIONTYPE", "CLASSIFICATIONTYPE.CLASSIFICATIONGROUP_ID = CLASSIFICATIONGROUP.CLASSIFICATIONGROUPID")
+        .where("CLASSIFICATIONTYPE.OBJECT_TYPE", objectTypes[i])
+        .orderBy("CLASSIFICATIONGROUP.SORTING")
+        .table();
+
+    //private callback function that processes the achieved scores per object type
+    function _processAchievedScoresBatchFn(pBatchData, pBatchNum)
+    {
+        //logic from above applies here aswell
+        for (ii = 0; ii < pBatchData.length; ii++) 
+        {
+            [uid, classificationGroupId, classificationTypeId, classificationScore] = pBatchData[ii];
+
+            if(!helperObject.hasOwnProperty(pBatchData[ii][0])) //uid
+            {
+                archievedScoresObject[pBatchData[ii][0]] = {};
+                helperObject[pBatchData[ii][0]] = "";
+                groupString[pBatchData[ii][0]] = ""; //groupString is another helper object to store all the groupIds
+            }
+            if(!helperObject.hasOwnProperty(pBatchData[ii][0] + pBatchData[ii][1])) //classificationGroup
+            {
+                groupString[pBatchData[ii][0]] = groupString[pBatchData[ii][0]].toString() + pBatchData[ii][1].toString() +" ";
+                archievedScoresObject[pBatchData[ii][0]][pBatchData[ii][1]] = {};
+                helperObject[pBatchData[ii][0] + pBatchData[ii][1]] = "";
+            }
+            if(!helperObject.hasOwnProperty(pBatchData[ii][0] + pBatchData[ii][2])) //classificationType
+            {
+                if(archievedScoresObject[pBatchData[ii][0]][pBatchData[ii][1]]["Score"] == undefined)
+                    archievedScoresObject[pBatchData[ii][0]][pBatchData[ii][1]]["Score"] = 0;
+                score = eMath.addDec(parseFloat(archievedScoresObject[pBatchData[ii][0]][pBatchData[ii][1]]["Score"]), parseFloat(pBatchData[ii][3]));
+                archievedScoresObject[pBatchData[ii][0]][pBatchData[ii][1]]["Score"] = score;
+                archievedScoresObject[pBatchData[ii][0]][pBatchData[ii][1]]["Grade"] = ClassificationUtils.getGradingFromObject(gradingObject[objectTypes[i]], pBatchData[ii][1], score);
+                helperObject[pBatchData[ii][0] + pBatchData[ii][2]] = "";
+            }
+        }
+    }
+
+    var achievedScoresStmt = newSelect(currentObjectColumn + ", CLASSIFICATIONTYPE.CLASSIFICATIONGROUP_ID, \n\
+                                        CLASSIFICATION.CLASSIFICATIONTYPE_ID, CLASSIFICATIONSCORE.SCORE")
+                                    .from(currentObjectTable)
+                                    .join("CLASSIFICATION", "CLASSIFICATION.OBJECT_ROWID = " + currentObjectColumn)
+                                    .join("CLASSIFICATIONSCORE", "CLASSIFICATION.CLASSIFICATIONSCORE_ID = CLASSIFICATIONSCORE.CLASSIFICATIONSCOREID")
+                                    .join("CLASSIFICATIONTYPE", "CLASSIFICATIONTYPE.CLASSIFICATIONTYPEID = CLASSIFICATION.CLASSIFICATIONTYPE_ID");
+
+    if(isOrganisation)
+        achievedScoresStmt.where("CONTACT.PERSON_ID is null");
+
+    achievedScoresStmt.orderBy(currentObjectColumn + ", CLASSIFICATIONTYPE.CLASSIFICATIONGROUP_ID, CLASSIFICATIONSCORE.SCORE asc");
+    achievedScoresStmt.pageSize(100)
+                        .forEachPage(_processAchievedScoresBatchFn);
+
+    //do this after all the data is collected since the achievedScoresStmt returns several records for each rowId. 
+    //If this would be done in the batch function it would result in false classificationstorage-results because not all records for a rowId are used
+    for (var row_Id in archievedScoresObject)
+    {
+        chainedGrading = "";
+        //chain all the Classifications together
+        for (var row_IdI in archievedScoresObject[row_Id]) 
+        {
+            chainedGrading += archievedScoresObject[row_Id][row_IdI]["Grade"]
+        }
+
+        for (var iii = 0; iii < orderedGroups.length; iii++) //the empty gradings have been ignored, but should be filled with "-"
+        {
+            if(!groupString[row_Id].toString().includes(orderedGroups[iii][0].toString())) //check which ones aren't included and add "-" for those at correct the position
+            {
+                chainedGrading = chainedGrading.substring(0, iii) + "-" + chainedGrading.substring(iii, chainedGrading.length);
+            }
+        }
+
+        //update the specified dataset if the already stored ClassificatioNValue differs from the freshly calculated one
+        cond = newWhere("CLASSIFICATIONSTORAGE.OBJECT_ROWID", row_Id)
+            .and("CLASSIFICATIONSTORAGE.OBJECT_TYPE", objectTypes[i])
+            .and("CLASSIFICATIONSTORAGE.CLASSIFICATIONVALUE", chainedGrading, SqlBuilder.NOT_EQUAL());
+        var count = Number(cond.updateData(true, table, column, null, [chainedGrading]));
+        if (count > 0)
+        {
+            outputInformation[objectTypes[i]].updatedElements += count;
+        }
+        else
+        {
+            outputInformation[objectTypes[i]].nonChangedElements++;
+        }
+    }
+}
+
+var outputInfo = "updateClassifications_serverProcess output is:\n" + JSON.stringify(outputInformation);
+logging.log(outputInfo);
\ No newline at end of file
diff --git a/process/updateClassifications_serverProcess/updateClassifications_serverProcess.aod b/process/updateClassifications_serverProcess/updateClassifications_serverProcess.aod
new file mode 100644
index 0000000000..52e9c03b7c
--- /dev/null
+++ b/process/updateClassifications_serverProcess/updateClassifications_serverProcess.aod
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.1">
+  <name>updateClassifications_serverProcess</name>
+  <title>Update all Classification entries in the system</title>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <process>%aditoprj%/process/updateClassifications_serverProcess/process.js</process>
+  <alias>Data_alias</alias>
+  <variants>
+    <element>EXECUTABLE</element>
+  </variants>
+</process>
-- 
GitLab


From b29adc06ccd617faf552b298c8ce03dfa2f36487 Mon Sep 17 00:00:00 2001
From: "a.schindlbeck" <a.schindlbeck@adito.de>
Date: Tue, 8 Sep 2020 10:24:07 +0200
Subject: [PATCH 255/309] Notifications: Dateorder + FilterView-Fixes

---
 entity/Notification_entity/Notification_entity.aod        | 3 ---
 .../children/archive/onActionProcess.js                   | 2 +-
 .../children/setnew/onActionProcess.js                    | 2 +-
 .../children/setread/onActionProcess.js                   | 8 ++++++--
 .../recordcontainers/db/orderClauseProcess.js             | 4 ++--
 5 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/entity/Notification_entity/Notification_entity.aod b/entity/Notification_entity/Notification_entity.aod
index c6d31ac7fd..6a17ff596e 100644
--- a/entity/Notification_entity/Notification_entity.aod
+++ b/entity/Notification_entity/Notification_entity.aod
@@ -120,9 +120,6 @@
           <tooltip></tooltip>
           <tooltipProcess>%aditoprj%/entity/Notification_entity/entityfields/setnotificationstate/children/setnew/tooltipProcess.js</tooltipProcess>
         </entityActionField>
-        <entityActionField>
-          <name>getNotification</name>
-        </entityActionField>
       </children>
     </entityActionGroup>
     <entityField>
diff --git a/entity/Notification_entity/entityfields/setnotificationstate/children/archive/onActionProcess.js b/entity/Notification_entity/entityfields/setnotificationstate/children/archive/onActionProcess.js
index d90098a01f..a11db05fbf 100644
--- a/entity/Notification_entity/entityfields/setnotificationstate/children/archive/onActionProcess.js
+++ b/entity/Notification_entity/entityfields/setnotificationstate/children/archive/onActionProcess.js
@@ -9,4 +9,4 @@ var selectedNotifications = vars.get("$sys.selection");
 for(var i = 0; i < selectedNotifications.length; i++)
     notification.updateUserNotificationState(user["name"], selectedNotifications[i], notification.STATE_ARCHIVE);
 
-neon.refresh();
\ No newline at end of file
+neon.refreshAll();
\ No newline at end of file
diff --git a/entity/Notification_entity/entityfields/setnotificationstate/children/setnew/onActionProcess.js b/entity/Notification_entity/entityfields/setnotificationstate/children/setnew/onActionProcess.js
index 9769ec5519..3010398e4c 100644
--- a/entity/Notification_entity/entityfields/setnotificationstate/children/setnew/onActionProcess.js
+++ b/entity/Notification_entity/entityfields/setnotificationstate/children/setnew/onActionProcess.js
@@ -9,4 +9,4 @@ var selectedNotifications = vars.get("$sys.selection");
 for(var i = 0; i < selectedNotifications.length; i++)
     notification.updateUserNotificationState(user["name"], selectedNotifications[i], notification.STATE_UNSEEN);
 
-neon.refresh();
\ No newline at end of file
+neon.refreshAll();
\ No newline at end of file
diff --git a/entity/Notification_entity/entityfields/setnotificationstate/children/setread/onActionProcess.js b/entity/Notification_entity/entityfields/setnotificationstate/children/setread/onActionProcess.js
index b852c1b089..f28870eaa2 100644
--- a/entity/Notification_entity/entityfields/setnotificationstate/children/setread/onActionProcess.js
+++ b/entity/Notification_entity/entityfields/setnotificationstate/children/setread/onActionProcess.js
@@ -8,14 +8,18 @@ import("KeywordRegistry_basic");
 var user = tools.getCurrentUser();
 var selectedNotifications = vars.get("$sys.selection");
 
-if (selectedNotifications.length == 0){
+if (selectedNotifications.length == 0)
+{
+    let userid = tools.getCurrentUser()["name"];
+    
     selectedNotifications = newSelect("ASYS_NOTIFICATIONS.ID")
     .from("ASYS_NOTIFICATIONS")
     .where("ASYS_NOTIFICATIONS.STATE", [notification.STATE_SEEN.toString(), notification.STATE_UNSEEN.toString()], SqlBuilder.IN())
+    .and("ASYS_NOTIFICATIONS.USERID", userid, SqlBuilder.EQUAL())
     .arrayColumn();
 }
 
 for(var i = 0; i < selectedNotifications.length; i++)
     notification.updateUserNotificationState(user["name"], selectedNotifications[i], notification.STATE_CONFIRMED);
 
-//neon.refreshAll();
\ No newline at end of file
+neon.refreshAll();
\ No newline at end of file
diff --git a/entity/Notification_entity/recordcontainers/db/orderClauseProcess.js b/entity/Notification_entity/recordcontainers/db/orderClauseProcess.js
index 86103719ab..72450da305 100644
--- a/entity/Notification_entity/recordcontainers/db/orderClauseProcess.js
+++ b/entity/Notification_entity/recordcontainers/db/orderClauseProcess.js
@@ -2,6 +2,6 @@ import("system.result");
 import("system.db");
 
 result.object({
-    "ASYS_NOTIFICATIONS.STATE": db.DESCENDING,
-    "ASYS_NOTIFICATIONCONTENTS.CREATEDATE": db.DESCENDING
+    "ASYS_NOTIFICATIONCONTENTS.CREATEDATE": db.DESCENDING,
+    "ASYS_NOTIFICATIONS.STATE": db.DESCENDING
     });
\ No newline at end of file
-- 
GitLab


From bb3c85ab920618bf39b1c35d9791ed0c3312fda2 Mon Sep 17 00:00:00 2001
From: "a.schindlbeck" <a.schindlbeck@adito.de>
Date: Tue, 8 Sep 2020 08:48:13 +0200
Subject: [PATCH 256/309] Notifications: Timeline works again

---
 neonView/NotificationFilter_view/NotificationFilter_view.aod | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/neonView/NotificationFilter_view/NotificationFilter_view.aod b/neonView/NotificationFilter_view/NotificationFilter_view.aod
index d37a1a1cc3..f1b5cbc587 100644
--- a/neonView/NotificationFilter_view/NotificationFilter_view.aod
+++ b/neonView/NotificationFilter_view/NotificationFilter_view.aod
@@ -29,7 +29,7 @@
     <timelineViewTemplate>
       <name>NotificationTimeline</name>
       <favoriteActionGroup1>setNotificationState</favoriteActionGroup1>
-      <dateField>CREATIONDATE</dateField>
+      <dateField>CREATEDATE</dateField>
       <titleField>CAPTION</titleField>
       <descriptionField>DESCRIPTION</descriptionField>
       <iconIdField>ICON</iconIdField>
-- 
GitLab


From 7ca4f615adfe570031bde2c0fdbbd181e643d491 Mon Sep 17 00:00:00 2001
From: "a.schindlbeck" <a.schindlbeck@adito.de>
Date: Tue, 8 Sep 2020 11:36:32 +0200
Subject: [PATCH 257/309] Notifications: NotificationState-Keyword add +
 translation

---
 .../addNotificationStateKeyword.xml                    | 10 ++++++++++
 .liquibase/Data_alias/basic/2020.2.0/changelog.xml     |  1 +
 language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod   |  3 +++
 language/_____LANGUAGE_de/_____LANGUAGE_de.aod         |  5 +++++
 language/_____LANGUAGE_en/_____LANGUAGE_en.aod         |  3 +++
 5 files changed, 22 insertions(+)
 create mode 100644 .liquibase/Data_alias/basic/2020.2.0/addNotificationStateKeywords/addNotificationStateKeyword.xml

diff --git a/.liquibase/Data_alias/basic/2020.2.0/addNotificationStateKeywords/addNotificationStateKeyword.xml b/.liquibase/Data_alias/basic/2020.2.0/addNotificationStateKeywords/addNotificationStateKeyword.xml
new file mode 100644
index 0000000000..2d5712313f
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2020.2.0/addNotificationStateKeywords/addNotificationStateKeyword.xml
@@ -0,0 +1,10 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+                   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+    <changeSet author="a.schindlbeck" id="866dab92-b0fe-4a8c-8b90-123824c10ffd">
+        <update tableName="AB_KEYWORD_ENTRY">
+            <column name="TITLE" value="Unread"/>
+            <where>AB_KEYWORD_ENTRYID='765dacdb-8f9c-46e9-8303-41355ba17010'</where>
+        </update>
+    </changeSet>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/2020.2.0/changelog.xml b/.liquibase/Data_alias/basic/2020.2.0/changelog.xml
index a1d4dae8d1..6007ef250f 100644
--- a/.liquibase/Data_alias/basic/2020.2.0/changelog.xml
+++ b/.liquibase/Data_alias/basic/2020.2.0/changelog.xml
@@ -5,4 +5,5 @@
     <include relativeToChangelogFile="true" file="ImportFields/changelog.xml"/>
     <include relativeToChangelogFile="true" file="LeadimportMappingAssistant/changelog.xml"/>
     <include relativeToChangelogFile="true" file="optimizeIndizes.xml"/>
+    <include relativeToChangelogFile="true" file="addNotificationStateKeywords/addNotificationStateKeyword.xml"/>
 </databaseChangeLog>
diff --git a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
index 9c60e9838e..015587fddd 100644
--- a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
+++ b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
@@ -7302,6 +7302,9 @@
     <entry>
       <key>Hint</key>
     </entry>
+    <entry>
+      <key>Unread</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 a4e4d93591..d2e2a0d023 100644
--- a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
+++ b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
@@ -5113,6 +5113,10 @@
       <key>Create</key>
       <value>erstelle</value>
     </entry>
+    <entry>
+      <key>Unread</key>
+      <value>Ungelesen</value>
+    </entry>
     <entry>
       <key>Permission Overview</key>
       <value>Berechtigungsüberblick</value>
@@ -8928,6 +8932,7 @@ Bitte Datumseingabe prüfen</value>
     </entry>
     <entry>
       <key>New</key>
+      <value>Neu</value>
     </entry>
     <entry>
       <key>Archived</key>
diff --git a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
index cf687d9006..8849809e65 100644
--- a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
+++ b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
@@ -7373,6 +7373,9 @@
     <entry>
       <key>Hint</key>
     </entry>
+    <entry>
+      <key>Unread</key>
+    </entry>
   </keyValueMap>
   <font name="Dialog" style="0" size="11" />
 </language>
-- 
GitLab


From 19533db590f79ec913ecb87e63aa43d4e4c183b0 Mon Sep 17 00:00:00 2001
From: "j.goderbauer" <j.goderbauer@adito.de>
Date: Tue, 8 Sep 2020 11:59:42 +0200
Subject: [PATCH 258/309] Lookupfilter: modified for better performance and
 errorfixes due to typeerrors

---
 entity/Activity_entity/Activity_entity.aod    | 10 +++---
 .../AnyContact_entity/AnyContact_entity.aod   |  5 +--
 entity/BulkMail_entity/BulkMail_entity.aod    |  6 ++--
 .../CampaignStep_entity.aod                   |  1 +
 entity/Campaign_entity/Campaign_entity.aod    | 10 +++---
 entity/Contract_entity/Contract_entity.aod    | 17 ++++------
 .../Leadimport_entity/Leadimport_entity.aod   | 14 ++++----
 entity/Offer_entity/Offer_entity.aod          | 27 ++++++++--------
 entity/Order_entity/Order_entity.aod          | 19 ++++++-----
 .../Organisation_entity.aod                   | 23 ++++++-------
 entity/Person_entity/Person_entity.aod        | 32 +++++++++----------
 .../PrivatePerson_entity.aod                  |  2 ++
 entity/Product_entity/Product_entity.aod      | 15 ++++-----
 .../Productprice_entity.aod                   | 16 +++++-----
 .../Salesproject_entity.aod                   | 22 ++++++-------
 .../SerialLetter_entity.aod                   |  6 ++--
 .../SupportTicket_entity.aod                  | 20 ++++++------
 entity/Task_entity/Task_entity.aod            | 21 ++++++------
 18 files changed, 132 insertions(+), 134 deletions(-)

diff --git a/entity/Activity_entity/Activity_entity.aod b/entity/Activity_entity/Activity_entity.aod
index ade2e89354..2c1db41005 100644
--- a/entity/Activity_entity/Activity_entity.aod
+++ b/entity/Activity_entity/Activity_entity.aod
@@ -657,13 +657,13 @@
           <name>DIRECTION.value</name>
           <recordfield>ACTIVITY.DIRECTION</recordfield>
           <isFilterable v="true" />
-          <isLookupFilter v="true" />
+          <isLookupFilter v="false" />
         </dbRecordFieldMapping>
         <dbRecordFieldMapping>
           <name>INFO.value</name>
           <recordfield>ACTIVITY.INFO</recordfield>
           <isFilterable v="true" />
-          <isLookupFilter v="true" />
+          <isLookupFilter v="false" />
         </dbRecordFieldMapping>
         <dbRecordFieldMapping>
           <name>SUBJECT.value</name>
@@ -675,13 +675,13 @@
           <name>ENTRYDATE.value</name>
           <recordfield>ACTIVITY.ENTRYDATE</recordfield>
           <isFilterable v="true" />
-          <isLookupFilter v="true" />
+          <isLookupFilter v="false" />
         </dbRecordFieldMapping>
         <dbRecordFieldMapping>
           <name>CATEGORY.value</name>
           <recordfield>ACTIVITY.CATEGORY</recordfield>
           <isFilterable v="true" />
-          <isLookupFilter v="true" />
+          <isLookupFilter v="false" />
         </dbRecordFieldMapping>
         <dbRecordFieldMapping>
           <name>DIRECTION.displayValue</name>
@@ -723,7 +723,7 @@
           <name>RESPONSIBLE.value</name>
           <recordfield>ACTIVITY.RESPONSIBLE</recordfield>
           <isFilterable v="true" />
-          <isLookupFilter v="true" />
+          <isLookupFilter v="false" />
         </dbRecordFieldMapping>
         <dbRecordFieldMapping>
           <name>entryDateDateFormat.value</name>
diff --git a/entity/AnyContact_entity/AnyContact_entity.aod b/entity/AnyContact_entity/AnyContact_entity.aod
index 9864eeffcb..0d0c5d1d96 100644
--- a/entity/AnyContact_entity/AnyContact_entity.aod
+++ b/entity/AnyContact_entity/AnyContact_entity.aod
@@ -294,18 +294,19 @@ See ContactUtils.getRelationTypeByPersOrg for possible values</description>
         <dbRecordFieldMapping>
           <name>PERSON_MIDDLENAME.value</name>
           <recordfield>PERSON.MIDDLENAME</recordfield>
+          <isLookupFilter v="false" />
         </dbRecordFieldMapping>
         <dbRecordFieldMapping>
           <name>PERSON_TITLE.value</name>
           <recordfield>PERSON.TITLE</recordfield>
           <isFilterable v="true" />
-          <isLookupFilter v="true" />
+          <isLookupFilter v="false" />
         </dbRecordFieldMapping>
         <dbRecordFieldMapping>
           <name>PERSON_SALUTATION.value</name>
           <recordfield>PERSON.SALUTATION</recordfield>
           <isFilterable v="true" />
-          <isLookupFilter v="true" />
+          <isLookupFilter v="false" />
         </dbRecordFieldMapping>
         <dbRecordFieldMapping>
           <name>PERSON_PICTURE.value</name>
diff --git a/entity/BulkMail_entity/BulkMail_entity.aod b/entity/BulkMail_entity/BulkMail_entity.aod
index a742ec5a58..a6e8b3db47 100644
--- a/entity/BulkMail_entity/BulkMail_entity.aod
+++ b/entity/BulkMail_entity/BulkMail_entity.aod
@@ -353,7 +353,7 @@
           <name>DESCRIPTION.value</name>
           <recordfield>BULKMAIL.DESCRIPTION</recordfield>
           <isFilterable v="true" />
-          <isLookupFilter v="true" />
+          <isLookupFilter v="false" />
         </dbRecordFieldMapping>
         <dbRecordFieldMapping>
           <name>DOCUMENTTEMPLATE_ID.value</name>
@@ -375,7 +375,7 @@
           <name>SENDER.value</name>
           <recordfield>BULKMAIL.SENDER</recordfield>
           <isFilterable v="true" />
-          <isLookupFilter v="true" />
+          <isLookupFilter v="false" />
         </dbRecordFieldMapping>
         <dbRecordFieldMapping>
           <name>DOCUMENTTEMPLATE_ID.displayValue</name>
@@ -385,7 +385,7 @@
           <name>STATUS.value</name>
           <recordfield>BULKMAIL.STATUS</recordfield>
           <isFilterable v="true" />
-          <isLookupFilter v="true" />
+          <isLookupFilter v="false" />
         </dbRecordFieldMapping>
         <dbRecordFieldMapping>
           <name>STATUS.displayValue</name>
diff --git a/entity/CampaignStep_entity/CampaignStep_entity.aod b/entity/CampaignStep_entity/CampaignStep_entity.aod
index 23338be86f..3d7c9f806c 100644
--- a/entity/CampaignStep_entity/CampaignStep_entity.aod
+++ b/entity/CampaignStep_entity/CampaignStep_entity.aod
@@ -465,6 +465,7 @@
         <dbRecordFieldMapping>
           <name>NAME.value</name>
           <recordfield>CAMPAIGNSTEP.NAME</recordfield>
+          <isLookupFilter v="true" />
         </dbRecordFieldMapping>
         <dbRecordFieldMapping>
           <name>SORTING.value</name>
diff --git a/entity/Campaign_entity/Campaign_entity.aod b/entity/Campaign_entity/Campaign_entity.aod
index f5c8d01e86..d53f98b1c0 100644
--- a/entity/Campaign_entity/Campaign_entity.aod
+++ b/entity/Campaign_entity/Campaign_entity.aod
@@ -583,13 +583,13 @@
           <name>DESCRIPTION.value</name>
           <recordfield>CAMPAIGN.DESCRIPTION</recordfield>
           <isFilterable v="true" />
-          <isLookupFilter v="true" />
+          <isLookupFilter v="false" />
         </dbRecordFieldMapping>
         <dbRecordFieldMapping>
           <name>EMPLOYEE_CONTACT_ID.value</name>
           <recordfield>CAMPAIGN.EMPLOYEE_CONTACT_ID</recordfield>
           <isFilterable v="true" />
-          <isLookupFilter v="true" />
+          <isLookupFilter v="false" />
         </dbRecordFieldMapping>
         <dbRecordFieldMapping>
           <name>NAME.value</name>
@@ -617,13 +617,13 @@
           <name>DATE_START.value</name>
           <expression>%aditoprj%/entity/Campaign_entity/recordcontainers/db/recordfieldmappings/date_start.value/expression.js</expression>
           <isFilterable v="true" />
-          <isLookupFilter v="true" />
+          <isLookupFilter v="false" />
         </dbRecordFieldMapping>
         <dbRecordFieldMapping>
           <name>DATE_END.value</name>
           <expression>%aditoprj%/entity/Campaign_entity/recordcontainers/db/recordfieldmappings/date_end.value/expression.js</expression>
           <isFilterable v="true" />
-          <isLookupFilter v="true" />
+          <isLookupFilter v="false" />
         </dbRecordFieldMapping>
         <consumerMapping>
           <name>Activities</name>
@@ -635,7 +635,7 @@
           <name>STATUS.value</name>
           <recordfield>CAMPAIGN.STATUS</recordfield>
           <isFilterable v="true" />
-          <isLookupFilter v="true" />
+          <isLookupFilter v="false" />
         </dbRecordFieldMapping>
         <dbRecordFieldMapping>
           <name>STATUS.displayValue</name>
diff --git a/entity/Contract_entity/Contract_entity.aod b/entity/Contract_entity/Contract_entity.aod
index c23930d570..b3f109df9e 100644
--- a/entity/Contract_entity/Contract_entity.aod
+++ b/entity/Contract_entity/Contract_entity.aod
@@ -455,13 +455,13 @@
           <name>CONTRACTDUE.value</name>
           <recordfield>CONTRACT.CONTRACTDUE</recordfield>
           <isFilterable v="true" />
-          <isLookupFilter v="true" />
+          <isLookupFilter v="false" />
         </dbRecordFieldMapping>
         <dbRecordFieldMapping>
           <name>CONTRACTEND.value</name>
           <recordfield>CONTRACT.CONTRACTEND</recordfield>
           <isFilterable v="true" />
-          <isLookupFilter v="true" />
+          <isLookupFilter v="false" />
         </dbRecordFieldMapping>
         <dbRecordFieldMapping>
           <name>CONTRACTID.value</name>
@@ -471,31 +471,31 @@
           <name>CONTRACTSTART.value</name>
           <recordfield>CONTRACT.CONTRACTSTART</recordfield>
           <isFilterable v="true" />
-          <isLookupFilter v="true" />
+          <isLookupFilter v="false" />
         </dbRecordFieldMapping>
         <dbRecordFieldMapping>
           <name>CONTRACTSTATUS.value</name>
           <recordfield>CONTRACT.CONTRACTSTATUS</recordfield>
           <isFilterable v="true" />
-          <isLookupFilter v="true" />
+          <isLookupFilter v="false" />
         </dbRecordFieldMapping>
         <dbRecordFieldMapping>
           <name>CONTRACTTYPE.value</name>
           <recordfield>CONTRACT.CONTRACTTYPE</recordfield>
           <isFilterable v="true" />
-          <isLookupFilter v="true" />
+          <isLookupFilter v="false" />
         </dbRecordFieldMapping>
         <dbRecordFieldMapping>
           <name>PAYMENT.value</name>
           <recordfield>CONTRACT.PAYMENT</recordfield>
           <isFilterable v="true" />
-          <isLookupFilter v="true" />
+          <isLookupFilter v="false" />
         </dbRecordFieldMapping>
         <dbRecordFieldMapping>
           <name>REMARK.value</name>
           <recordfield>CONTRACT.REMARK</recordfield>
           <isFilterable v="true" />
-          <isLookupFilter v="true" />
+          <isLookupFilter v="false" />
         </dbRecordFieldMapping>
         <dbRecordFieldMapping>
           <name>CONTACT_ID.value</name>
@@ -539,9 +539,6 @@
           <isFilterable v="true" />
           <filtertype>EXTENDED</filtertype>
         </consumerMapping>
-        <dbRecordFieldMapping>
-          <name>COUNT.value</name>
-        </dbRecordFieldMapping>
         <aggregateFieldDbMapping>
           <name>COUNT_aggregate.value</name>
           <recordfield>CONTRACT.CONTRACTID</recordfield>
diff --git a/entity/Leadimport_entity/Leadimport_entity.aod b/entity/Leadimport_entity/Leadimport_entity.aod
index 1b13419957..e5241d647c 100644
--- a/entity/Leadimport_entity/Leadimport_entity.aod
+++ b/entity/Leadimport_entity/Leadimport_entity.aod
@@ -353,7 +353,7 @@
           <name>LEADIMPORT_DATE.value</name>
           <recordfield>LEADIMPORT.IMPORT_DATE</recordfield>
           <isFilterable v="true" />
-          <isLookupFilter v="true" />
+          <isLookupFilter v="false" />
         </dbRecordFieldMapping>
         <dbRecordFieldMapping>
           <name>NAME.value</name>
@@ -365,25 +365,25 @@
           <name>STATUS.value</name>
           <recordfield>LEADIMPORT.STATUS</recordfield>
           <isFilterable v="true" />
-          <isLookupFilter v="true" />
+          <isLookupFilter v="false" />
         </dbRecordFieldMapping>
         <dbRecordFieldMapping>
           <name>LEADIMPORT_EMPLOYEE.value</name>
           <recordfield>LEADIMPORT.IMPORTEMPLOYEE</recordfield>
           <isFilterable v="true" />
-          <isLookupFilter v="true" />
+          <isLookupFilter v="false" />
         </dbRecordFieldMapping>
         <dbRecordFieldMapping>
           <name>FIELDDELIMITERS.value</name>
           <recordfield>LEADIMPORT.FIELD_DELIMITER</recordfield>
           <isFilterable v="true" />
-          <isLookupFilter v="true" />
+          <isLookupFilter v="false" />
         </dbRecordFieldMapping>
         <dbRecordFieldMapping>
           <name>IMPORTSOURCE.value</name>
           <recordfield>LEADIMPORT.IMPORTSOURCE</recordfield>
           <isFilterable v="true" />
-          <isLookupFilter v="true" />
+          <isLookupFilter v="false" />
         </dbRecordFieldMapping>
         <dbRecordFieldMapping>
           <name>DATE_EDIT.value</name>
@@ -405,13 +405,13 @@
           <name>FIELDSEPARATOR.value</name>
           <recordfield>LEADIMPORT.FIELD_SEPARATOR</recordfield>
           <isFilterable v="true" />
-          <isLookupFilter v="true" />
+          <isLookupFilter v="false" />
         </dbRecordFieldMapping>
         <dbRecordFieldMapping>
           <name>SENTENCESEPARATOR.value</name>
           <recordfield>LEADIMPORT.RECORD_SEPARATOR</recordfield>
           <isFilterable v="true" />
-          <isLookupFilter v="true" />
+          <isLookupFilter v="false" />
         </dbRecordFieldMapping>
       </recordFieldMappings>
     </dbRecordContainer>
diff --git a/entity/Offer_entity/Offer_entity.aod b/entity/Offer_entity/Offer_entity.aod
index c5ef46f8c0..d511b462fa 100644
--- a/entity/Offer_entity/Offer_entity.aod
+++ b/entity/Offer_entity/Offer_entity.aod
@@ -1104,19 +1104,19 @@
           <name>CURRENCY.value</name>
           <recordfield>OFFER.CURRENCY</recordfield>
           <isFilterable v="true" />
-          <isLookupFilter v="true" />
+          <isLookupFilter v="false" />
         </dbRecordFieldMapping>
         <dbRecordFieldMapping>
           <name>HEADER.value</name>
           <recordfield>OFFER.HEADER</recordfield>
           <isFilterable v="true" />
-          <isLookupFilter v="true" />
+          <isLookupFilter v="false" />
         </dbRecordFieldMapping>
         <dbRecordFieldMapping>
           <name>NET.value</name>
           <recordfield>OFFER.NET</recordfield>
           <isFilterable v="true" />
-          <isLookupFilter v="true" />
+          <isLookupFilter v="false" />
         </dbRecordFieldMapping>
         <dbRecordFieldMapping>
           <name>OFFERCODE.value</name>
@@ -1128,7 +1128,7 @@
           <name>OFFERDATE.value</name>
           <recordfield>OFFER.OFFERDATE</recordfield>
           <isFilterable v="true" />
-          <isLookupFilter v="true" />
+          <isLookupFilter v="false" />
         </dbRecordFieldMapping>
         <dbRecordFieldMapping>
           <name>OFFERID.value</name>
@@ -1142,19 +1142,19 @@
           <name>STATUS.value</name>
           <recordfield>OFFER.STATUS</recordfield>
           <isFilterable v="true" />
-          <isLookupFilter v="true" />
+          <isLookupFilter v="false" />
         </dbRecordFieldMapping>
         <dbRecordFieldMapping>
           <name>VAT.value</name>
           <recordfield>OFFER.VAT</recordfield>
           <isFilterable v="true" />
-          <isLookupFilter v="true" />
+          <isLookupFilter v="false" />
         </dbRecordFieldMapping>
         <dbRecordFieldMapping>
           <name>VERSNR.value</name>
           <recordfield>OFFER.VERSNR</recordfield>
           <isFilterable v="true" />
-          <isLookupFilter v="true" />
+          <isLookupFilter v="false" />
         </dbRecordFieldMapping>
         <dbRecordFieldMapping>
           <name>CONTACT_ORG_ID.value</name>
@@ -1172,7 +1172,7 @@
           <name>ADDRESS.value</name>
           <recordfield>OFFER.ADDRESS</recordfield>
           <isFilterable v="true" />
-          <isLookupFilter v="true" />
+          <isLookupFilter v="false" />
         </dbRecordFieldMapping>
         <dbRecordFieldMapping>
           <name>CURRENCY.displayValue</name>
@@ -1195,7 +1195,7 @@
           <name>DELIVERYTERMS.value</name>
           <recordfield>OFFER.DELIVERYTERMS</recordfield>
           <isFilterable v="true" />
-          <isLookupFilter v="true" />
+          <isLookupFilter v="false" />
         </dbRecordFieldMapping>
         <dbRecordFieldMapping>
           <name>DELIVERYTERMS.displayValue</name>
@@ -1209,7 +1209,7 @@
           <name>INFO.value</name>
           <recordfield>OFFER.INFO</recordfield>
           <isFilterable v="true" />
-          <isLookupFilter v="true" />
+          <isLookupFilter v="false" />
         </dbRecordFieldMapping>
         <dbRecordFieldMapping>
           <name>USER_NEW.value</name>
@@ -1235,7 +1235,7 @@
           <name>FOOTER.value</name>
           <recordfield>OFFER.FOOTER</recordfield>
           <isFilterable v="true" />
-          <isLookupFilter v="true" />
+          <isLookupFilter v="false" />
         </dbRecordFieldMapping>
         <dbRecordFieldMapping>
           <name>OBJECT_TYPE.value</name>
@@ -1249,7 +1249,7 @@
           <name>CONTACT_ID.value</name>
           <recordfield>OFFER.CONTACT_ID</recordfield>
           <isFilterable v="true" />
-          <isLookupFilter v="true" />
+          <isLookupFilter v="false" />
         </dbRecordFieldMapping>
         <dbRecordFieldMapping>
           <name>LETTERSALUTATION.value</name>
@@ -1258,6 +1258,7 @@
         <dbRecordFieldMapping>
           <name>CONTACT_ORG_ID.displayValue</name>
           <recordfield>ORGANISATION.NAME</recordfield>
+          <isLookupFilter v="true" />
         </dbRecordFieldMapping>
         <dbRecordFieldMapping>
           <name>CONTACT_PERSON_ID.displayValue</name>
@@ -1277,7 +1278,7 @@
           <name>ISOLANGUAGE.value</name>
           <recordfield>OFFER.ISOLANGUAGE</recordfield>
           <isFilterable v="true" />
-          <isLookupFilter v="true" />
+          <isLookupFilter v="false" />
         </dbRecordFieldMapping>
         <dbRecordFieldMapping>
           <name>ISOLANGUAGE.displayValue</name>
diff --git a/entity/Order_entity/Order_entity.aod b/entity/Order_entity/Order_entity.aod
index 20e41538fa..d38b802de3 100644
--- a/entity/Order_entity/Order_entity.aod
+++ b/entity/Order_entity/Order_entity.aod
@@ -940,7 +940,7 @@
           <name>CURRENCY.value</name>
           <recordfield>SALESORDER.CURRENCY</recordfield>
           <isFilterable v="true" />
-          <isLookupFilter v="true" />
+          <isLookupFilter v="false" />
         </dbRecordFieldMapping>
         <dbRecordFieldMapping>
           <name>FOOTER.value</name>
@@ -957,6 +957,8 @@
         <dbRecordFieldMapping>
           <name>SALESORDERCODE.value</name>
           <recordfield>SALESORDER.SALESORDERCODE</recordfield>
+          <isFilterable v="true" />
+          <isLookupFilter v="true" />
         </dbRecordFieldMapping>
         <dbRecordFieldMapping>
           <name>SALESORDERDATE.value</name>
@@ -978,13 +980,13 @@
           <name>CONTACT_ORG_ID.value</name>
           <recordfield>CONTACT.ORGANISATION_ID</recordfield>
           <isFilterable v="true" />
-          <isLookupFilter v="true" />
+          <isLookupFilter v="false" />
         </dbRecordFieldMapping>
         <dbRecordFieldMapping>
           <name>CONTACT_PERSON_ID.value</name>
           <recordfield>CONTACT.PERSON_ID</recordfield>
           <isFilterable v="true" />
-          <isLookupFilter v="true" />
+          <isLookupFilter v="false" />
         </dbRecordFieldMapping>
         <dbRecordFieldMapping>
           <name>CURRENCY.displayValue</name>
@@ -994,11 +996,12 @@
           <name>OFFER_ID.value</name>
           <recordfield>SALESORDER.OFFER_ID</recordfield>
           <isFilterable v="true" />
-          <isLookupFilter v="true" />
+          <isLookupFilter v="false" />
         </dbRecordFieldMapping>
         <dbRecordFieldMapping>
           <name>CONTACT_ORG_ID.displayValue</name>
           <recordfield>ORGANISATION.NAME</recordfield>
+          <isLookupFilter v="true" />
         </dbRecordFieldMapping>
         <dbRecordFieldMapping>
           <name>CONTACT_PERSON_ID.displayValue</name>
@@ -1025,7 +1028,7 @@
           <name>ORDERTYPE.value</name>
           <recordfield>SALESORDER.ORDERTYPE</recordfield>
           <isFilterable v="true" />
-          <isLookupFilter v="true" />
+          <isLookupFilter v="false" />
         </dbRecordFieldMapping>
         <dbRecordFieldMapping>
           <name>PAID.value</name>
@@ -1035,7 +1038,7 @@
           <name>PAYDATE.value</name>
           <recordfield>SALESORDER.PAYDATE</recordfield>
           <isFilterable v="true" />
-          <isLookupFilter v="true" />
+          <isLookupFilter v="false" />
         </dbRecordFieldMapping>
         <dbRecordFieldMapping>
           <name>PAYDUEDATE.value</name>
@@ -1061,13 +1064,13 @@
           <name>PAYMENTTERMS.value</name>
           <recordfield>SALESORDER.PAYMENTTERMS</recordfield>
           <isFilterable v="true" />
-          <isLookupFilter v="true" />
+          <isLookupFilter v="false" />
         </dbRecordFieldMapping>
         <dbRecordFieldMapping>
           <name>DELIVERYTERMS.value</name>
           <recordfield>SALESORDER.DELIVERYTERMS</recordfield>
           <isFilterable v="true" />
-          <isLookupFilter v="true" />
+          <isLookupFilter v="false" />
         </dbRecordFieldMapping>
         <dbRecordFieldMapping>
           <name>DELIVERYADDRESS.value</name>
diff --git a/entity/Organisation_entity/Organisation_entity.aod b/entity/Organisation_entity/Organisation_entity.aod
index c46cee54a6..1c97f11469 100644
--- a/entity/Organisation_entity/Organisation_entity.aod
+++ b/entity/Organisation_entity/Organisation_entity.aod
@@ -1287,13 +1287,13 @@
           <name>INFO.value</name>
           <recordfield>ORGANISATION.INFO</recordfield>
           <isFilterable v="true" />
-          <isLookupFilter v="true" />
+          <isLookupFilter v="false" />
         </dbRecordFieldMapping>
         <dbRecordFieldMapping>
           <name>LANGUAGE.value</name>
           <recordfield>CONTACT.ISOLANGUAGE</recordfield>
           <isFilterable v="true" />
-          <isLookupFilter v="true" />
+          <isLookupFilter v="false" />
         </dbRecordFieldMapping>
         <dbRecordFieldMapping>
           <name>NAME.value</name>
@@ -1317,25 +1317,25 @@
           <name>STATUS.value</name>
           <recordfield>CONTACT.STATUS</recordfield>
           <isFilterable v="true" />
-          <isLookupFilter v="true" />
+          <isLookupFilter v="false" />
         </dbRecordFieldMapping>
         <dbRecordFieldMapping>
           <name>TYPE.value</name>
           <recordfield>ORGANISATION.KIND</recordfield>
           <isFilterable v="true" />
-          <isLookupFilter v="true" />
+          <isLookupFilter v="false" />
         </dbRecordFieldMapping>
         <dbRecordFieldMapping>
           <name>STANDARD_EMAIL_COMMUNICATION.displayValue</name>
           <expression>%aditoprj%/entity/Organisation_entity/recordcontainers/db/recordfieldmappings/standard_email_communication.displayvalue/expression.js</expression>
           <isFilterable v="true" />
-          <isLookupFilter v="true" />
+          <isLookupFilter v="false" />
         </dbRecordFieldMapping>
         <dbRecordFieldMapping>
           <name>STANDARD_PHONE_COMMUNICATION.displayValue</name>
           <expression>%aditoprj%/entity/Organisation_entity/recordcontainers/db/recordfieldmappings/standard_phone_communication.displayvalue/expression.js</expression>
           <isFilterable v="true" />
-          <isLookupFilter v="true" />
+          <isLookupFilter v="false" />
         </dbRecordFieldMapping>
         <dbRecordFieldMapping>
           <name>STATUS.displayValue</name>
@@ -1384,12 +1384,12 @@
         <dbRecordFieldMapping>
           <name>STANDARD_EMAIL_COMMUNICATION.value</name>
           <isFilterable v="true" />
-          <isLookupFilter v="true" />
+          <isLookupFilter v="false" />
         </dbRecordFieldMapping>
         <dbRecordFieldMapping>
           <name>STANDARD_PHONE_COMMUNICATION.value</name>
           <isFilterable v="true" />
-          <isLookupFilter v="true" />
+          <isLookupFilter v="false" />
         </dbRecordFieldMapping>
         <consumerMapping>
           <name>Activities</name>
@@ -1401,7 +1401,7 @@
           <name>Addresses</name>
           <filterConditionProcess>%aditoprj%/entity/Organisation_entity/recordcontainers/db/recordfieldmappings/addresses/filterConditionProcess.js</filterConditionProcess>
           <isFilterable v="true" />
-          <isLookupFilter v="true" />
+          <isLookupFilter v="false" />
           <filtertype>BASIC</filtertype>
         </consumerMapping>
         <consumerMapping>
@@ -1425,7 +1425,7 @@
           <name>ObjectTrees</name>
           <filterConditionProcess>%aditoprj%/entity/Organisation_entity/recordcontainers/db/recordfieldmappings/objecttrees/filterConditionProcess.js</filterConditionProcess>
           <isFilterable v="true" />
-          <isLookupFilter v="true" />
+          <isLookupFilter v="false" />
           <filtertype>BASIC</filtertype>
         </consumerMapping>
         <dbRecordFieldMapping>
@@ -1439,6 +1439,7 @@
         <dbRecordFieldMapping>
           <name>STANDARD_CITY.value</name>
           <recordfield>ADDRESS.CITY</recordfield>
+          <isLookupFilter v="true" />
         </dbRecordFieldMapping>
         <dbRecordFieldMapping>
           <name>STANDARD_ZIP.value</name>
@@ -1453,7 +1454,7 @@
           <name>CLASSIFICATIONSTORAGE_ID.value</name>
           <recordfield>CLASSIFICATIONSTORAGE.CLASSIFICATIONVALUE</recordfield>
           <isFilterable v="true" />
-          <isLookupFilter v="true" />
+          <isLookupFilter v="false" />
         </dbRecordFieldMapping>
         <dbRecordFieldMapping>
           <name>STANDARD_LAT.value</name>
diff --git a/entity/Person_entity/Person_entity.aod b/entity/Person_entity/Person_entity.aod
index 9a7067f642..6215388cf0 100644
--- a/entity/Person_entity/Person_entity.aod
+++ b/entity/Person_entity/Person_entity.aod
@@ -1329,7 +1329,7 @@
           <name>DATEOFBIRTH.value</name>
           <recordfield>PERSON.DATEOFBIRTH</recordfield>
           <isFilterable v="true" />
-          <isLookupFilter v="true" />
+          <isLookupFilter v="false" />
         </dbRecordFieldMapping>
         <dbRecordFieldMapping>
           <name>FIRSTNAME.value</name>
@@ -1341,13 +1341,13 @@
           <name>GENDER.value</name>
           <recordfield>PERSON.GENDER</recordfield>
           <isFilterable v="true" />
-          <isLookupFilter v="true" />
+          <isLookupFilter v="false" />
         </dbRecordFieldMapping>
         <dbRecordFieldMapping>
           <name>LANGUAGE.value</name>
           <recordfield>CONTACT.ISOLANGUAGE</recordfield>
           <isFilterable v="true" />
-          <isLookupFilter v="true" />
+          <isLookupFilter v="false" />
         </dbRecordFieldMapping>
         <dbRecordFieldMapping>
           <name>PERSON_ID.value</name>
@@ -1363,7 +1363,7 @@
           <name>MIDDLENAME.value</name>
           <recordfield>PERSON.MIDDLENAME</recordfield>
           <isFilterable v="true" />
-          <isLookupFilter v="true" />
+          <isLookupFilter v="false" />
         </dbRecordFieldMapping>
         <dbRecordFieldMapping>
           <name>CONTACTID.value</name>
@@ -1373,13 +1373,13 @@
           <name>SALUTATION.value</name>
           <recordfield>PERSON.SALUTATION</recordfield>
           <isFilterable v="true" />
-          <isLookupFilter v="true" />
+          <isLookupFilter v="false" />
         </dbRecordFieldMapping>
         <dbRecordFieldMapping>
           <name>TITLE.value</name>
           <recordfield>PERSON.TITLE</recordfield>
           <isFilterable v="true" />
-          <isLookupFilter v="true" />
+          <isLookupFilter v="false" />
         </dbRecordFieldMapping>
         <dbRecordFieldMapping>
           <name>TITLESUFFIX.value</name>
@@ -1423,25 +1423,25 @@
           <name>STATUS.value</name>
           <recordfield>CONTACT.STATUS</recordfield>
           <isFilterable v="true" />
-          <isLookupFilter v="true" />
+          <isLookupFilter v="false" />
         </dbRecordFieldMapping>
         <dbRecordFieldMapping>
           <name>POSITION.value</name>
           <recordfield>CONTACT.CONTACTPOSITION</recordfield>
           <isFilterable v="true" />
-          <isLookupFilter v="true" />
+          <isLookupFilter v="false" />
         </dbRecordFieldMapping>
         <dbRecordFieldMapping>
           <name>DEPARTMENT.value</name>
           <recordfield>CONTACT.DEPARTMENT</recordfield>
           <isFilterable v="true" />
-          <isLookupFilter v="true" />
+          <isLookupFilter v="false" />
         </dbRecordFieldMapping>
         <dbRecordFieldMapping>
           <name>CONTACTROLE.value</name>
           <recordfield>CONTACT.CONTACTROLE</recordfield>
           <isFilterable v="true" />
-          <isLookupFilter v="true" />
+          <isLookupFilter v="false" />
         </dbRecordFieldMapping>
         <dbRecordFieldMapping>
           <name>ORGANISATION_NAME.value</name>
@@ -1483,18 +1483,18 @@
         <dbRecordFieldMapping>
           <name>STANDARD_EMAIL_COMMUNICATION.value</name>
           <isFilterable v="true" />
-          <isLookupFilter v="true" />
+          <isLookupFilter v="false" />
         </dbRecordFieldMapping>
         <dbRecordFieldMapping>
           <name>STANDARD_PHONE_COMMUNICATION.value</name>
           <isFilterable v="true" />
-          <isLookupFilter v="true" />
+          <isLookupFilter v="false" />
         </dbRecordFieldMapping>
         <consumerMapping>
           <name>Organisations</name>
           <filterConditionProcess>%aditoprj%/entity/Person_entity/recordcontainers/db/recordfieldmappings/organisations/filterConditionProcess.js</filterConditionProcess>
           <isFilterable v="true" />
-          <isLookupFilter v="true" />
+          <isLookupFilter v="false" />
           <filtertype>BASIC</filtertype>
         </consumerMapping>
         <consumerMapping>
@@ -1511,14 +1511,14 @@
           <name>PersAddresses</name>
           <filterConditionProcess>%aditoprj%/entity/Person_entity/recordcontainers/db/recordfieldmappings/persaddresses/filterConditionProcess.js</filterConditionProcess>
           <isFilterable v="true" />
-          <isLookupFilter v="true" />
+          <isLookupFilter v="false" />
           <filtertype>BASIC</filtertype>
         </consumerMapping>
         <consumerMapping>
           <name>Communications</name>
           <filterConditionProcess>%aditoprj%/entity/Person_entity/recordcontainers/db/recordfieldmappings/communications/filterConditionProcess.js</filterConditionProcess>
           <isFilterable v="true" />
-          <isLookupFilter v="true" />
+          <isLookupFilter v="false" />
           <filtertype>BASIC</filtertype>
         </consumerMapping>
         <dbRecordFieldMapping>
@@ -1529,7 +1529,7 @@
           <name>ObjectTrees</name>
           <filterConditionProcess>%aditoprj%/entity/Person_entity/recordcontainers/db/recordfieldmappings/objecttrees/filterConditionProcess.js</filterConditionProcess>
           <isFilterable v="true" />
-          <isLookupFilter v="true" />
+          <isLookupFilter v="false" />
           <filtertype>BASIC</filtertype>
         </consumerMapping>
         <dbRecordFieldMapping>
diff --git a/entity/PrivatePerson_entity/PrivatePerson_entity.aod b/entity/PrivatePerson_entity/PrivatePerson_entity.aod
index fd51fcaef2..e3cc784be6 100644
--- a/entity/PrivatePerson_entity/PrivatePerson_entity.aod
+++ b/entity/PrivatePerson_entity/PrivatePerson_entity.aod
@@ -108,10 +108,12 @@
         <dbRecordFieldMapping>
           <name>FIRSTNAME.value</name>
           <recordfield>PERSON.FIRSTNAME</recordfield>
+          <isLookupFilter v="true" />
         </dbRecordFieldMapping>
         <dbRecordFieldMapping>
           <name>LASTNAME.value</name>
           <recordfield>PERSON.LASTNAME</recordfield>
+          <isLookupFilter v="true" />
         </dbRecordFieldMapping>
         <dbRecordFieldMapping>
           <name>MIDDLENAME.value</name>
diff --git a/entity/Product_entity/Product_entity.aod b/entity/Product_entity/Product_entity.aod
index 3c58515f1f..01c9b42d47 100644
--- a/entity/Product_entity/Product_entity.aod
+++ b/entity/Product_entity/Product_entity.aod
@@ -516,19 +516,19 @@
           <name>ADVERTISING.value</name>
           <recordfield>PRODUCT.ADVERTISING</recordfield>
           <isFilterable v="true" />
-          <isLookupFilter v="true" />
+          <isLookupFilter v="false" />
         </dbRecordFieldMapping>
         <dbRecordFieldMapping>
           <name>GROUPCODEID.value</name>
           <recordfield>PRODUCT.GROUPCODEID</recordfield>
           <isFilterable v="true" />
-          <isLookupFilter v="true" />
+          <isLookupFilter v="false" />
         </dbRecordFieldMapping>
         <dbRecordFieldMapping>
           <name>MINSTOCK.value</name>
           <recordfield>PRODUCT.MINSTOCK</recordfield>
           <isFilterable v="true" />
-          <isLookupFilter v="true" />
+          <isLookupFilter v="false" />
         </dbRecordFieldMapping>
         <dbRecordFieldMapping>
           <name>PRODUCTCODE.value</name>
@@ -548,19 +548,19 @@
           <name>STATUS.value</name>
           <recordfield>PRODUCT.STATUS</recordfield>
           <isFilterable v="true" />
-          <isLookupFilter v="true" />
+          <isLookupFilter v="false" />
         </dbRecordFieldMapping>
         <dbRecordFieldMapping>
           <name>UNIT.value</name>
           <recordfield>PRODUCT.UNIT</recordfield>
           <isFilterable v="true" />
-          <isLookupFilter v="true" />
+          <isLookupFilter v="false" />
         </dbRecordFieldMapping>
         <dbRecordFieldMapping>
           <name>CONTACT_ID.value</name>
           <recordfield>PRODUCT.CONTACT_ID</recordfield>
           <isFilterable v="true" />
-          <isLookupFilter v="true" />
+          <isLookupFilter v="false" />
         </dbRecordFieldMapping>
         <dbRecordFieldMapping>
           <name>GROUPCODEID.displayValue</name>
@@ -600,9 +600,6 @@
           <isFilterable v="true" />
           <filtertype>EXTENDED</filtertype>
         </consumerMapping>
-        <dbRecordFieldMapping>
-          <name>COUNT.value</name>
-        </dbRecordFieldMapping>
         <aggregateFieldDbMapping>
           <name>COUNT_aggregate.value</name>
           <recordfield>PRODUCT.PRODUCTID</recordfield>
diff --git a/entity/Productprice_entity/Productprice_entity.aod b/entity/Productprice_entity/Productprice_entity.aod
index 942d7f465f..88bf091386 100644
--- a/entity/Productprice_entity/Productprice_entity.aod
+++ b/entity/Productprice_entity/Productprice_entity.aod
@@ -256,31 +256,31 @@
           <name>BUYSELL.value</name>
           <recordfield>PRODUCTPRICE.BUYSELL</recordfield>
           <isFilterable v="true" />
-          <isLookupFilter v="true" />
+          <isLookupFilter v="false" />
         </dbRecordFieldMapping>
         <dbRecordFieldMapping>
           <name>CURRENCY.value</name>
           <recordfield>PRODUCTPRICE.CURRENCY</recordfield>
           <isFilterable v="true" />
-          <isLookupFilter v="true" />
+          <isLookupFilter v="false" />
         </dbRecordFieldMapping>
         <dbRecordFieldMapping>
           <name>FROMQUANTITY.value</name>
           <recordfield>PRODUCTPRICE.FROMQUANTITY</recordfield>
           <isFilterable v="true" />
-          <isLookupFilter v="true" />
+          <isLookupFilter v="false" />
         </dbRecordFieldMapping>
         <dbRecordFieldMapping>
           <name>PRICE.value</name>
           <recordfield>PRODUCTPRICE.PRICE</recordfield>
           <isFilterable v="true" />
-          <isLookupFilter v="true" />
+          <isLookupFilter v="false" />
         </dbRecordFieldMapping>
         <dbRecordFieldMapping>
           <name>PRICELIST.value</name>
           <recordfield>PRODUCTPRICE.PRICELIST</recordfield>
           <isFilterable v="true" />
-          <isLookupFilter v="true" />
+          <isLookupFilter v="false" />
         </dbRecordFieldMapping>
         <dbRecordFieldMapping>
           <name>PRODUCTPRICEID.value</name>
@@ -290,7 +290,7 @@
           <name>PRODUCT_ID.value</name>
           <recordfield>PRODUCTPRICE.PRODUCT_ID</recordfield>
           <isFilterable v="true" />
-          <isLookupFilter v="true" />
+          <isLookupFilter v="false" />
         </dbRecordFieldMapping>
         <dbRecordFieldMapping>
           <name>CONTACT_ID.value</name>
@@ -308,13 +308,13 @@
           <name>VALID_TO.value</name>
           <recordfield>PRODUCTPRICE.VALID_TO</recordfield>
           <isFilterable v="true" />
-          <isLookupFilter v="true" />
+          <isLookupFilter v="false" />
         </dbRecordFieldMapping>
         <dbRecordFieldMapping>
           <name>VAT.value</name>
           <recordfield>PRODUCTPRICE.VAT</recordfield>
           <isFilterable v="true" />
-          <isLookupFilter v="true" />
+          <isLookupFilter v="false" />
         </dbRecordFieldMapping>
         <dbRecordFieldMapping>
           <name>CURRENCY.displayValue</name>
diff --git a/entity/Salesproject_entity/Salesproject_entity.aod b/entity/Salesproject_entity/Salesproject_entity.aod
index cdbe5d0856..5d642967ff 100644
--- a/entity/Salesproject_entity/Salesproject_entity.aod
+++ b/entity/Salesproject_entity/Salesproject_entity.aod
@@ -809,25 +809,25 @@
           <name>ENDDATE.value</name>
           <recordfield>SALESPROJECT.ENDDATE</recordfield>
           <isFilterable v="true" />
-          <isLookupFilter v="true" />
+          <isLookupFilter v="false" />
         </dbRecordFieldMapping>
         <dbRecordFieldMapping>
           <name>INFO.value</name>
           <recordfield>SALESPROJECT.INFO</recordfield>
           <isFilterable v="true" />
-          <isLookupFilter v="true" />
+          <isLookupFilter v="false" />
         </dbRecordFieldMapping>
         <dbRecordFieldMapping>
           <name>PHASE.value</name>
           <recordfield>SALESPROJECT.PHASE</recordfield>
           <isFilterable v="true" />
-          <isLookupFilter v="true" />
+          <isLookupFilter v="false" />
         </dbRecordFieldMapping>
         <dbRecordFieldMapping>
           <name>PROBABILITY.value</name>
           <recordfield>SALESPROJECT.PROBABILITY</recordfield>
           <isFilterable v="true" />
-          <isLookupFilter v="true" />
+          <isLookupFilter v="false" />
         </dbRecordFieldMapping>
         <dbRecordFieldMapping>
           <name>PROJECTCODE.value</name>
@@ -849,19 +849,19 @@
           <name>STARTDATE.value</name>
           <recordfield>SALESPROJECT.STARTDATE</recordfield>
           <isFilterable v="true" />
-          <isLookupFilter v="true" />
+          <isLookupFilter v="false" />
         </dbRecordFieldMapping>
         <dbRecordFieldMapping>
           <name>VOLUME.value</name>
           <recordfield>SALESPROJECT.VOLUME</recordfield>
           <isFilterable v="true" />
-          <isLookupFilter v="true" />
+          <isLookupFilter v="false" />
         </dbRecordFieldMapping>
         <dbRecordFieldMapping>
           <name>CONTACT_ID.value</name>
           <recordfield>SALESPROJECT.CONTACT_ID</recordfield>
           <isFilterable v="true" />
-          <isLookupFilter v="true" />
+          <isLookupFilter v="false" />
         </dbRecordFieldMapping>
         <dbRecordFieldMapping>
           <name>CONTACT_ID.displayValue</name>
@@ -879,13 +879,13 @@
           <name>REASONS.value</name>
           <recordfield>SALESPROJECT.REASONS</recordfield>
           <isFilterable v="true" />
-          <isLookupFilter v="true" />
+          <isLookupFilter v="false" />
         </dbRecordFieldMapping>
         <consumerMapping>
           <name>Organisations</name>
           <filterConditionProcess>%aditoprj%/entity/Salesproject_entity/recordcontainers/db/recordfieldmappings/organisations/filterConditionProcess.js</filterConditionProcess>
           <isFilterable v="true" />
-          <isLookupFilter v="true" />
+          <isLookupFilter v="false" />
           <filtertype>BASIC</filtertype>
         </consumerMapping>
         <consumerMapping>
@@ -902,7 +902,7 @@
           <name>STATUS.value</name>
           <recordfield>SALESPROJECT.STATUS</recordfield>
           <isFilterable v="true" />
-          <isLookupFilter v="true" />
+          <isLookupFilter v="false" />
         </dbRecordFieldMapping>
         <aggregateFieldDbMapping>
           <name>COUNT_aggregate.value</name>
@@ -913,7 +913,7 @@
           <name>CLASSIFICATIONSTORAGE_ID.value</name>
           <recordfield>CLASSIFICATIONSTORAGE.CLASSIFICATIONVALUE</recordfield>
           <isFilterable v="true" />
-          <isLookupFilter v="true" />
+          <isLookupFilter v="false" />
         </dbRecordFieldMapping>
       </recordFieldMappings>
       <filterExtensions>
diff --git a/entity/SerialLetter_entity/SerialLetter_entity.aod b/entity/SerialLetter_entity/SerialLetter_entity.aod
index 8edb65a275..f7d8c265e9 100644
--- a/entity/SerialLetter_entity/SerialLetter_entity.aod
+++ b/entity/SerialLetter_entity/SerialLetter_entity.aod
@@ -235,7 +235,7 @@
           <name>DOCUMENTTEMPLATE_ID.value</name>
           <recordfield>SERIALLETTER.DOCUMENTTEMPLATE_ID</recordfield>
           <isFilterable v="true" />
-          <isLookupFilter v="true" />
+          <isLookupFilter v="false" />
         </dbRecordFieldMapping>
         <dbRecordFieldMapping>
           <name>SERIALLETTERID.value</name>
@@ -255,13 +255,13 @@
           <name>DESCRIPTION.value</name>
           <recordfield>SERIALLETTER.DESCRIPTION</recordfield>
           <isFilterable v="true" />
-          <isLookupFilter v="true" />
+          <isLookupFilter v="false" />
         </dbRecordFieldMapping>
         <dbRecordFieldMapping>
           <name>STATUS.value</name>
           <recordfield>SERIALLETTER.STATUS</recordfield>
           <isFilterable v="true" />
-          <isLookupFilter v="true" />
+          <isLookupFilter v="false" />
         </dbRecordFieldMapping>
         <dbRecordFieldMapping>
           <name>STATUS.displayValue</name>
diff --git a/entity/SupportTicket_entity/SupportTicket_entity.aod b/entity/SupportTicket_entity/SupportTicket_entity.aod
index 054a9a5466..23f83fc09c 100644
--- a/entity/SupportTicket_entity/SupportTicket_entity.aod
+++ b/entity/SupportTicket_entity/SupportTicket_entity.aod
@@ -447,31 +447,32 @@
         <dbRecordFieldMapping>
           <name>CODE.value</name>
           <recordfield>TICKET.CODE</recordfield>
-          <isFilterable v="false" />
+          <isFilterable v="true" />
+          <isLookupFilter v="true" />
         </dbRecordFieldMapping>
         <dbRecordFieldMapping>
           <name>TASK_DESCRIPTION.value</name>
           <recordfield>TASK.DESCRIPTION</recordfield>
           <isFilterable v="true" />
-          <isLookupFilter v="true" />
+          <isLookupFilter v="false" />
         </dbRecordFieldMapping>
         <dbRecordFieldMapping>
           <name>TASK_EDITOR_CONTACT_ID.value</name>
           <recordfield>TASK.EDITOR_CONTACT_ID</recordfield>
           <isFilterable v="true" />
-          <isLookupFilter v="true" />
+          <isLookupFilter v="false" />
         </dbRecordFieldMapping>
         <dbRecordFieldMapping>
           <name>TASK_MATURITY_DATE.value</name>
           <recordfield>TASK.MATURITY_DATE</recordfield>
           <isFilterable v="true" />
-          <isLookupFilter v="true" />
+          <isLookupFilter v="false" />
         </dbRecordFieldMapping>
         <dbRecordFieldMapping>
           <name>TASK_PRIORITY.value</name>
           <recordfield>TASK.PRIORITY</recordfield>
           <isFilterable v="true" />
-          <isLookupFilter v="true" />
+          <isLookupFilter v="false" />
         </dbRecordFieldMapping>
         <dbRecordFieldMapping>
           <name>TASK_REQUESTOR_CONTACT_ID.value</name>
@@ -481,13 +482,13 @@
           <name>TASK_START_DATE.value</name>
           <recordfield>TASK.START_DATE</recordfield>
           <isFilterable v="true" />
-          <isLookupFilter v="true" />
+          <isLookupFilter v="false" />
         </dbRecordFieldMapping>
         <dbRecordFieldMapping>
           <name>TASK_STATUS.value</name>
           <recordfield>TASK.STATUS</recordfield>
           <isFilterable v="true" />
-          <isLookupFilter v="true" />
+          <isLookupFilter v="false" />
         </dbRecordFieldMapping>
         <dbRecordFieldMapping>
           <name>TASK_SUBJECT.value</name>
@@ -507,7 +508,7 @@
           <name>TASK_PROGRESS.value</name>
           <recordfield>TASK.PROGRESS</recordfield>
           <isFilterable v="true" />
-          <isLookupFilter v="true" />
+          <isLookupFilter v="false" />
         </dbRecordFieldMapping>
         <dbRecordFieldMapping>
           <name>TASK_PROGRESS.displayValue</name>
@@ -547,9 +548,6 @@
           <name>TASK_PARENT_CONTEXT.value</name>
           <recordfield>TASK.PARENT_CONTEXT</recordfield>
         </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>COUNT.value</name>
-        </dbRecordFieldMapping>
         <aggregateFieldDbMapping>
           <name>COUNT_aggregate.value</name>
           <recordfield>TICKET.TICKETID</recordfield>
diff --git a/entity/Task_entity/Task_entity.aod b/entity/Task_entity/Task_entity.aod
index 106bb5a4b7..d425425dcf 100644
--- a/entity/Task_entity/Task_entity.aod
+++ b/entity/Task_entity/Task_entity.aod
@@ -492,49 +492,49 @@
           <name>DESCRIPTION.value</name>
           <recordfield>TASK.DESCRIPTION</recordfield>
           <isFilterable v="true" />
-          <isLookupFilter v="true" />
+          <isLookupFilter v="false" />
         </dbRecordFieldMapping>
         <dbRecordFieldMapping>
           <name>EDITOR_CONTACT_ID.value</name>
           <recordfield>TASK.EDITOR_CONTACT_ID</recordfield>
           <isFilterable v="true" />
-          <isLookupFilter v="true" />
+          <isLookupFilter v="false" />
         </dbRecordFieldMapping>
         <dbRecordFieldMapping>
           <name>MATURITY_DATE.value</name>
           <recordfield>TASK.MATURITY_DATE</recordfield>
           <isFilterable v="true" />
-          <isLookupFilter v="true" />
+          <isLookupFilter v="false" />
         </dbRecordFieldMapping>
         <dbRecordFieldMapping>
           <name>PRIORITY.value</name>
           <recordfield>TASK.PRIORITY</recordfield>
           <isFilterable v="true" />
-          <isLookupFilter v="true" />
+          <isLookupFilter v="false" />
         </dbRecordFieldMapping>
         <dbRecordFieldMapping>
           <name>PROTECTIONLEVEL.value</name>
           <recordfield>TASK.PROTECTIONLEVEL</recordfield>
           <isFilterable v="true" />
-          <isLookupFilter v="true" />
+          <isLookupFilter v="false" />
         </dbRecordFieldMapping>
         <dbRecordFieldMapping>
           <name>REQUESTOR_CONTACT_ID.value</name>
           <recordfield>TASK.REQUESTOR_CONTACT_ID</recordfield>
           <isFilterable v="true" />
-          <isLookupFilter v="true" />
+          <isLookupFilter v="false" />
         </dbRecordFieldMapping>
         <dbRecordFieldMapping>
           <name>START_DATE.value</name>
           <recordfield>TASK.START_DATE</recordfield>
           <isFilterable v="true" />
-          <isLookupFilter v="true" />
+          <isLookupFilter v="false" />
         </dbRecordFieldMapping>
         <dbRecordFieldMapping>
           <name>STATUS.value</name>
           <recordfield>TASK.STATUS</recordfield>
           <isFilterable v="true" />
-          <isLookupFilter v="true" />
+          <isLookupFilter v="false" />
         </dbRecordFieldMapping>
         <dbRecordFieldMapping>
           <name>SUBJECT.value</name>
@@ -571,7 +571,7 @@
           <name>PROGRESS.value</name>
           <recordfield>TASK.PROGRESS</recordfield>
           <isFilterable v="true" />
-          <isLookupFilter v="true" />
+          <isLookupFilter v="false" />
         </dbRecordFieldMapping>
         <dbRecordFieldMapping>
           <name>PROGRESS.displayValue</name>
@@ -585,9 +585,6 @@
           <name>TYPE.value</name>
           <recordfield>TASK.KIND</recordfield>
         </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>COUNT.value</name>
-        </dbRecordFieldMapping>
         <aggregateFieldDbMapping>
           <name>COUNT_aggregate.value</name>
           <recordfield>TASK.TASKID</recordfield>
-- 
GitLab


From 8a76dfa1199ee820ecd3cc6b7f2c06099ab24fba Mon Sep 17 00:00:00 2001
From: "a.schindlbeck" <a.schindlbeck@adito.de>
Date: Tue, 8 Sep 2020 11:36:32 +0200
Subject: [PATCH 259/309] Notifications: NotificationState-Keyword add +
 translation

---
 .../addNotificationStateKeyword.xml                             | 2 +-
 language/_____LANGUAGE_de/_____LANGUAGE_de.aod                  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.liquibase/Data_alias/basic/2020.2.0/addNotificationStateKeywords/addNotificationStateKeyword.xml b/.liquibase/Data_alias/basic/2020.2.0/addNotificationStateKeywords/addNotificationStateKeyword.xml
index 2d5712313f..9817d49cf3 100644
--- a/.liquibase/Data_alias/basic/2020.2.0/addNotificationStateKeywords/addNotificationStateKeyword.xml
+++ b/.liquibase/Data_alias/basic/2020.2.0/addNotificationStateKeywords/addNotificationStateKeyword.xml
@@ -4,7 +4,7 @@
     <changeSet author="a.schindlbeck" id="866dab92-b0fe-4a8c-8b90-123824c10ffd">
         <update tableName="AB_KEYWORD_ENTRY">
             <column name="TITLE" value="Unread"/>
-            <where>AB_KEYWORD_ENTRYID='765dacdb-8f9c-46e9-8303-41355ba17010'</where>
+            <where>AB_KEYWORD_ENTRYID='f568c222-7ac5-475e-b916-cea0e0e8612a'</where>
         </update>
     </changeSet>
 </databaseChangeLog>
\ No newline at end of file
diff --git a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
index d2e2a0d023..2fd326ec36 100644
--- a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
+++ b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
@@ -5104,7 +5104,7 @@
     </entry>
     <entry>
       <key>Read</key>
-      <value>gelesen</value>
+      <value>Gelesen</value>
     </entry>
     <entry>
       <key>Permission Set ID</key>
-- 
GitLab


From d2173e62605eaec10a84e1942bd5b8f77f72227b Mon Sep 17 00:00:00 2001
From: "j.goderbauer" <j.goderbauer@adito.de>
Date: Tue, 8 Sep 2020 13:07:05 +0200
Subject: [PATCH 260/309] Userhelp: fix scan services

---
 neonContext/Userhelp/Userhelp.aod | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/neonContext/Userhelp/Userhelp.aod b/neonContext/Userhelp/Userhelp.aod
index bcacbf186d..435de68c2c 100644
--- a/neonContext/Userhelp/Userhelp.aod
+++ b/neonContext/Userhelp/Userhelp.aod
@@ -3,13 +3,8 @@
   <name>Userhelp</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <filterView>Userhelp_FilterView</filterView>
-  <editView>Userhelp_EditView</editView>
   <entity>UserhelpResources</entity>
   <references>
-    <neonViewReference>
-      <name>44005781-a90b-468f-a970-7833d170f671</name>
-      <view>Userhelp_EditView</view>
-    </neonViewReference>
     <neonViewReference>
       <name>2a1dd62b-0f30-442b-aa1d-969b46312d2a</name>
       <view>Userhelp_FilterView</view>
-- 
GitLab


From ceb4beaf081635dcc09f0ea63cb9acc45536a894 Mon Sep 17 00:00:00 2001
From: "j.goderbauer" <j.goderbauer@adito.de>
Date: Tue, 8 Sep 2020 13:31:08 +0200
Subject: [PATCH 261/309] Classification bugfix: groups

---
 .../entityfields/object_type/onValueChange.js |  3 +-
 .../groupQueryProcess.js                      |  8 ++--
 .../Salesproject_entity.aod                   | 21 +---------
 .../classificationtype_param/valueProcess.js  |  4 --
 .../objectrowid_param/valueProcess.js         |  4 --
 .../children/objecttype_param/valueProcess.js |  4 --
 .../filterConditionProcess.js                 |  3 +-
 .../filterFieldsProcess.js                    |  3 +-
 .../filterValuesProcess.js                    |  3 +-
 .../groupQueryProcess.js                      | 42 +++++++++++++++++++
 10 files changed, 50 insertions(+), 45 deletions(-)
 delete mode 100644 entity/Salesproject_entity/entityfields/classificationgroups/children/classificationtype_param/valueProcess.js
 delete mode 100644 entity/Salesproject_entity/entityfields/classificationgroups/children/objectrowid_param/valueProcess.js
 delete mode 100644 entity/Salesproject_entity/entityfields/classificationgroups/children/objecttype_param/valueProcess.js
 create mode 100644 entity/Salesproject_entity/recordcontainers/db/filterextensions/classificationgroup_filter/groupQueryProcess.js

diff --git a/entity/ClassificationAdmin_entity/entityfields/object_type/onValueChange.js b/entity/ClassificationAdmin_entity/entityfields/object_type/onValueChange.js
index a2973102df..22539b26e0 100644
--- a/entity/ClassificationAdmin_entity/entityfields/object_type/onValueChange.js
+++ b/entity/ClassificationAdmin_entity/entityfields/object_type/onValueChange.js
@@ -1,4 +1,3 @@
 import("system.neon");
 
-neon.setFieldValue("$field.CLASSIFICATIONGROUP", "");
-neon.refresh("$field.CLASSIFICATIONGROUP")
\ No newline at end of file
+neon.setFieldValue("$field.CLASSIFICATIONGROUP", "");
\ No newline at end of file
diff --git a/entity/Organisation_entity/recordcontainers/db/filterextensions/classificationgroup_filter/groupQueryProcess.js b/entity/Organisation_entity/recordcontainers/db/filterextensions/classificationgroup_filter/groupQueryProcess.js
index 343227e54a..35ed570493 100644
--- a/entity/Organisation_entity/recordcontainers/db/filterextensions/classificationgroup_filter/groupQueryProcess.js
+++ b/entity/Organisation_entity/recordcontainers/db/filterextensions/classificationgroup_filter/groupQueryProcess.js
@@ -2,21 +2,19 @@ import("system.translate");
 import("Sql_lib");
 import("system.result");
 import("system.vars");
-import("system.logging");
-logging.log("classificationgroup_filter.groupQueryProcess");
+
 var isCount = vars.get("$local.count");             // TRUE if the count of the records is needed
 var columns = vars.get("$local.columnlist");        // The column, expected from the querry, see also AttributeFilter_lib
 var condition = vars.get("$local.condition");       // The Condition that's beeing used, includes the grouphirachy
 var groupedColumns = vars.get("$local.groupedlist") // The coloumns, used for grouping
 var order = vars.get("$local.order");               // The order of the result
-var classificationId = vars.get("$local.name");
-classificationId = classificationId.slice(classificationId.lastIndexOf(".") + 1, classificationId.length);
+var name = vars.get("$local.name");
 
 var stmt = newSelect(isCount ? groupedColumns : columns)
                     .from("ORGANISATION")
                     .join("CONTACT", "ORGANISATIONID = ORGANISATION_ID  and PERSON_ID is null")
                     .leftJoin("CLASSIFICATIONSTORAGE", "CLASSIFICATIONSTORAGE.OBJECT_ROWID = CONTACT.CONTACTID and OBJECT_TYPE = 'Organisation'")
-                    .where(condition)
+                    .whereIfSet(condition)
                     .groupBy(groupedColumns)
                     .toString();
                     
diff --git a/entity/Salesproject_entity/Salesproject_entity.aod b/entity/Salesproject_entity/Salesproject_entity.aod
index 5d642967ff..fc857899ee 100644
--- a/entity/Salesproject_entity/Salesproject_entity.aod
+++ b/entity/Salesproject_entity/Salesproject_entity.aod
@@ -666,26 +666,6 @@
         </entityParameter>
       </children>
     </entityConsumer>
-    <entityConsumer>
-      <name>ClassificationGroups</name>
-      <dependency>
-        <name>dependency</name>
-      </dependency>
-      <children>
-        <entityParameter>
-          <name>ClassificationType_param</name>
-          <valueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/classificationgroups/children/classificationtype_param/valueProcess.js</valueProcess>
-        </entityParameter>
-        <entityParameter>
-          <name>ObjectRowid_param</name>
-          <valueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/classificationgroups/children/objectrowid_param/valueProcess.js</valueProcess>
-        </entityParameter>
-        <entityParameter>
-          <name>ObjectType_param</name>
-          <valueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/classificationgroups/children/objecttype_param/valueProcess.js</valueProcess>
-        </entityParameter>
-      </children>
-    </entityConsumer>
     <entityField>
       <name>PHASEINFO</name>
       <title>phase information</title>
@@ -939,6 +919,7 @@
           <filterValuesProcess>%aditoprj%/entity/Salesproject_entity/recordcontainers/db/filterextensions/classificationgroup_filter/filterValuesProcess.js</filterValuesProcess>
           <filterConditionProcess>%aditoprj%/entity/Salesproject_entity/recordcontainers/db/filterextensions/classificationgroup_filter/filterConditionProcess.js</filterConditionProcess>
           <isGroupable v="true" />
+          <groupQueryProcess>%aditoprj%/entity/Salesproject_entity/recordcontainers/db/filterextensions/classificationgroup_filter/groupQueryProcess.js</groupQueryProcess>
           <filtertype>BASIC</filtertype>
         </filterExtensionSet>
       </filterExtensions>
diff --git a/entity/Salesproject_entity/entityfields/classificationgroups/children/classificationtype_param/valueProcess.js b/entity/Salesproject_entity/entityfields/classificationgroups/children/classificationtype_param/valueProcess.js
deleted file mode 100644
index 6dd2e44174..0000000000
--- a/entity/Salesproject_entity/entityfields/classificationgroups/children/classificationtype_param/valueProcess.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import("KeywordRegistry_basic");
-import("system.result");
-
-result.string($KeywordRegistry.classificationType$salesproject());
\ No newline at end of file
diff --git a/entity/Salesproject_entity/entityfields/classificationgroups/children/objectrowid_param/valueProcess.js b/entity/Salesproject_entity/entityfields/classificationgroups/children/objectrowid_param/valueProcess.js
deleted file mode 100644
index 338565e60f..0000000000
--- a/entity/Salesproject_entity/entityfields/classificationgroups/children/objectrowid_param/valueProcess.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import("system.vars");
-import("system.result");
-
-result.string(vars.get("$sys.uid"));
\ No newline at end of file
diff --git a/entity/Salesproject_entity/entityfields/classificationgroups/children/objecttype_param/valueProcess.js b/entity/Salesproject_entity/entityfields/classificationgroups/children/objecttype_param/valueProcess.js
deleted file mode 100644
index 5996e99db2..0000000000
--- a/entity/Salesproject_entity/entityfields/classificationgroups/children/objecttype_param/valueProcess.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import("system.result");
-import("Context_lib");
-
-result.string(ContextUtils.getCurrentContextId());
\ No newline at end of file
diff --git a/entity/Salesproject_entity/recordcontainers/db/filterextensions/classificationgroup_filter/filterConditionProcess.js b/entity/Salesproject_entity/recordcontainers/db/filterextensions/classificationgroup_filter/filterConditionProcess.js
index 4d7f34b4b3..ef0d44ef34 100644
--- a/entity/Salesproject_entity/recordcontainers/db/filterextensions/classificationgroup_filter/filterConditionProcess.js
+++ b/entity/Salesproject_entity/recordcontainers/db/filterextensions/classificationgroup_filter/filterConditionProcess.js
@@ -1,7 +1,6 @@
-import("system.vars");
 import("system.result");
 import("ClassificationFilter_lib");
 
-var sqlCond = ClassificationGroupFilterUtils.makeFilterConditionSql(vars.get("$sys.currentcontextname"));
+var sqlCond = ClassificationGroupFilterUtils.makeFilterConditionSql();
 
 result.string(sqlCond);
\ No newline at end of file
diff --git a/entity/Salesproject_entity/recordcontainers/db/filterextensions/classificationgroup_filter/filterFieldsProcess.js b/entity/Salesproject_entity/recordcontainers/db/filterextensions/classificationgroup_filter/filterFieldsProcess.js
index b066dbd2bd..f4082997e0 100644
--- a/entity/Salesproject_entity/recordcontainers/db/filterextensions/classificationgroup_filter/filterFieldsProcess.js
+++ b/entity/Salesproject_entity/recordcontainers/db/filterextensions/classificationgroup_filter/filterFieldsProcess.js
@@ -1,8 +1,7 @@
-import("system.vars");
 import("system.result");
 import("ClassificationFilter_lib");
 
 //this filterExtensionSet is for the Classifications (ClassificationGroups, e.g. 1. Target Group, Customer Value...)
-var fields = ClassificationTypeFilterUtils.getFilterFieldsGroup(vars.get("$sys.currentcontextname"));
+var fields = ClassificationGroupFilterUtils.makeFilterFields();
 
 result.string(fields);
\ No newline at end of file
diff --git a/entity/Salesproject_entity/recordcontainers/db/filterextensions/classificationgroup_filter/filterValuesProcess.js b/entity/Salesproject_entity/recordcontainers/db/filterextensions/classificationgroup_filter/filterValuesProcess.js
index 0b91eddce8..447f4c0372 100644
--- a/entity/Salesproject_entity/recordcontainers/db/filterextensions/classificationgroup_filter/filterValuesProcess.js
+++ b/entity/Salesproject_entity/recordcontainers/db/filterextensions/classificationgroup_filter/filterValuesProcess.js
@@ -1,6 +1,5 @@
-import("system.vars");
 import("system.result");
 import("ClassificationFilter_lib");
 
-var values = ClassificationGroupFilterUtils.makeFilterValues(vars.get("$sys.currentcontextname"));
+var values = ClassificationGroupFilterUtils.makeFilterValues();
 result.object(values);
\ No newline at end of file
diff --git a/entity/Salesproject_entity/recordcontainers/db/filterextensions/classificationgroup_filter/groupQueryProcess.js b/entity/Salesproject_entity/recordcontainers/db/filterextensions/classificationgroup_filter/groupQueryProcess.js
new file mode 100644
index 0000000000..e8c31f088d
--- /dev/null
+++ b/entity/Salesproject_entity/recordcontainers/db/filterextensions/classificationgroup_filter/groupQueryProcess.js
@@ -0,0 +1,42 @@
+import("system.translate");
+import("Sql_lib");
+import("system.result");
+import("system.vars");
+
+
+function Scp(){
+    
+}
+
+Scp.makeDefaultGroupQuery = function()
+{
+    var isCount = vars.get("$local.count");             // TRUE if the count of the records is needed
+    var columns = vars.get("$local.columnlist");        // The column, expected from the querry, see also AttributeFilter_lib
+    var condition = vars.get("$local.condition");       // The Condition that's beeing used, includes the grouphirachy
+    var groupedColumns = vars.get("$local.groupedlist") // The coloumns, used for grouping
+    var order = vars.get("$local.order");               // The order of the result
+    var name = vars.get("$local.name");
+    return Scp.getDefaultGroupQuery(isCount, columns, condition, groupedColumns, order, name);
+};
+
+Scp.getDefaultGroupQuery = function(pIsCount, pColumns, pCondition, pGroupedColumns, pOrder, pName)
+{
+    var stmt = newSelect(pIsCount ? pGroupedColumns : pColumns)
+        .from("SALESPROJECT")
+        .leftJoin("CLASSIFICATIONSTORAGE", "CLASSIFICATIONSTORAGE.OBJECT_ROWID = SALESPROJECT.SALESPROJECTID and OBJECT_TYPE = 'Salesproject'");
+
+    if (pCondition)
+    {
+        var condition = pCondition.trim();
+        if (condition)
+            stmt.where(condition);
+    }
+
+    stmt.groupBy(pGroupedColumns);
+    return stmt;
+};
+
+var res = Scp.makeDefaultGroupQuery().toString();
+result.string(res);
+
+
-- 
GitLab


From 15c0d7569156188036db6a515027afab774014a9 Mon Sep 17 00:00:00 2001
From: "a.schindlbeck" <a.schindlbeck@adito.de>
Date: Tue, 8 Sep 2020 13:56:24 +0200
Subject: [PATCH 262/309] Notifications: Filter-Bugfix

---
 entity/Notification_entity/Notification_entity.aod | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/entity/Notification_entity/Notification_entity.aod b/entity/Notification_entity/Notification_entity.aod
index 6a17ff596e..a2e404cefe 100644
--- a/entity/Notification_entity/Notification_entity.aod
+++ b/entity/Notification_entity/Notification_entity.aod
@@ -174,12 +174,19 @@
       <onDBDelete>%aditoprj%/entity/Notification_entity/recordcontainers/db/onDBDelete.js</onDBDelete>
       <linkInformation>
         <linkInformation>
-          <name>38bfb16c-bfe9-45dd-8ce7-692ebba030a9</name>
+          <name>3061f3b4-a5d1-4436-9c4d-28415363a056</name>
           <tableName>ASYS_NOTIFICATIONCONTENTS</tableName>
           <primaryKey>CONTENTID</primaryKey>
           <isUIDTable v="false" />
           <readonly v="true" />
         </linkInformation>
+        <linkInformation>
+          <name>0abd3811-b847-4999-90a5-dae0f8851433</name>
+          <tableName>ASYS_NOTIFICATIONS</tableName>
+          <primaryKey>ID</primaryKey>
+          <isUIDTable v="true" />
+          <readonly v="true" />
+        </linkInformation>
       </linkInformation>
       <recordFieldMappings>
         <dbRecordFieldMapping>
-- 
GitLab


From b0950bfe514dcdf0fc89eb5eae8c184ab0a62126 Mon Sep 17 00:00:00 2001
From: "j.goderbauer" <j.goderbauer@adito.de>
Date: Tue, 8 Sep 2020 14:27:23 +0200
Subject: [PATCH 263/309] Classification bugfix: groups 2

---
 .../groupQueryProcess.js                      | 23 ++++--
 .../groupQueryProcess.js                      | 43 +----------
 process/ClassificationFilter_lib/process.js   | 76 +++++++++++++++++++
 3 files changed, 95 insertions(+), 47 deletions(-)

diff --git a/entity/Organisation_entity/recordcontainers/db/filterextensions/classificationgroup_filter/groupQueryProcess.js b/entity/Organisation_entity/recordcontainers/db/filterextensions/classificationgroup_filter/groupQueryProcess.js
index 35ed570493..768e6ca750 100644
--- a/entity/Organisation_entity/recordcontainers/db/filterextensions/classificationgroup_filter/groupQueryProcess.js
+++ b/entity/Organisation_entity/recordcontainers/db/filterextensions/classificationgroup_filter/groupQueryProcess.js
@@ -11,11 +11,20 @@ var order = vars.get("$local.order");               // The order of the result
 var name = vars.get("$local.name");
 
 var stmt = newSelect(isCount ? groupedColumns : columns)
-                    .from("ORGANISATION")
-                    .join("CONTACT", "ORGANISATIONID = ORGANISATION_ID  and PERSON_ID is null")
-                    .leftJoin("CLASSIFICATIONSTORAGE", "CLASSIFICATIONSTORAGE.OBJECT_ROWID = CONTACT.CONTACTID and OBJECT_TYPE = 'Organisation'")
-                    .whereIfSet(condition)
-                    .groupBy(groupedColumns)
-                    .toString();
-                    
+    .from("ORGANISATION")
+    .join("CONTACT", "ORGANISATIONID = ORGANISATION_ID  and PERSON_ID is null")
+    .leftJoin("CLASSIFICATIONSTORAGE", "CLASSIFICATIONSTORAGE.OBJECT_ROWID = CONTACT.CONTACTID and OBJECT_TYPE = 'Organisation'")
+
+if (condition)
+{
+    condition = condition.trim();
+    if (condition)
+        stmt.where(condition);
+}
+    
+if (order)
+    stmt.orderBy(order);
+
+stmt.groupBy(groupedColumns);
+stmt = stmt.toString();
 result.string(stmt);
\ No newline at end of file
diff --git a/entity/Salesproject_entity/recordcontainers/db/filterextensions/classificationgroup_filter/groupQueryProcess.js b/entity/Salesproject_entity/recordcontainers/db/filterextensions/classificationgroup_filter/groupQueryProcess.js
index e8c31f088d..1f7be0b8bd 100644
--- a/entity/Salesproject_entity/recordcontainers/db/filterextensions/classificationgroup_filter/groupQueryProcess.js
+++ b/entity/Salesproject_entity/recordcontainers/db/filterextensions/classificationgroup_filter/groupQueryProcess.js
@@ -1,42 +1,5 @@
-import("system.translate");
-import("Sql_lib");
+import("ClassificationFilter_lib");
 import("system.result");
-import("system.vars");
-
-
-function Scp(){
-    
-}
-
-Scp.makeDefaultGroupQuery = function()
-{
-    var isCount = vars.get("$local.count");             // TRUE if the count of the records is needed
-    var columns = vars.get("$local.columnlist");        // The column, expected from the querry, see also AttributeFilter_lib
-    var condition = vars.get("$local.condition");       // The Condition that's beeing used, includes the grouphirachy
-    var groupedColumns = vars.get("$local.groupedlist") // The coloumns, used for grouping
-    var order = vars.get("$local.order");               // The order of the result
-    var name = vars.get("$local.name");
-    return Scp.getDefaultGroupQuery(isCount, columns, condition, groupedColumns, order, name);
-};
-
-Scp.getDefaultGroupQuery = function(pIsCount, pColumns, pCondition, pGroupedColumns, pOrder, pName)
-{
-    var stmt = newSelect(pIsCount ? pGroupedColumns : pColumns)
-        .from("SALESPROJECT")
-        .leftJoin("CLASSIFICATIONSTORAGE", "CLASSIFICATIONSTORAGE.OBJECT_ROWID = SALESPROJECT.SALESPROJECTID and OBJECT_TYPE = 'Salesproject'");
-
-    if (pCondition)
-    {
-        var condition = pCondition.trim();
-        if (condition)
-            stmt.where(condition);
-    }
-
-    stmt.groupBy(pGroupedColumns);
-    return stmt;
-};
-
-var res = Scp.makeDefaultGroupQuery().toString();
-result.string(res);
-
 
+var res = ClassificationGroupFilterUtils.makeDefaultGroupQuery().toString();
+result.string(res);
\ No newline at end of file
diff --git a/process/ClassificationFilter_lib/process.js b/process/ClassificationFilter_lib/process.js
index ed71bb867c..167971780e 100644
--- a/process/ClassificationFilter_lib/process.js
+++ b/process/ClassificationFilter_lib/process.js
@@ -340,4 +340,80 @@ ClassificationGroupFilterUtils.makeFilterConditionSql = function()
         uidInfo.table, uidInfo.column, columnPlaceholder);
     
     return res;
+};
+
+/**
+ * Builds a group-by-sql-statement for a classification group filter extension set. This allows to group for classificationgroups within a db-table.<br/>
+ * Use the stringified result of this in groupQueryProcess (see the example). <br/>
+ * Note that in some cases you need to write your own process (for example: Organisations, since there is the special case that you need the 
+ * ORGANISATION and CONTACT table). This function is useful for the default-cases.
+ *
+* @return {SqlBuilder}     <p/>Statement as SqlBuilder-object that respresents the query that can be passed to the groupQueryProcess of a 
+ *                              filterExtenionSet
+ *
+ * @see ClassificationGroupFilterUtils.getDefaultGroupQuery for more details
+ * @static 
+ * @example
+ * import("ClassificationFilter_lib");
+ * import("system.result");
+ * 
+ * var res = ClassificationGroupFilterUtils.makeDefaultGroupQuery().toString();
+ * result.string(res);
+ * 
+ */
+ClassificationGroupFilterUtils.makeDefaultGroupQuery = function()
+{
+    var isCount = vars.get("$local.count");             // TRUE if the count of the records is needed
+    var columns = vars.get("$local.columnlist");        // The column, expected from the querry, see also AttributeFilter_lib
+    var condition = vars.get("$local.condition");       // The Condition that's beeing used, includes the grouphirachy
+    var groupedColumns = vars.get("$local.groupedlist") // The coloumns, used for grouping
+    var order = vars.get("$local.order");               // The order of the result
+    var name = vars.get("$local.name");
+    var uidColumn = vars.get("$sys.uidcolumn");
+    uidColumn = EntityUtils.parseUidColumn(uidColumn);
+    var table = uidColumn.table;
+    var column = uidColumn.column;
+    var context = ContextUtils.getCurrentContextId();
+    return ClassificationGroupFilterUtils.getDefaultGroupQuery(table, column, context, isCount, columns, condition, groupedColumns, order, name);
+};
+
+/**
+ * returns a group-by-sql-statement depending on the given params for a classification group filter extension set
+ * This allows to group for classificationgroups within a db-table
+ * 
+ * @param {String} pIdTableName         <p/> name of the db-table where the data shall be filtered
+ * @param {String} pIdColumnName        <p/> name of the primarykey-column of the table that was given via pIdTablename
+ * @param {String} pObjectType          <p/> contextId of the objects thats records 
+ * @param {Boolean} pIsCount            <p/> true, if the count of the records is requested
+ * @param {Array} pColumns              <p/> an array that contains all the columns that should be returned by the statement
+ * @param {String} pCondition           <p/> a SQL-condition that's beeing used for filtering the records, includes the group hirachy
+ * @param {Array} pGroupedColumns       <p/> an array that contains all the grouping columns (these are specified in the filterValuesProcess)
+ *                                           that should be returned by the statement
+ * @param {String} pOrder               <p/> the order-by clause definition for the statement that is requested
+ * @param {String} pName                <p/> name of the group field (this is the name as specified in the filterValuesProcess)
+ *
+ * @return {SqlBuilder}     <p/>Statement as SqlBuilder-object that respresents the query that can be passed to the groupQueryProcess of a 
+ *                              filterExtenionSet
+ * @static 
+ */
+ClassificationGroupFilterUtils.getDefaultGroupQuery = function(pIdTableName, pIdColumnName, pObjectType, pIsCount, pColumns, pCondition
+    , pGroupedColumns, pOrder, pName)
+{
+    var stmt = newSelect(pIsCount ? pGroupedColumns : pColumns)
+                .from(pIdTableName)
+                .leftJoin("CLASSIFICATIONSTORAGE", newWhere("CLASSIFICATIONSTORAGE.OBJECT_ROWID = " + pIdTableName + "." + pIdColumnName)
+                .and("CLASSIFICATIONSTORAGE.OBJECT_TYPE", pObjectType));
+
+    if (pCondition)
+    {
+        var condition = pCondition.trim();
+        if (condition)
+            stmt.where(condition);
+    }
+    
+    if (pOrder)
+        stmt.orderBy(pOrder);
+
+    stmt.groupBy(pGroupedColumns);
+    return stmt;
 };
\ No newline at end of file
-- 
GitLab


From 966f652d9fe329e4db014c218e0e7ec1499c1c13 Mon Sep 17 00:00:00 2001
From: "a.schindlbeck" <a.schindlbeck@adito.de>
Date: Tue, 8 Sep 2020 14:45:30 +0200
Subject: [PATCH 264/309] Notifications: Type Filter Fix

---
 .../entityfields/typecode/dropDownProcess.js                    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/entity/Notification_entity/entityfields/typecode/dropDownProcess.js b/entity/Notification_entity/entityfields/typecode/dropDownProcess.js
index f4800969f4..53f38d2035 100644
--- a/entity/Notification_entity/entityfields/typecode/dropDownProcess.js
+++ b/entity/Notification_entity/entityfields/typecode/dropDownProcess.js
@@ -6,7 +6,7 @@ var types = []
 
 for (let property in notification.getAllTypes()) 
 {
-  types.push(property);
+  types.push([property, property]);
 }
 
 result.object(types);
\ No newline at end of file
-- 
GitLab


From 660839e83d5f1bb4bab298eee1bc7ab1a4449da8 Mon Sep 17 00:00:00 2001
From: "j.goderbauer" <j.goderbauer@adito.de>
Date: Tue, 8 Sep 2020 15:43:05 +0200
Subject: [PATCH 265/309] upgrade project version: 6.1.1 -> 6.2.0

---
 .aditoprj/project.version                                   | 4 ++--
 neonView/360DegreeFilter_view/360DegreeFilter_view.aod      | 2 +-
 .../CampaignCostVariable_view/CampaignCostVariable_view.aod | 2 +-
 .../DocumentTemplateFilter_view.aod                         | 6 +++---
 neonView/FavoriteFilter_view/FavoriteFilter_view.aod        | 2 +-
 .../OfferPreviewMultiple_view/OfferPreviewMultiple_view.aod | 6 +++---
 .../PermissionCalendarFilter_view.aod                       | 2 +-
 .../SalesprojectFilter_view/SalesprojectFilter_view.aod     | 2 +-
 8 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/.aditoprj/project.version b/.aditoprj/project.version
index 2a99306b4f..b4940e7b13 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!
-#Mon Mar 16 10:08:50 CET 2020
-version=6.1.1
+#Tue Sep 08 15:42:02 CEST 2020
+version=6.2.0
diff --git a/neonView/360DegreeFilter_view/360DegreeFilter_view.aod b/neonView/360DegreeFilter_view/360DegreeFilter_view.aod
index a6ca35f6cb..d08051d2b5 100644
--- a/neonView/360DegreeFilter_view/360DegreeFilter_view.aod
+++ b/neonView/360DegreeFilter_view/360DegreeFilter_view.aod
@@ -15,10 +15,10 @@
       <titleField>TITLE</titleField>
       <descriptionField>DATE</descriptionField>
       <iconField>ICON</iconField>
+      <entityField>#ENTITY</entityField>
       <defaultGroupFields>
         <element>ENTITY_NAME</element>
       </defaultGroupFields>
-      <entityField>#ENTITY</entityField>
     </treeViewTemplate>
     <timelineViewTemplate>
       <name>Timeline</name>
diff --git a/neonView/CampaignCostVariable_view/CampaignCostVariable_view.aod b/neonView/CampaignCostVariable_view/CampaignCostVariable_view.aod
index c06e092232..5821748a90 100644
--- a/neonView/CampaignCostVariable_view/CampaignCostVariable_view.aod
+++ b/neonView/CampaignCostVariable_view/CampaignCostVariable_view.aod
@@ -15,10 +15,10 @@
     <treeTableViewTemplate>
       <name>CostTreeTable</name>
       <favoriteActionGroup1>alter</favoriteActionGroup1>
+      <entityField>#ENTITY</entityField>
       <defaultGroupFields>
         <element>CAMPAIGNSTEP_ID</element>
       </defaultGroupFields>
-      <entityField>#ENTITY</entityField>
       <columns>
         <neonTreeTableColumn>
           <name>457caff8-0403-425f-839c-62e5d05fe3a1</name>
diff --git a/neonView/DocumentTemplateFilter_view/DocumentTemplateFilter_view.aod b/neonView/DocumentTemplateFilter_view/DocumentTemplateFilter_view.aod
index c09f4a9cc3..129100f62d 100644
--- a/neonView/DocumentTemplateFilter_view/DocumentTemplateFilter_view.aod
+++ b/neonView/DocumentTemplateFilter_view/DocumentTemplateFilter_view.aod
@@ -22,13 +22,13 @@
     <treeTableViewTemplate>
       <name>SearchTree</name>
       <parentField>KIND</parentField>
-      <defaultGroupFields>
-        <element>KIND</element>
-      </defaultGroupFields>
       <entityField>#ENTITY</entityField>
       <linkedColumns>
         <element>NAME</element>
       </linkedColumns>
+      <defaultGroupFields>
+        <element>KIND</element>
+      </defaultGroupFields>
       <columns>
         <neonTreeTableColumn>
           <name>c0085121-edf6-4e3e-ace4-d599af4aa2f1</name>
diff --git a/neonView/FavoriteFilter_view/FavoriteFilter_view.aod b/neonView/FavoriteFilter_view/FavoriteFilter_view.aod
index 69c2f20b23..8c10293e8a 100644
--- a/neonView/FavoriteFilter_view/FavoriteFilter_view.aod
+++ b/neonView/FavoriteFilter_view/FavoriteFilter_view.aod
@@ -30,10 +30,10 @@
     <treeTableViewTemplate>
       <name>FavoriteTree</name>
       <parentField>TITLE</parentField>
+      <entityField>#ENTITY</entityField>
       <defaultGroupFields>
         <element>GROUP_TITLE</element>
       </defaultGroupFields>
-      <entityField>#ENTITY</entityField>
       <isCreatable v="false" />
       <isEditable v="false" />
       <columns>
diff --git a/neonView/OfferPreviewMultiple_view/OfferPreviewMultiple_view.aod b/neonView/OfferPreviewMultiple_view/OfferPreviewMultiple_view.aod
index d9949333d9..c879059396 100644
--- a/neonView/OfferPreviewMultiple_view/OfferPreviewMultiple_view.aod
+++ b/neonView/OfferPreviewMultiple_view/OfferPreviewMultiple_view.aod
@@ -23,12 +23,12 @@
     </dynamicMultiDataChartViewTemplate>
     <treeTableViewTemplate>
       <name>StatusTreeTable</name>
-      <defaultGroupFields>
-        <element>STATUS</element>
-      </defaultGroupFields>
       <hideActions v="true" />
       <entityField>#ENTITY</entityField>
       <linkedColumns />
+      <defaultGroupFields>
+        <element>STATUS</element>
+      </defaultGroupFields>
       <columns>
         <neonTreeTableColumn>
           <name>5cd9839b-0dea-44e8-9e2f-8f75a7e9cb16</name>
diff --git a/neonView/PermissionCalendarFilter_view/PermissionCalendarFilter_view.aod b/neonView/PermissionCalendarFilter_view/PermissionCalendarFilter_view.aod
index e32b8d2864..ffca2d78c9 100644
--- a/neonView/PermissionCalendarFilter_view/PermissionCalendarFilter_view.aod
+++ b/neonView/PermissionCalendarFilter_view/PermissionCalendarFilter_view.aod
@@ -40,10 +40,10 @@
     <treeTableViewTemplate>
       <name>PermissionCalendarTreeTable</name>
       <favoriteActionGroup1>AddActions</favoriteActionGroup1>
+      <entityField>#ENTITY</entityField>
       <defaultGroupFields>
         <element>PERMISSION</element>
       </defaultGroupFields>
-      <entityField>#ENTITY</entityField>
       <isCreatable v="false" />
       <isEditable v="true" />
       <columns>
diff --git a/neonView/SalesprojectFilter_view/SalesprojectFilter_view.aod b/neonView/SalesprojectFilter_view/SalesprojectFilter_view.aod
index 2713e11d76..3ca5b6aa0b 100644
--- a/neonView/SalesprojectFilter_view/SalesprojectFilter_view.aod
+++ b/neonView/SalesprojectFilter_view/SalesprojectFilter_view.aod
@@ -107,12 +107,12 @@
     </tableViewTemplate>
     <treeTableViewTemplate>
       <name>Treetable</name>
-      <defaultGroupFields />
       <entityField>#ENTITY</entityField>
       <linkedColumns>
         <element>PROJECTCODE</element>
         <element>PROJECTTITLE</element>
       </linkedColumns>
+      <defaultGroupFields />
       <fixedFilterFields />
       <columns>
         <neonTreeTableColumn>
-- 
GitLab


From 18b6812dc50942609f1edf59139318f454c502b2 Mon Sep 17 00:00:00 2001
From: "j.goderbauer" <j.goderbauer@adito.de>
Date: Tue, 8 Sep 2020 15:55:37 +0200
Subject: [PATCH 266/309] Address_lib: documentation fix

---
 process/Address_lib/documentation.adoc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/process/Address_lib/documentation.adoc b/process/Address_lib/documentation.adoc
index 427c006157..08a8841eb5 100644
--- a/process/Address_lib/documentation.adoc
+++ b/process/Address_lib/documentation.adoc
@@ -8,7 +8,7 @@ This is a library for working with big amounts of the combination of the followi
 
 as well as related data like the standard communication data.
 
-This is mainly done via the `AddressObject` which uses database access for loading the data and 
+This is mainly done via the `AddrObject` which uses database access for loading the data and 
 placeholder-definitions for preparing and formatting the data.
 
 == FAQ
@@ -18,7 +18,7 @@ How to get the correct formatted standard address for a single contact, dependin
   This can be easily done via the following code-snippet where the variable `contactId` is 
   the `CONTACT.CONTACTID` of the address where you want to load the data: 
 
-  new AddressObject(contactId).getFormattedAddress();
+  new AddrObject(contactId).getFormattedAddress();
 
 
 How to get the correct formatted standard address for several contacts, depending on their country?::
-- 
GitLab


From 7b23cd0fbef3f7c1d288e76818cc02bd6e4dc282 Mon Sep 17 00:00:00 2001
From: "a.schindlbeck" <a.schindlbeck@adito.de>
Date: Tue, 8 Sep 2020 15:39:42 +0200
Subject: [PATCH 267/309] Notifications: Type translations

---
 .../entityfields/typecode/dropDownProcess.js                 | 5 +++--
 language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod         | 2 +-
 language/_____LANGUAGE_de/_____LANGUAGE_de.aod               | 4 +++-
 language/_____LANGUAGE_en/_____LANGUAGE_en.aod               | 2 +-
 4 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/entity/Notification_entity/entityfields/typecode/dropDownProcess.js b/entity/Notification_entity/entityfields/typecode/dropDownProcess.js
index 53f38d2035..7b41babad8 100644
--- a/entity/Notification_entity/entityfields/typecode/dropDownProcess.js
+++ b/entity/Notification_entity/entityfields/typecode/dropDownProcess.js
@@ -4,9 +4,10 @@ import("system.notification");
 
 var types = []
 
-for (let property in notification.getAllTypes()) 
+var props = notification.getAllTypes();
+for (i = 0; i < props.length; i++) 
 {
-  types.push([property, property]);
+  types.push([props[i]["typecode"], props[i]["title"]]);
 }
 
 result.object(types);
\ No newline at end of file
diff --git a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
index 015587fddd..8c5a16686d 100644
--- a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
+++ b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
@@ -6910,7 +6910,7 @@
       <key>granted permission</key>
     </entry>
     <entry>
-      <key>bulk mail sent</key>
+      <key>Bulk mail sent</key>
     </entry>
     <entry>
       <key>download ready</key>
diff --git a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
index 2fd326ec36..22e0f10f3b 100644
--- a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
+++ b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
@@ -8954,6 +8954,7 @@ Bitte Datumseingabe prüfen</value>
     </entry>
     <entry>
       <key>Workflow deploy failed</key>
+      <value>Workflow deploy fehlgeschlagen</value>
     </entry>
     <entry>
       <key>Current Recipients</key>
@@ -9141,7 +9142,8 @@ Bitte Datumseingabe prüfen</value>
       <key>granted permission</key>
     </entry>
     <entry>
-      <key>bulk mail sent</key>
+      <key>Bulk mail sent</key>
+      <value>Serienmail gesendet</value>
     </entry>
     <entry>
       <key>Permission Procurer User</key>
diff --git a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
index 8849809e65..ff0565ce60 100644
--- a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
+++ b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
@@ -7082,7 +7082,7 @@
       <key>granted permission</key>
     </entry>
     <entry>
-      <key>bulk mail sent</key>
+      <key>Bulk mail sent</key>
     </entry>
     <entry>
       <key>download ready</key>
-- 
GitLab


From e7a33223bbab89be0cfd06302cabe61f24f8fd83 Mon Sep 17 00:00:00 2001
From: Daniel Tran <d.tran@adito.de>
Date: Tue, 8 Sep 2020 20:27:20 +0000
Subject: [PATCH 268/309] #1058757: district management impl

---
 .idea/inspectionProfiles/Project_Default.xml  |   6 -
 .idea/vcs.xml                                 |   6 -
 .../basic/2020.2.0/Districts/changelog.xml    |   7 +
 .../2020.2.0/Districts/create_district.xml    |  21 ++
 .../create_districtResponsibleKeyword.xml     |  14 +
 .../create_districtResponsibleMemberRole.xml  |  14 +
 .../Districts/create_districtresponsible.xml  |  17 +
 .../Data_alias/basic/2020.2.0/changelog.xml   |   1 +
 .liquibase/Data_alias/changelog.xml           |   4 +-
 aliasDefinition/Data_alias/Data_alias.aod     | 326 ++++++++++++++++-
 .../translate4log/property.js                 |  16 +-
 .../translate4log/property.js                 |  12 +-
 .../translate4log/property.js                 |  14 +-
 .../translate4log/property.js                 |  14 +-
 .../translate4log/property.js                 |  14 +-
 .../translate4log/property.js                 |  12 +-
 .../translate4log/property.js                 |  16 +-
 .../translate4log/property.js                 |  12 +-
 .../translate4log/property.js                 |  12 +-
 .../_____SYSTEM_APPLICATION_NEON.aod          |  14 +-
 entity/Attribute_entity/Attribute_entity.aod  |  10 +
 .../DistrictResponsible_entity.aod            | 264 ++++++++++++++
 .../contentTitleProcess.js                    |  12 +
 .../valueProcess.js                           |  52 +++
 .../entityfields/date_edit/valueProcess.js    |  13 +
 .../entityfields/date_new/valueProcess.js     |  13 +
 .../department_attribute_id/valueProcess.js   |  12 +
 .../departmentattributename/valueProcess.js   |  15 +
 .../children/parentid_param/valueProcess.js   |   4 +
 .../entityfields/district_id/valueProcess.js  |   4 +
 .../assignmentrowid_param/valueProcess.js     |   4 +
 .../assignmenttable_param/valueProcess.js     |   3 +
 .../children/tablenames_param/valueProcess.js |   9 +
 .../entityfields/user_edit/valueProcess.js    |  13 +
 .../entityfields/user_new/valueProcess.js     |  13 +
 .../recordcontainers/db/cacheKeyProcess.js    |   7 +
 .../recordcontainers/db/conditionProcess.js   |  57 +++
 .../expression.js                             |  16 +
 entity/District_entity/District_entity.aod    | 341 ++++++++++++++++++
 entity/District_entity/afterUiInit.js         |   0
 entity/District_entity/contentTitleProcess.js |   4 +
 .../appliedfilter/onValueChange.js            |   0
 .../appliedfilter/valueProcess.js             |  37 ++
 .../customercounting/valueProcess.js          |  24 ++
 .../entityfields/date_edit/valueProcess.js    |  13 +
 .../entityfields/date_new/valueProcess.js     |  13 +
 .../district_filter/valueProcess.js           |  27 ++
 .../district_number/displayValueProcess.js    |  10 +
 .../district_number/onValidation.js           |  18 +
 .../district_number/valueProcess.js           |  21 ++
 .../valueProcess.js                           |   7 +
 .../district_status/dropDownProcess.js        |   9 +
 .../children/districtid_param/valueProcess.js |   5 +
 .../assignmentrowid_param/valueProcess.js     |   4 +
 .../assignmenttable_param/valueProcess.js     |   3 +
 .../entityfields/iso3/displayValueProcess.js  |   5 +
 .../children/tablenames_param/valueProcess.js |   9 +
 .../filterpreset_param/valueProcess.js        |   4 +
 .../displayValueProcess.js                    |   8 +
 .../onValueChange.js                          |   0
 .../parentdistrict_districtid/stateProcess.js |   0
 .../entityfields/parentfilter/stateProcess.js |   8 +
 .../entityfields/parentfilter/valueProcess.js |  64 ++++
 .../totalturnover/valueProcess.js             |  27 ++
 .../entityfields/user_edit/valueProcess.js    |  13 +
 .../entityfields/user_new/valueProcess.js     |  13 +
 .../recordcontainers/db/cacheKeyProcess.js    |   9 +
 .../recordcontainers/db/conditionProcess.js   |  18 +
 .../recordcontainers/db/orderClauseProcess.js |   4 +
 .../expression.js                             |   8 +
 .../recordcontainers/jdito/cacheKeyProcess.js |   0
 entity/Document_entity/Document_entity.aod    |  12 +
 entity/Employee_entity/Employee_entity.aod    |  10 +
 entity/Language_entity/Language_entity.aod    |   6 +
 .../LogHistory_entity/LogHistory_entity.aod   |  12 +
 entity/Member_entity/Member_entity.aod        |  95 ++++-
 .../entityfields/uid/documentation.adoc       |   1 +
 .../recordcontainers/jdito/contentProcess.js  | 114 ++++++
 .../Organisation_entity.aod                   |  24 ++
 .../children/orguid_param/valueProcess.js     |   4 +
 .../Organisation_entity/initFilterProcess.js  |  11 +-
 entity/Person_entity/Person_entity.aod        |  14 +
 .../onlyresponsibledistricts/valueProcess.js  |  10 +
 .../Salesproject_entity.aod                   |   4 +-
 .../_____LANGUAGE_EXTRA.aod                   |  57 +++
 .../_____LANGUAGE_de/_____LANGUAGE_de.aod     |  73 ++++
 .../_____LANGUAGE_en/_____LANGUAGE_en.aod     |  57 +++
 neonContext/District/District.aod             |  34 ++
 .../DistrictResponsible.aod                   |  21 ++
 neonContext/Organisation/Organisation.aod     |   6 +-
 neonContext/Person/Person.aod                 |   4 +
 .../DistrictEdit_view/DistrictEdit_view.aod   |  57 +++
 .../DistrictFilter_view.aod                   |  45 +++
 .../DistrictList_view/DistrictList_view.aod   |  48 +++
 .../DistrictMain_view/DistrictMain_view.aod   |  33 ++
 .../DistrictPreview_view.aod                  |  63 ++++
 .../DistrictResponsibleList_view.aod          |  33 ++
 .../DistrictResponsibleMultiEdit_view.aod     |  28 ++
 .../DistrictResponsiblePreviewList_view.aod   |  26 ++
 .../OrganisationDistrictResponsibles_view.aod |  18 +
 .../OrganisationMain_view.aod                 |   5 +
 .../PersonDistricts_view.aod                  |  18 +
 neonView/PersonMain_view/PersonMain_view.aod  |   5 +
 .../_____PREFERENCES_PROJECT.aod              |   2 +-
 process/Employee_lib/process.js               |  23 +-
 105 files changed, 2674 insertions(+), 98 deletions(-)
 delete mode 100644 .idea/inspectionProfiles/Project_Default.xml
 delete mode 100644 .idea/vcs.xml
 create mode 100644 .liquibase/Data_alias/basic/2020.2.0/Districts/changelog.xml
 create mode 100644 .liquibase/Data_alias/basic/2020.2.0/Districts/create_district.xml
 create mode 100644 .liquibase/Data_alias/basic/2020.2.0/Districts/create_districtResponsibleKeyword.xml
 create mode 100644 .liquibase/Data_alias/basic/2020.2.0/Districts/create_districtResponsibleMemberRole.xml
 create mode 100644 .liquibase/Data_alias/basic/2020.2.0/Districts/create_districtresponsible.xml
 create mode 100644 entity/DistrictResponsible_entity/DistrictResponsible_entity.aod
 create mode 100644 entity/DistrictResponsible_entity/contentTitleProcess.js
 create mode 100644 entity/DistrictResponsible_entity/entityfields/collecteddistrictids_param/valueProcess.js
 create mode 100644 entity/DistrictResponsible_entity/entityfields/date_edit/valueProcess.js
 create mode 100644 entity/DistrictResponsible_entity/entityfields/date_new/valueProcess.js
 create mode 100644 entity/DistrictResponsible_entity/entityfields/department_attribute_id/valueProcess.js
 create mode 100644 entity/DistrictResponsible_entity/entityfields/departmentattributename/valueProcess.js
 create mode 100644 entity/DistrictResponsible_entity/entityfields/departments/children/parentid_param/valueProcess.js
 create mode 100644 entity/DistrictResponsible_entity/entityfields/district_id/valueProcess.js
 create mode 100644 entity/DistrictResponsible_entity/entityfields/documents/children/assignmentrowid_param/valueProcess.js
 create mode 100644 entity/DistrictResponsible_entity/entityfields/documents/children/assignmenttable_param/valueProcess.js
 create mode 100644 entity/DistrictResponsible_entity/entityfields/loghistories/children/tablenames_param/valueProcess.js
 create mode 100644 entity/DistrictResponsible_entity/entityfields/user_edit/valueProcess.js
 create mode 100644 entity/DistrictResponsible_entity/entityfields/user_new/valueProcess.js
 create mode 100644 entity/DistrictResponsible_entity/recordcontainers/db/cacheKeyProcess.js
 create mode 100644 entity/DistrictResponsible_entity/recordcontainers/db/conditionProcess.js
 create mode 100644 entity/DistrictResponsible_entity/recordcontainers/db/recordfieldmappings/employee_contact_id.displayvalue/expression.js
 create mode 100644 entity/District_entity/District_entity.aod
 create mode 100644 entity/District_entity/afterUiInit.js
 create mode 100644 entity/District_entity/contentTitleProcess.js
 create mode 100644 entity/District_entity/entityfields/appliedfilter/onValueChange.js
 create mode 100644 entity/District_entity/entityfields/appliedfilter/valueProcess.js
 create mode 100644 entity/District_entity/entityfields/customercounting/valueProcess.js
 create mode 100644 entity/District_entity/entityfields/date_edit/valueProcess.js
 create mode 100644 entity/District_entity/entityfields/date_new/valueProcess.js
 create mode 100644 entity/District_entity/entityfields/district_filter/valueProcess.js
 create mode 100644 entity/District_entity/entityfields/district_number/displayValueProcess.js
 create mode 100644 entity/District_entity/entityfields/district_number/onValidation.js
 create mode 100644 entity/District_entity/entityfields/district_number/valueProcess.js
 create mode 100644 entity/District_entity/entityfields/district_number_fieldgroup/valueProcess.js
 create mode 100644 entity/District_entity/entityfields/district_status/dropDownProcess.js
 create mode 100644 entity/District_entity/entityfields/districtresponsibles/children/districtid_param/valueProcess.js
 create mode 100644 entity/District_entity/entityfields/documents/children/assignmentrowid_param/valueProcess.js
 create mode 100644 entity/District_entity/entityfields/documents/children/assignmenttable_param/valueProcess.js
 create mode 100644 entity/District_entity/entityfields/iso3/displayValueProcess.js
 create mode 100644 entity/District_entity/entityfields/logs/children/tablenames_param/valueProcess.js
 create mode 100644 entity/District_entity/entityfields/organisations/children/filterpreset_param/valueProcess.js
 create mode 100644 entity/District_entity/entityfields/parentdistrict_districtid/displayValueProcess.js
 create mode 100644 entity/District_entity/entityfields/parentdistrict_districtid/onValueChange.js
 create mode 100644 entity/District_entity/entityfields/parentdistrict_districtid/stateProcess.js
 create mode 100644 entity/District_entity/entityfields/parentfilter/stateProcess.js
 create mode 100644 entity/District_entity/entityfields/parentfilter/valueProcess.js
 create mode 100644 entity/District_entity/entityfields/totalturnover/valueProcess.js
 create mode 100644 entity/District_entity/entityfields/user_edit/valueProcess.js
 create mode 100644 entity/District_entity/entityfields/user_new/valueProcess.js
 create mode 100644 entity/District_entity/recordcontainers/db/cacheKeyProcess.js
 create mode 100644 entity/District_entity/recordcontainers/db/conditionProcess.js
 create mode 100644 entity/District_entity/recordcontainers/db/orderClauseProcess.js
 create mode 100644 entity/District_entity/recordcontainers/db/recordfieldmappings/parent_district.displayvalue/expression.js
 create mode 100644 entity/District_entity/recordcontainers/jdito/cacheKeyProcess.js
 create mode 100644 entity/Member_entity/entityfields/uid/documentation.adoc
 create mode 100644 entity/Member_entity/recordcontainers/jdito/contentProcess.js
 create mode 100644 entity/Organisation_entity/entityfields/districtresponsibles/children/orguid_param/valueProcess.js
 create mode 100644 entity/Person_entity/entityfields/districts/children/onlyresponsibledistricts/valueProcess.js
 create mode 100644 neonContext/District/District.aod
 create mode 100644 neonContext/DistrictResponsible/DistrictResponsible.aod
 create mode 100644 neonView/DistrictEdit_view/DistrictEdit_view.aod
 create mode 100644 neonView/DistrictFilter_view/DistrictFilter_view.aod
 create mode 100644 neonView/DistrictList_view/DistrictList_view.aod
 create mode 100644 neonView/DistrictMain_view/DistrictMain_view.aod
 create mode 100644 neonView/DistrictPreview_view/DistrictPreview_view.aod
 create mode 100644 neonView/DistrictResponsibleList_view/DistrictResponsibleList_view.aod
 create mode 100644 neonView/DistrictResponsibleMultiEdit_view/DistrictResponsibleMultiEdit_view.aod
 create mode 100644 neonView/DistrictResponsiblePreviewList_view/DistrictResponsiblePreviewList_view.aod
 create mode 100644 neonView/OrganisationDistrictResponsibles_view/OrganisationDistrictResponsibles_view.aod
 create mode 100644 neonView/PersonDistricts_view/PersonDistricts_view.aod

diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
deleted file mode 100644
index 4a1ab97369..0000000000
--- a/.idea/inspectionProfiles/Project_Default.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<component name="InspectionProjectProfileManager">
-  <profile version="1.0">
-    <option name="myName" value="Project Default" />
-    <inspection_tool class="LossyEncoding" enabled="false" level="WARNING" enabled_by_default="false" />
-  </profile>
-</component>
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
deleted file mode 100644
index 9661ac7134..0000000000
--- a/.idea/vcs.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="$PROJECT_DIR$" vcs="Git" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/2020.2.0/Districts/changelog.xml b/.liquibase/Data_alias/basic/2020.2.0/Districts/changelog.xml
new file mode 100644
index 0000000000..a423a1456f
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2020.2.0/Districts/changelog.xml
@@ -0,0 +1,7 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+                   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+    <include relativeToChangelogFile="true" file="create_district.xml"/>
+    <include relativeToChangelogFile="true" file="create_districtresponsible.xml"/>
+    <include relativeToChangelogFile="true" file="create_districtResponsibleKeyword.xml"/>
+</databaseChangeLog>
diff --git a/.liquibase/Data_alias/basic/2020.2.0/Districts/create_district.xml b/.liquibase/Data_alias/basic/2020.2.0/Districts/create_district.xml
new file mode 100644
index 0000000000..6ea091c954
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2020.2.0/Districts/create_district.xml
@@ -0,0 +1,21 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+    <changeSet author="d.tran" id="4bfb41ea-ef43-403a-9a93-48d92294b1cb">
+        <createTable tableName="DISTRICT">
+            <column name="DISTRICTID" type="CHAR(36)">
+                <constraints primaryKey="true" primaryKeyName="PK_DISTRICT_DISTRICTID"/>
+            </column>
+            <column name="DISTRICT_NAME" type="VARCHAR(50)"/>
+            <column name="DISTRICT_NUMBER" type="INTEGER"/>
+            <column name="DISTRICT_INFO" type="VARCHAR(50)"/>
+            <column name="ISO3" type="VARCHAR(5)"/>
+            <column name="PARENTDISTRICT_DISTRICTID" type="CHAR(36)"/>
+            <column name="DISTRICT_FILTER" type="NCLOB"/>
+            <column name="DISTRICT_STATUS" type="INTEGER"/>
+            <column name="USER_NEW" type="NVARCHAR(50)"/>
+            <column name="USER_EDIT" type="NVARCHAR(50)"/>
+            <column name="DATE_NEW" type="DATETIME"/>
+            <column name="DATE_EDIT" type="DATETIME"/>
+        </createTable>
+    </changeSet>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/2020.2.0/Districts/create_districtResponsibleKeyword.xml b/.liquibase/Data_alias/basic/2020.2.0/Districts/create_districtResponsibleKeyword.xml
new file mode 100644
index 0000000000..4e8f1db18e
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2020.2.0/Districts/create_districtResponsibleKeyword.xml
@@ -0,0 +1,14 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+  <changeSet author="d.tran" id="04265522-bc51-4a4e-b637-335942dff147">
+    <insert tableName="AB_KEYWORD_ENTRY">
+      <column name="AB_KEYWORD_ENTRYID" value="997b4954-3108-41e0-a339-c1045ea2e01c"/>
+      <column name="KEYID" value="MEMBERROLEDISTRICTRESPONSIBLE"/>
+      <column name="TITLE" value="District Responsible"/>
+      <column name="CONTAINER" value="MemberRole"/>
+      <column name="SORTING" valueNumeric="0"/>
+      <column name="ISACTIVE" valueNumeric="1"/>
+      <column name="ISESSENTIAL" valueNumeric="0"/>
+    </insert>  
+  </changeSet>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/2020.2.0/Districts/create_districtResponsibleMemberRole.xml b/.liquibase/Data_alias/basic/2020.2.0/Districts/create_districtResponsibleMemberRole.xml
new file mode 100644
index 0000000000..5747db8f36
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2020.2.0/Districts/create_districtResponsibleMemberRole.xml
@@ -0,0 +1,14 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+    <changeSet author="d.tran" id="d95ebf6c-1e34-4ba3-9f0b-386c5059444e">
+        <insert tableName="AB_KEYWORD_ENTRY">
+            <column name="AB_KEYWORD_ENTRYID" value="66d1563a-a76c-47ca-af6b-38586a2f3ce3"/>
+            <column name="KEYID" value="MEMROLEDISTRICTRESPONSIBLE"/>
+            <column name="TITLE" value="District Responsible"/>
+            <column name="CONTAINER" value="MemberRole"/>
+            <column name="SORTING" valueNumeric="0"/>
+            <column name="ISACTIVE" valueNumeric="1"/>
+            <column name="ISESSENTIAL" valueNumeric="0"/>
+        </insert>
+    </changeSet>
+</databaseChangeLog>
diff --git a/.liquibase/Data_alias/basic/2020.2.0/Districts/create_districtresponsible.xml b/.liquibase/Data_alias/basic/2020.2.0/Districts/create_districtresponsible.xml
new file mode 100644
index 0000000000..71ac9397e0
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2020.2.0/Districts/create_districtresponsible.xml
@@ -0,0 +1,17 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+    <changeSet author="d.tran" id="0e5cc99d-3500-484c-abc4-441e3a5c4b7f">
+        <createTable tableName="DISTRICTRESPONSIBLE">
+            <column name="DISTRICTRESPONSIBLEID" type="CHAR(36)">
+                <constraints primaryKey="true" primaryKeyName="PK_DISTRICTRESPONSIBLE_DISTRICTRESPONSIBLEID"/>
+            </column>
+            <column name="DISTRICT_ID" type="CHAR(36)"/>
+            <column name="EMPLOYEE_CONTACT_ID" type="CHAR(36)"/>
+            <column name="DEPARTMENT_ATTRIBUTE_ID" type="CHAR(36)"/>
+            <column name="USER_NEW" type="NVARCHAR(50)"/>
+            <column name="USER_EDIT" type="NVARCHAR(50)"/>
+            <column name="DATE_NEW" type="DATETIME"/>
+            <column name="DATE_EDIT" type="DATETIME"/>
+        </createTable>
+    </changeSet>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/2020.2.0/changelog.xml b/.liquibase/Data_alias/basic/2020.2.0/changelog.xml
index 6007ef250f..21311ae8db 100644
--- a/.liquibase/Data_alias/basic/2020.2.0/changelog.xml
+++ b/.liquibase/Data_alias/basic/2020.2.0/changelog.xml
@@ -1,6 +1,7 @@
 <?xml version="1.1" encoding="UTF-8" standalone="no"?>
 <databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
                    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+    <include relativeToChangelogFile="true" file="Districts/changelog.xml"/>
     <include relativeToChangelogFile="true" file="Classification/changelog.xml"/>
     <include relativeToChangelogFile="true" file="ImportFields/changelog.xml"/>
     <include relativeToChangelogFile="true" file="LeadimportMappingAssistant/changelog.xml"/>
diff --git a/.liquibase/Data_alias/changelog.xml b/.liquibase/Data_alias/changelog.xml
index ae8736c63f..c3a1d3c575 100644
--- a/.liquibase/Data_alias/changelog.xml
+++ b/.liquibase/Data_alias/changelog.xml
@@ -16,7 +16,7 @@
     <include relativeToChangelogFile="true" file="basic/2020.1.2/changelog.xml"/>
     <include relativeToChangelogFile="true" file="basic/2020.1.3/changelog.xml"/>
     <include relativeToChangelogFile="true" file="basic/2020.2.0/changelog.xml"/>
-    
-    <!--enable this only when you definetly want to overwrite the existing data with demo records:--> 
+
+    <!--enable this only when you definetly want to overwrite the existing data with demo records:-->
     <!--<include relativeToChangelogFile="true" file="basic/_demoData/changelog.xml" context="example"/>-->
 </databaseChangeLog>
\ No newline at end of file
diff --git a/aliasDefinition/Data_alias/Data_alias.aod b/aliasDefinition/Data_alias/Data_alias.aod
index 4bb598459a..402c8e920f 100644
--- a/aliasDefinition/Data_alias/Data_alias.aod
+++ b/aliasDefinition/Data_alias/Data_alias.aod
@@ -14990,7 +14990,7 @@
                 <name>GRADING</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="1" />
+                <columnType v="12" />
                 <size v="1" />
                 <scale v="0" />
                 <notNull v="false" />
@@ -15052,7 +15052,7 @@
                 <name>OBJECT_ROWID</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
+                <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
                 <notNull v="false" />
@@ -15095,7 +15095,7 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
-                <size v="36" />
+                <size v="63" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -15314,6 +15314,326 @@
               </entityFieldDb>
             </entityFields>
           </entityDb>
+          <entityDb>
+            <name>DISTRICT</name>
+            <dbName></dbName>
+            <idColumn>DISTRICTID</idColumn>
+            <idGeneratorType v="0" />
+            <idGeneratorInterval v="1" />
+            <documentation></documentation>
+            <title></title>
+            <description></description>
+            <auditSyncConfig>
+              <name>auditSyncConfig</name>
+              <auditMode v="0" />
+              <syncActive v="false" />
+              <syncComplete v="true" />
+              <syncDirection v="1" />
+              <syncIds></syncIds>
+            </auditSyncConfig>
+            <entityFields>
+              <entityFieldDb>
+                <name>DISTRICT_NAME</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="50" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>DISTRICT_INFO</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="50" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>DATE_EDIT</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="93" />
+                <size v="29" />
+                <scale v="9" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>DISTRICT_STATUS</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="4" />
+                <size v="10" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>PARENTDISTRICT_DISTRICTID</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="36" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>DATE_NEW</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="93" />
+                <size v="29" />
+                <scale v="9" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>USER_NEW</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="36" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>DISTRICT_NUMBER</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="4" />
+                <size v="10" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>ISO3</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="5" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>DISTRICTID</name>
+                <dbName></dbName>
+                <primaryKey v="true" />
+                <columnType v="1" />
+                <size v="36" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="true" />
+                <index v="true" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>USER_EDIT</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="36" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>DISTRICT_FILTER</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="2005" />
+                <size v="2147483647" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+            </entityFields>
+          </entityDb>
+          <entityDb>
+            <name>DISTRICTRESPONSIBLE</name>
+            <dbName></dbName>
+            <idColumn>DISTRICTRESPONSIBLEID</idColumn>
+            <idGeneratorType v="0" />
+            <idGeneratorInterval v="1" />
+            <documentation></documentation>
+            <title></title>
+            <description></description>
+            <auditSyncConfig>
+              <name>auditSyncConfig</name>
+              <auditMode v="0" />
+              <syncActive v="false" />
+              <syncComplete v="true" />
+              <syncDirection v="1" />
+              <syncIds></syncIds>
+            </auditSyncConfig>
+            <entityFields>
+              <entityFieldDb>
+                <name>DISTRICTRESPONSIBLEID</name>
+                <dbName></dbName>
+                <primaryKey v="true" />
+                <columnType v="1" />
+                <size v="36" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="true" />
+                <index v="true" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>DATE_EDIT</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="93" />
+                <size v="29" />
+                <scale v="9" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>DEPARTMENT_ATTRIBUTE_ID</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="36" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>DISTRICT_ID</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="36" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>EMPLOYEE_CONTACT_ID</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="36" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>DATE_NEW</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="93" />
+                <size v="29" />
+                <scale v="9" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>USER_NEW</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="36" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>USER_EDIT</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="36" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+            </entityFields>
+          </entityDb>
         </entities>
       </entityGroup>
     </aliasDefDb>
diff --git a/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/contact/entityfields/organisation_id/customproperties/translate4log/property.js b/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/contact/entityfields/organisation_id/customproperties/translate4log/property.js
index 633ea8076f..013c797ac6 100644
--- a/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/contact/entityfields/organisation_id/customproperties/translate4log/property.js
+++ b/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/contact/entityfields/organisation_id/customproperties/translate4log/property.js
@@ -1,8 +1,8 @@
-import("Contact_lib");
-import("system.db");
-import("system.result");
-import("Loghistory_lib");
-
-var params = Translate4LogParams.load();
-var res = OrganisationUtils.getNameByContactId(params.value);
-result.string(res);
+import("Contact_lib");
+import("system.db");
+import("system.result");
+import("Loghistory_lib");
+
+var params = Translate4LogParams.load();
+var res = OrganisationUtils.getNameByContactId(params.value);
+result.string(res);
diff --git a/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/offer/entityfields/contact_id/customproperties/translate4log/property.js b/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/offer/entityfields/contact_id/customproperties/translate4log/property.js
index 26c85ce005..f35d37ab09 100644
--- a/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/offer/entityfields/contact_id/customproperties/translate4log/property.js
+++ b/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/offer/entityfields/contact_id/customproperties/translate4log/property.js
@@ -1,7 +1,7 @@
-import("Contact_lib");
-import("system.result");
-import("Loghistory_lib");
-
-var params = Translate4LogParams.load();
-var res = ContactUtils.getFullTitleByContactId(params.value);
+import("Contact_lib");
+import("system.result");
+import("Loghistory_lib");
+
+var params = Translate4LogParams.load();
+var res = ContactUtils.getFullTitleByContactId(params.value);
 result.string(res);
\ No newline at end of file
diff --git a/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/offer/entityfields/net/customproperties/translate4log/property.js b/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/offer/entityfields/net/customproperties/translate4log/property.js
index d5c240bd0a..4bd7c6c1a5 100644
--- a/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/offer/entityfields/net/customproperties/translate4log/property.js
+++ b/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/offer/entityfields/net/customproperties/translate4log/property.js
@@ -1,8 +1,8 @@
-import("system.translate");
-import("system.vars");
-import("system.result");
-import("system.text");
-import("Loghistory_lib");
-
-var params = Translate4LogParams.load();
+import("system.translate");
+import("system.vars");
+import("system.result");
+import("system.text");
+import("Loghistory_lib");
+
+var params = Translate4LogParams.load();
 result.string(text.formatDouble(params.value, "#,##0.00", true));
\ No newline at end of file
diff --git a/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/offer/entityfields/vat/customproperties/translate4log/property.js b/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/offer/entityfields/vat/customproperties/translate4log/property.js
index d5c240bd0a..4bd7c6c1a5 100644
--- a/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/offer/entityfields/vat/customproperties/translate4log/property.js
+++ b/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/offer/entityfields/vat/customproperties/translate4log/property.js
@@ -1,8 +1,8 @@
-import("system.translate");
-import("system.vars");
-import("system.result");
-import("system.text");
-import("Loghistory_lib");
-
-var params = Translate4LogParams.load();
+import("system.translate");
+import("system.vars");
+import("system.result");
+import("system.text");
+import("Loghistory_lib");
+
+var params = Translate4LogParams.load();
 result.string(text.formatDouble(params.value, "#,##0.00", true));
\ No newline at end of file
diff --git a/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/product/entityfields/contact_id/customproperties/translate4log/property.js b/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/product/entityfields/contact_id/customproperties/translate4log/property.js
index 0046811b3b..9f7c5917a2 100644
--- a/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/product/entityfields/contact_id/customproperties/translate4log/property.js
+++ b/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/product/entityfields/contact_id/customproperties/translate4log/property.js
@@ -1,8 +1,8 @@
-import("Contact_lib");
-import("system.db");
-import("system.result");
-import("Loghistory_lib");
-
-var params = Translate4LogParams.load();
-var res = OrganisationUtils.getNameByContactId(params.value);
+import("Contact_lib");
+import("system.db");
+import("system.result");
+import("Loghistory_lib");
+
+var params = Translate4LogParams.load();
+var res = OrganisationUtils.getNameByContactId(params.value);
 result.string(res);
\ No newline at end of file
diff --git a/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/salesorder/entityfields/contact_id/customproperties/translate4log/property.js b/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/salesorder/entityfields/contact_id/customproperties/translate4log/property.js
index 26c85ce005..f35d37ab09 100644
--- a/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/salesorder/entityfields/contact_id/customproperties/translate4log/property.js
+++ b/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/salesorder/entityfields/contact_id/customproperties/translate4log/property.js
@@ -1,7 +1,7 @@
-import("Contact_lib");
-import("system.result");
-import("Loghistory_lib");
-
-var params = Translate4LogParams.load();
-var res = ContactUtils.getFullTitleByContactId(params.value);
+import("Contact_lib");
+import("system.result");
+import("Loghistory_lib");
+
+var params = Translate4LogParams.load();
+var res = ContactUtils.getFullTitleByContactId(params.value);
 result.string(res);
\ No newline at end of file
diff --git a/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/salesproject/entityfields/contact_id/customproperties/translate4log/property.js b/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/salesproject/entityfields/contact_id/customproperties/translate4log/property.js
index 633ea8076f..013c797ac6 100644
--- a/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/salesproject/entityfields/contact_id/customproperties/translate4log/property.js
+++ b/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/salesproject/entityfields/contact_id/customproperties/translate4log/property.js
@@ -1,8 +1,8 @@
-import("Contact_lib");
-import("system.db");
-import("system.result");
-import("Loghistory_lib");
-
-var params = Translate4LogParams.load();
-var res = OrganisationUtils.getNameByContactId(params.value);
-result.string(res);
+import("Contact_lib");
+import("system.db");
+import("system.result");
+import("Loghistory_lib");
+
+var params = Translate4LogParams.load();
+var res = OrganisationUtils.getNameByContactId(params.value);
+result.string(res);
diff --git a/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/task/entityfields/editor_contact_id/customproperties/translate4log/property.js b/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/task/entityfields/editor_contact_id/customproperties/translate4log/property.js
index 26c85ce005..f35d37ab09 100644
--- a/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/task/entityfields/editor_contact_id/customproperties/translate4log/property.js
+++ b/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/task/entityfields/editor_contact_id/customproperties/translate4log/property.js
@@ -1,7 +1,7 @@
-import("Contact_lib");
-import("system.result");
-import("Loghistory_lib");
-
-var params = Translate4LogParams.load();
-var res = ContactUtils.getFullTitleByContactId(params.value);
+import("Contact_lib");
+import("system.result");
+import("Loghistory_lib");
+
+var params = Translate4LogParams.load();
+var res = ContactUtils.getFullTitleByContactId(params.value);
 result.string(res);
\ No newline at end of file
diff --git a/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/task/entityfields/requestor_contact_id/customproperties/translate4log/property.js b/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/task/entityfields/requestor_contact_id/customproperties/translate4log/property.js
index 26c85ce005..f35d37ab09 100644
--- a/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/task/entityfields/requestor_contact_id/customproperties/translate4log/property.js
+++ b/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/task/entityfields/requestor_contact_id/customproperties/translate4log/property.js
@@ -1,7 +1,7 @@
-import("Contact_lib");
-import("system.result");
-import("Loghistory_lib");
-
-var params = Translate4LogParams.load();
-var res = ContactUtils.getFullTitleByContactId(params.value);
+import("Contact_lib");
+import("system.result");
+import("Loghistory_lib");
+
+var params = Translate4LogParams.load();
+var res = ContactUtils.getFullTitleByContactId(params.value);
 result.string(res);
\ No newline at end of file
diff --git a/application/_____SYSTEM_APPLICATION_NEON/_____SYSTEM_APPLICATION_NEON.aod b/application/_____SYSTEM_APPLICATION_NEON/_____SYSTEM_APPLICATION_NEON.aod
index 256d8c0500..6113055f4e 100644
--- a/application/_____SYSTEM_APPLICATION_NEON/_____SYSTEM_APPLICATION_NEON.aod
+++ b/application/_____SYSTEM_APPLICATION_NEON/_____SYSTEM_APPLICATION_NEON.aod
@@ -306,6 +306,10 @@
                 <name>Userhelp</name>
                 <kind v="10077" />
               </entityNode>
+              <entityNode>
+                <name>District</name>
+                <kind v="10077" />
+              </entityNode>
             </childNodes>
           </entityNode>
         </childNodes>
@@ -321,15 +325,14 @@
             <kind v="123" />
             <title></title>
             <childNodes>
-              <entityNode>
-                <name>PROJECT_HumanResources</name>
-                <kind v="159" />
-                <title></title>
-              </entityNode>
               <entityNode>
                 <name>Employee</name>
                 <kind v="10077" />
               </entityNode>
+              <entityNode>
+                <name>INTERNAL_ADMINISTRATOR</name>
+                <kind v="159" />
+              </entityNode>
             </childNodes>
           </entityNode>
           <entityNode>
@@ -345,7 +348,6 @@
               <entityNode>
                 <name>INTERNAL_ADMINISTRATOR</name>
                 <kind v="159" />
-                <title></title>
               </entityNode>
               <entityNode>
                 <name>PermissionMetaData</name>
diff --git a/entity/Attribute_entity/Attribute_entity.aod b/entity/Attribute_entity/Attribute_entity.aod
index 34e9a227c4..6f00c57a63 100644
--- a/entity/Attribute_entity/Attribute_entity.aod
+++ b/entity/Attribute_entity/Attribute_entity.aod
@@ -156,6 +156,12 @@
           <fieldName>Departments</fieldName>
           <isConsumer v="false" />
         </entityDependency>
+        <entityDependency>
+          <name>71cfeddd-a315-4692-8299-08813ca1dc19</name>
+          <entityName>DistrictResponsible_entity</entityName>
+          <fieldName>Departments</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
       </dependencies>
       <children>
         <entityParameter>
@@ -179,6 +185,10 @@
           <name>ChildType_param</name>
           <expose v="false" />
         </entityParameter>
+        <entityParameter>
+          <name>ParentId_param</name>
+          <description>parent id, this is used for filtering by the parent in the content process</description>
+        </entityParameter>
       </children>
     </entityProvider>
     <entityField>
diff --git a/entity/DistrictResponsible_entity/DistrictResponsible_entity.aod b/entity/DistrictResponsible_entity/DistrictResponsible_entity.aod
new file mode 100644
index 0000000000..32f46b01cf
--- /dev/null
+++ b/entity/DistrictResponsible_entity/DistrictResponsible_entity.aod
@@ -0,0 +1,264 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
+  <name>DistrictResponsible_entity</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <icon>VAADIN:GLOBE</icon>
+  <title>Verantwortlicher</title>
+  <contentTitleProcess>%aditoprj%/entity/DistrictResponsible_entity/contentTitleProcess.js</contentTitleProcess>
+  <image>VAADIN:GLOBE</image>
+  <recordContainer>db</recordContainer>
+  <entityFields>
+    <entityProvider>
+      <name>#PROVIDER</name>
+    </entityProvider>
+    <entityField>
+      <name>DEPARTMENT_ATTRIBUTE_ID</name>
+      <title>Department</title>
+      <consumer>Departments</consumer>
+      <state>AUTO</state>
+      <valueProcess>%aditoprj%/entity/DistrictResponsible_entity/entityfields/department_attribute_id/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>EMPLOYEE_CONTACT_ID</name>
+      <title>{$DISTRICT_RESPONSIBLE}</title>
+      <consumer>Employees</consumer>
+      <linkedContext>Person</linkedContext>
+      <selectionMode>SINGLE</selectionMode>
+    </entityField>
+    <entityField>
+      <name>DISTRICT_ID</name>
+      <consumer>Districts</consumer>
+      <valueProcess>%aditoprj%/entity/DistrictResponsible_entity/entityfields/district_id/valueProcess.js</valueProcess>
+    </entityField>
+    <entityConsumer>
+      <name>Departments</name>
+      <dependency>
+        <name>dependency</name>
+        <entityName>Attribute_entity</entityName>
+        <fieldName>SpecificAttribute</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>ParentId_param</name>
+          <valueProcess>%aditoprj%/entity/DistrictResponsible_entity/entityfields/departments/children/parentid_param/valueProcess.js</valueProcess>
+          <description>parent id, this is used for filtering by the parent in the content process</description>
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityConsumer>
+      <name>Employees</name>
+      <dependency>
+        <name>dependency</name>
+        <entityName>Employee_entity</entityName>
+        <fieldName>Employees</fieldName>
+      </dependency>
+    </entityConsumer>
+    <entityConsumer>
+      <name>Districts</name>
+      <dependency>
+        <name>dependency</name>
+        <entityName>District_entity</entityName>
+        <fieldName>Districts</fieldName>
+      </dependency>
+    </entityConsumer>
+    <entityField>
+      <name>DISTRICTRESPONSIBLEID</name>
+    </entityField>
+    <entityField>
+      <name>USER_NEW</name>
+      <valueProcess>%aditoprj%/entity/DistrictResponsible_entity/entityfields/user_new/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>USER_EDIT</name>
+      <valueProcess>%aditoprj%/entity/DistrictResponsible_entity/entityfields/user_edit/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>DATE_NEW</name>
+      <valueProcess>%aditoprj%/entity/DistrictResponsible_entity/entityfields/date_new/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>DATE_EDIT</name>
+      <valueProcess>%aditoprj%/entity/DistrictResponsible_entity/entityfields/date_edit/valueProcess.js</valueProcess>
+    </entityField>
+    <entityProvider>
+      <name>DistrictResponsibles</name>
+      <lookupIdfield>DISTRICTRESPONSIBLEID</lookupIdfield>
+      <dependencies>
+        <entityDependency>
+          <name>ef26fdb6-5fcf-416e-bcc8-380b5751b523</name>
+          <entityName>District_entity</entityName>
+          <fieldName>DistrictResponsibles</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+      </dependencies>
+      <children>
+        <entityParameter>
+          <name>DistrictId_param</name>
+          <mandatory v="true" />
+        </entityParameter>
+        <entityParameter>
+          <name>OrgUid_param</name>
+          <expose v="false" />
+        </entityParameter>
+      </children>
+    </entityProvider>
+    <entityParameter>
+      <name>DistrictId_param</name>
+      <expose v="true" />
+      <mandatory v="false" />
+    </entityParameter>
+    <entityConsumer>
+      <name>LogHistories</name>
+      <dependency>
+        <name>dependency</name>
+        <entityName>LogHistory_entity</entityName>
+        <fieldName>LogHistoryProvider</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>tablenames_param</name>
+          <valueProcess>%aditoprj%/entity/DistrictResponsible_entity/entityfields/loghistories/children/tablenames_param/valueProcess.js</valueProcess>
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityConsumer>
+      <name>Documents</name>
+      <dependency>
+        <name>dependency</name>
+        <entityName>Document_entity</entityName>
+        <fieldName>Documents</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>AssignmentRowId_param</name>
+          <valueProcess>%aditoprj%/entity/DistrictResponsible_entity/entityfields/documents/children/assignmentrowid_param/valueProcess.js</valueProcess>
+        </entityParameter>
+        <entityParameter>
+          <name>AssignmentTable_param</name>
+          <valueProcess>%aditoprj%/entity/DistrictResponsible_entity/entityfields/documents/children/assignmenttable_param/valueProcess.js</valueProcess>
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityParameter>
+      <name>OnlyResponsibles_param</name>
+      <expose v="true" />
+    </entityParameter>
+    <entityField>
+      <name>departmentAttributeName</name>
+      <title>Department</title>
+      <state>READONLY</state>
+      <valueProcess>%aditoprj%/entity/DistrictResponsible_entity/entityfields/departmentattributename/valueProcess.js</valueProcess>
+    </entityField>
+    <entityProvider>
+      <name>OrganisationResponsibles</name>
+      <dependencies>
+        <entityDependency>
+          <name>9c2fe0da-9456-44ef-ac6c-28ac234b35f7</name>
+          <entityName>Organisation_entity</entityName>
+          <fieldName>DistrictResponsibles</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+        <entityDependency>
+          <name>7e71479b-8f39-4cd8-a31e-fac43df426d6</name>
+          <entityName>Salesproject_entity</entityName>
+          <fieldName>DistrictResponsibles</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+        <entityDependency>
+          <name>97a448e1-05fb-4e42-ba83-11b419034f08</name>
+          <entityName>Member_entity</entityName>
+          <fieldName>DistrictResponsibles</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+      </dependencies>
+      <children>
+        <entityParameter>
+          <name>DistrictId_param</name>
+          <expose v="false" />
+        </entityParameter>
+        <entityParameter>
+          <name>OnlyResponsibles_param</name>
+          <expose v="false" />
+        </entityParameter>
+      </children>
+    </entityProvider>
+    <entityParameter>
+      <name>OrgUid_param</name>
+      <expose v="true" />
+    </entityParameter>
+    <entityProvider>
+      <name>#PROVIDER_AGGREGATES</name>
+      <useAggregates v="true" />
+    </entityProvider>
+  </entityFields>
+  <recordContainers>
+    <dbRecordContainer>
+      <name>db</name>
+      <alias>Data_alias</alias>
+      <isPageable v="false" />
+      <conditionProcess>%aditoprj%/entity/DistrictResponsible_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
+      <cacheType>GLOBAL</cacheType>
+      <cacheKeyProcess>%aditoprj%/entity/DistrictResponsible_entity/recordcontainers/db/cacheKeyProcess.js</cacheKeyProcess>
+      <linkInformation>
+        <linkInformation>
+          <name>d659c49e-363d-4a1a-93a5-1abcfcf9e51c</name>
+          <tableName>DISTRICTRESPONSIBLE</tableName>
+          <primaryKey>DISTRICTRESPONSIBLEID</primaryKey>
+          <isUIDTable v="true" />
+          <readonly v="false" />
+        </linkInformation>
+      </linkInformation>
+      <recordFieldMappings>
+        <dbRecordFieldMapping>
+          <name>DEPARTMENT_ATTRIBUTE_ID.value</name>
+          <recordfield>DISTRICTRESPONSIBLE.DEPARTMENT_ATTRIBUTE_ID</recordfield>
+          <isFilterable v="true" />
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>DISTRICT_ID.value</name>
+          <recordfield>DISTRICTRESPONSIBLE.DISTRICT_ID</recordfield>
+          <isFilterable v="true" />
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>EMPLOYEE_CONTACT_ID.value</name>
+          <recordfield>DISTRICTRESPONSIBLE.EMPLOYEE_CONTACT_ID</recordfield>
+          <isFilterable v="true" />
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>DISTRICTRESPONSIBLEID.value</name>
+          <recordfield>DISTRICTRESPONSIBLE.DISTRICTRESPONSIBLEID</recordfield>
+          <isFilterable v="false" />
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>USER_EDIT.value</name>
+          <recordfield>DISTRICTRESPONSIBLE.USER_EDIT</recordfield>
+          <isFilterable v="true" />
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>USER_NEW.value</name>
+          <recordfield>DISTRICTRESPONSIBLE.USER_NEW</recordfield>
+          <isFilterable v="true" />
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>DATE_EDIT.value</name>
+          <recordfield>DISTRICTRESPONSIBLE.DATE_EDIT</recordfield>
+          <isFilterable v="true" />
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>DATE_NEW.value</name>
+          <recordfield>DISTRICTRESPONSIBLE.DATE_NEW</recordfield>
+          <isFilterable v="true" />
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>EMPLOYEE_CONTACT_ID.displayValue</name>
+          <expression>%aditoprj%/entity/DistrictResponsible_entity/recordcontainers/db/recordfieldmappings/employee_contact_id.displayvalue/expression.js</expression>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>DEPARTMENT_ATTRIBUTE_ID.displayValue</name>
+          <recordfield>DISTRICTRESPONSIBLE.DEPARTMENT_ATTRIBUTE_ID</recordfield>
+          <expression>%aditoprj%/entity/DistrictResponsible_entity/recordcontainers/db/recordfieldmappings/department_attribute_id.displayvalue/expression.js</expression>
+        </dbRecordFieldMapping>
+      </recordFieldMappings>
+    </dbRecordContainer>
+  </recordContainers>
+</entity>
diff --git a/entity/DistrictResponsible_entity/contentTitleProcess.js b/entity/DistrictResponsible_entity/contentTitleProcess.js
new file mode 100644
index 0000000000..67d21cf41f
--- /dev/null
+++ b/entity/DistrictResponsible_entity/contentTitleProcess.js
@@ -0,0 +1,12 @@
+import("system.logging");
+import("system.vars");
+import("system.result");
+import("Employee_lib");
+
+var contactId = vars.get("$field.EMPLOYEE_CONTACT_ID");
+var res = "";
+
+if(contactId)
+    res = EmployeeUtils.getUsersDepartment(contactId, true);
+
+result.string(res)
\ No newline at end of file
diff --git a/entity/DistrictResponsible_entity/entityfields/collecteddistrictids_param/valueProcess.js b/entity/DistrictResponsible_entity/entityfields/collecteddistrictids_param/valueProcess.js
new file mode 100644
index 0000000000..552eea46c9
--- /dev/null
+++ b/entity/DistrictResponsible_entity/entityfields/collecteddistrictids_param/valueProcess.js
@@ -0,0 +1,52 @@
+import("system.entities");
+import("system.result");
+import("system.vars");
+import("Sql_lib");
+
+var orgUid = vars.get("$param.OrgUid_param");
+
+if(orgUid) 
+{
+    var orgDistrictIds = getDistrictIdsByOrgUid(orgUid);
+    orgDistrictIds = JSON.stringify(orgDistrictIds);
+} else {
+    orgDistrictIds = JSON.stringify([]);
+}
+
+result.string(orgDistrictIds);
+
+function _getDistrictIdsByOrgUid(pOrgUid) {
+    
+    var districtIds = [];
+    var nonMatchedId = [];
+    var loadingRowsConfig = entities.createConfigForLoadingRows()
+                                        .entity("District_entity")
+                                        .fields(["#UID", "appliedFilter", "DISTRICT_NAME", "PARENTDISTRICT_ID"]);
+    var districtRows = entities.getRows(loadingRowsConfig);
+    
+    for (i = 0; i < districtRows.length; i++) {
+        
+        if (districtRows[i]["PARENTDISTRICT_ID"] in nonMatchedId)
+        {
+            nonMatchedId.push(districtRows[i]["#UID"]);
+            continue;
+        } else {
+            var filter = JSON.stringify(JSON.parse(districtRows[i]["appliedFilter"]).filter);
+            var rowCountConfig = entities.createConfigForLoadingRows()
+                                            .entity("Organisation_entity")
+                                            .uid(pOrgUid)
+                                            //.provider()
+                                            .filter(filter);
+        
+            var rowCount = entities.getRowCount(rowCountConfig);
+        
+            if (rowCount > 0) 
+            {
+                districtIds.push(districtRows[i]["#UID"]);   
+            } else {
+                nonMatchedId.push(districtRows[i]["#UID"]);
+            }   
+        }
+    }
+    return districtIds;
+}
\ No newline at end of file
diff --git a/entity/DistrictResponsible_entity/entityfields/date_edit/valueProcess.js b/entity/DistrictResponsible_entity/entityfields/date_edit/valueProcess.js
new file mode 100644
index 0000000000..054ad94ce2
--- /dev/null
+++ b/entity/DistrictResponsible_entity/entityfields/date_edit/valueProcess.js
@@ -0,0 +1,13 @@
+import("system.vars");
+import("system.neon");
+import("system.result");
+
+
+var currentDate = null;
+
+if (vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_EDIT)
+{
+    currentDate = vars.get("$sys.date");
+}
+
+result.string(currentDate);
\ No newline at end of file
diff --git a/entity/DistrictResponsible_entity/entityfields/date_new/valueProcess.js b/entity/DistrictResponsible_entity/entityfields/date_new/valueProcess.js
new file mode 100644
index 0000000000..032607ee56
--- /dev/null
+++ b/entity/DistrictResponsible_entity/entityfields/date_new/valueProcess.js
@@ -0,0 +1,13 @@
+import("system.vars");
+import("system.neon");
+import("system.result");
+
+
+var currentDate = null;
+
+if (vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_NEW)
+{
+    currentDate = vars.get("$sys.date");
+}
+
+result.string(currentDate);
\ No newline at end of file
diff --git a/entity/DistrictResponsible_entity/entityfields/department_attribute_id/valueProcess.js b/entity/DistrictResponsible_entity/entityfields/department_attribute_id/valueProcess.js
new file mode 100644
index 0000000000..3474c5398a
--- /dev/null
+++ b/entity/DistrictResponsible_entity/entityfields/department_attribute_id/valueProcess.js
@@ -0,0 +1,12 @@
+import("system.vars");
+import("system.result");
+import("system.tools");
+
+var employeesContactId = vars.get("$field.EMPLOYEE_CONTACT_ID");
+var departmentsAttrId = ""
+if (employeesContactId)
+{
+    departmentsAttrId = tools.getUsersByAttribute(tools.CONTACTID, [employeesContactId])[0][tools.PARAMS].department;
+}
+
+result.string(departmentsAttrId);
\ No newline at end of file
diff --git a/entity/DistrictResponsible_entity/entityfields/departmentattributename/valueProcess.js b/entity/DistrictResponsible_entity/entityfields/departmentattributename/valueProcess.js
new file mode 100644
index 0000000000..7fac5c4e39
--- /dev/null
+++ b/entity/DistrictResponsible_entity/entityfields/departmentattributename/valueProcess.js
@@ -0,0 +1,15 @@
+import("system.logging");
+import("system.vars");
+import("system.result");
+import("Attribute_lib");
+
+
+var departmentAttrId = vars.get("$field.DEPARTMENT_ATTRIBUTE_ID");
+var departmentDisplayName = "";
+
+if (departmentAttrId) 
+{
+    departmentDisplayName = AttributeUtil.getSimpleAttributeName(departmentAttrId, true);
+}
+
+result.string(departmentDisplayName);
\ No newline at end of file
diff --git a/entity/DistrictResponsible_entity/entityfields/departments/children/parentid_param/valueProcess.js b/entity/DistrictResponsible_entity/entityfields/departments/children/parentid_param/valueProcess.js
new file mode 100644
index 0000000000..246beece1e
--- /dev/null
+++ b/entity/DistrictResponsible_entity/entityfields/departments/children/parentid_param/valueProcess.js
@@ -0,0 +1,4 @@
+import("AttributeRegistry_basic");
+import("system.result");
+
+result.string($AttributeRegistry.departments());
\ No newline at end of file
diff --git a/entity/DistrictResponsible_entity/entityfields/district_id/valueProcess.js b/entity/DistrictResponsible_entity/entityfields/district_id/valueProcess.js
new file mode 100644
index 0000000000..2cc037e509
--- /dev/null
+++ b/entity/DistrictResponsible_entity/entityfields/district_id/valueProcess.js
@@ -0,0 +1,4 @@
+import("system.result");
+import("system.vars");
+
+result.string(vars.get("$param.DistrictId_param"));
\ No newline at end of file
diff --git a/entity/DistrictResponsible_entity/entityfields/documents/children/assignmentrowid_param/valueProcess.js b/entity/DistrictResponsible_entity/entityfields/documents/children/assignmentrowid_param/valueProcess.js
new file mode 100644
index 0000000000..51e13bb7a6
--- /dev/null
+++ b/entity/DistrictResponsible_entity/entityfields/documents/children/assignmentrowid_param/valueProcess.js
@@ -0,0 +1,4 @@
+import("system.result");
+import("system.vars");
+
+result.string(vars.get("$field.DISTRICTRESPONSIBLEID"));
\ No newline at end of file
diff --git a/entity/DistrictResponsible_entity/entityfields/documents/children/assignmenttable_param/valueProcess.js b/entity/DistrictResponsible_entity/entityfields/documents/children/assignmenttable_param/valueProcess.js
new file mode 100644
index 0000000000..b5a701f96e
--- /dev/null
+++ b/entity/DistrictResponsible_entity/entityfields/documents/children/assignmenttable_param/valueProcess.js
@@ -0,0 +1,3 @@
+import("system.result");
+
+result.string("DISTRICTRESPONSIBLE");
\ No newline at end of file
diff --git a/entity/DistrictResponsible_entity/entityfields/loghistories/children/tablenames_param/valueProcess.js b/entity/DistrictResponsible_entity/entityfields/loghistories/children/tablenames_param/valueProcess.js
new file mode 100644
index 0000000000..7e27434b58
--- /dev/null
+++ b/entity/DistrictResponsible_entity/entityfields/loghistories/children/tablenames_param/valueProcess.js
@@ -0,0 +1,9 @@
+import("system.vars");
+import("system.result");
+import("Context_lib");
+
+var res = [{id: vars.get("$field.DISTRICTRESPONSIBLEID"), tableNames: ["DISTRICTRESPONSIBLE"]}];
+
+res = JSON.stringify(res);//currently only strings  can be passed as param
+
+result.object(res);
\ No newline at end of file
diff --git a/entity/DistrictResponsible_entity/entityfields/user_edit/valueProcess.js b/entity/DistrictResponsible_entity/entityfields/user_edit/valueProcess.js
new file mode 100644
index 0000000000..a55cb32746
--- /dev/null
+++ b/entity/DistrictResponsible_entity/entityfields/user_edit/valueProcess.js
@@ -0,0 +1,13 @@
+import("system.vars");
+import("system.neon");
+import("system.result");
+
+
+var currentUser = null;
+
+if (vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_EDIT)
+{
+    currentUser = vars.get("$sys.user");
+}
+
+result.string(currentUser);
\ No newline at end of file
diff --git a/entity/DistrictResponsible_entity/entityfields/user_new/valueProcess.js b/entity/DistrictResponsible_entity/entityfields/user_new/valueProcess.js
new file mode 100644
index 0000000000..1411b9ac93
--- /dev/null
+++ b/entity/DistrictResponsible_entity/entityfields/user_new/valueProcess.js
@@ -0,0 +1,13 @@
+import("system.vars");
+import("system.neon");
+import("system.result");
+
+
+var currentUser = null;
+
+if (vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_NEW)
+{
+    currentUser = vars.get("$sys.user");
+}
+
+result.string(currentUser);
\ No newline at end of file
diff --git a/entity/DistrictResponsible_entity/recordcontainers/db/cacheKeyProcess.js b/entity/DistrictResponsible_entity/recordcontainers/db/cacheKeyProcess.js
new file mode 100644
index 0000000000..37bf4d68be
--- /dev/null
+++ b/entity/DistrictResponsible_entity/recordcontainers/db/cacheKeyProcess.js
@@ -0,0 +1,7 @@
+import("CachedRecordContainer_lib");
+import("system.result");
+
+
+var cacheKey = CachedRecordContainerUtils.getCommonKey("$param.DistrictId_param", "$param.CollectedDistrictIds_param");
+
+result.string(cacheKey);
\ No newline at end of file
diff --git a/entity/DistrictResponsible_entity/recordcontainers/db/conditionProcess.js b/entity/DistrictResponsible_entity/recordcontainers/db/conditionProcess.js
new file mode 100644
index 0000000000..7fc53ff212
--- /dev/null
+++ b/entity/DistrictResponsible_entity/recordcontainers/db/conditionProcess.js
@@ -0,0 +1,57 @@
+import("system.entities");
+import("system.result");
+import("system.vars");
+import("Sql_lib");
+
+var districtId = vars.get("$param.DistrictId_param");
+//var onlyResponsibles = vars.get("$param.OnlyResponsibles_param");
+var orgUid = vars.get("$param.OrgUid_param");
+var cond;
+
+if (districtId)
+{
+    cond = newWhere("DISTRICTRESPONSIBLE.DISTRICT_ID", districtId);
+} 
+else if(orgUid) 
+{
+    var orgDistrictIds = getDistrictIdsByOrgUid(orgUid);
+    cond = newWhere("DISTRICTRESPONSIBLE.DISTRICT_ID", orgDistrictIds, SqlBuilder.IN());
+}
+
+result.string(cond.toString());
+
+function getDistrictIdsByOrgUid(pOrgUid) {
+    
+    var districtIds = [];
+    var nonMatchedId = [];
+    var loadingRowsConfig = entities.createConfigForLoadingRows()
+                                        .entity("District_entity")
+                                        .fields(["#UID", "appliedFilter", "DISTRICT_NAME", "PARENTDISTRICT_ID"]);
+    var districtRows = entities.getRows(loadingRowsConfig);
+    
+    for (i = 0; i < districtRows.length; i++) {
+        
+        if (districtRows[i]["PARENTDISTRICT_ID"] in nonMatchedId)
+        {
+            nonMatchedId.push(districtRows[i]["#UID"]);
+            continue;
+        } else {
+            var filter = JSON.stringify(JSON.parse(districtRows[i]["appliedFilter"]).filter);
+            var rowCountConfig = entities.createConfigForLoadingRows()
+                                            .entity("Organisation_entity")
+                                            .uid(pOrgUid)
+                                            //.provider()
+                                            .filter(filter);
+        
+            var rowCount = entities.getRowCount(rowCountConfig);
+        
+            if (rowCount > 0) 
+            {
+                districtIds.push(districtRows[i]["#UID"]);   
+            } else {
+                nonMatchedId.push(districtRows[i]["#UID"]);
+            }   
+        }
+    }
+    return districtIds;
+}
\ No newline at end of file
diff --git a/entity/DistrictResponsible_entity/recordcontainers/db/recordfieldmappings/employee_contact_id.displayvalue/expression.js b/entity/DistrictResponsible_entity/recordcontainers/db/recordfieldmappings/employee_contact_id.displayvalue/expression.js
new file mode 100644
index 0000000000..2dd8e6a868
--- /dev/null
+++ b/entity/DistrictResponsible_entity/recordcontainers/db/recordfieldmappings/employee_contact_id.displayvalue/expression.js
@@ -0,0 +1,16 @@
+import("system.logging");
+import("system.result");
+import("Contact_lib");
+import("Sql_lib");
+
+
+var contact = Contact.createWithColumnPreset();
+var renderer = new ContactTitleRenderer(contact, ContactTitleRenderer.OPTIONS.NoOption);
+var selectExpression = renderer.asSql();
+
+result.string(newSelect(selectExpression)
+                .from("CONTACT")
+                .leftJoin("PERSON", "PERSON.PERSONID = CONTACT.PERSON_ID")
+                .leftJoin("ORGANISATION", "ORGANISATION.ORGANISATIONID = CONTACT.ORGANISATION_ID")
+                .where("CONTACT.CONTACTID = DISTRICTRESPONSIBLE.EMPLOYEE_CONTACT_ID")
+                .toString());
diff --git a/entity/District_entity/District_entity.aod b/entity/District_entity/District_entity.aod
new file mode 100644
index 0000000000..5748ce859c
--- /dev/null
+++ b/entity/District_entity/District_entity.aod
@@ -0,0 +1,341 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
+  <name>District_entity</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <icon>VAADIN:GLOBE</icon>
+  <title>District definition</title>
+  <contentTitleProcess>%aditoprj%/entity/District_entity/contentTitleProcess.js</contentTitleProcess>
+  <afterUiInit>%aditoprj%/entity/District_entity/afterUiInit.js</afterUiInit>
+  <titlePlural></titlePlural>
+  <recordContainer>db</recordContainer>
+  <entityFields>
+    <entityProvider>
+      <name>#PROVIDER</name>
+    </entityProvider>
+    <entityField>
+      <name>DISTRICT_NAME</name>
+      <title>Name</title>
+      <groupable v="true" />
+      <mandatory v="true" />
+    </entityField>
+    <entityField>
+      <name>DISTRICT_NUMBER</name>
+      <title>{$DISTRICT_NUMBER}</title>
+      <contentType>TEXT</contentType>
+      <groupable v="true" />
+      <valueProcess>%aditoprj%/entity/District_entity/entityfields/district_number/valueProcess.js</valueProcess>
+      <displayValueProcess>%aditoprj%/entity/District_entity/entityfields/district_number/displayValueProcess.js</displayValueProcess>
+      <onValidation>%aditoprj%/entity/District_entity/entityfields/district_number/onValidation.js</onValidation>
+    </entityField>
+    <entityField>
+      <name>DISTRICT_INFO</name>
+      <title>Information</title>
+      <contentType>LONG_TEXT</contentType>
+    </entityField>
+    <entityField>
+      <name>DISTRICTID</name>
+    </entityField>
+    <entityField>
+      <name>DISTRICT_STATUS</name>
+      <title>Status</title>
+      <groupable v="true" />
+      <mandatory v="true" />
+      <dropDownProcess>%aditoprj%/entity/District_entity/entityfields/district_status/dropDownProcess.js</dropDownProcess>
+      <selectionMode>SINGLE</selectionMode>
+    </entityField>
+    <entityField>
+      <name>PARENTDISTRICT_DISTRICTID</name>
+      <title>{$DISTRICT_PARENT_DISTRICT}</title>
+      <consumer>ParentDistricts</consumer>
+      <dropDownProcess>%aditoprj%/entity/District_entity/entityfields/parentdistrict_districtid/dropDownProcess.js</dropDownProcess>
+      <stateProcess>%aditoprj%/entity/District_entity/entityfields/parentdistrict_districtid/stateProcess.js</stateProcess>
+      <displayValueProcess>%aditoprj%/entity/District_entity/entityfields/parentdistrict_districtid/displayValueProcess.js</displayValueProcess>
+      <onValueChange>%aditoprj%/entity/District_entity/entityfields/parentdistrict_districtid/onValueChange.js</onValueChange>
+      <onValueChangeTypes>
+        <element>MASK</element>
+        <element>PROCESS</element>
+        <element>PROCESS_SETVALUE</element>
+      </onValueChangeTypes>
+    </entityField>
+    <entityField>
+      <name>DISTRICT_FILTER</name>
+      <title>District Filter</title>
+      <contentType>FILTER_TREE</contentType>
+      <valueProcess>%aditoprj%/entity/District_entity/entityfields/district_filter/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>customerCounting</name>
+      <title>Customer counting</title>
+      <groupable v="true" />
+      <valueProcess>%aditoprj%/entity/District_entity/entityfields/customercounting/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>totalTurnover</name>
+      <title>{$DISTRICT_TOTAL_TURNOVER}</title>
+      <groupable v="true" />
+      <valueProcess>%aditoprj%/entity/District_entity/entityfields/totalturnover/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>ISO3</name>
+      <title>Language</title>
+      <consumer>Languages</consumer>
+      <groupable v="true" />
+      <displayValueProcess>%aditoprj%/entity/District_entity/entityfields/iso3/displayValueProcess.js</displayValueProcess>
+    </entityField>
+    <entityProvider>
+      <name>Districts</name>
+      <lookupIdfield>DISTRICTID</lookupIdfield>
+      <recordContainer>db</recordContainer>
+      <dependencies>
+        <entityDependency>
+          <name>291c0ca4-5a68-45f5-80a7-745c7df56d7c</name>
+          <entityName>DistrictResponsible_entity</entityName>
+          <fieldName>Districts</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+        <entityDependency>
+          <name>d2c383ee-7b5d-4242-b598-8343c1133fdd</name>
+          <entityName>District_entity</entityName>
+          <fieldName>ParentDistricts</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+      </dependencies>
+    </entityProvider>
+    <entityConsumer>
+      <name>Languages</name>
+      <dependency>
+        <name>dependency</name>
+        <entityName>Language_entity</entityName>
+        <fieldName>ISO3Name</fieldName>
+      </dependency>
+    </entityConsumer>
+    <entityConsumer>
+      <name>DistrictResponsibles</name>
+      <dependency>
+        <name>dependency</name>
+        <entityName>DistrictResponsible_entity</entityName>
+        <fieldName>DistrictResponsibles</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>DistrictId_param</name>
+          <valueProcess>%aditoprj%/entity/District_entity/entityfields/districtresponsibles/children/districtid_param/valueProcess.js</valueProcess>
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityField>
+      <name>USER_NEW</name>
+      <valueProcess>%aditoprj%/entity/District_entity/entityfields/user_new/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>USER_EDIT</name>
+      <valueProcess>%aditoprj%/entity/District_entity/entityfields/user_edit/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>DATE_NEW</name>
+      <valueProcess>%aditoprj%/entity/District_entity/entityfields/date_new/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>DATE_EDIT</name>
+      <groupable v="false" />
+      <valueProcess>%aditoprj%/entity/District_entity/entityfields/date_edit/valueProcess.js</valueProcess>
+    </entityField>
+    <entityConsumer>
+      <name>Organisations</name>
+      <refreshParent v="true" />
+      <dependency>
+        <name>dependency</name>
+        <entityName>Organisation_entity</entityName>
+        <fieldName>Organisations</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>FilterPreSet_param</name>
+          <valueProcess>%aditoprj%/entity/District_entity/entityfields/organisations/children/filterpreset_param/valueProcess.js</valueProcess>
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityFieldGroup>
+      <name>DISTRICT_NUMBER_fieldGroup</name>
+      <valueProcess>%aditoprj%/entity/District_entity/entityfields/district_number_fieldgroup/valueProcess.js</valueProcess>
+      <title>{$DISTRICT_NO}</title>
+      <fields>
+        <element>DISTRICT_NUMBER</element>
+      </fields>
+    </entityFieldGroup>
+    <entityConsumer>
+      <name>ParentDistricts</name>
+      <dependency>
+        <name>dependency</name>
+        <entityName>#ENTITY</entityName>
+        <fieldName>Districts</fieldName>
+      </dependency>
+    </entityConsumer>
+    <entityConsumer>
+      <name>Documents</name>
+      <dependency>
+        <name>dependency</name>
+        <entityName>Document_entity</entityName>
+        <fieldName>Documents</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>AssignmentRowId_param</name>
+          <valueProcess>%aditoprj%/entity/District_entity/entityfields/documents/children/assignmentrowid_param/valueProcess.js</valueProcess>
+        </entityParameter>
+        <entityParameter>
+          <name>AssignmentTable_param</name>
+          <valueProcess>%aditoprj%/entity/District_entity/entityfields/documents/children/assignmenttable_param/valueProcess.js</valueProcess>
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityConsumer>
+      <name>LogHistories</name>
+      <dependency>
+        <name>dependency</name>
+        <entityName>LogHistory_entity</entityName>
+        <fieldName>LogHistoryProvider</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>tablenames_param</name>
+          <valueProcess>%aditoprj%/entity/District_entity/entityfields/logs/children/tablenames_param/valueProcess.js</valueProcess>
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityField>
+      <name>parentFilter</name>
+      <title>Parent Filter</title>
+      <contentType>FILTER_TREE</contentType>
+      <state>READONLY</state>
+      <stateProcess>%aditoprj%/entity/District_entity/entityfields/parentfilter/stateProcess.js</stateProcess>
+      <valueProcess>%aditoprj%/entity/District_entity/entityfields/parentfilter/valueProcess.js</valueProcess>
+      <onValueChange>%aditoprj%/entity/District_entity/entityfields/parentfilter/onValueChange.js</onValueChange>
+    </entityField>
+    <entityParameter>
+      <name>OnlyResponsibleDistricts</name>
+      <expose v="true" />
+    </entityParameter>
+    <entityParameter>
+      <name>DistrictIdByOrgId_param</name>
+      <expose v="true" />
+    </entityParameter>
+    <entityField>
+      <name>appliedFilter</name>
+      <valueProcess>%aditoprj%/entity/District_entity/entityfields/appliedfilter/valueProcess.js</valueProcess>
+      <onValueChange>%aditoprj%/entity/District_entity/entityfields/appliedfilter/onValueChange.js</onValueChange>
+      <onValueChangeTypes>
+        <element>MASK</element>
+        <element>PROCESS</element>
+        <element>PROCESS_SETVALUE</element>
+        <element>RECORD</element>
+      </onValueChangeTypes>
+    </entityField>
+    <entityProvider>
+      <name>#PROVIDER_AGGREGATES</name>
+      <useAggregates v="true" />
+    </entityProvider>
+  </entityFields>
+  <recordContainers>
+    <dbRecordContainer>
+      <name>db</name>
+      <alias>Data_alias</alias>
+      <isPageable v="false" />
+      <conditionProcess>%aditoprj%/entity/District_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
+      <orderClauseProcess>%aditoprj%/entity/District_entity/recordcontainers/db/orderClauseProcess.js</orderClauseProcess>
+      <cacheType>GLOBAL</cacheType>
+      <cacheKeyProcess>%aditoprj%/entity/District_entity/recordcontainers/db/cacheKeyProcess.js</cacheKeyProcess>
+      <linkInformation>
+        <linkInformation>
+          <name>b8398641-f97b-43e4-8f2c-beda8690ab2f</name>
+          <tableName>DISTRICT</tableName>
+          <primaryKey>DISTRICTID</primaryKey>
+          <isUIDTable v="true" />
+          <readonly v="false" />
+        </linkInformation>
+      </linkInformation>
+      <recordFieldMappings>
+        <dbRecordFieldMapping>
+          <name>DATE_EDIT.value</name>
+          <recordfield>DISTRICT.DATE_EDIT</recordfield>
+          <isLookupFilter v="true" />
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>DATE_NEW.value</name>
+          <recordfield>DISTRICT.DATE_NEW</recordfield>
+          <isLookupFilter v="true" />
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>DISTRICT_FILTER.value</name>
+          <recordfield>DISTRICT.DISTRICT_FILTER</recordfield>
+          <isLookupFilter v="true" />
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>DISTRICT_INFO.value</name>
+          <recordfield>DISTRICT.DISTRICT_INFO</recordfield>
+          <isLookupFilter v="true" />
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>DISTRICT_NAME.value</name>
+          <recordfield>DISTRICT.DISTRICT_NAME</recordfield>
+          <isLookupFilter v="true" />
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>DISTRICT_NUMBER.value</name>
+          <recordfield>DISTRICT.DISTRICT_NUMBER</recordfield>
+          <isLookupFilter v="true" />
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>DISTRICT_STATUS.value</name>
+          <recordfield>DISTRICT.DISTRICT_STATUS</recordfield>
+          <isLookupFilter v="true" />
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>DISTRICTID.value</name>
+          <recordfield>DISTRICT.DISTRICTID</recordfield>
+          <isLookupFilter v="true" />
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>ISO3.value</name>
+          <recordfield>DISTRICT.ISO3</recordfield>
+          <isLookupFilter v="true" />
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>PARENTDISTRICT_DISTRICTID.value</name>
+          <recordfield>DISTRICT.PARENTDISTRICT_DISTRICTID</recordfield>
+          <isLookupFilter v="true" />
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>USER_EDIT.value</name>
+          <recordfield>DISTRICT.USER_EDIT</recordfield>
+          <isLookupFilter v="true" />
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>USER_NEW.value</name>
+          <recordfield>DISTRICT.USER_NEW</recordfield>
+          <isLookupFilter v="true" />
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>PARENTDISTRICT_DISTRICTID.displayValue</name>
+          <expression>%aditoprj%/entity/District_entity/recordcontainers/db/recordfieldmappings/parent_district.displayvalue/expression.js</expression>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>appliedFilter.value</name>
+          <isLookupFilter v="true" />
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>customerCounting.value</name>
+          <isLookupFilter v="true" />
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>parentFilter.value</name>
+          <isLookupFilter v="true" />
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>totalTurnover.value</name>
+          <isLookupFilter v="true" />
+        </dbRecordFieldMapping>
+      </recordFieldMappings>
+    </dbRecordContainer>
+  </recordContainers>
+</entity>
diff --git a/entity/District_entity/afterUiInit.js b/entity/District_entity/afterUiInit.js
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/entity/District_entity/contentTitleProcess.js b/entity/District_entity/contentTitleProcess.js
new file mode 100644
index 0000000000..638819b352
--- /dev/null
+++ b/entity/District_entity/contentTitleProcess.js
@@ -0,0 +1,4 @@
+import("system.vars");
+import("system.result");
+
+result.string(vars.get("$field.DISTRICT_NAME"));
\ No newline at end of file
diff --git a/entity/District_entity/entityfields/appliedfilter/onValueChange.js b/entity/District_entity/entityfields/appliedfilter/onValueChange.js
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/entity/District_entity/entityfields/appliedfilter/valueProcess.js b/entity/District_entity/entityfields/appliedfilter/valueProcess.js
new file mode 100644
index 0000000000..253bd0712a
--- /dev/null
+++ b/entity/District_entity/entityfields/appliedfilter/valueProcess.js
@@ -0,0 +1,37 @@
+import("system.result");
+import("system.vars");
+
+var parentFilter = vars.get("$field.parentFilter");
+var districtFilter = vars.get("$field.DISTRICT_FILTER");
+
+var appliedFilter = {
+        entity: "Organisation_entity", 
+        filter: {
+            type: "group", 
+            operator: "AND", 
+            childs: []
+}};
+
+if (parentFilter)
+{
+    appliedFilter.filter.childs.push(JSON.parse(parentFilter).filter);
+}
+if (districtFilter)
+{
+    //appliedFilter = _getApplicableFilter(appliedFilter, districtFilter);
+    appliedFilter.filter.childs.push(JSON.parse(districtFilter).filter);
+}
+
+result.string(JSON.stringify(appliedFilter));
+
+filterArray = [];
+
+function _getApplicableFilter(pFilter, pAppendFilter){
+    
+    var applicableFilter = "";
+    var childFilter = JSON.parse(pFilter).filter;
+    
+    
+    
+    return applicableFilter;
+}
\ No newline at end of file
diff --git a/entity/District_entity/entityfields/customercounting/valueProcess.js b/entity/District_entity/entityfields/customercounting/valueProcess.js
new file mode 100644
index 0000000000..ccecd79603
--- /dev/null
+++ b/entity/District_entity/entityfields/customercounting/valueProcess.js
@@ -0,0 +1,24 @@
+import("system.logging");
+import("system.vars");
+import("system.result");
+import("system.entities");
+import("system.neon");
+
+var appliedFilter = vars.get("$field.appliedFilter");
+var conf, rowCount = 0;
+
+if (appliedFilter)
+{
+    appliedFilter = JSON.parse(appliedFilter).filter;
+    appliedFilter = JSON.stringify(appliedFilter);
+    
+    conf = entities.createConfigForLoadingRows()
+                        .entity("Organisation_entity")
+                        .fields(["ORGANISATIONID"])
+                        .filter(appliedFilter);
+                                
+    rowCount = entities.getRowCount(conf);
+}
+
+
+result.string(rowCount);
\ No newline at end of file
diff --git a/entity/District_entity/entityfields/date_edit/valueProcess.js b/entity/District_entity/entityfields/date_edit/valueProcess.js
new file mode 100644
index 0000000000..054ad94ce2
--- /dev/null
+++ b/entity/District_entity/entityfields/date_edit/valueProcess.js
@@ -0,0 +1,13 @@
+import("system.vars");
+import("system.neon");
+import("system.result");
+
+
+var currentDate = null;
+
+if (vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_EDIT)
+{
+    currentDate = vars.get("$sys.date");
+}
+
+result.string(currentDate);
\ No newline at end of file
diff --git a/entity/District_entity/entityfields/date_new/valueProcess.js b/entity/District_entity/entityfields/date_new/valueProcess.js
new file mode 100644
index 0000000000..032607ee56
--- /dev/null
+++ b/entity/District_entity/entityfields/date_new/valueProcess.js
@@ -0,0 +1,13 @@
+import("system.vars");
+import("system.neon");
+import("system.result");
+
+
+var currentDate = null;
+
+if (vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_NEW)
+{
+    currentDate = vars.get("$sys.date");
+}
+
+result.string(currentDate);
\ No newline at end of file
diff --git a/entity/District_entity/entityfields/district_filter/valueProcess.js b/entity/District_entity/entityfields/district_filter/valueProcess.js
new file mode 100644
index 0000000000..f184154fd9
--- /dev/null
+++ b/entity/District_entity/entityfields/district_filter/valueProcess.js
@@ -0,0 +1,27 @@
+import("system.neon");
+import("system.vars");
+import("system.result");
+import("Sql_lib");
+
+
+var currentFilter = vars.get("$this.value");
+var entity = "Organisation_entity";
+var emptyFilter = {
+    entity: entity, 
+    filter: {
+        type: "group", 
+        operator: "AND", 
+        childs: []
+    }
+};
+
+
+if (currentFilter)
+    currentFilter = JSON.parse(currentFilter);
+
+//if the filter field is empty or if the entity was changed, reset the filter
+if (!currentFilter || currentFilter.entity != emptyFilter.entity)
+{
+    var condJson = JSON.stringify(emptyFilter);
+    result.string(condJson);
+}
\ No newline at end of file
diff --git a/entity/District_entity/entityfields/district_number/displayValueProcess.js b/entity/District_entity/entityfields/district_number/displayValueProcess.js
new file mode 100644
index 0000000000..95a9d9d109
--- /dev/null
+++ b/entity/District_entity/entityfields/district_number/displayValueProcess.js
@@ -0,0 +1,10 @@
+import("system.vars");
+import("system.logging");
+import("system.result");
+import("system.neon");
+import("Sql_lib");
+
+
+var districtNo = vars.get("$field.DISTRICT_NUMBER");
+
+result.string(districtNo.padStart(4, '0'));
diff --git a/entity/District_entity/entityfields/district_number/onValidation.js b/entity/District_entity/entityfields/district_number/onValidation.js
new file mode 100644
index 0000000000..33392435cc
--- /dev/null
+++ b/entity/District_entity/entityfields/district_number/onValidation.js
@@ -0,0 +1,18 @@
+import("system.vars");
+import("system.neon");
+import("system.result");
+import("system.translate");
+import("Sql_lib");
+
+
+var localValue = vars.get("$local.value");
+var value = vars.get("$field.DISTRICT_NUMBER");
+var biggestDistrictNo = newSelect("MAX(DISTRICT_NUMBER)").from("DISTRICT").cell();
+
+if (localValue)
+{
+    if (Number(localValue) <= Number(biggestDistrictNo) && Number(localValue) != Number(value))
+    {
+        result.string(translate.withArguments("The district no has to be bigger than %0", [biggestDistrictNo]));
+    }
+}
\ No newline at end of file
diff --git a/entity/District_entity/entityfields/district_number/valueProcess.js b/entity/District_entity/entityfields/district_number/valueProcess.js
new file mode 100644
index 0000000000..3e307b09a5
--- /dev/null
+++ b/entity/District_entity/entityfields/district_number/valueProcess.js
@@ -0,0 +1,21 @@
+import("system.result");
+import("system.neon");
+import("system.vars");
+import("Sql_lib");
+
+
+var returnableDistrictNo = null;
+var thisValue = vars.get("this.value");
+var previousDistrictNo  = newSelect("COUNT(*)").from("DISTRICT").cell();
+
+if (vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_NEW) 
+{
+    if (previousDistrictNo != Number(previousDistrictNo)+1 && !thisValue) 
+    {
+        returnableDistrictNo = Number(previousDistrictNo)+1;
+    } else{
+        
+    }
+}
+
+result.string(returnableDistrictNo);
\ No newline at end of file
diff --git a/entity/District_entity/entityfields/district_number_fieldgroup/valueProcess.js b/entity/District_entity/entityfields/district_number_fieldgroup/valueProcess.js
new file mode 100644
index 0000000000..33857cd998
--- /dev/null
+++ b/entity/District_entity/entityfields/district_number_fieldgroup/valueProcess.js
@@ -0,0 +1,7 @@
+import("system.vars");
+import("system.result");
+import("system.translate");
+
+var districtNo = vars.get("$field.DISTRICT_NUMBER");
+
+result.string(translate.text("District No.:") + " " + districtNo.padStart(4, '0'));
\ No newline at end of file
diff --git a/entity/District_entity/entityfields/district_status/dropDownProcess.js b/entity/District_entity/entityfields/district_status/dropDownProcess.js
new file mode 100644
index 0000000000..43063fe007
--- /dev/null
+++ b/entity/District_entity/entityfields/district_status/dropDownProcess.js
@@ -0,0 +1,9 @@
+import("system.result");
+import("system.translate");
+
+var selectableOptions = new Array();
+
+selectableOptions[0] = translate.text("Active");
+selectableOptions[1] = translate.text("Inactive");
+
+result.object(selectableOptions);
\ No newline at end of file
diff --git a/entity/District_entity/entityfields/districtresponsibles/children/districtid_param/valueProcess.js b/entity/District_entity/entityfields/districtresponsibles/children/districtid_param/valueProcess.js
new file mode 100644
index 0000000000..d3d1d4b6cb
--- /dev/null
+++ b/entity/District_entity/entityfields/districtresponsibles/children/districtid_param/valueProcess.js
@@ -0,0 +1,5 @@
+import("system.result");
+import("system.vars");
+
+
+result.string(vars.get("$field.DISTRICTID"));
\ No newline at end of file
diff --git a/entity/District_entity/entityfields/documents/children/assignmentrowid_param/valueProcess.js b/entity/District_entity/entityfields/documents/children/assignmentrowid_param/valueProcess.js
new file mode 100644
index 0000000000..9e43ccb56d
--- /dev/null
+++ b/entity/District_entity/entityfields/documents/children/assignmentrowid_param/valueProcess.js
@@ -0,0 +1,4 @@
+import("system.vars");
+import("system.result");
+
+result.string(vars.get("$field.DISTRICTID"));
\ No newline at end of file
diff --git a/entity/District_entity/entityfields/documents/children/assignmenttable_param/valueProcess.js b/entity/District_entity/entityfields/documents/children/assignmenttable_param/valueProcess.js
new file mode 100644
index 0000000000..8a6858d63b
--- /dev/null
+++ b/entity/District_entity/entityfields/documents/children/assignmenttable_param/valueProcess.js
@@ -0,0 +1,3 @@
+import("system.result");
+
+result.string("DISTRICT");
\ No newline at end of file
diff --git a/entity/District_entity/entityfields/iso3/displayValueProcess.js b/entity/District_entity/entityfields/iso3/displayValueProcess.js
new file mode 100644
index 0000000000..d951329b13
--- /dev/null
+++ b/entity/District_entity/entityfields/iso3/displayValueProcess.js
@@ -0,0 +1,5 @@
+import("Context_lib");
+import("system.vars");
+import("system.result");
+
+result.string(ContextUtils.loadContentTitle("Language_entity", vars.get("$field.ISO3")));
\ No newline at end of file
diff --git a/entity/District_entity/entityfields/logs/children/tablenames_param/valueProcess.js b/entity/District_entity/entityfields/logs/children/tablenames_param/valueProcess.js
new file mode 100644
index 0000000000..20ea950711
--- /dev/null
+++ b/entity/District_entity/entityfields/logs/children/tablenames_param/valueProcess.js
@@ -0,0 +1,9 @@
+import("system.vars");
+import("system.result");
+import("Context_lib");
+
+var res = [{id: vars.get("$field.DISTRICTID"), tableNames: ["DISTRICT"]}];
+
+res = JSON.stringify(res);//currently only strings  can be passed as param
+
+result.object(res);
\ No newline at end of file
diff --git a/entity/District_entity/entityfields/organisations/children/filterpreset_param/valueProcess.js b/entity/District_entity/entityfields/organisations/children/filterpreset_param/valueProcess.js
new file mode 100644
index 0000000000..8ca4bf1284
--- /dev/null
+++ b/entity/District_entity/entityfields/organisations/children/filterpreset_param/valueProcess.js
@@ -0,0 +1,4 @@
+import("system.result");
+import("system.vars");
+
+result.string(JSON.stringify(JSON.parse(vars.get("$field.appliedFilter")).filter));
\ No newline at end of file
diff --git a/entity/District_entity/entityfields/parentdistrict_districtid/displayValueProcess.js b/entity/District_entity/entityfields/parentdistrict_districtid/displayValueProcess.js
new file mode 100644
index 0000000000..a90a11a8f7
--- /dev/null
+++ b/entity/District_entity/entityfields/parentdistrict_districtid/displayValueProcess.js
@@ -0,0 +1,8 @@
+import("system.vars");
+import("system.result");
+import("Sql_lib");
+
+var parentDistrictId = vars.get("$field.PARENTDISTRICT_DISTRICTID");
+var parentDistrictName = newSelect("DISTRICT.DISTRICT_NAME").from("DISTRICT").where("DISTRICT.DISTRICTID", parentDistrictId).cell();
+
+result.string(parentDistrictName);
\ No newline at end of file
diff --git a/entity/District_entity/entityfields/parentdistrict_districtid/onValueChange.js b/entity/District_entity/entityfields/parentdistrict_districtid/onValueChange.js
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/entity/District_entity/entityfields/parentdistrict_districtid/stateProcess.js b/entity/District_entity/entityfields/parentdistrict_districtid/stateProcess.js
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/entity/District_entity/entityfields/parentfilter/stateProcess.js b/entity/District_entity/entityfields/parentfilter/stateProcess.js
new file mode 100644
index 0000000000..a8368fb6d4
--- /dev/null
+++ b/entity/District_entity/entityfields/parentfilter/stateProcess.js
@@ -0,0 +1,8 @@
+import("system.vars");
+import("system.result");
+import("system.neon");
+
+if (!vars.get("$field.parentFilter") || !vars.get("$field.PARENTDISTRICT_DISTRICTID"))
+    result.string(neon.COMPONENTSTATE_DISABLED);
+else
+    result.string(neon.COMPONENTSTATE_READONLY);
\ No newline at end of file
diff --git a/entity/District_entity/entityfields/parentfilter/valueProcess.js b/entity/District_entity/entityfields/parentfilter/valueProcess.js
new file mode 100644
index 0000000000..e1c0dfd89d
--- /dev/null
+++ b/entity/District_entity/entityfields/parentfilter/valueProcess.js
@@ -0,0 +1,64 @@
+import("system.result");
+import("system.vars");
+import("system.neon");
+import("Sql_lib");
+
+var res = "";
+var parentDistrictId = vars.get("$field.PARENTDISTRICT_DISTRICTID");
+
+if (parentDistrictId)
+{
+    var completeParentFilter = _getParentFilter(parentDistrictId, null);
+    completeParentFilter.entity = "Organisation_entity";
+    res = completeParentFilter;
+}
+else
+{
+    var entity = "Organisation_entity";
+    var emptyFilter = {
+        entity: entity, 
+        filter: {
+            type: "group", 
+            operator: "AND", 
+            childs: []
+        }
+    };
+    
+    res = emptyFilter;
+}
+    
+result.string(JSON.stringify(res));
+
+
+function _getParentFilter(pParentDistrictId, pPreviousFilter)
+{
+    var resFilter;
+    
+    if (pPreviousFilter != null)
+    {
+        resFilter = pPreviousFilter;
+    } 
+
+    if (pParentDistrictId)
+    {
+        var parentDistrictFilter, grandParentDistrict;
+        [parentDistrictFilter, grandParentDistrict] = newSelect(["DISTRICT.DISTRICT_FILTER", "DISTRICT.PARENTDISTRICT_DISTRICTID"])
+                                                            .from("DISTRICT")
+                                                            .where("DISTRICT.DISTRICTID", pParentDistrictId)
+                                                            .arrayRow();
+
+        parentDistrictFilter = JSON.parse(parentDistrictFilter);
+
+        if (pPreviousFilter)
+            parentDistrictFilter.filter.childs.push(resFilter.filter);//todo: kommentar ergänzen was wir heir eigentlcih machen
+        
+        resFilter = parentDistrictFilter;
+
+        if (grandParentDistrict.length > 0)
+        {   
+            resFilter = _getParentFilter(grandParentDistrict, resFilter);
+        }
+    }
+
+    return resFilter;
+}
\ No newline at end of file
diff --git a/entity/District_entity/entityfields/totalturnover/valueProcess.js b/entity/District_entity/entityfields/totalturnover/valueProcess.js
new file mode 100644
index 0000000000..d63350d1cb
--- /dev/null
+++ b/entity/District_entity/entityfields/totalturnover/valueProcess.js
@@ -0,0 +1,27 @@
+import("system.logging");
+import("system.vars");
+import("system.result");
+import("system.entities");
+import("system.neon");
+
+var appliedFilter = vars.get("$field.DISTRICT_FILTER");
+var conf, rows, districtTurnover = 0;
+
+if (appliedFilter)
+{
+    appliedFilter = JSON.parse(appliedFilter).filter;
+    appliedFilter = JSON.stringify(appliedFilter);
+    
+    conf = entities.createConfigForLoadingRows()
+                        .entity("Organisation_entity")
+                        .fields(["TurnoverCurrentYear"])
+                        .filter(appliedFilter);
+                                
+    rows = entities.getRows(conf);
+    
+    for (i = 0; i < rows.length; i++) {
+        appliedFilter += Number(rows[i].TurnoverCurrentYear);
+    }
+}
+
+result.string(districtTurnover);
\ No newline at end of file
diff --git a/entity/District_entity/entityfields/user_edit/valueProcess.js b/entity/District_entity/entityfields/user_edit/valueProcess.js
new file mode 100644
index 0000000000..a55cb32746
--- /dev/null
+++ b/entity/District_entity/entityfields/user_edit/valueProcess.js
@@ -0,0 +1,13 @@
+import("system.vars");
+import("system.neon");
+import("system.result");
+
+
+var currentUser = null;
+
+if (vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_EDIT)
+{
+    currentUser = vars.get("$sys.user");
+}
+
+result.string(currentUser);
\ No newline at end of file
diff --git a/entity/District_entity/entityfields/user_new/valueProcess.js b/entity/District_entity/entityfields/user_new/valueProcess.js
new file mode 100644
index 0000000000..1411b9ac93
--- /dev/null
+++ b/entity/District_entity/entityfields/user_new/valueProcess.js
@@ -0,0 +1,13 @@
+import("system.vars");
+import("system.neon");
+import("system.result");
+
+
+var currentUser = null;
+
+if (vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_NEW)
+{
+    currentUser = vars.get("$sys.user");
+}
+
+result.string(currentUser);
\ No newline at end of file
diff --git a/entity/District_entity/recordcontainers/db/cacheKeyProcess.js b/entity/District_entity/recordcontainers/db/cacheKeyProcess.js
new file mode 100644
index 0000000000..4e5a7a8939
--- /dev/null
+++ b/entity/District_entity/recordcontainers/db/cacheKeyProcess.js
@@ -0,0 +1,9 @@
+import("CachedRecordContainer_lib");
+import("system.result");
+
+
+var cacheKey;
+
+cacheKey = CachedRecordContainerUtils.getCommonKey("$param.OnlyResponsibleDistricts");
+
+result.string(cacheKey);
\ No newline at end of file
diff --git a/entity/District_entity/recordcontainers/db/conditionProcess.js b/entity/District_entity/recordcontainers/db/conditionProcess.js
new file mode 100644
index 0000000000..f21e37720e
--- /dev/null
+++ b/entity/District_entity/recordcontainers/db/conditionProcess.js
@@ -0,0 +1,18 @@
+import("system.result");
+import("system.vars");
+import("Sql_lib");
+
+
+var onlyResponsibleParam = vars.get("$param.OnlyResponsibleDistricts");
+
+if (onlyResponsibleParam)
+{
+    var responsibleDistricts = newSelect("DISTRICTRESPONSIBLE.DISTRICT_ID")
+                                    .from("DISTRICTRESPONSIBLE")
+                                    .where("DISTRICTRESPONSIBLE.EMPLOYEE_CONTACT_ID", onlyResponsibleParam)
+                                    .arrayColumn();
+    
+    var cond = newWhere("DISTRICT.DISTRICTID", responsibleDistricts, SqlBuilder.IN());
+    
+    result.string(cond.toString());
+}
\ No newline at end of file
diff --git a/entity/District_entity/recordcontainers/db/orderClauseProcess.js b/entity/District_entity/recordcontainers/db/orderClauseProcess.js
new file mode 100644
index 0000000000..8eecff7ca3
--- /dev/null
+++ b/entity/District_entity/recordcontainers/db/orderClauseProcess.js
@@ -0,0 +1,4 @@
+import("system.db");
+import("system.result");
+
+result.object({"DISTRICT_NUMBER" : db.ASCENDING});
\ No newline at end of file
diff --git a/entity/District_entity/recordcontainers/db/recordfieldmappings/parent_district.displayvalue/expression.js b/entity/District_entity/recordcontainers/db/recordfieldmappings/parent_district.displayvalue/expression.js
new file mode 100644
index 0000000000..d5e9849d7e
--- /dev/null
+++ b/entity/District_entity/recordcontainers/db/recordfieldmappings/parent_district.displayvalue/expression.js
@@ -0,0 +1,8 @@
+import("system.result");
+import("Sql_lib");
+
+
+result.string(newSelect("DISTRICT.DISTRICT_NAME")
+                .from("DISTRICT")
+                .where("DISTRICT.PARENTDISTRICT_DISTRICTID = DISTRICT.DISTRICTID")
+                .toString());
\ No newline at end of file
diff --git a/entity/District_entity/recordcontainers/jdito/cacheKeyProcess.js b/entity/District_entity/recordcontainers/jdito/cacheKeyProcess.js
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/entity/Document_entity/Document_entity.aod b/entity/Document_entity/Document_entity.aod
index f37fc7d02a..ee34493e4a 100644
--- a/entity/Document_entity/Document_entity.aod
+++ b/entity/Document_entity/Document_entity.aod
@@ -227,6 +227,18 @@
           <fieldName>Documents</fieldName>
           <isConsumer v="false" />
         </entityDependency>
+        <entityDependency>
+          <name>b7b14281-6e78-4005-ad5b-14dffc4091f5</name>
+          <entityName>District_entity</entityName>
+          <fieldName>Documents</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+        <entityDependency>
+          <name>e6553781-e306-4335-a929-2c2a8ad8270f</name>
+          <entityName>DistrictResponsible_entity</entityName>
+          <fieldName>Documents</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
       </dependencies>
       <children>
         <entityParameter>
diff --git a/entity/Employee_entity/Employee_entity.aod b/entity/Employee_entity/Employee_entity.aod
index afac629c04..60ea8401f6 100644
--- a/entity/Employee_entity/Employee_entity.aod
+++ b/entity/Employee_entity/Employee_entity.aod
@@ -262,6 +262,12 @@
           <fieldName>Leadimport_Empl</fieldName>
           <isConsumer v="false" />
         </entityDependency>
+        <entityDependency>
+          <name>e9a775ab-e63d-493d-94dc-6b27dfb77173</name>
+          <entityName>DistrictResponsible_entity</entityName>
+          <fieldName>Employees</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
       </dependencies>
       <children>
         <entityParameter>
@@ -384,6 +390,10 @@
       <name>#PROVIDER_AGGREGATES</name>
       <useAggregates v="true" />
     </entityProvider>
+    <entityParameter>
+      <name>DepartmentAttrIdByEmployeeContactId_param</name>
+      <expose v="true" />
+    </entityParameter>
   </entityFields>
   <recordContainers>
     <jDitoRecordContainer>
diff --git a/entity/Language_entity/Language_entity.aod b/entity/Language_entity/Language_entity.aod
index 7387d81814..865dc46a9d 100644
--- a/entity/Language_entity/Language_entity.aod
+++ b/entity/Language_entity/Language_entity.aod
@@ -87,6 +87,12 @@
           <fieldName>Languages</fieldName>
           <isConsumer v="false" />
         </entityDependency>
+        <entityDependency>
+          <name>9ee48241-5d40-46e9-83ec-a1dc55fdb7d5</name>
+          <entityName>District_entity</entityName>
+          <fieldName>Languages</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
       </dependencies>
       <children>
         <entityParameter>
diff --git a/entity/LogHistory_entity/LogHistory_entity.aod b/entity/LogHistory_entity/LogHistory_entity.aod
index 7026c8106b..5cb913b76a 100644
--- a/entity/LogHistory_entity/LogHistory_entity.aod
+++ b/entity/LogHistory_entity/LogHistory_entity.aod
@@ -111,6 +111,18 @@
           <fieldName>LogHistories</fieldName>
           <isConsumer v="false" />
         </entityDependency>
+        <entityDependency>
+          <name>fd46379e-f1be-4a9e-9914-4f3f81d96ad5</name>
+          <entityName>District_entity</entityName>
+          <fieldName>LogHistories</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+        <entityDependency>
+          <name>e97b5f2d-d2e0-4539-96e9-e3f96107ffaa</name>
+          <entityName>DistrictResponsible_entity</entityName>
+          <fieldName>LogHistories</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
       </dependencies>
     </entityProvider>
     <entityParameter>
diff --git a/entity/Member_entity/Member_entity.aod b/entity/Member_entity/Member_entity.aod
index 4e8d292267..6d305e8e0c 100644
--- a/entity/Member_entity/Member_entity.aod
+++ b/entity/Member_entity/Member_entity.aod
@@ -174,12 +174,6 @@
       <targetIdField>CONTACT_ID</targetIdField>
       <recordContainer>db</recordContainer>
       <dependencies>
-        <entityDependency>
-          <name>df6a9a25-f787-41f6-877b-c8e3cbbdc6be</name>
-          <entityName>Salesproject_entity</entityName>
-          <fieldName>Members</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
         <entityDependency>
           <name>efeb191c-dd03-46e1-b176-c4e0c2f75fc5</name>
           <entityName>Campaign_entity</entityName>
@@ -203,6 +197,28 @@
       <name>#PROVIDER_AGGREGATES</name>
       <useAggregates v="true" />
     </entityProvider>
+    <entityConsumer>
+      <name>DistrictResponsibles</name>
+      <dependency>
+        <name>dependency</name>
+      </dependency>
+    </entityConsumer>
+    <entityProvider>
+      <name>WithDistrictResponsibles</name>
+      <recordContainer>jdito</recordContainer>
+      <dependencies>
+        <entityDependency>
+          <name>6f90b6c6-118c-485e-9a41-365bdc325f9b</name>
+          <entityName>Salesproject_entity</entityName>
+          <fieldName>Members</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+      </dependencies>
+    </entityProvider>
+    <entityField>
+      <name>UID</name>
+      <documentation>%aditoprj%/entity/Member_entity/entityfields/uid/documentation.adoc</documentation>
+    </entityField>
   </entityFields>
   <recordContainers>
     <dbRecordContainer>
@@ -325,5 +341,72 @@
         </dbRecordFieldMapping>
       </recordFieldMappings>
     </dbRecordContainer>
+    <jDitoRecordContainer>
+      <name>jdito</name>
+      <jDitoRecordAlias>Data_alias</jDitoRecordAlias>
+      <contentProcess>%aditoprj%/entity/Member_entity/recordcontainers/jdito/contentProcess.js</contentProcess>
+      <recordFieldMappings>
+        <jDitoRecordFieldMapping>
+          <name>UID.value</name>
+        </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>OBJECTMEMBERID.value</name>
+        </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>CONTACT_ID.value</name>
+        </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>CONTACTROLE.value</name>
+        </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>DEPARTMENT.value</name>
+        </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>ICON.value</name>
+        </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>IMAGE.value</name>
+        </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>MEMBERROLE.value</name>
+        </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>OBJECT_ROWID.value</name>
+        </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>OBJECT_TYPE.value</name>
+        </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>ORG_ORGID.value</name>
+        </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>ORGANISATION_NAME.value</name>
+        </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>PERSON_FIRSTNAME.value</name>
+        </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>PERSON_FULL_NAME.value</name>
+        </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>PERSON_LASTNAME.value</name>
+        </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>PERSON_PERSID.value</name>
+        </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>PERSON_SALUTATION.value</name>
+        </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>PERSON_TITLE.value</name>
+        </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>POSITION.value</name>
+        </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>TARGETCONTEXT.value</name>
+        </jDitoRecordFieldMapping>
+      </recordFieldMappings>
+    </jDitoRecordContainer>
   </recordContainers>
 </entity>
diff --git a/entity/Member_entity/entityfields/uid/documentation.adoc b/entity/Member_entity/entityfields/uid/documentation.adoc
new file mode 100644
index 0000000000..4db4f5e242
--- /dev/null
+++ b/entity/Member_entity/entityfields/uid/documentation.adoc
@@ -0,0 +1 @@
+Is only used by the jdito record container.
\ No newline at end of file
diff --git a/entity/Member_entity/recordcontainers/jdito/contentProcess.js b/entity/Member_entity/recordcontainers/jdito/contentProcess.js
new file mode 100644
index 0000000000..b678a96f2f
--- /dev/null
+++ b/entity/Member_entity/recordcontainers/jdito/contentProcess.js
@@ -0,0 +1,114 @@
+import("system.result");
+import("system.vars");
+import("system.entities");
+import("KeywordRegistry_basic");
+import("Sql_lib");
+
+var idValues = vars.get("$local.idvalues");
+var filter = vars.get("$local.filter");
+var memberLoadingConfig = entities.createConfigForLoadingRows()
+                                    .entity("Member_entity")
+                                    .provider("Links")
+                                    .addParameter("ObjectRowId_param", vars.get("$param.ObjectRowId_param"))
+                                    .addParameter("ObjectType_param", vars.get("$param.ObjectType_param"))
+                                    .fields(["#UID", "CONTACT_ID", "CONTACTROLE", "DEPARTMENT", "ICON", "IMAGE", "MEMBERROLE", "OBJECT_ROWID", "OBJECT_TYPE",
+                                                "OBJECTMEMBERID", "ORG_ORGID", "ORGANISATION_NAME", "PERSON_FIRSTNAME", "PERSON_FULL_NAME", 
+                                                "PERSON_LASTNAME", "PERSON_PERSID", "PERSON_SALUTATION", "PERSON_TITLE", "POSITION", "TARGETCONTEXT"]);
+
+if (idValues)
+{
+    memberLoadingConfig.uids(idValues);
+}
+
+if (filter && filter.filter != null)
+{
+    memberLoadingConfig.filter(JSON.stringify(filter.filter));
+}
+
+var memberRows = entities.getRows(memberLoadingConfig);
+
+if (vars.get("$param.ObjectType_param") == "Salesproject" && vars.get("$param.ObjectRowId_param") != null)
+{
+    var orgContactId = newSelect("SALESPROJECT.CONTACT_ID")
+                        .from("SALESPROJECT")
+                        .where("SALESPROJECT.SALESPROJECTID", "$param.ObjectRowId_param")
+                        .cell();
+    
+    var districtLoadingConfig = entities.createConfigForLoadingRows()
+                                            .entity("DistrictResponsible_entity")
+                                            .provider("OrganisationResponsibles")
+                                            .addParameter("OrgUid_param", orgContactId)
+                                            .fields(["#UID","DISTRICTRESPONSIBLEID", "DISTRICT_ID", "EMPLOYEE_CONTACT_ID", 
+                                                        "EMPLOYEE_CONTACT_ID.displayValue", "USER_EDIT", "USER_NEW", 
+                                                        "departmentAttributeName", "DATE_EDIT", "DATE_NEW"]);
+    
+    var districtRows = entities.getRows(districtLoadingConfig);
+    
+    
+    districtRows = districtRows.map(function(row)
+    {
+        return [row["#UID"], row["DISTRICTRESPONSIBLEID"], row["DISTRICT_ID"], row["EMPLOYEE_CONTACT_ID"], row["EMPLOYEE_CONTACT_ID.displayValue"], 
+            row["USER_EDIT"], row["USER_NEW"], row["departmentAttributeName"], row["DATE_EDIT"], row["DATE_NEW"]];
+    });
+}
+
+
+memberRows = memberRows.map(function(row)
+{
+    return [row["#UID"], row["OBJECTMEMBERID"], row["CONTACT_ID"], row["CONTACTROLE"], row["DEPARTMENT"], row["ICON"], row["IMAGE"], row["MEMBERROLE"], row["OBJECT_ROWID"], 
+                row["OBJECT_TYPE"], row["ORG_ORGID"], row["ORGANISATION_NAME"], row["PERSON_FIRSTNAME"], 
+                row["PERSON_FULL_NAME"], row["PERSON_LASTNAME"], row["PERSON_PERSID"], row["PERSON_SALUTATION"], row["PERSON_TITLE"], 
+                row["POSITION"], row["TARGETCONTEXT"]];
+});
+
+var responsibleUids = [];
+
+districtRows.forEach(function(row){
+    responsibleUids.push(row[3]);
+});
+
+var loadingConfPers = entities.createConfigForLoadingRows()
+                                    .entity("Person_entity")
+                                    .uids(responsibleUids)
+                                    .fields(["ORGANISATION_ID", "ORGANISATION_NAME", "CONTACTROLE", "POSITION", 
+                                                "FIRSTNAME", "LASTNAME", "SALUTATION", "TITLE"]);
+
+var persRows = entities.getRows(loadingConfPers);
+var counter = 0;
+
+persRows = persRows.map(function(row){
+    return [row["SALUTATION"], row["TITLE"], row["FIRSTNAME"], row["LASTNAME"],
+                row["ORGANISATION_NAME"], row["ORGANISATION_ID"], row["CONTACTROLE"],
+                row["POSITION"], row["PERSONID"]];
+});
+
+
+districtRows.forEach(function(row){
+    
+    memberRows.push(
+        [row[0],
+        null,
+        row[3],
+        persRows[counter][6],
+        row[7],
+        "VAADIN:GLOBE",
+        "TEXT:" + row[4].substring(row[4].indexOf(" ", 0)+1, row[4].length),
+        "MEMBERROLEDISTRICTRESPONSIBLE",
+        vars.get("$param.ObjectRowId_param"),
+        vars.get("$param.ObjectType_param"),
+        persRows[counter][5],
+        persRows[counter][4],
+        persRows[counter][2],
+        row[4],
+        persRows[counter][3], 
+        persRows[counter][8], 
+        persRows[counter][0], 
+        persRows[counter][1], 
+        persRows[counter][7],
+        null
+    ]);
+    
+    counter++;
+});
+
+result.object(memberRows);
\ No newline at end of file
diff --git a/entity/Organisation_entity/Organisation_entity.aod b/entity/Organisation_entity/Organisation_entity.aod
index 1c97f11469..6bb2df593c 100644
--- a/entity/Organisation_entity/Organisation_entity.aod
+++ b/entity/Organisation_entity/Organisation_entity.aod
@@ -144,6 +144,12 @@
           <fieldName>OrganisationConsumer</fieldName>
           <isConsumer v="false" />
         </entityDependency>
+        <entityDependency>
+          <name>36d6824f-8f2f-4207-9dde-60f0b8f08815</name>
+          <entityName>District_entity</entityName>
+          <fieldName>Organisations</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
       </dependencies>
       <children>
         <entityParameter>
@@ -1231,6 +1237,24 @@
       <documentation>%aditoprj%/entity/Organisation_entity/entityfields/indexp/documentation.adoc</documentation>
       <recordContainer>index</recordContainer>
     </entityProvider>
+    <entityConsumer>
+      <name>DistrictResponsibles</name>
+      <dependency>
+        <name>dependency</name>
+        <entityName>DistrictResponsible_entity</entityName>
+        <fieldName>OrganisationResponsibles</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>OrgUid_param</name>
+          <valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/districtresponsibles/children/orguid_param/valueProcess.js</valueProcess>
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityParameter>
+      <name>FilterPreSet_param</name>
+      <expose v="true" />
+    </entityParameter>
   </entityFields>
   <recordContainers>
     <dbRecordContainer>
diff --git a/entity/Organisation_entity/entityfields/districtresponsibles/children/orguid_param/valueProcess.js b/entity/Organisation_entity/entityfields/districtresponsibles/children/orguid_param/valueProcess.js
new file mode 100644
index 0000000000..70a1c0fcc1
--- /dev/null
+++ b/entity/Organisation_entity/entityfields/districtresponsibles/children/orguid_param/valueProcess.js
@@ -0,0 +1,4 @@
+import("system.result");
+import("system.vars");
+
+result.string(vars.get("$field.CONTACTID"));
\ No newline at end of file
diff --git a/entity/Organisation_entity/initFilterProcess.js b/entity/Organisation_entity/initFilterProcess.js
index dccabf9d95..4ceb24fc08 100644
--- a/entity/Organisation_entity/initFilterProcess.js
+++ b/entity/Organisation_entity/initFilterProcess.js
@@ -4,10 +4,13 @@ import("Keyword_lib");
 import("KeywordRegistry_basic");
 import("system.result");
 
-if (vars.get("$sys.presentationmode") === neon.CONTEXT_PRESENTATIONMODE_FILTER) 
+var filter = vars.get("$param.FilterPreSet_param");
+
+if (vars.get("$sys.presentationmode") === neon.CONTEXT_PRESENTATIONMODE_FILTER && (!filter && filter != null)) 
 {
     var statusInactive = $KeywordRegistry.contactStatus$inactive();
-    var filter = {
+    
+    filter = {
         type: "group",
         operator: "AND",
         childs: [{
@@ -21,4 +24,6 @@ if (vars.get("$sys.presentationmode") === neon.CONTEXT_PRESENTATIONMODE_FILTER)
     };
 
     result.string(JSON.stringify(filter));
-}
\ No newline at end of file
+}
+
+result.string(filter);
\ No newline at end of file
diff --git a/entity/Person_entity/Person_entity.aod b/entity/Person_entity/Person_entity.aod
index 6215388cf0..367ab7a019 100644
--- a/entity/Person_entity/Person_entity.aod
+++ b/entity/Person_entity/Person_entity.aod
@@ -1279,6 +1279,20 @@
       <name>#PROVIDER_AGGREGATES</name>
       <useAggregates v="true" />
     </entityProvider>
+    <entityConsumer>
+      <name>Districts</name>
+      <dependency>
+        <name>dependency</name>
+        <entityName>District_entity</entityName>
+        <fieldName>Districts</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>OnlyResponsibleDistricts</name>
+          <valueProcess>%aditoprj%/entity/Person_entity/entityfields/districts/children/onlyresponsibledistricts/valueProcess.js</valueProcess>
+        </entityParameter>
+      </children>
+    </entityConsumer>
   </entityFields>
   <recordContainers>
     <dbRecordContainer>
diff --git a/entity/Person_entity/entityfields/districts/children/onlyresponsibledistricts/valueProcess.js b/entity/Person_entity/entityfields/districts/children/onlyresponsibledistricts/valueProcess.js
new file mode 100644
index 0000000000..e1c2fe5e69
--- /dev/null
+++ b/entity/Person_entity/entityfields/districts/children/onlyresponsibledistricts/valueProcess.js
@@ -0,0 +1,10 @@
+import("system.vars");
+import("system.result");
+import("Employee_lib");
+
+
+var contactId = vars.get("$field.CONTACTID");
+
+if (EmployeeUtils.isUser(contactId)) {
+    result.string(contactId);
+} 
\ No newline at end of file
diff --git a/entity/Salesproject_entity/Salesproject_entity.aod b/entity/Salesproject_entity/Salesproject_entity.aod
index fc857899ee..c3ff1ca80c 100644
--- a/entity/Salesproject_entity/Salesproject_entity.aod
+++ b/entity/Salesproject_entity/Salesproject_entity.aod
@@ -14,7 +14,7 @@
   <useFavorites v="true" />
   <iconId>VAADIN:BOOK_DOLLAR</iconId>
   <imageProcess>%aditoprj%/entity/Salesproject_entity/imageProcess.js</imageProcess>
-  <titlePlural>Sales Projects</titlePlural>
+  <titlePlural>Salesprojects</titlePlural>
   <recordContainer>db</recordContainer>
   <entityFields>
     <entityProvider>
@@ -257,7 +257,7 @@
       <dependency>
         <name>dependency</name>
         <entityName>Member_entity</entityName>
-        <fieldName>Links</fieldName>
+        <fieldName>WithDistrictResponsibles</fieldName>
       </dependency>
       <children>
         <entityParameter>
diff --git a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
index 8c5a16686d..fa04a60d9e 100644
--- a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
+++ b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
@@ -7305,6 +7305,63 @@
     <entry>
       <key>Unread</key>
     </entry>
+    <entry>
+      <key>Parent Filter</key>
+    </entry>
+    <entry>
+      <key>Filter information</key>
+    </entry>
+    <entry>
+      <key>District Responsible</key>
+    </entry>
+    <entry>
+      <key>Responsibles</key>
+    </entry>
+    <entry>
+      <key>Districts</key>
+    </entry>
+    <entry>
+      <key>{$DISTRICTNUMBER}</key>
+    </entry>
+    <entry>
+      <key>{$DISTRICT_PARENT_DISTRICT}</key>
+    </entry>
+    <entry>
+      <key>Responsible Districts</key>
+    </entry>
+    <entry>
+      <key>District No.:</key>
+    </entry>
+    <entry>
+      <key>Customer counting</key>
+    </entry>
+    <entry>
+      <key>{$PARENT_DISTRICT}</key>
+    </entry>
+    <entry>
+      <key>{$DISTRICT_NUMBER}</key>
+    </entry>
+    <entry>
+      <key>District definition</key>
+    </entry>
+    <entry>
+      <key>{$DISTRICT_NO}</key>
+    </entry>
+    <entry>
+      <key>{$DISTRICT}</key>
+    </entry>
+    <entry>
+      <key>The district no has to be bigger than %0</key>
+    </entry>
+    <entry>
+      <key>District Filter</key>
+    </entry>
+    <entry>
+      <key>{$DISTRICT_RESPONSIBLE}</key>
+    </entry>
+    <entry>
+      <key>{$DISTRICT_TOTAL_TURNOVER}</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 22e0f10f3b..6481d8a8ba 100644
--- a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
+++ b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
@@ -9309,6 +9309,79 @@ Bitte Datumseingabe prüfen</value>
     <entry>
       <key>The use of any of your previous %0 passwords is prohibited</key>
     </entry>
+    <entry>
+      <key>Parent Filter</key>
+      <value>Ãœbergeordneter Filter</value>
+    </entry>
+    <entry>
+      <key>Filter information</key>
+    </entry>
+    <entry>
+      <key>District Responsible</key>
+      <value>Gebietsverantwortlicher</value>
+    </entry>
+    <entry>
+      <key>Responsibles</key>
+      <value>Gebietsverantwortliche</value>
+    </entry>
+    <entry>
+      <key>Districts</key>
+    </entry>
+    <entry>
+      <key>{$DISTRICTNUMBER}</key>
+      <value>Gebietsnummer</value>
+    </entry>
+    <entry>
+      <key>{$DISTRICT_PARENT_DISTRICT}</key>
+      <value>Ãœbergeordnetes Gebiet</value>
+    </entry>
+    <entry>
+      <key>Responsible Districts</key>
+      <value>Verantwortliche Gebiete</value>
+    </entry>
+    <entry>
+      <key>District No.:</key>
+      <value>Gebiets-Nr.:</value>
+    </entry>
+    <entry>
+      <key>Customer counting</key>
+      <value>Anzahl Kunden</value>
+    </entry>
+    <entry>
+      <key>{$PARENT_DISTRICT}</key>
+    </entry>
+    <entry>
+      <key>{$DISTRICT_NUMBER}</key>
+      <value>Gebietsnummer</value>
+    </entry>
+    <entry>
+      <key>District definition</key>
+      <value>Gebietsdefinition</value>
+    </entry>
+    <entry>
+      <key>{$DISTRICT_NO}</key>
+      <value>Gebietsnr.:</value>
+    </entry>
+    <entry>
+      <key>{$DISTRICT}</key>
+      <value>Gebiet</value>
+    </entry>
+    <entry>
+      <key>The district no has to be bigger than %0</key>
+      <value>Die Gebietsnummer sollte größer sein als %0</value>
+    </entry>
+    <entry>
+      <key>District Filter</key>
+      <value>Gebietsfilter</value>
+    </entry>
+    <entry>
+      <key>{$DISTRICT_RESPONSIBLE}</key>
+      <value>Gebietsverantwortlicher</value>
+    </entry>
+    <entry>
+      <key>{$DISTRICT_TOTAL_TURNOVER}</key>
+      <value>Umsatz gesamt</value>
+    </entry>
   </keyValueMap>
   <font name="Dialog" style="0" size="11" />
 </language>
diff --git a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
index ff0565ce60..20f4b0786a 100644
--- a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
+++ b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
@@ -7376,6 +7376,63 @@
     <entry>
       <key>Unread</key>
     </entry>
+    <entry>
+      <key>Parent Filter</key>
+    </entry>
+    <entry>
+      <key>Filter information</key>
+    </entry>
+    <entry>
+      <key>District Responsible</key>
+    </entry>
+    <entry>
+      <key>Responsibles</key>
+    </entry>
+    <entry>
+      <key>Districts</key>
+    </entry>
+    <entry>
+      <key>{$DISTRICTNUMBER}</key>
+    </entry>
+    <entry>
+      <key>{$DISTRICT_PARENT_DISTRICT}</key>
+    </entry>
+    <entry>
+      <key>Responsible Districts</key>
+    </entry>
+    <entry>
+      <key>District No.:</key>
+    </entry>
+    <entry>
+      <key>Customer counting</key>
+    </entry>
+    <entry>
+      <key>{$PARENT_DISTRICT}</key>
+    </entry>
+    <entry>
+      <key>{$DISTRICT_NUMBER}</key>
+    </entry>
+    <entry>
+      <key>District definition</key>
+    </entry>
+    <entry>
+      <key>{$DISTRICT_NO}</key>
+    </entry>
+    <entry>
+      <key>{$DISTRICT}</key>
+    </entry>
+    <entry>
+      <key>The district no has to be bigger than %0</key>
+    </entry>
+    <entry>
+      <key>District Filter</key>
+    </entry>
+    <entry>
+      <key>{$DISTRICT_RESPONSIBLE}</key>
+    </entry>
+    <entry>
+      <key>{$DISTRICT_TOTAL_TURNOVER}</key>
+    </entry>
   </keyValueMap>
   <font name="Dialog" style="0" size="11" />
 </language>
diff --git a/neonContext/District/District.aod b/neonContext/District/District.aod
new file mode 100644
index 0000000000..f595315a28
--- /dev/null
+++ b/neonContext/District/District.aod
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<neonContext xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonContext/1.1.1">
+  <name>District</name>
+  <title>Districts</title>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <icon>VAADIN:GLOBE</icon>
+  <mainView>DistrictMain_view</mainView>
+  <filterView>DistrictFilter_view</filterView>
+  <editView>DistrictEdit_view</editView>
+  <previewView>DistrictPreview_view</previewView>
+  <entity>District_entity</entity>
+  <references>
+    <neonViewReference>
+      <name>7e7c84fd-f4c5-4907-ab43-b31d6fafb42a</name>
+      <view>DistrictFilter_view</view>
+    </neonViewReference>
+    <neonViewReference>
+      <name>12843ee8-b70b-41e3-88e8-4500d299b588</name>
+      <view>DistrictEdit_view</view>
+    </neonViewReference>
+    <neonViewReference>
+      <name>db6ac483-a73c-462f-8e2d-e59db4c7c6a2</name>
+      <view>DistrictMain_view</view>
+    </neonViewReference>
+    <neonViewReference>
+      <name>bb3c4a77-62b0-4749-a4ef-55c60c6b9e5c</name>
+      <view>DistrictPreview_view</view>
+    </neonViewReference>
+    <neonViewReference>
+      <name>bb8600b2-a4ee-49a5-b120-b2e12db7e25c</name>
+      <view>DistrictList_view</view>
+    </neonViewReference>
+  </references>
+</neonContext>
diff --git a/neonContext/DistrictResponsible/DistrictResponsible.aod b/neonContext/DistrictResponsible/DistrictResponsible.aod
new file mode 100644
index 0000000000..58d47bc30b
--- /dev/null
+++ b/neonContext/DistrictResponsible/DistrictResponsible.aod
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<neonContext xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonContext/1.1.1">
+  <name>DistrictResponsible</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <icon>VAADIN:GLOBE</icon>
+  <entity>DistrictResponsible_entity</entity>
+  <references>
+    <neonViewReference>
+      <name>ee2298ba-af17-492b-9128-714e82def8e3</name>
+      <view>DistrictResponsibleMultiEdit_view</view>
+    </neonViewReference>
+    <neonViewReference>
+      <name>fc24246c-51de-4d00-b2aa-7e9505461c2e</name>
+      <view>DistrictResponsibleList_view</view>
+    </neonViewReference>
+    <neonViewReference>
+      <name>cba355d3-4ef4-441e-8976-f51c8fe65eec</name>
+      <view>DistrictResponsiblePreviewList_view</view>
+    </neonViewReference>
+  </references>
+</neonContext>
diff --git a/neonContext/Organisation/Organisation.aod b/neonContext/Organisation/Organisation.aod
index 5303c6b55c..0f3b35cfd1 100644
--- a/neonContext/Organisation/Organisation.aod
+++ b/neonContext/Organisation/Organisation.aod
@@ -53,7 +53,7 @@
     </neonViewReference>
     <neonViewReference>
       <name>a97ac17d-171b-4c9a-83fa-bb5a466c7b20</name>
-      <view>OrganisationNoNoiseTable_view</view>
+      <view>OrganisationDuplicateEditview_view</view>
     </neonViewReference>
     <neonViewReference>
       <name>ade0ed85-260d-4da5-bf4c-f838cfdcc693</name>
@@ -67,5 +67,9 @@
       <name>0b052872-d6b4-41ac-ad0b-580575893e1b</name>
       <view>OrganisationLesserNoiseTable_view</view>
     </neonViewReference>
+    <neonViewReference>
+      <name>2193fe84-ff57-4382-8200-5d1d846f455c</name>
+      <view>OrganisationDistrictResponsibles_view</view>
+    </neonViewReference>
   </references>
 </neonContext>
diff --git a/neonContext/Person/Person.aod b/neonContext/Person/Person.aod
index 5a9b1ecbe9..0d4160ba11 100644
--- a/neonContext/Person/Person.aod
+++ b/neonContext/Person/Person.aod
@@ -63,5 +63,9 @@
       <name>2a6c44be-53e2-469e-84b3-615841bd4430</name>
       <view>PersonDuplicateEditview_view</view>
     </neonViewReference>
+    <neonViewReference>
+      <name>93a274f8-8d73-4e18-b77c-a7eda6028116</name>
+      <view>PersonDistricts_view</view>
+    </neonViewReference>
   </references>
 </neonContext>
diff --git a/neonView/DistrictEdit_view/DistrictEdit_view.aod b/neonView/DistrictEdit_view/DistrictEdit_view.aod
new file mode 100644
index 0000000000..ef598ae566
--- /dev/null
+++ b/neonView/DistrictEdit_view/DistrictEdit_view.aod
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.6">
+  <name>DistrictEdit_view</name>
+  <title>Responsible Districts</title>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <layout>
+    <boxLayout>
+      <name>layout</name>
+    </boxLayout>
+  </layout>
+  <children>
+    <genericViewTemplate>
+      <name>genericViewTemplate</name>
+      <editMode v="true" />
+      <entityField>#ENTITY</entityField>
+      <fields>
+        <entityFieldLink>
+          <name>3c4e3069-f8ce-4cfc-84f5-17b5cbe606ec</name>
+          <entityField>DISTRICT_NAME</entityField>
+        </entityFieldLink>
+        <entityFieldLink>
+          <name>fd54e6af-1045-402d-a464-0bcd8d27573c</name>
+          <entityField>DISTRICT_NUMBER</entityField>
+        </entityFieldLink>
+        <entityFieldLink>
+          <name>ec0706b4-dcf4-4c0d-b99a-cc0b129f3e46</name>
+          <entityField>DISTRICT_INFO</entityField>
+        </entityFieldLink>
+        <entityFieldLink>
+          <name>325331a3-facb-4fd3-9efb-2bd8ed6f08f0</name>
+          <entityField>ISO3</entityField>
+        </entityFieldLink>
+        <entityFieldLink>
+          <name>941cb436-8b93-427d-ae2d-3731e55dd040</name>
+          <entityField>DISTRICT_STATUS</entityField>
+        </entityFieldLink>
+        <entityFieldLink>
+          <name>f77428c6-eaff-4554-aedb-cf56d4c573d6</name>
+          <entityField>PARENTDISTRICT_DISTRICTID</entityField>
+        </entityFieldLink>
+        <entityFieldLink>
+          <name>914ec7a6-f89f-44c5-9ea9-1a6223e4cf62</name>
+          <entityField>parentFilter</entityField>
+        </entityFieldLink>
+        <entityFieldLink>
+          <name>44d4f67e-5041-4b3f-a64f-71910050e035</name>
+          <entityField>DISTRICT_FILTER</entityField>
+        </entityFieldLink>
+      </fields>
+    </genericViewTemplate>
+    <neonViewReference>
+      <name>f1dddbee-5718-46b8-b682-ba4e707bf529</name>
+      <entityField>DistrictResponsibles</entityField>
+      <view>DistrictResponsibleMultiEdit_view</view>
+    </neonViewReference>
+  </children>
+</neonView>
diff --git a/neonView/DistrictFilter_view/DistrictFilter_view.aod b/neonView/DistrictFilter_view/DistrictFilter_view.aod
new file mode 100644
index 0000000000..d9ab4d5e1e
--- /dev/null
+++ b/neonView/DistrictFilter_view/DistrictFilter_view.aod
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.6">
+  <name>DistrictFilter_view</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <filterable v="true" />
+  <layout>
+    <groupLayout>
+      <name>layout</name>
+    </groupLayout>
+  </layout>
+  <children>
+    <treeTableViewTemplate>
+      <name>treetableViewTemplate</name>
+      <parentField>PARENTDISTRICT_DISTRICTID</parentField>
+      <hideContentSearch v="false" />
+      <showChildrenCount v="false" />
+      <entityField>#ENTITY</entityField>
+      <linkedColumns />
+      <defaultGroupFields />
+      <fixedFilterFields />
+      <columns>
+        <neonTreeTableColumn>
+          <name>9f8e99dc-cfb3-4038-b949-27571f787db2</name>
+          <entityField>DISTRICT_NAME</entityField>
+        </neonTreeTableColumn>
+        <neonTreeTableColumn>
+          <name>98f4acf0-ecb3-4999-8727-16df56e502cc</name>
+          <entityField>DISTRICT_NUMBER</entityField>
+        </neonTreeTableColumn>
+        <neonTreeTableColumn>
+          <name>9533ae87-3b08-4dd6-8265-13024cbab918</name>
+          <entityField>DISTRICT_INFO</entityField>
+        </neonTreeTableColumn>
+        <neonTreeTableColumn>
+          <name>df5ff116-cead-46c3-9569-0a51f2243c81</name>
+          <entityField>ISO3</entityField>
+        </neonTreeTableColumn>
+        <neonTreeTableColumn>
+          <name>87184bb1-4d44-4872-bae7-9be903f71354</name>
+          <entityField>DISTRICT_STATUS</entityField>
+        </neonTreeTableColumn>
+      </columns>
+    </treeTableViewTemplate>
+  </children>
+</neonView>
diff --git a/neonView/DistrictList_view/DistrictList_view.aod b/neonView/DistrictList_view/DistrictList_view.aod
new file mode 100644
index 0000000000..4525f95ab6
--- /dev/null
+++ b/neonView/DistrictList_view/DistrictList_view.aod
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.6">
+  <name>DistrictList_view</name>
+  <title>Responsible Districts</title>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <layout>
+    <boxLayout>
+      <name>layout</name>
+    </boxLayout>
+  </layout>
+  <children>
+    <treeTableViewTemplate>
+      <name>treeTableViewTemplate</name>
+      <parentField>PARENTDISTRICT_DISTRICTID</parentField>
+      <hideActions v="true" />
+      <entityField>#ENTITY</entityField>
+      <linkedColumns />
+      <defaultGroupFields />
+      <fixedFilterFields />
+      <hideHeader v="false" />
+      <isCreatable v="false" />
+      <isDeletable v="false" />
+      <isEditable v="false" />
+      <columns>
+        <neonTreeTableColumn>
+          <name>15a66360-dff7-4d21-b4e1-f48102f0bda1</name>
+          <entityField>DISTRICT_NAME</entityField>
+        </neonTreeTableColumn>
+        <neonTreeTableColumn>
+          <name>ca9631f4-f48b-49a6-83dd-3c5b33ee669a</name>
+          <entityField>DISTRICT_NUMBER</entityField>
+        </neonTreeTableColumn>
+        <neonTreeTableColumn>
+          <name>257e37e4-e6b0-4d74-aa46-9c0643aed985</name>
+          <entityField>DISTRICT_INFO</entityField>
+        </neonTreeTableColumn>
+        <neonTreeTableColumn>
+          <name>54a43aa1-1347-474c-9465-3a018d0cb99f</name>
+          <entityField>ISO3</entityField>
+        </neonTreeTableColumn>
+        <neonTreeTableColumn>
+          <name>932b9d0a-ccfc-4d17-b158-b19e3795af0b</name>
+          <entityField>DISTRICT_STATUS</entityField>
+        </neonTreeTableColumn>
+      </columns>
+    </treeTableViewTemplate>
+  </children>
+</neonView>
diff --git a/neonView/DistrictMain_view/DistrictMain_view.aod b/neonView/DistrictMain_view/DistrictMain_view.aod
new file mode 100644
index 0000000000..2babd2f4b0
--- /dev/null
+++ b/neonView/DistrictMain_view/DistrictMain_view.aod
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.6">
+  <name>DistrictMain_view</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <layout>
+    <masterSlaveLayout>
+      <name>layout</name>
+      <master>8b52b148-a054-4e85-8de0-856be82abc77</master>
+    </masterSlaveLayout>
+  </layout>
+  <children>
+    <neonViewReference>
+      <name>8b52b148-a054-4e85-8de0-856be82abc77</name>
+      <entityField>#ENTITY</entityField>
+      <view>DistrictPreview_view</view>
+    </neonViewReference>
+    <neonViewReference>
+      <name>b409f300-c8b4-4052-9012-5e6b79c03a9c</name>
+      <entityField>Organisations</entityField>
+      <view>OrganisationFilter_view</view>
+    </neonViewReference>
+    <neonViewReference>
+      <name>665bcb1a-aeb5-4dc5-9c2b-5398ee85bdc9</name>
+      <entityField>Documents</entityField>
+      <view>DocumentFilter_view</view>
+    </neonViewReference>
+    <neonViewReference>
+      <name>7001aa5a-75d1-42b4-bc45-db303d89184e</name>
+      <entityField>LogHistories</entityField>
+      <view>LogHistoryFilter_view</view>
+    </neonViewReference>
+  </children>
+</neonView>
diff --git a/neonView/DistrictPreview_view/DistrictPreview_view.aod b/neonView/DistrictPreview_view/DistrictPreview_view.aod
new file mode 100644
index 0000000000..14f7d89a8f
--- /dev/null
+++ b/neonView/DistrictPreview_view/DistrictPreview_view.aod
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.6">
+  <name>DistrictPreview_view</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <filterable v="true" />
+  <layout>
+    <headerFooterLayout>
+      <name>layout</name>
+      <header>cardViewTemplate</header>
+      <footer>scoreCardViewTemplate</footer>
+    </headerFooterLayout>
+  </layout>
+  <children>
+    <cardViewTemplate>
+      <name>cardViewTemplate</name>
+      <titleField>DISTRICT_NAME</titleField>
+      <descriptionField>DISTRICT_NUMBER_fieldGroup</descriptionField>
+      <entityField>#ENTITY</entityField>
+    </cardViewTemplate>
+    <neonViewReference>
+      <name>a7a731e8-f93e-4d90-8459-d249a13ecf0d</name>
+      <entityField>DistrictResponsibles</entityField>
+      <view>DistrictResponsiblePreviewList_view</view>
+    </neonViewReference>
+    <genericViewTemplate>
+      <name>furtherInfosGenericViewTemplate</name>
+      <showDrawer v="true" />
+      <drawerCaption>Further informations</drawerCaption>
+      <fixedDrawer v="false" />
+      <hideEmptyFields v="true" />
+      <entityField>#ENTITY</entityField>
+      <title>Further informations</title>
+      <fields>
+        <entityFieldLink>
+          <name>cda733b1-3bf4-4ec0-9aef-8865b7704094</name>
+          <entityField>LANG</entityField>
+        </entityFieldLink>
+        <entityFieldLink>
+          <name>f1c69329-5a9f-456f-b37d-1ca1b0e4943c</name>
+          <entityField>DISTRICT_INFO</entityField>
+        </entityFieldLink>
+        <entityFieldLink>
+          <name>0dddb53a-30ea-4c82-b7c2-7c3372a2968a</name>
+          <entityField>DISTRICT_FILTER</entityField>
+        </entityFieldLink>
+      </fields>
+    </genericViewTemplate>
+    <scoreCardViewTemplate>
+      <name>scoreCardViewTemplate</name>
+      <entityField>#ENTITY</entityField>
+      <fields>
+        <entityFieldLink>
+          <name>5aa54d53-a6c2-4b5f-9eae-67c8e4208cfc</name>
+          <entityField>totalTurnover</entityField>
+        </entityFieldLink>
+        <entityFieldLink>
+          <name>c76e215e-e2f4-42e5-a245-810003fec56b</name>
+          <entityField>customerCounting</entityField>
+        </entityFieldLink>
+      </fields>
+    </scoreCardViewTemplate>
+  </children>
+</neonView>
diff --git a/neonView/DistrictResponsibleList_view/DistrictResponsibleList_view.aod b/neonView/DistrictResponsibleList_view/DistrictResponsibleList_view.aod
new file mode 100644
index 0000000000..26598ff9fa
--- /dev/null
+++ b/neonView/DistrictResponsibleList_view/DistrictResponsibleList_view.aod
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.6">
+  <name>DistrictResponsibleList_view</name>
+  <title>Responsibles</title>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <layout>
+    <noneLayout>
+      <name>layout</name>
+    </noneLayout>
+  </layout>
+  <children>
+    <tableViewTemplate>
+      <name>tableViewTemplate</name>
+      <hideActions v="true" />
+      <entityField>#ENTITY</entityField>
+      <linkedColumns />
+      <fixedFilterFields />
+      <isCreatable v="false" />
+      <isDeletable v="false" />
+      <isEditable v="false" />
+      <columns>
+        <neonTableColumn>
+          <name>32e7b066-76b4-4bd2-b440-bc7844c929a6</name>
+          <entityField>EMPLOYEE_CONTACT_ID</entityField>
+        </neonTableColumn>
+        <neonTableColumn>
+          <name>dc9bce22-9a99-4db9-a76a-8fd4a91d5f0f</name>
+          <entityField>departmentAttributeName</entityField>
+        </neonTableColumn>
+      </columns>
+    </tableViewTemplate>
+  </children>
+</neonView>
diff --git a/neonView/DistrictResponsibleMultiEdit_view/DistrictResponsibleMultiEdit_view.aod b/neonView/DistrictResponsibleMultiEdit_view/DistrictResponsibleMultiEdit_view.aod
new file mode 100644
index 0000000000..5446115f96
--- /dev/null
+++ b/neonView/DistrictResponsibleMultiEdit_view/DistrictResponsibleMultiEdit_view.aod
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.6">
+  <name>DistrictResponsibleMultiEdit_view</name>
+  <title></title>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <layout>
+    <boxLayout>
+      <name>layout</name>
+    </boxLayout>
+  </layout>
+  <children>
+    <genericMultipleViewTemplate>
+      <name>genericViewTemplate</name>
+      <entityField>#ENTITY</entityField>
+      <title>Responsible</title>
+      <columns>
+        <neonGenericMultipleTableColumn>
+          <name>e1988e26-68a4-4a96-a484-4d9f7506505d</name>
+          <entityField>departmentAttributeName</entityField>
+        </neonGenericMultipleTableColumn>
+        <neonGenericMultipleTableColumn>
+          <name>2c588be3-a0df-4c3f-9632-574e5b975073</name>
+          <entityField>EMPLOYEE_CONTACT_ID</entityField>
+        </neonGenericMultipleTableColumn>
+      </columns>
+    </genericMultipleViewTemplate>
+  </children>
+</neonView>
diff --git a/neonView/DistrictResponsiblePreviewList_view/DistrictResponsiblePreviewList_view.aod b/neonView/DistrictResponsiblePreviewList_view/DistrictResponsiblePreviewList_view.aod
new file mode 100644
index 0000000000..d04097450b
--- /dev/null
+++ b/neonView/DistrictResponsiblePreviewList_view/DistrictResponsiblePreviewList_view.aod
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.6">
+  <name>DistrictResponsiblePreviewList_view</name>
+  <title>Contactperson</title>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <layout>
+    <noneLayout>
+      <name>layout</name>
+    </noneLayout>
+  </layout>
+  <children>
+    <titledListViewTemplate>
+      <name>titledListViewTemplate</name>
+      <titleField>departmentAttributeName</titleField>
+      <entityField>#ENTITY</entityField>
+      <title>Contactperson</title>
+      <columns>
+        <neonTitledListTableColumn>
+          <name>007d67c4-146b-4202-a677-4390059b4a0a</name>
+          <entityField>EMPLOYEE_CONTACT_ID</entityField>
+          <fullWidth v="false" />
+        </neonTitledListTableColumn>
+      </columns>
+    </titledListViewTemplate>
+  </children>
+</neonView>
diff --git a/neonView/OrganisationDistrictResponsibles_view/OrganisationDistrictResponsibles_view.aod b/neonView/OrganisationDistrictResponsibles_view/OrganisationDistrictResponsibles_view.aod
new file mode 100644
index 0000000000..ab57158edf
--- /dev/null
+++ b/neonView/OrganisationDistrictResponsibles_view/OrganisationDistrictResponsibles_view.aod
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.6">
+  <name>OrganisationDistrictResponsibles_view</name>
+  <title>Responsibles</title>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <layout>
+    <noneLayout>
+      <name>layout</name>
+    </noneLayout>
+  </layout>
+  <children>
+    <neonViewReference>
+      <name>a698babd-271c-4f21-94f7-391f4ad80877</name>
+      <entityField>DistrictResponsibles</entityField>
+      <view>DistrictResponsibleList_view</view>
+    </neonViewReference>
+  </children>
+</neonView>
diff --git a/neonView/OrganisationMain_view/OrganisationMain_view.aod b/neonView/OrganisationMain_view/OrganisationMain_view.aod
index 4b49bf017e..24ea1854e8 100644
--- a/neonView/OrganisationMain_view/OrganisationMain_view.aod
+++ b/neonView/OrganisationMain_view/OrganisationMain_view.aod
@@ -70,5 +70,10 @@
       <entityField>SelfDuplicatesUncached</entityField>
       <view>OrganisationFilter_view</view>
     </neonViewReference>
+    <neonViewReference>
+      <name>db26269b-32ae-47da-ba22-41e0a5952103</name>
+      <entityField>#ENTITY</entityField>
+      <view>OrganisationDistrictResponsibles_view</view>
+    </neonViewReference>
   </children>
 </neonView>
diff --git a/neonView/PersonDistricts_view/PersonDistricts_view.aod b/neonView/PersonDistricts_view/PersonDistricts_view.aod
new file mode 100644
index 0000000000..d665b77e67
--- /dev/null
+++ b/neonView/PersonDistricts_view/PersonDistricts_view.aod
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.6">
+  <name>PersonDistricts_view</name>
+  <title>Responsible Districts</title>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <layout>
+    <noneLayout>
+      <name>layout</name>
+    </noneLayout>
+  </layout>
+  <children>
+    <neonViewReference>
+      <name>c461b0a2-316c-481f-9697-0b24adbcf8bc</name>
+      <entityField>Districts</entityField>
+      <view>DistrictList_view</view>
+    </neonViewReference>
+  </children>
+</neonView>
diff --git a/neonView/PersonMain_view/PersonMain_view.aod b/neonView/PersonMain_view/PersonMain_view.aod
index f59ffc93a3..1151edfebd 100644
--- a/neonView/PersonMain_view/PersonMain_view.aod
+++ b/neonView/PersonMain_view/PersonMain_view.aod
@@ -64,5 +64,10 @@
       <entityField>SelfDuplicatesUncached</entityField>
       <view>PersonFilter_view</view>
     </neonViewReference>
+    <neonViewReference>
+      <name>f826f154-bf7f-4c7e-9ce2-3105cc629851</name>
+      <entityField>#ENTITY</entityField>
+      <view>PersonDistricts_view</view>
+    </neonViewReference>
   </children>
 </neonView>
diff --git a/preferences/_____PREFERENCES_PROJECT/_____PREFERENCES_PROJECT.aod b/preferences/_____PREFERENCES_PROJECT/_____PREFERENCES_PROJECT.aod
index a44cefc227..55876a9e62 100644
--- a/preferences/_____PREFERENCES_PROJECT/_____PREFERENCES_PROJECT.aod
+++ b/preferences/_____PREFERENCES_PROJECT/_____PREFERENCES_PROJECT.aod
@@ -30,7 +30,7 @@
   <recordContainerCachingAlias>RecordContainerCache</recordContainerCachingAlias>
   <clientSearchOptimizedForSpeed v="true" />
   <clientSearchExcludeForIgnorecase v="true" />
-  <neonClientPermissionsEnabled v="true" />
+  <neonClientPermissionsEnabled v="false" />
   <clientFeedbackMailaddress />
   <blobHandlingMethod>DATABASE</blobHandlingMethod>
   <databaseAuditGetOldValueLobs v="false" />
diff --git a/process/Employee_lib/process.js b/process/Employee_lib/process.js
index 5a89f59926..11a783e252 100644
--- a/process/Employee_lib/process.js
+++ b/process/Employee_lib/process.js
@@ -1,7 +1,8 @@
+import("system.tools");
 import("system.vars");
 import("system.db");
+import("Attribute_lib");
 import("Sql_lib");
-import("system.tools");
 
 /**
  * Provides functions for employees and users.j
@@ -145,4 +146,24 @@ EmployeeUtils.isUser = function (pContactId)
 {
     var user = tools.getUserByAttribute(tools.CONTACTID, pContactId);
     return user != null;
+}
+
+/**
+ * Returns users department as corresponding attribute id.
+ * 
+ * @param {String} pContactId the contactId from the employee, from which you want the department back.
+ * @param {String} pDepartmentAsDisplayable the department as displayable value.
+ * @return {String} the department as corresponding attribute id or as displayable departmentname (e.g.: "Marketing", "Human Ressources").
+ */
+EmployeeUtils.getUsersDepartment = function(pContactId, pDepartmentAsDisplayable){
+    
+    var user = tools.getUsersByAttribute(tools.CONTACTID, [pContactId]);
+    var department = user[0][tools.PARAMS].department;
+    
+    if (pDepartmentAsDisplayable)
+    {
+       department = AttributeUtil.getSimpleAttributeName(department, true)
+    }
+    
+    return department;
 }
\ No newline at end of file
-- 
GitLab


From 7ec2e4de51e28fbb392607cbc8c757b7c7906d0d Mon Sep 17 00:00:00 2001
From: "j.goderbauer" <j.goderbauer@adito.de>
Date: Wed, 9 Sep 2020 07:44:35 +0200
Subject: [PATCH 269/309] ScanServices: Classification

---
 aliasDefinition/Data_alias/Data_alias.aod     |  7 -----
 .../ClassificationScore_entity.aod            |  1 -
 .../entityfields/score/onValidation.js        |  0
 .../maxscore.value/expression.js              |  1 -
 process/ClassificationFilter_lib/process.js   | 28 +++++++++++--------
 process/Classification_lib/process.js         |  6 ++--
 6 files changed, 19 insertions(+), 24 deletions(-)
 delete mode 100644 entity/ClassificationScore_entity/entityfields/score/onValidation.js

diff --git a/aliasDefinition/Data_alias/Data_alias.aod b/aliasDefinition/Data_alias/Data_alias.aod
index 402c8e920f..d7ec9b0450 100644
--- a/aliasDefinition/Data_alias/Data_alias.aod
+++ b/aliasDefinition/Data_alias/Data_alias.aod
@@ -9651,13 +9651,6 @@
                 <documentation></documentation>
                 <title></title>
                 <description></description>
-                <dependencies>
-                  <entityDependency>
-                    <name>d9eb29b7-a77c-4b72-b98e-13a87bedfc2b</name>
-                    <entityName>CLASSIFICATIONTYPE</entityName>
-                    <fieldName>CLASSIFICATIONTYPE</fieldName>
-                  </entityDependency>
-                </dependencies>
               </entityFieldDb>
             </entityFields>
           </entityDb>
diff --git a/entity/ClassificationScore_entity/ClassificationScore_entity.aod b/entity/ClassificationScore_entity/ClassificationScore_entity.aod
index 51332fbd2e..b248094981 100644
--- a/entity/ClassificationScore_entity/ClassificationScore_entity.aod
+++ b/entity/ClassificationScore_entity/ClassificationScore_entity.aod
@@ -38,7 +38,6 @@
       <outputFormat>#,##0.00</outputFormat>
       <inputFormat>#,##0.00</inputFormat>
       <mandatory v="true" />
-      <onValidation>%aditoprj%/entity/ClassificationScore_entity/entityfields/score/onValidation.js</onValidation>
     </entityField>
     <entityProvider>
       <name>ClassificationScores</name>
diff --git a/entity/ClassificationScore_entity/entityfields/score/onValidation.js b/entity/ClassificationScore_entity/entityfields/score/onValidation.js
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/entity/ClassificationType_entity/recordcontainers/db/recordfieldmappings/maxscore.value/expression.js b/entity/ClassificationType_entity/recordcontainers/db/recordfieldmappings/maxscore.value/expression.js
index 80e8d7e14a..d8c6a26ee9 100644
--- a/entity/ClassificationType_entity/recordcontainers/db/recordfieldmappings/maxscore.value/expression.js
+++ b/entity/ClassificationType_entity/recordcontainers/db/recordfieldmappings/maxscore.value/expression.js
@@ -6,5 +6,4 @@ var statement = newSelect("max(CLASSIFICATIONSCORE.SCORE)")
         .from("CLASSIFICATIONSCORE")
         .where("CLASSIFICATIONSCORE.CLASSIFICATIONTYPE_ID = CLASSIFICATIONTYPE.CLASSIFICATIONTYPEID");
 
-logging.log("statement.toString()>>" + statement.toString())
 result.string(statement.toString());
\ No newline at end of file
diff --git a/process/ClassificationFilter_lib/process.js b/process/ClassificationFilter_lib/process.js
index 167971780e..35716cdec2 100644
--- a/process/ClassificationFilter_lib/process.js
+++ b/process/ClassificationFilter_lib/process.js
@@ -21,7 +21,7 @@ function ClassificationTypeFilterUtils() {}
 /**
  * fetches classificationtypes and transforms them into filter fields
  * 
- * @param {String} pObjectType       <p/> contextId of the context whoes attributes are used for providing the filter fields
+ * @param {String} pObjectType       <p/> contextId of the context whoes classification types are used for providing the filter fields
  *                                      
  * @return {String}                  <p/> field-definitions (array of objects) that are ready to use for a filterExtensionSet in a stringified form
  *                                   <br/> The object within the array contains the following properties:
@@ -151,7 +151,7 @@ ClassificationTypeFilterUtils.getTranslationSql = function()
 
 /**
  * Procides static methods for en- or decoding classification group filter names
- * AttributeFilter names are shared over several processes and contain therefore various information
+ * ClassifcationGroupFilter names are shared over several processes and contain therefore various information
  * The infomration needs to be encoded to be able to transfer it over the different processes
  * 
  * @class
@@ -162,9 +162,10 @@ function ClassificationGroupFilterNameCoder(){}
 /**
  * encodes several parameters into one string that can be used as classification group filter-name
  * 
- * @param {String} pUid                 <p/> attribute uid of the attribute that has to be encoded
- * @param {String} pAttributeType       <p/> attribute type of the attribute that has to be encoded 
- *                                      <br/> while you may able to specify any string, only values of $AttributeTypes.*** are useful
+ * @param {String} pClassificationGroupId           <p/> uid-value of a classification group
+ * @param {String} pRepresentingSqlExpression       <p/> sql expressions that represents one classification group result, for example an sql 
+ *                                                  expression that returns the Value "B" for the classificationvalue "CBA" when the fielter field 
+ *                                                  for the second level classification group is generated
  *                                      
  * @return {String}                     <p/> an encoded string of the given parametervalues 
  *                                      <br/> this is basically a serialized object which is base64 encoded
@@ -177,17 +178,18 @@ ClassificationGroupFilterNameCoder.encode = function (pClassificationGroupId, pR
         representingSqlExpression: pRepresentingSqlExpression
     };
     res = JSON.stringify(res);
-    res = util.encodeBase64String(res);
+    res = util.encodeBase64String(res);//encode base64 to ensure that there a no problematic characters in the filterfield name
     return res;
 };
 
 /**
- * decodes a string that was encoded with AttributeSearchNameCoder.encode
+ * decodes a string that was encoded with ClassificationGroupFilterNameCoder.encode
  * 
  * 
  * @param {String} pEncodedString       <p/> string that shall be decoded; the origin of the name has to be a filter-object
  *                                      
- * @return {Object}                     <p/> an object that contains all keys and values that have been encoded with AttributeSearchNameCoder.encode
+ * @return {Object}                     <p/> an object that contains all keys and values that have been encoded with 
+ *                                      ClassificationGroupFilterNameCoder.encode
  * @static 
  */
 ClassificationGroupFilterNameCoder.decode = function (pEncodedString)
@@ -210,7 +212,7 @@ function ClassificationGroupFilterUtils() {}
 /**
  * fetches classificationgroups and transforms them into filter fields
  * 
- * @param {String} pObjectType       <p/> contextId of the context whoes attributes are used for providing the filter fields
+ * @param {String} pObjectType       <p/> contextId of the context whoes classification groups are used for providing the filter fields
  *                                      
  * @return {String}                  <p/> field-definitions (array of objects) that are ready to use for a filterExtensionSet in a stringified form
  *                                   <br/> The object within the array contains the following properties:
@@ -241,7 +243,7 @@ ClassificationGroupFilterUtils.getFilterFields = function(pObjectType)
         var classificationGroupTitle = classificationGroup["#CONTENTTITLE"];
         
         var representingSqlExpression = sqlHelper.substring("CLASSIFICATIONVALUE", idx+1, 1);
-        var name = ClassificationGroupFilterNameCoder.encode(classificationGroupId, sqlHelper.substring("CLASSIFICATIONVALUE", idx+1, 1));
+        var name = ClassificationGroupFilterNameCoder.encode(classificationGroupId, representingSqlExpression);
         res.push({
             name: name,
             title: classificationGroupTitle,
@@ -300,7 +302,11 @@ ClassificationGroupFilterUtils.makeFilterValues = function()
 /**
  * Builds a Sql-condition that may be used in a filter extension set and allows to filter for classificationtypes within a db-table
  * 
+ * @param {String} pObjectType          <p/> contextId of the objects thats records 
+ * @param {String} pFilterName          <p/> name of the filter that was prior encoded and contains various information
  * @param {String} pCondition           <p/> a SQL-condition like it is given in the "$local.condition"-variable in filter extension sets
+ * @param {String} pRawValue            <p/> the raw input value that the user has entered for a filter operation
+ * @param {String} pOperatorName        <p/> the operator of the condition (equals, smaller, greater, etc.) as a resolved name; e.g. "IS NOT NULL"
  * @param {String} pIdTableName         <p/> name of the db-table where the data shall be filtered
  * @param {String} pIdColumnName        <p/> name of the primarykey-column of the table that was given via pIdTablename
  * @param {String} pColumnPlaceholder   <p/> name of the placeholder where the columnname should be like it is given in the 
@@ -364,7 +370,7 @@ ClassificationGroupFilterUtils.makeFilterConditionSql = function()
 ClassificationGroupFilterUtils.makeDefaultGroupQuery = function()
 {
     var isCount = vars.get("$local.count");             // TRUE if the count of the records is needed
-    var columns = vars.get("$local.columnlist");        // The column, expected from the querry, see also AttributeFilter_lib
+    var columns = vars.get("$local.columnlist");        // The column, expected from the querry, see the filterFieldsProcess
     var condition = vars.get("$local.condition");       // The Condition that's beeing used, includes the grouphirachy
     var groupedColumns = vars.get("$local.groupedlist") // The coloumns, used for grouping
     var order = vars.get("$local.order");               // The order of the result
diff --git a/process/Classification_lib/process.js b/process/Classification_lib/process.js
index baa8bf0808..c56bb0f4c8 100644
--- a/process/Classification_lib/process.js
+++ b/process/Classification_lib/process.js
@@ -350,10 +350,8 @@ ClassificationUtils.getGradingFromObject = function(pGradingObject, pGroupId, pS
  * Inserts a empty classification data set into Classificationstorage, since every dataset of a classifiable module has to have an entry 
  * because the updateClassifications_serverProcess is only updating instead of inserting.<br>
  * 
- * @param {String or Array} pUid                          <p>
- *                                                          The unique uid('s) of the inserted record
- * @param {String} pObjectType                            <p>
- *                                                          The object type
+ * @param {String|Array} pUids         <p/>The unique uid('s) of the inserted record, string for one element, array for several elements
+ * @param {String} pObjectType         <p>contextId for the passed uids that shall be initialized
  */
 ClassificationUtils.insertEmptyClassification = function(pUids, pObjectType)
 {
-- 
GitLab


From 8e9ce117595867477f9f9bc10e25e6965a91339e Mon Sep 17 00:00:00 2001
From: "j.goderbauer" <j.goderbauer@adito.de>
Date: Wed, 9 Sep 2020 07:45:54 +0200
Subject: [PATCH 270/309] updated aliasDefintion: Data_alias

---
 aliasDefinition/Data_alias/Data_alias.aod | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/aliasDefinition/Data_alias/Data_alias.aod b/aliasDefinition/Data_alias/Data_alias.aod
index d7ec9b0450..bd124f29d2 100644
--- a/aliasDefinition/Data_alias/Data_alias.aod
+++ b/aliasDefinition/Data_alias/Data_alias.aod
@@ -15385,7 +15385,7 @@
                 <name>PARENTDISTRICT_DISTRICTID</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
+                <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
                 <notNull v="false" />
@@ -15414,7 +15414,7 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
-                <size v="36" />
+                <size v="50" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -15470,7 +15470,7 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
-                <size v="36" />
+                <size v="50" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -15545,7 +15545,7 @@
                 <name>DEPARTMENT_ATTRIBUTE_ID</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
+                <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
                 <notNull v="false" />
@@ -15559,7 +15559,7 @@
                 <name>DISTRICT_ID</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
+                <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
                 <notNull v="false" />
@@ -15573,7 +15573,7 @@
                 <name>EMPLOYEE_CONTACT_ID</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
+                <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
                 <notNull v="false" />
@@ -15602,7 +15602,7 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
-                <size v="36" />
+                <size v="50" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -15616,7 +15616,7 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
-                <size v="36" />
+                <size v="50" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
-- 
GitLab


From 89406e860c77f7ab0faf2dd88edf021b65592480 Mon Sep 17 00:00:00 2001
From: "j.goderbauer" <j.goderbauer@adito.de>
Date: Wed, 9 Sep 2020 08:45:49 +0200
Subject: [PATCH 271/309] several ScanServices

---
 entity/Countries_Entity/Countries_Entity.aod  |  2 ++
 .../entityfields/iso2name/documentation.adoc  |  4 +++
 .../ImportField_Entity/ImportField_Entity.aod |  1 +
 .../leadimportids/documentation.adoc          |  1 +
 process/Sql_lib/process.js                    | 25 +++++++++++++++----
 5 files changed, 28 insertions(+), 5 deletions(-)
 create mode 100644 entity/Countries_Entity/entityfields/iso2name/documentation.adoc
 create mode 100644 entity/ImportField_Entity/entityfields/leadimportids/documentation.adoc

diff --git a/entity/Countries_Entity/Countries_Entity.aod b/entity/Countries_Entity/Countries_Entity.aod
index 9b431268c5..9a4408cb03 100644
--- a/entity/Countries_Entity/Countries_Entity.aod
+++ b/entity/Countries_Entity/Countries_Entity.aod
@@ -14,6 +14,8 @@
     </entityProvider>
     <entityProvider>
       <name>ISO2Name</name>
+      <lookupIdfield>ISO2</lookupIdfield>
+      <documentation>%aditoprj%/entity/Countries_Entity/entityfields/iso2name/documentation.adoc</documentation>
       <dependencies>
         <entityDependency>
           <name>83e8a2e6-aa80-4b35-a0ad-8dad483ed428</name>
diff --git a/entity/Countries_Entity/entityfields/iso2name/documentation.adoc b/entity/Countries_Entity/entityfields/iso2name/documentation.adoc
new file mode 100644
index 0000000000..4e2b19d84b
--- /dev/null
+++ b/entity/Countries_Entity/entityfields/iso2name/documentation.adoc
@@ -0,0 +1,4 @@
+Provides a list of countries, where the UID is the countires two character ISO-code
+ISO 3166-1 alpha-2; see: https://en.wikipedia.org/wiki/ISO_3166-1_alpha-2
+
+For example: `IT` for Italy, `DE` for Germany, `NO` for Norway, etc.
\ No newline at end of file
diff --git a/entity/ImportField_Entity/ImportField_Entity.aod b/entity/ImportField_Entity/ImportField_Entity.aod
index c3c160e699..cb5bb3fb64 100644
--- a/entity/ImportField_Entity/ImportField_Entity.aod
+++ b/entity/ImportField_Entity/ImportField_Entity.aod
@@ -55,6 +55,7 @@
     </entityConsumer>
     <entityProvider>
       <name>LeadImportIds</name>
+      <documentation>%aditoprj%/entity/ImportField_Entity/entityfields/leadimportids/documentation.adoc</documentation>
       <titlePlural>Import Fields</titlePlural>
       <dependencies>
         <entityDependency>
diff --git a/entity/ImportField_Entity/entityfields/leadimportids/documentation.adoc b/entity/ImportField_Entity/entityfields/leadimportids/documentation.adoc
new file mode 100644
index 0000000000..c3e81f687c
--- /dev/null
+++ b/entity/ImportField_Entity/entityfields/leadimportids/documentation.adoc
@@ -0,0 +1 @@
+Provides configured ImportFields for one specific lead import.
\ No newline at end of file
diff --git a/process/Sql_lib/process.js b/process/Sql_lib/process.js
index 3600f01d4a..247df44a33 100644
--- a/process/Sql_lib/process.js
+++ b/process/Sql_lib/process.js
@@ -3969,13 +3969,28 @@ SqlUtils.getResolvingCaseWhen = function(pKeyValueArray, pDbFieldName, pLocale)
 };
 
 /**
-* resolves key-value pairs (of strings) into a case when expression
+* resolves an array of key-value pairs (of strings) into a sql case when expression<br/>
+* This is useful for results of entities.getRows for example.
 * 
-* @param {String[][]} pKeyValueArray you've to pass a 2D-Array where each element has at pos0 the key and pos1 the value
-* @param {String} pDbFieldName name fo the database field where the KEY-value is stored
-* @param {String} [pLocale=current client language] specifies the locale for translating the title; can be false if nothing shalle be translated
+* @param {Array} pKeyValueObject    <p/>you've to pass a 2D-Array where each element has to be an object with at least one key: value-pair, e.g.: 
+*                                   <br/>[{uid: "uid1", value: "value1"}, {uid: "uidN", value: "valueN"}]
+* @param {String} pUid              <p/>name of the key where the rawvalue (the uid) is located in the object
+* @param {String} pTranslatedValue  <p/>name of the key where the already translated value is located in the object
+* @param {String} pDbFieldName      <p/>name fo the database field where the KEY-value is stored
 * 
-* @return {String} a SQL-expression (case-when-statement) that resolves the KEYID into the title -> as preparedSatement-elements
+* @return {String}                  <p/>a SQL-expression (case-when-statement) that resolves the KEYID into the title -> as 
+*                                       preparedSatement-elements
+*                                   <br/>The else-value is "unassigned".
+* 
+* @example
+* var exampleDataStack = [
+*       {keyVal: "PHONE", titleOriginal: "Phone", titleTranslated: "Telefon", origin: "MetaImporter"},
+*       {keyVal: "EMAIL", titleOriginal: "email", titleTranslated: "E-Mail", origin: "MetaImporter"}
+* ];
+* 
+* var sqlExpr = SqlUtils.getResolvingCaseWhenFromObject(exampleDataStack, "keyVal", "titleTranslated", "FORM.COMMUNICATION");
+* //results in a sql case when as prepared statement that is resolvedas following: 
+* //case  when FORM.COMMUNICATION = 'PHONE'  then 'Telefon'   when FORM.COMMUNICATION = 'EMAIL'  then 'E-Mail'   else 'nicht zugeordnet' end
 */
 SqlUtils.getResolvingCaseWhenFromObject = function(pKeyValueObject, pUid, pTranslatedValue, pDbFieldName) 
 {
-- 
GitLab


From a0a78de1f12f3f8522796854e2d9ba4bacbd3381 Mon Sep 17 00:00:00 2001
From: "j.goderbauer" <j.goderbauer@adito.de>
Date: Wed, 9 Sep 2020 09:10:37 +0200
Subject: [PATCH 272/309] Organisation_entity: Index bugfix: standard phone and
 standard email stored too much values

---
 .../Organisation_entity.aod                   |  4 +--
 .../recordcontainers/index/query.js           | 29 ++++++++++++-------
 2 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/entity/Organisation_entity/Organisation_entity.aod b/entity/Organisation_entity/Organisation_entity.aod
index 6bb2df593c..deb5ee3641 100644
--- a/entity/Organisation_entity/Organisation_entity.aod
+++ b/entity/Organisation_entity/Organisation_entity.aod
@@ -1601,7 +1601,7 @@
           <additionalFieldNameAliases>
             <element>email</element>
           </additionalFieldNameAliases>
-          <isMultiValued v="true" />
+          <isMultiValued v="false" />
         </indexRecordFieldMapping>
         <indexRecordFieldMapping>
           <name>STANDARD_PHONE_COMMUNICATION.value</name>
@@ -1609,7 +1609,7 @@
           <additionalFieldNameAliases>
             <element>phone</element>
           </additionalFieldNameAliases>
-          <isMultiValued v="true" />
+          <isMultiValued v="false" />
         </indexRecordFieldMapping>
         <indexRecordFieldMapping>
           <name>ADDRESS_ID.displayValue</name>
diff --git a/entity/Organisation_entity/recordcontainers/index/query.js b/entity/Organisation_entity/recordcontainers/index/query.js
index e860656afa..0bc707c216 100644
--- a/entity/Organisation_entity/recordcontainers/index/query.js
+++ b/entity/Organisation_entity/recordcontainers/index/query.js
@@ -15,17 +15,18 @@ You may want to check out if your change affects other modules. However adding m
  */
 
 var commMediumPhoneIds = CommUtil.getMediumIdsByCategory("PHONE");
+var commMediumMailIds = CommUtil.getMediumIdsByCategory("EMAIL");
 var sqlHelper = new SqlMaskingUtils();
 var querySelect = newSelect([
         "CONTACT.CONTACTID",
         sqlHelper.concat(["ORGANISATION.NAME", "'|'", "ORGANISATION.CUSTOMERCODE"]),
         sqlHelper.concat([
-            sqlHelper.concat(["defaultAddress.ADDRESS", "defaultAddress.BUILDINGNO", "'-'"
-                ,"defaultAddress.COUNTRY", "defaultAddress.ZIP", "defaultAddress.CITY"]),
+            sqlHelper.concat(["standardAddress.ADDRESS", "standardAddress.BUILDINGNO", "'-'"
+                ,"standardAddress.COUNTRY", "standardAddress.ZIP", "standardAddress.CITY"]),
             sqlHelper.concat(["'" + translate.text("Phone") + ":'", "(" + CommUtil.getStandardSubSqlPhone() + ")"]),
             sqlHelper.concat(["'" + translate.text("Email") + ":'", "(" + CommUtil.getStandardSubSqlMail() + ")"])
         ], " | "),
-        sqlHelper.concat([sqlHelper.cast("defaultAddress.LAT", SQLTYPES.VARCHAR, 16), sqlHelper.cast("defaultAddress.LON", SQLTYPES.VARCHAR, 16)], ","),
+        sqlHelper.concat([sqlHelper.cast("standardAddress.LAT", SQLTYPES.VARCHAR, 16), sqlHelper.cast("standardAddress.LON", SQLTYPES.VARCHAR, 16)], ","),
         //additional indexed fields
         "ORGANISATION.NAME",
         sqlHelper.trim("ORGANISATION.ORGANISATIONID"),//trim to enable filter patterns like: >> -organisationid_value:0<<
@@ -35,19 +36,27 @@ var querySelect = newSelect([
         "ADDRESS.COUNTRY",
         "ADDRESS.ZIP",
         "ADDRESS.CITY",
-        "COMMUNICATION.ADDR",
-        "PHONE.ADDR",
-        sqlHelper.concat([sqlHelper.concat(["defaultAddress.ADDRESS", "defaultAddress.BUILDINGNO"])
-            ,sqlHelper.concat(["defaultAddress.COUNTRY", "defaultAddress.ZIP", "defaultAddress.CITY"])
+        "standardEmail.ADDR",
+        "standardPhone.ADDR",
+        sqlHelper.concat([sqlHelper.concat(["standardAddress.ADDRESS", "standardAddress.BUILDINGNO"])
+            ,sqlHelper.concat(["standardAddress.COUNTRY", "standardAddress.ZIP", "standardAddress.CITY"])
         ], " - ")
     ])
     .from("ORGANISATION")
     .join("CONTACT", "CONTACT.ORGANISATION_ID = ORGANISATION.ORGANISATIONID and CONTACT.PERSON_ID is null")
-    .leftJoin("ADDRESS", "defaultAddress.ADDRESSID = CONTACT.ADDRESS_ID", "defaultAddress")
+    .leftJoin("ADDRESS", "standardAddress.ADDRESSID = CONTACT.ADDRESS_ID", "standardAddress")
     .leftJoin("ADDRESS", "ADDRESS.CONTACT_ID = CONTACT.CONTACTID")
     .leftJoin("COMMUNICATION", "COMMUNICATION.CONTACT_ID = CONTACT.CONTACTID")
-    .leftJoin("COMMUNICATION", newWhere("phone.CONTACT_ID = CONTACT.CONTACTID")
-        .and(["COMMUNICATION", "MEDIUM_ID", "phone"], commMediumPhoneIds, SqlBuilder.IN()), "phone")
+    //standardMail is not multi valued and can only old one value (the standard email address)
+    .leftJoin("COMMUNICATION", newWhere("standardEmail.CONTACT_ID = CONTACT.CONTACTID")
+            .and(["COMMUNICATION", "MEDIUM_ID", "standardEmail"], commMediumMailIds, SqlBuilder.IN())
+            .and(["COMMUNICATION", "ISSTANDARD", "standardEmail"], "1")
+        , "standardEmail")
+    //standardPhone is not multi valued and can only old one value (the standard phone number)
+    .leftJoin("COMMUNICATION", newWhere("standardPhone.CONTACT_ID = CONTACT.CONTACTID")
+            .and(["COMMUNICATION", "MEDIUM_ID", "standardPhone"], commMediumPhoneIds, SqlBuilder.IN())
+            .and(["COMMUNICATION", "ISSTANDARD", "standardPhone"], "1")
+        , "standardPhone")
     .where("CONTACT.STATUS", $KeywordRegistry.contactStatus$inactive(), SqlBuilder.NOT_EQUAL());
 
 if (vars.exists("$local.idvalue") && vars.get("$local.idvalue") && vars.get("$local.idvalue").length > 0) 
-- 
GitLab


From ce4215136541f3e87608cb2d999f3514237b1ffd Mon Sep 17 00:00:00 2001
From: "j.goderbauer" <j.goderbauer@adito.de>
Date: Wed, 9 Sep 2020 09:12:30 +0200
Subject: [PATCH 273/309] Organisation_entity: Index bugfix: standard phone and
 standard email stored too much values 2

---
 process/IncomingCallExecutor_lib/process.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/process/IncomingCallExecutor_lib/process.js b/process/IncomingCallExecutor_lib/process.js
index 876bb084ac..9f6eb5534d 100644
--- a/process/IncomingCallExecutor_lib/process.js
+++ b/process/IncomingCallExecutor_lib/process.js
@@ -379,7 +379,7 @@ IncomingCallExecutor._getContactsFromNumber = function(pNumber, pContactIds)
         contactIds.
         */
         var patternConfig = indexsearch.createPatternConfig();
-        var searchTerm = indexsearch.createTerm(pNumber).setIndexField("phone");
+        var searchTerm = indexsearch.createTerm(pNumber).setIndexField("phone");//phone contains right now the standard phone number
         patternConfig.plus(searchTerm);
         var pattern = indexsearch.buildPattern(patternConfig);
         var indexQuery = indexsearch.createIndexQuery().setPattern(pattern)
-- 
GitLab


From af3c2a421e6ce033a8f80b756ee3b1ca96473c55 Mon Sep 17 00:00:00 2001
From: "j.goderbauer" <j.goderbauer@adito.de>
Date: Wed, 9 Sep 2020 09:33:57 +0200
Subject: [PATCH 274/309] AroundLocation fix: did not update when radius was
 removed

---
 .../entityfields/contactids/valueProcess.js            | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/entity/AroundLocation_entity/entityfields/contactids/valueProcess.js b/entity/AroundLocation_entity/entityfields/contactids/valueProcess.js
index 8c557caa9b..c501306c78 100644
--- a/entity/AroundLocation_entity/entityfields/contactids/valueProcess.js
+++ b/entity/AroundLocation_entity/entityfields/contactids/valueProcess.js
@@ -5,12 +5,14 @@ import("system.indexsearch");
 import("system.neon");
 
 var contactIds = [];
+var hitCount = 0;
+var totalHitCount = 0;
 
 var radius = vars.get("$field.SearchRadius");
 var lat  = vars.get("$param.LocationLat_param");
 var lon  = vars.get("$param.LocationLon_param");
 
-if (radius && lat && lon)
+if (radius && lat && lon && !vars.get("$sys.validationerrors"))
 {
     //filter our origin uid because otherwise we would have the origin organisation in our resultset
     var excludedUid = vars.get("$param.OriginUid_param");
@@ -50,8 +52,10 @@ if (radius && lat && lon)
         contactIds = indexResult.HITS.map(function (e){
             return e[indexsearch.FIELD_ID];
         });
-        neon.setFieldValue("$field.HitCount", contactIds.length);
-        neon.setFieldValue("$field.TotalHitCount", indexResult.TOTALHITS);
+    hitCount = contactIds.length;
+    totalHitCount = indexResult.TOTALHITS;
 }
 
+neon.setFieldValue("$field.HitCount", hitCount);
+neon.setFieldValue("$field.TotalHitCount", totalHitCount);
 result.string(JSON.stringify(contactIds));
\ No newline at end of file
-- 
GitLab


From 6662adafd6fb083d49b3d58e446dbdd8acc18c7d Mon Sep 17 00:00:00 2001
From: "j.goderbauer" <j.goderbauer@adito.de>
Date: Wed, 9 Sep 2020 09:38:44 +0200
Subject: [PATCH 275/309] Organisation: fix scan service error

---
 neonContext/Organisation/Organisation.aod | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/neonContext/Organisation/Organisation.aod b/neonContext/Organisation/Organisation.aod
index 0f3b35cfd1..03cdfd02c6 100644
--- a/neonContext/Organisation/Organisation.aod
+++ b/neonContext/Organisation/Organisation.aod
@@ -51,10 +51,6 @@
       <name>c72caf13-37cf-4af9-811d-832f43801369</name>
       <view>OrganisationAttributeRestriction_view</view>
     </neonViewReference>
-    <neonViewReference>
-      <name>a97ac17d-171b-4c9a-83fa-bb5a466c7b20</name>
-      <view>OrganisationDuplicateEditview_view</view>
-    </neonViewReference>
     <neonViewReference>
       <name>ade0ed85-260d-4da5-bf4c-f838cfdcc693</name>
       <view>OrganisationReport_view</view>
-- 
GitLab


From 051290da8f262245963a6eb064d8c93775e81355 Mon Sep 17 00:00:00 2001
From: "j.goderbauer" <j.goderbauer@adito.de>
Date: Wed, 9 Sep 2020 09:40:49 +0200
Subject: [PATCH 276/309] Updated language files

---
 .../_____LANGUAGE_EXTRA.aod                   | 18 ++++++++++++++++
 .../_____LANGUAGE_de/_____LANGUAGE_de.aod     | 21 +++++++++++++++++++
 .../_____LANGUAGE_en/_____LANGUAGE_en.aod     | 18 ++++++++++++++++
 3 files changed, 57 insertions(+)

diff --git a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
index fa04a60d9e..d8a6e1937e 100644
--- a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
+++ b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
@@ -7362,6 +7362,24 @@
     <entry>
       <key>{$DISTRICT_TOTAL_TURNOVER}</key>
     </entry>
+    <entry>
+      <key>Update all Classification entries in the system</key>
+    </entry>
+    <entry>
+      <key>Lead import</key>
+    </entry>
+    <entry>
+      <key>Nr</key>
+    </entry>
+    <entry>
+      <key>Verantwortlicher</key>
+    </entry>
+    <entry>
+      <key>Userhelp Ressources</key>
+    </entry>
+    <entry>
+      <key>Worklow started</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 6481d8a8ba..9aa11d7e1e 100644
--- a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
+++ b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
@@ -9382,6 +9382,27 @@ Bitte Datumseingabe prüfen</value>
       <key>{$DISTRICT_TOTAL_TURNOVER}</key>
       <value>Umsatz gesamt</value>
     </entry>
+    <entry>
+      <key>Update all Classification entries in the system</key>
+      <value>Aktualisiere alle gespeicherten Klassifizierungswerte im System.</value>
+    </entry>
+    <entry>
+      <key>Lead import</key>
+      <value>Leadimport</value>
+    </entry>
+    <entry>
+      <key>Nr</key>
+    </entry>
+    <entry>
+      <key>Verantwortlicher</key>
+    </entry>
+    <entry>
+      <key>Userhelp Ressources</key>
+    </entry>
+    <entry>
+      <key>Worklow started</key>
+      <value>Worklow gestartet</value>
+    </entry>
   </keyValueMap>
   <font name="Dialog" style="0" size="11" />
 </language>
diff --git a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
index 20f4b0786a..70bde122c6 100644
--- a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
+++ b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
@@ -7433,6 +7433,24 @@
     <entry>
       <key>{$DISTRICT_TOTAL_TURNOVER}</key>
     </entry>
+    <entry>
+      <key>Update all Classification entries in the system</key>
+    </entry>
+    <entry>
+      <key>Lead import</key>
+    </entry>
+    <entry>
+      <key>Nr</key>
+    </entry>
+    <entry>
+      <key>Verantwortlicher</key>
+    </entry>
+    <entry>
+      <key>Userhelp Ressources</key>
+    </entry>
+    <entry>
+      <key>Worklow started</key>
+    </entry>
   </keyValueMap>
   <font name="Dialog" style="0" size="11" />
 </language>
-- 
GitLab


From 5f28aa37a092afb1a4b4f99d5f055974f668a595 Mon Sep 17 00:00:00 2001
From: "j.goderbauer" <j.goderbauer@adito.de>
Date: Wed, 9 Sep 2020 09:44:03 +0200
Subject: [PATCH 277/309] updated language sources

---
 entity/AddressValidation_entity/AddressValidation_entity.aod    | 2 +-
 .../DistrictResponsible_entity/DistrictResponsible_entity.aod   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/entity/AddressValidation_entity/AddressValidation_entity.aod b/entity/AddressValidation_entity/AddressValidation_entity.aod
index f5c5c28ad4..4f1ed59385 100644
--- a/entity/AddressValidation_entity/AddressValidation_entity.aod
+++ b/entity/AddressValidation_entity/AddressValidation_entity.aod
@@ -130,7 +130,7 @@
     </entityField>
     <entityField>
       <name>BUILDINGNO</name>
-      <title>Nr</title>
+      <title>House number</title>
     </entityField>
     <entityProvider>
       <name>StreetValidation</name>
diff --git a/entity/DistrictResponsible_entity/DistrictResponsible_entity.aod b/entity/DistrictResponsible_entity/DistrictResponsible_entity.aod
index 32f46b01cf..deda3b03d7 100644
--- a/entity/DistrictResponsible_entity/DistrictResponsible_entity.aod
+++ b/entity/DistrictResponsible_entity/DistrictResponsible_entity.aod
@@ -3,7 +3,7 @@
   <name>DistrictResponsible_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <icon>VAADIN:GLOBE</icon>
-  <title>Verantwortlicher</title>
+  <title>District Responsible</title>
   <contentTitleProcess>%aditoprj%/entity/DistrictResponsible_entity/contentTitleProcess.js</contentTitleProcess>
   <image>VAADIN:GLOBE</image>
   <recordContainer>db</recordContainer>
-- 
GitLab


From bce670e6c60288e6229b7686b5068138d21b1c81 Mon Sep 17 00:00:00 2001
From: "j.goderbauer" <j.goderbauer@adito.de>
Date: Wed, 9 Sep 2020 09:54:39 +0200
Subject: [PATCH 278/309] updated db indizes

---
 .../basic/2020.2.0/optimizeIndizes.xml        | 23 ++++++++++++++++++-
 .liquibase/Data_alias/changelog.xml           |  2 +-
 aliasDefinition/Data_alias/Data_alias.aod     | 14 +++++------
 3 files changed, 30 insertions(+), 9 deletions(-)

diff --git a/.liquibase/Data_alias/basic/2020.2.0/optimizeIndizes.xml b/.liquibase/Data_alias/basic/2020.2.0/optimizeIndizes.xml
index b94480075b..3cab67efb5 100644
--- a/.liquibase/Data_alias/basic/2020.2.0/optimizeIndizes.xml
+++ b/.liquibase/Data_alias/basic/2020.2.0/optimizeIndizes.xml
@@ -5,9 +5,12 @@
         <createIndex tableName="COMMUNICATION" indexName="IDX_COMMUNICATION_MEDIUM_ID">
             <column name="MEDIUM_ID"/>
         </createIndex>
-        <createIndex tableName="AB_APPOINTMENTLINK" indexName="IDX_APPOINTMENTLINK_AP_ID">
+        <createIndex tableName="AB_APPOINTMENTLINK" indexName="IDX_APPOINTLINK_AP_ID">
             <column name="APPOINTMENT_ID"/>
         </createIndex>
+        <createIndex tableName="AB_APPOINTMENTLINK" indexName="IDX_APPOINTLINK_OBJECT_ROWID">
+            <column name="OBJECT_ROWID"/>
+        </createIndex>
         <createIndex tableName="EXPORTTEMPLATEPLACEOFUSE" indexName="IDX_EXPORTTEMPLATEUSE_T_ID">
             <column name="EXPORTTEMPLATE_ID"/>
         </createIndex>
@@ -29,5 +32,23 @@
         <createIndex tableName="LEADIMPORTMAPPINGASSISTANT" indexName="IDX_LEADIMPORTMAPPING_LI_ID">
             <column name="LEADIMPORT_ID"/>
         </createIndex>
+        <createIndex tableName="EXPORTTEMPLATESELECTION" indexName="IDX_EXPTEMPLATESEL_TEMPLATE_ID">
+            <column name="EXPORTTEMPLATE_ID"/>
+        </createIndex>
+        <createIndex tableName="AB_PERMISSIONCALENDAR" indexName="IDX_AB_PERMCAL_PROCURER_ROWID">
+            <column name="PERMISSIONPROCURER_ROWID"/>
+        </createIndex>
+        <createIndex tableName="AB_PERMISSIONCALENDAR" indexName="IDX_AB_PERMCAL_DEALER_ROWID">
+            <column name="PERMISSIONDEALER_ROWID"/>
+        </createIndex>
+        <createIndex tableName="VISITPLANENTRY" indexName="IDX_VISITPLNENTRY_VRECOMMND_ID">
+            <column name="VISITRECOMMENDATION_ID"/>
+        </createIndex>
+        <createIndex tableName="VISITPLANENTRY" indexName="IDX_VISITPLNENTRY_CONTCT_ID">
+            <column name="CONTACT_ID"/>
+        </createIndex>
+        <createIndex tableName="VISITPLANENTRY" indexName="IDX_VISITPLNENTRY_ORGCONTCT_ID">
+            <column name="ORGANISATION_CONTACT_ID"/>
+        </createIndex>
     </changeSet>
 </databaseChangeLog>
diff --git a/.liquibase/Data_alias/changelog.xml b/.liquibase/Data_alias/changelog.xml
index c3a1d3c575..8b0160a2bd 100644
--- a/.liquibase/Data_alias/changelog.xml
+++ b/.liquibase/Data_alias/changelog.xml
@@ -18,5 +18,5 @@
     <include relativeToChangelogFile="true" file="basic/2020.2.0/changelog.xml"/>
 
     <!--enable this only when you definetly want to overwrite the existing data with demo records:-->
-    <!--<include relativeToChangelogFile="true" file="basic/_demoData/changelog.xml" context="example"/>-->
+    <include relativeToChangelogFile="true" file="basic/_demoData/changelog.xml" context="example"/>
 </databaseChangeLog>
\ No newline at end of file
diff --git a/aliasDefinition/Data_alias/Data_alias.aod b/aliasDefinition/Data_alias/Data_alias.aod
index bd124f29d2..dde67708f2 100644
--- a/aliasDefinition/Data_alias/Data_alias.aod
+++ b/aliasDefinition/Data_alias/Data_alias.aod
@@ -6986,7 +6986,7 @@
                 <scale v="0" />
                 <notNull v="true" />
                 <isUnique v="false" />
-                <index v="false" />
+                <index v="true" />
                 <documentation></documentation>
                 <title>{$OBJECTLINK_OBJECT}</title>
                 <description></description>
@@ -14405,7 +14405,7 @@
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
-                <index v="false" />
+                <index v="true" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
@@ -14544,7 +14544,7 @@
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
-                <index v="false" />
+                <index v="true" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
@@ -14558,7 +14558,7 @@
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
-                <index v="false" />
+                <index v="true" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
@@ -14870,7 +14870,7 @@
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
-                <index v="false" />
+                <index v="true" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
@@ -14926,7 +14926,7 @@
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
-                <index v="false" />
+                <index v="true" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
@@ -14940,7 +14940,7 @@
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
-                <index v="false" />
+                <index v="true" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
-- 
GitLab


From 4aa3f2b5fe00888af02782ce1fcad5af44626e5f Mon Sep 17 00:00:00 2001
From: "j.goderbauer" <j.goderbauer@adito.de>
Date: Wed, 9 Sep 2020 09:58:41 +0200
Subject: [PATCH 279/309] disable demodata

---
 .liquibase/Data_alias/changelog.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.liquibase/Data_alias/changelog.xml b/.liquibase/Data_alias/changelog.xml
index 8b0160a2bd..c3a1d3c575 100644
--- a/.liquibase/Data_alias/changelog.xml
+++ b/.liquibase/Data_alias/changelog.xml
@@ -18,5 +18,5 @@
     <include relativeToChangelogFile="true" file="basic/2020.2.0/changelog.xml"/>
 
     <!--enable this only when you definetly want to overwrite the existing data with demo records:-->
-    <include relativeToChangelogFile="true" file="basic/_demoData/changelog.xml" context="example"/>
+    <!--<include relativeToChangelogFile="true" file="basic/_demoData/changelog.xml" context="example"/>-->
 </databaseChangeLog>
\ No newline at end of file
-- 
GitLab


From 316a48559b2bd0a87355859b3ca943e98d053ce7 Mon Sep 17 00:00:00 2001
From: "j.goderbauer" <j.goderbauer@adito.de>
Date: Wed, 9 Sep 2020 10:14:28 +0200
Subject: [PATCH 280/309] [Projekt: Entwicklung - Neon][TicketNr.:
 1065008][Liquibase Fehler in Git-Tag -> version/2020/2/0/0_RC3]

---
 .liquibase/Data_alias/basic/2020.2.0/optimizeIndizes.xml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/.liquibase/Data_alias/basic/2020.2.0/optimizeIndizes.xml b/.liquibase/Data_alias/basic/2020.2.0/optimizeIndizes.xml
index 3cab67efb5..c9e5b442ce 100644
--- a/.liquibase/Data_alias/basic/2020.2.0/optimizeIndizes.xml
+++ b/.liquibase/Data_alias/basic/2020.2.0/optimizeIndizes.xml
@@ -2,9 +2,6 @@
 <databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
                    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
     <changeSet author="s.listl" id="a303ace0-b324-435a-84d8-7ef4d0419af8">
-        <createIndex tableName="COMMUNICATION" indexName="IDX_COMMUNICATION_MEDIUM_ID">
-            <column name="MEDIUM_ID"/>
-        </createIndex>
         <createIndex tableName="AB_APPOINTMENTLINK" indexName="IDX_APPOINTLINK_AP_ID">
             <column name="APPOINTMENT_ID"/>
         </createIndex>
-- 
GitLab


From 3dc4842ba956d355889991aa9266ad564284d1ba Mon Sep 17 00:00:00 2001
From: "j.goderbauer" <j.goderbauer@adito.de>
Date: Wed, 9 Sep 2020 14:37:33 +0200
Subject: [PATCH 281/309] Several scanservices

---
 .../Duplicates_entity/Duplicates_entity.aod   |   4 +-
 .../Organisation_entity.aod                   | 133 +++++++++++++++++-
 .../classificationstorage_id/valueProcess.js  |  10 --
 .../nonselfduplicates/documentation.adoc      |   3 +
 .../openaroundlocation/onActionProcess.js     |   1 -
 .../openaroundlocation/stateProcess.js        |   6 +-
 .../organisations/documentation.adoc          |   1 +
 .../selfduplicates/documentation.adoc         |   1 +
 .../withattribute/documentation.adoc          |   3 +
 entity/Person_entity/Person_entity.aod        | 102 +++++++++++---
 .../entityfields/contact/documentation.adoc   |   1 +
 .../entityfields/contacts/documentation.adoc  |   1 +
 .../documentation.adoc                        |   3 +
 .../nonselfduplicates/documentation.adoc      |   3 +
 .../organisationrelated/documentation.adoc    |   1 +
 .../quickentrycontacts/documentation.adoc     |   3 +
 .../selfduplicates/documentation.adoc         |   1 +
 .../UnlinkedMailMappingWrapper_entity.aod     |   1 +
 .../documentation.adoc                        |   6 +-
 .../forunlinkedmail/documentation.adoc        |   3 +
 20 files changed, 248 insertions(+), 39 deletions(-)
 delete mode 100644 entity/Organisation_entity/entityfields/classificationstorage_id/valueProcess.js
 create mode 100644 entity/Organisation_entity/entityfields/nonselfduplicates/documentation.adoc
 create mode 100644 entity/Organisation_entity/entityfields/organisations/documentation.adoc
 create mode 100644 entity/Organisation_entity/entityfields/selfduplicates/documentation.adoc
 create mode 100644 entity/Organisation_entity/entityfields/withattribute/documentation.adoc
 create mode 100644 entity/Person_entity/entityfields/contact/documentation.adoc
 create mode 100644 entity/Person_entity/entityfields/contacts/documentation.adoc
 create mode 100644 entity/Person_entity/entityfields/idfilteredactivecontacts/documentation.adoc
 create mode 100644 entity/Person_entity/entityfields/nonselfduplicates/documentation.adoc
 create mode 100644 entity/Person_entity/entityfields/organisationrelated/documentation.adoc
 create mode 100644 entity/Person_entity/entityfields/quickentrycontacts/documentation.adoc
 create mode 100644 entity/Person_entity/entityfields/selfduplicates/documentation.adoc
 create mode 100644 entity/UnlinkedMailMappingWrapper_entity/entityfields/forunlinkedmail/documentation.adoc

diff --git a/entity/Duplicates_entity/Duplicates_entity.aod b/entity/Duplicates_entity/Duplicates_entity.aod
index a0a699a39c..54ee932a32 100644
--- a/entity/Duplicates_entity/Duplicates_entity.aod
+++ b/entity/Duplicates_entity/Duplicates_entity.aod
@@ -112,7 +112,7 @@
       <dependency>
         <name>dependency</name>
         <entityName>Person_entity</entityName>
-        <fieldName>Contacts</fieldName>
+        <fieldName>NonselfDuplicates</fieldName>
       </dependency>
       <children>
         <entityParameter>
@@ -189,7 +189,7 @@
       <dependency>
         <name>dependency</name>
         <entityName>Organisation_entity</entityName>
-        <fieldName>Organisations</fieldName>
+        <fieldName>NonselfDuplicates</fieldName>
       </dependency>
       <children>
         <entityParameter>
diff --git a/entity/Organisation_entity/Organisation_entity.aod b/entity/Organisation_entity/Organisation_entity.aod
index deb5ee3641..43d7463ef6 100644
--- a/entity/Organisation_entity/Organisation_entity.aod
+++ b/entity/Organisation_entity/Organisation_entity.aod
@@ -112,6 +112,7 @@
     </entityFieldGroup>
     <entityProvider>
       <name>Organisations</name>
+      <documentation>%aditoprj%/entity/Organisation_entity/entityfields/organisations/documentation.adoc</documentation>
       <recordContainer>db</recordContainer>
       <dependencies>
         <entityDependency>
@@ -172,6 +173,14 @@
           <name>AttributeId_param</name>
           <expose v="false" />
         </entityParameter>
+        <entityParameter>
+          <name>DuplicateActionsControl_param</name>
+          <expose v="false" />
+        </entityParameter>
+        <entityParameter>
+          <name>DuplicateCurrentContactId_param</name>
+          <expose v="false" />
+        </entityParameter>
       </children>
     </entityProvider>
     <entityConsumer>
@@ -621,6 +630,14 @@
           <name>ExcludedContactIds_param</name>
           <expose v="false" />
         </entityParameter>
+        <entityParameter>
+          <name>DuplicateActionsControl_param</name>
+          <expose v="false" />
+        </entityParameter>
+        <entityParameter>
+          <name>DuplicateCurrentContactId_param</name>
+          <expose v="false" />
+        </entityParameter>
       </children>
     </entityProvider>
     <entityParameter>
@@ -635,6 +652,7 @@
     </entityParameter>
     <entityProvider>
       <name>WithAttribute</name>
+      <documentation>%aditoprj%/entity/Organisation_entity/entityfields/withattribute/documentation.adoc</documentation>
       <dependencies>
         <entityDependency>
           <name>10480df2-f0b6-4cb6-8bfb-4a468b994996</name>
@@ -671,6 +689,14 @@
           <name>ExcludedContactIds_param</name>
           <expose v="true" />
         </entityParameter>
+        <entityParameter>
+          <name>DuplicateActionsControl_param</name>
+          <expose v="false" />
+        </entityParameter>
+        <entityParameter>
+          <name>DuplicateCurrentContactId_param</name>
+          <expose v="false" />
+        </entityParameter>
       </children>
     </entityProvider>
     <entityParameter>
@@ -961,8 +987,39 @@
       <stateProcess>%aditoprj%/entity/Organisation_entity/entityfields/openadminview/stateProcess.js</stateProcess>
     </entityActionField>
     <entityProvider>
-      <name>SelfDuplicatesProvider</name>
+      <name>SelfDuplicates</name>
+      <documentation>%aditoprj%/entity/Organisation_entity/entityfields/selfduplicates/documentation.adoc</documentation>
       <titlePlural>Duplicates</titlePlural>
+      <children>
+        <entityParameter>
+          <name>AttributeId_param</name>
+          <expose v="false" />
+        </entityParameter>
+        <entityParameter>
+          <name>AttributeKeyId_param</name>
+          <expose v="false" />
+        </entityParameter>
+        <entityParameter>
+          <name>FilterPreSet_param</name>
+          <expose v="false" />
+        </entityParameter>
+        <entityParameter>
+          <name>OrganisationType_param</name>
+          <expose v="false" />
+        </entityParameter>
+        <entityParameter>
+          <name>WithPrivate_param</name>
+          <expose v="false" />
+        </entityParameter>
+        <entityParameter>
+          <name>OnlyOwnSupervised_param</name>
+          <expose v="false" />
+        </entityParameter>
+        <entityParameter>
+          <name>ExcludeOrganisationsByPersonId</name>
+          <expose v="false" />
+        </entityParameter>
+      </children>
     </entityProvider>
     <entityParameter>
       <name>OnlyShowContactIds_param</name>
@@ -1028,7 +1085,7 @@
       <dependency>
         <name>dependency</name>
         <entityName>Organisation_entity</entityName>
-        <fieldName>SelfDuplicatesProvider</fieldName>
+        <fieldName>SelfDuplicates</fieldName>
       </dependency>
       <children>
         <entityParameter>
@@ -1236,6 +1293,44 @@
       <name>indexP</name>
       <documentation>%aditoprj%/entity/Organisation_entity/entityfields/indexp/documentation.adoc</documentation>
       <recordContainer>index</recordContainer>
+      <children>
+        <entityParameter>
+          <name>AttributeId_param</name>
+          <expose v="false" />
+        </entityParameter>
+        <entityParameter>
+          <name>ExcludedContactIds_param</name>
+          <expose v="false" />
+        </entityParameter>
+        <entityParameter>
+          <name>OnlyShowContactIds_param</name>
+          <expose v="false" />
+        </entityParameter>
+        <entityParameter>
+          <name>DuplicateCurrentContactId_param</name>
+          <expose v="false" />
+        </entityParameter>
+        <entityParameter>
+          <name>ExcludeOrganisationsByPersonId</name>
+          <expose v="false" />
+        </entityParameter>
+        <entityParameter>
+          <name>FilterPreSet_param</name>
+          <expose v="false" />
+        </entityParameter>
+        <entityParameter>
+          <name>OnlyOwnSupervised_param</name>
+          <expose v="false" />
+        </entityParameter>
+        <entityParameter>
+          <name>WithPrivate_param</name>
+          <expose v="false" />
+        </entityParameter>
+        <entityParameter>
+          <name>OrganisationType_param</name>
+          <expose v="false" />
+        </entityParameter>
+      </children>
     </entityProvider>
     <entityConsumer>
       <name>DistrictResponsibles</name>
@@ -1255,6 +1350,40 @@
       <name>FilterPreSet_param</name>
       <expose v="true" />
     </entityParameter>
+    <entityProvider>
+      <name>NonselfDuplicates</name>
+      <documentation>%aditoprj%/entity/Organisation_entity/entityfields/nonselfduplicates/documentation.adoc</documentation>
+      <dependencies>
+        <entityDependency>
+          <name>2e410b9e-5ebc-48ea-9562-da386202d7e8</name>
+          <entityName>Duplicates_entity</entityName>
+          <fieldName>DuplicateOrganisationsConsumer</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+      </dependencies>
+      <children>
+        <entityParameter>
+          <name>AttributeKeyId_param</name>
+          <expose v="false" />
+        </entityParameter>
+        <entityParameter>
+          <name>DuplicateCurrentContactId_param</name>
+          <expose v="false" />
+        </entityParameter>
+        <entityParameter>
+          <name>ExcludedContactIds_param</name>
+          <expose v="false" />
+        </entityParameter>
+        <entityParameter>
+          <name>OnlyShowContactIds_param</name>
+          <expose v="true" />
+        </entityParameter>
+        <entityParameter>
+          <name>OnlyOwnSupervised_param</name>
+          <expose v="false" />
+        </entityParameter>
+      </children>
+    </entityProvider>
   </entityFields>
   <recordContainers>
     <dbRecordContainer>
diff --git a/entity/Organisation_entity/entityfields/classificationstorage_id/valueProcess.js b/entity/Organisation_entity/entityfields/classificationstorage_id/valueProcess.js
deleted file mode 100644
index f7db7e7050..0000000000
--- a/entity/Organisation_entity/entityfields/classificationstorage_id/valueProcess.js
+++ /dev/null
@@ -1,10 +0,0 @@
-//import("Sql_lib");
-//import("system.result");
-//import("system.vars");
-//
-//var classification = newSelect("CLASSIFICATIONSTORAGE.CLASSIFICATIONVALUE")
-//                                .from("CLASSIFICATIONSTORAGE")
-//                                .where("CLASSIFICATIONSTORAGE.OBJECT_ROWID", vars.get("$field.ORGANISATIONID"))
-//                                .cell();
-//                                
-//result.string(classification);
diff --git a/entity/Organisation_entity/entityfields/nonselfduplicates/documentation.adoc b/entity/Organisation_entity/entityfields/nonselfduplicates/documentation.adoc
new file mode 100644
index 0000000000..dc35980c12
--- /dev/null
+++ b/entity/Organisation_entity/entityfields/nonselfduplicates/documentation.adoc
@@ -0,0 +1,3 @@
+Provides organisation duplicate-records without the `Organisation_entity` scope, for example for the `Duplicates_entity`.
+
+The provider is named `NonselfDuplicates` to differentiate this provider and the `SelfDuplicates`-provider.
\ No newline at end of file
diff --git a/entity/Organisation_entity/entityfields/openaroundlocation/onActionProcess.js b/entity/Organisation_entity/entityfields/openaroundlocation/onActionProcess.js
index df10e3d43c..3ede9b6084 100644
--- a/entity/Organisation_entity/entityfields/openaroundlocation/onActionProcess.js
+++ b/entity/Organisation_entity/entityfields/openaroundlocation/onActionProcess.js
@@ -5,7 +5,6 @@ import("system.neon");
 var rowConfig = entities.createConfigForLoadingRows()
     .fields(["STANDARD_LAT", "STANDARD_LON"])
     .entity("Organisation_entity")
-//    .entity(vars.get("$sys.currententityname"))
     .uid(vars.get("$sys.uid"));
 var row = entities.getRow(rowConfig);
 
diff --git a/entity/Organisation_entity/entityfields/openaroundlocation/stateProcess.js b/entity/Organisation_entity/entityfields/openaroundlocation/stateProcess.js
index a2899dea4d..129f026470 100644
--- a/entity/Organisation_entity/entityfields/openaroundlocation/stateProcess.js
+++ b/entity/Organisation_entity/entityfields/openaroundlocation/stateProcess.js
@@ -3,11 +3,7 @@ import("system.neon");
 import("system.vars");
 import("system.entities");
 
-//todo: only visible if location tracking is enabled
-
-
-//todo: use read entity and comment why (data is not loaded)
-
+//use read entity since the lat and lon fields are not loaded by default since they are not needed otherwise
 var rowConfig = entities.createConfigForLoadingRows()
     .fields(["STANDARD_LAT", "STANDARD_LON"])
     .entity(vars.get("$sys.currententityname"))
diff --git a/entity/Organisation_entity/entityfields/organisations/documentation.adoc b/entity/Organisation_entity/entityfields/organisations/documentation.adoc
new file mode 100644
index 0000000000..69b5814ae9
--- /dev/null
+++ b/entity/Organisation_entity/entityfields/organisations/documentation.adoc
@@ -0,0 +1 @@
+Provides several organisation contacts for basic use cases.
\ No newline at end of file
diff --git a/entity/Organisation_entity/entityfields/selfduplicates/documentation.adoc b/entity/Organisation_entity/entityfields/selfduplicates/documentation.adoc
new file mode 100644
index 0000000000..396162acb9
--- /dev/null
+++ b/entity/Organisation_entity/entityfields/selfduplicates/documentation.adoc
@@ -0,0 +1 @@
+Provides organisation duplicate-records within the `Organisation_entity` scope itself.
\ No newline at end of file
diff --git a/entity/Organisation_entity/entityfields/withattribute/documentation.adoc b/entity/Organisation_entity/entityfields/withattribute/documentation.adoc
new file mode 100644
index 0000000000..4b77444176
--- /dev/null
+++ b/entity/Organisation_entity/entityfields/withattribute/documentation.adoc
@@ -0,0 +1,3 @@
+Provides organisation contacts where one attribute has a specific, given value.
+
+Use case: "give me all organizations where loyalty has the value high".
\ No newline at end of file
diff --git a/entity/Person_entity/Person_entity.aod b/entity/Person_entity/Person_entity.aod
index 367ab7a019..3d84d402a3 100644
--- a/entity/Person_entity/Person_entity.aod
+++ b/entity/Person_entity/Person_entity.aod
@@ -116,6 +116,7 @@
     </entityField>
     <entityProvider>
       <name>OrganisationRelated</name>
+      <documentation>%aditoprj%/entity/Person_entity/entityfields/organisationrelated/documentation.adoc</documentation>
       <recordContainer>db</recordContainer>
       <dependencies>
         <entityDependency>
@@ -138,6 +139,10 @@
           <name>OnlyActive_param</name>
           <expose v="false" />
         </entityParameter>
+        <entityParameter>
+          <name>DuplicateCurrentContactId_param</name>
+          <expose v="false" />
+        </entityParameter>
       </children>
     </entityProvider>
     <entityField>
@@ -345,6 +350,7 @@
     </entityFieldGroup>
     <entityProvider>
       <name>Contact</name>
+      <documentation>%aditoprj%/entity/Person_entity/entityfields/contact/documentation.adoc</documentation>
       <recordContainer>db</recordContainer>
       <dependencies>
         <entityDependency>
@@ -372,6 +378,14 @@
           <name>OnlyActive_param</name>
           <expose v="false" />
         </entityParameter>
+        <entityParameter>
+          <name>DuplicateCurrentContactId_param</name>
+          <expose v="false" />
+        </entityParameter>
+        <entityParameter>
+          <name>DuplicateActionsControl_param</name>
+          <expose v="false" />
+        </entityParameter>
       </children>
     </entityProvider>
     <entityConsumer>
@@ -687,6 +701,7 @@
     </entityParameter>
     <entityProvider>
       <name>Contacts</name>
+      <documentation>%aditoprj%/entity/Person_entity/entityfields/contacts/documentation.adoc</documentation>
       <dependencies>
         <entityDependency>
           <name>c98da62f-d6b2-4ddb-9101-92e9a60abdfb</name>
@@ -722,6 +737,10 @@
           <name>OnlyActive_param</name>
           <expose v="false" />
         </entityParameter>
+        <entityParameter>
+          <name>DuplicateCurrentContactId_param</name>
+          <expose v="false" />
+        </entityParameter>
       </children>
     </entityProvider>
     <entityConsumer>
@@ -901,7 +920,7 @@
       <dependency>
         <name>dependency</name>
         <entityName>Person_entity</entityName>
-        <fieldName>SelfDuplicatesProvider</fieldName>
+        <fieldName>SelfDuplicates</fieldName>
       </dependency>
       <children>
         <entityParameter>
@@ -949,6 +968,7 @@
     </entityField>
     <entityProvider>
       <name>QuickEntryContacts</name>
+      <documentation>%aditoprj%/entity/Person_entity/entityfields/quickentrycontacts/documentation.adoc</documentation>
       <titlePlural>Additional Contacts</titlePlural>
       <dependencies>
         <entityDependency>
@@ -971,6 +991,14 @@
           <name>OnlyActive_param</name>
           <expose v="false" />
         </entityParameter>
+        <entityParameter>
+          <name>DuplicateActionsControl_param</name>
+          <expose v="false" />
+        </entityParameter>
+        <entityParameter>
+          <name>DuplicateCurrentContactId_param</name>
+          <expose v="false" />
+        </entityParameter>
       </children>
     </entityProvider>
     <entityActionField>
@@ -1146,25 +1174,10 @@
       <name>OnlyShowContactIds_param</name>
       <expose v="true" />
     </entityParameter>
-    <entityConsumer>
-      <name>SelfDuplicates</name>
-      <dependency>
-        <name>dependency</name>
-        <entityName>Person_entity</entityName>
-        <fieldName>SelfDuplicatesProvider</fieldName>
-      </dependency>
-    </entityConsumer>
     <entityProvider>
-      <name>SelfDuplicatesProvider</name>
+      <name>SelfDuplicates</name>
+      <documentation>%aditoprj%/entity/Person_entity/entityfields/selfduplicates/documentation.adoc</documentation>
       <titlePlural>Duplicates</titlePlural>
-      <dependencies>
-        <entityDependency>
-          <name>f6d16008-1764-4920-8ea5-c95c6a67f508</name>
-          <entityName>Person_entity</entityName>
-          <fieldName>SelfDuplicates</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
-      </dependencies>
       <children>
         <entityParameter>
           <name>OnlyShowContactIds_param</name>
@@ -1174,6 +1187,18 @@
           <name>OnlyActive_param</name>
           <expose v="false" />
         </entityParameter>
+        <entityParameter>
+          <name>OrgId_param</name>
+          <expose v="false" />
+        </entityParameter>
+        <entityParameter>
+          <name>OnlyOwnSupervised_param</name>
+          <expose v="false" />
+        </entityParameter>
+        <entityParameter>
+          <name>ContactId_param</name>
+          <expose v="false" />
+        </entityParameter>
       </children>
     </entityProvider>
     <entityField>
@@ -1213,6 +1238,7 @@
     </entityActionField>
     <entityProvider>
       <name>IdFilteredActiveContacts</name>
+      <documentation>%aditoprj%/entity/Person_entity/entityfields/idfilteredactivecontacts/documentation.adoc</documentation>
       <dependencies>
         <entityDependency>
           <name>511f3e4c-7493-4a31-a136-0ba80ba2ec85</name>
@@ -1270,6 +1296,12 @@
       <name>indexP</name>
       <documentation>%aditoprj%/entity/Person_entity/entityfields/indexp/documentation.adoc</documentation>
       <recordContainer>index</recordContainer>
+      <children>
+        <entityParameter>
+          <name>DuplicateActionsControl_param</name>
+          <expose v="false" />
+        </entityParameter>
+      </children>
     </entityProvider>
     <entityField>
       <name>PERSON_OBJECTTYPE</name>
@@ -1293,6 +1325,40 @@
         </entityParameter>
       </children>
     </entityConsumer>
+    <entityProvider>
+      <name>NonselfDuplicates</name>
+      <documentation>%aditoprj%/entity/Person_entity/entityfields/nonselfduplicates/documentation.adoc</documentation>
+      <dependencies>
+        <entityDependency>
+          <name>3a4352e2-9686-4c52-9d01-dbfad8c68ea7</name>
+          <entityName>Duplicates_entity</entityName>
+          <fieldName>DuplicatePersonsConsumer</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+      </dependencies>
+      <children>
+        <entityParameter>
+          <name>ContactId_param</name>
+          <expose v="false" />
+        </entityParameter>
+        <entityParameter>
+          <name>DuplicateCurrentContactId_param</name>
+          <expose v="false" />
+        </entityParameter>
+        <entityParameter>
+          <name>OnlyShowContactIds_param</name>
+          <expose v="true" />
+        </entityParameter>
+        <entityParameter>
+          <name>OrgId_param</name>
+          <expose v="false" />
+        </entityParameter>
+        <entityParameter>
+          <name>OnlyOwnSupervised_param</name>
+          <expose v="false" />
+        </entityParameter>
+      </children>
+    </entityProvider>
   </entityFields>
   <recordContainers>
     <dbRecordContainer>
diff --git a/entity/Person_entity/entityfields/contact/documentation.adoc b/entity/Person_entity/entityfields/contact/documentation.adoc
new file mode 100644
index 0000000000..e289ce7180
--- /dev/null
+++ b/entity/Person_entity/entityfields/contact/documentation.adoc
@@ -0,0 +1 @@
+Provides excactly one or none person contact.
\ No newline at end of file
diff --git a/entity/Person_entity/entityfields/contacts/documentation.adoc b/entity/Person_entity/entityfields/contacts/documentation.adoc
new file mode 100644
index 0000000000..ee82569190
--- /dev/null
+++ b/entity/Person_entity/entityfields/contacts/documentation.adoc
@@ -0,0 +1 @@
+Provides several person contacts.
\ No newline at end of file
diff --git a/entity/Person_entity/entityfields/idfilteredactivecontacts/documentation.adoc b/entity/Person_entity/entityfields/idfilteredactivecontacts/documentation.adoc
new file mode 100644
index 0000000000..d9bacf9834
--- /dev/null
+++ b/entity/Person_entity/entityfields/idfilteredactivecontacts/documentation.adoc
@@ -0,0 +1,3 @@
+Provides person contacts that are active (default) and excludes contacts with given IDs. 
+
+This is useful for lists where person contacts can be chosen only once.
\ No newline at end of file
diff --git a/entity/Person_entity/entityfields/nonselfduplicates/documentation.adoc b/entity/Person_entity/entityfields/nonselfduplicates/documentation.adoc
new file mode 100644
index 0000000000..d7964dadc0
--- /dev/null
+++ b/entity/Person_entity/entityfields/nonselfduplicates/documentation.adoc
@@ -0,0 +1,3 @@
+Provides contact duplicate-records without the `Person_entity` scope, for example for the `Duplicates_entity`.
+
+The provider is named `NonselfDuplicates` to differentiate this provider and the `SelfDuplicates`-provider.
\ No newline at end of file
diff --git a/entity/Person_entity/entityfields/organisationrelated/documentation.adoc b/entity/Person_entity/entityfields/organisationrelated/documentation.adoc
new file mode 100644
index 0000000000..d3ad0acc86
--- /dev/null
+++ b/entity/Person_entity/entityfields/organisationrelated/documentation.adoc
@@ -0,0 +1 @@
+Provides person contacts for one specific (given) organisation.
\ No newline at end of file
diff --git a/entity/Person_entity/entityfields/quickentrycontacts/documentation.adoc b/entity/Person_entity/entityfields/quickentrycontacts/documentation.adoc
new file mode 100644
index 0000000000..e512d6ef8e
--- /dev/null
+++ b/entity/Person_entity/entityfields/quickentrycontacts/documentation.adoc
@@ -0,0 +1,3 @@
+Provides the `Person_entity` for the Quickinsert-use-case:
+
+The `Quickinsert_entity` is only used to create new records, not to update, delete or show them.
\ No newline at end of file
diff --git a/entity/Person_entity/entityfields/selfduplicates/documentation.adoc b/entity/Person_entity/entityfields/selfduplicates/documentation.adoc
new file mode 100644
index 0000000000..4f02d8b1a2
--- /dev/null
+++ b/entity/Person_entity/entityfields/selfduplicates/documentation.adoc
@@ -0,0 +1 @@
+Provides contact duplicate-records within the `Person_entity` scope itself.
\ No newline at end of file
diff --git a/entity/UnlinkedMailMappingWrapper_entity/UnlinkedMailMappingWrapper_entity.aod b/entity/UnlinkedMailMappingWrapper_entity/UnlinkedMailMappingWrapper_entity.aod
index d82d86fc8e..42eb73a718 100644
--- a/entity/UnlinkedMailMappingWrapper_entity/UnlinkedMailMappingWrapper_entity.aod
+++ b/entity/UnlinkedMailMappingWrapper_entity/UnlinkedMailMappingWrapper_entity.aod
@@ -11,6 +11,7 @@
     </entityProvider>
     <entityProvider>
       <name>ForUnlinkedMail</name>
+      <documentation>%aditoprj%/entity/UnlinkedMailMappingWrapper_entity/entityfields/forunlinkedmail/documentation.adoc</documentation>
       <children>
         <entityParameter>
           <name>UnlinkedMailId_param</name>
diff --git a/entity/UnlinkedMailMappingWrapper_entity/documentation.adoc b/entity/UnlinkedMailMappingWrapper_entity/documentation.adoc
index 8559ac9a3d..27350aa271 100644
--- a/entity/UnlinkedMailMappingWrapper_entity/documentation.adoc
+++ b/entity/UnlinkedMailMappingWrapper_entity/documentation.adoc
@@ -1,3 +1,7 @@
 = UnlinkedMailMappingWrapper_entity
 
-For manual linking of an unlinked mail
\ No newline at end of file
+For manual linking of an unlinked mail
+
+WARNING: This is deprecated and should not longer be used. Activites are now created always and have some or no activity links.
+
+//todo: remove entity
\ No newline at end of file
diff --git a/entity/UnlinkedMailMappingWrapper_entity/entityfields/forunlinkedmail/documentation.adoc b/entity/UnlinkedMailMappingWrapper_entity/entityfields/forunlinkedmail/documentation.adoc
new file mode 100644
index 0000000000..1f1f3de9c7
--- /dev/null
+++ b/entity/UnlinkedMailMappingWrapper_entity/entityfields/forunlinkedmail/documentation.adoc
@@ -0,0 +1,3 @@
+Provides a wrapper for Unlinked Mails. 
+
+WARNING: This is deprecated and should not longer be used. Activites are now created always and have some or no activity links.
\ No newline at end of file
-- 
GitLab


From 3abcd8da34fee7e6492c463f58a630e8d1aca1a3 Mon Sep 17 00:00:00 2001
From: "j.goderbauer" <j.goderbauer@adito.de>
Date: Wed, 9 Sep 2020 15:39:07 +0200
Subject: [PATCH 282/309] Organisation: aroundLocation was calculated in
 new/edit mode

---
 .../openaroundlocation/stateProcess.js        | 31 ++++++++++---------
 1 file changed, 17 insertions(+), 14 deletions(-)

diff --git a/entity/Organisation_entity/entityfields/openaroundlocation/stateProcess.js b/entity/Organisation_entity/entityfields/openaroundlocation/stateProcess.js
index 129f026470..b9adad9dcc 100644
--- a/entity/Organisation_entity/entityfields/openaroundlocation/stateProcess.js
+++ b/entity/Organisation_entity/entityfields/openaroundlocation/stateProcess.js
@@ -3,21 +3,24 @@ import("system.neon");
 import("system.vars");
 import("system.entities");
 
-//use read entity since the lat and lon fields are not loaded by default since they are not needed otherwise
-var rowConfig = entities.createConfigForLoadingRows()
-    .fields(["STANDARD_LAT", "STANDARD_LON"])
-    .entity(vars.get("$sys.currententityname"))
-    .uid(vars.get("$sys.uid"));
-var row = entities.getRow(rowConfig);
+var recordState = vars.get("$sys.operatingstate");
+var res = neon.COMPONENTSTATE_DISABLED;
+var uid = vars.get("$sys.uid");
+if (recordState != neon.OPERATINGSTATE_NEW && recordState != neon.OPERATINGSTATE_EDIT && uid)
+{
+    //use read entity since the lat and lon fields are not loaded by default since they are not needed otherwise
+    var rowConfig = entities.createConfigForLoadingRows()
+        .fields(["STANDARD_LAT", "STANDARD_LON"])
+        .entity(vars.get("$sys.currententityname"))
+        .uid(uid);
+    var row = entities.getRow(rowConfig);
 
-var lat = row["STANDARD_LAT"];
-var lon = row["STANDARD_LON"];
+    var lat = row["STANDARD_LAT"];
+    var lon = row["STANDARD_LON"];
+
+    if (lat && lon)
+        res = neon.COMPONENTSTATE_AUTO;
+}
 
-var res;
-if (lat && lon)
-    res = neon.COMPONENTSTATE_AUTO;
-else
-    res = neon.COMPONENTSTATE_DISABLED;
-    
 result.string(res);
     
\ No newline at end of file
-- 
GitLab


From 0acb85f727d3e174d27f12488d935ae4ec891ef1 Mon Sep 17 00:00:00 2001
From: "a.voegl" <a.voegl@adito.de>
Date: Wed, 9 Sep 2020 16:17:05 +0200
Subject: [PATCH 283/309] =?UTF-8?q?add=20GroupLayout=20for=20Persons=20in?=
 =?UTF-8?q?=20Organisations=20&=20Filter=20360=C2=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../360DegreeFilter_view.aod                  |  4 +-
 .../PersonSimpleList_view.aod                 | 51 ++++++++++++++++++-
 2 files changed, 52 insertions(+), 3 deletions(-)

diff --git a/neonView/360DegreeFilter_view/360DegreeFilter_view.aod b/neonView/360DegreeFilter_view/360DegreeFilter_view.aod
index d08051d2b5..c0e2ae19ee 100644
--- a/neonView/360DegreeFilter_view/360DegreeFilter_view.aod
+++ b/neonView/360DegreeFilter_view/360DegreeFilter_view.aod
@@ -2,7 +2,7 @@
 <neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.6">
   <name>360DegreeFilter_view</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
-  <filterable v="true" />
+  <filterable v="false" />
   <layout>
     <groupLayout>
       <name>layout</name>
@@ -15,6 +15,7 @@
       <titleField>TITLE</titleField>
       <descriptionField>DATE</descriptionField>
       <iconField>ICON</iconField>
+      <hideContentSearch v="false" />
       <entityField>#ENTITY</entityField>
       <defaultGroupFields>
         <element>ENTITY_NAME</element>
@@ -26,6 +27,7 @@
       <titleField>TITLE</titleField>
       <descriptionField>ENTITY_NAME</descriptionField>
       <iconIdField>ICON</iconIdField>
+      <hideContentSearch v="false" />
       <entityField>#ENTITY</entityField>
     </timelineViewTemplate>
   </children>
diff --git a/neonView/PersonSimpleList_view/PersonSimpleList_view.aod b/neonView/PersonSimpleList_view/PersonSimpleList_view.aod
index 5a2312e1f7..63a4b1e6d2 100644
--- a/neonView/PersonSimpleList_view/PersonSimpleList_view.aod
+++ b/neonView/PersonSimpleList_view/PersonSimpleList_view.aod
@@ -4,9 +4,9 @@
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <filterable v="true" />
   <layout>
-    <boxLayout>
+    <groupLayout>
       <name>layout</name>
-    </boxLayout>
+    </groupLayout>
   </layout>
   <children>
     <tableViewTemplate>
@@ -60,5 +60,52 @@
         </neonTableColumn>
       </columns>
     </tableViewTemplate>
+    <treeTableViewTemplate>
+      <name>tree</name>
+      <favoriteActionGroup1>filterViewActionGroup</favoriteActionGroup1>
+      <entityField>#ENTITY</entityField>
+      <columns>
+        <neonTreeTableColumn>
+          <name>b18db709-56e9-4f7e-89a2-f0e2b81c75d0</name>
+          <entityField>PICTURE</entityField>
+        </neonTreeTableColumn>
+        <neonTreeTableColumn>
+          <name>7d8d985a-dfec-452c-8b6c-a55bfe5ede54</name>
+          <entityField>SALUTATION</entityField>
+        </neonTreeTableColumn>
+        <neonTreeTableColumn>
+          <name>92be2c7c-99c8-4e05-8f0a-e18d7a2daf3e</name>
+          <entityField>TITLE</entityField>
+        </neonTreeTableColumn>
+        <neonTreeTableColumn>
+          <name>1b427ee7-e139-48a0-a28a-fc6df7dcd973</name>
+          <entityField>FIRSTNAME</entityField>
+        </neonTreeTableColumn>
+        <neonTreeTableColumn>
+          <name>d783cfe2-b9de-4ffc-88b3-01d6f9fdecbe</name>
+          <entityField>LASTNAME</entityField>
+        </neonTreeTableColumn>
+        <neonTreeTableColumn>
+          <name>e2bb18db-6b2b-49d2-a02a-de671cab56a7</name>
+          <entityField>STANDARD_EMAIL_COMMUNICATION</entityField>
+        </neonTreeTableColumn>
+        <neonTreeTableColumn>
+          <name>9b8fee81-dc82-42c3-9b8e-6327567f6e51</name>
+          <entityField>STANDARD_PHONE_COMMUNICATION</entityField>
+        </neonTreeTableColumn>
+        <neonTreeTableColumn>
+          <name>3eda2fc2-6f6d-4b88-a25b-565f854f69db</name>
+          <entityField>DEPARTMENT</entityField>
+        </neonTreeTableColumn>
+        <neonTreeTableColumn>
+          <name>9013309d-9823-43b7-940e-0b1dce0e7588</name>
+          <entityField>CONTACTROLE</entityField>
+        </neonTreeTableColumn>
+        <neonTreeTableColumn>
+          <name>ece44de8-f5c0-4cdd-a9d9-4d7c004a1367</name>
+          <entityField>POSITION</entityField>
+        </neonTreeTableColumn>
+      </columns>
+    </treeTableViewTemplate>
   </children>
 </neonView>
-- 
GitLab


From e4b3ec2148570de2a8d7f963db33936ad7dbb5df Mon Sep 17 00:00:00 2001
From: Daniel Tran <d.tran@adito.de>
Date: Thu, 10 Sep 2020 06:39:46 +0000
Subject: [PATCH 284/309] #1058762 dm fix doc

---
 .../basic/2020.2.0/Districts/changelog.xml    |    1 +
 .../create_districtResponsibleKeyword.xml     |   24 +-
 .../create_districtResponsibleMemberRole.xml  |   14 -
 .../2020.2.0/Districts/create_indizes.xml     |   15 +
 aliasDefinition/Data_alias/Data_alias.aod     |    6 +-
 .../_____SYSTEMALIAS/_____SYSTEMALIAS.aod     | 1866 ++++++++++++++---
 .../DistrictResponsible_entity.aod            |   30 +-
 .../documentation.adoc                        |   17 +
 .../valueProcess.js                           |    2 +-
 .../districtresponsibles/documentation.adoc   |    3 +
 .../documentation.adoc                        |    3 +
 .../recordcontainers/db/conditionProcess.js   |    6 +-
 entity/District_entity/District_entity.aod    |   41 +-
 entity/District_entity/afterUiInit.js         |    0
 entity/District_entity/documentation.adoc     |   23 +
 .../appliedfilter/onValueChange.js            |    0
 .../children/tablenames_param/valueProcess.js |    9 -
 .../onValueChange.js                          |    0
 .../parentdistrict_districtid/stateProcess.js |    0
 .../responsibledistricts/documentation.adoc   |    3 +
 .../recordcontainers/db/conditionProcess.js   |    2 +-
 .../expression.js                             |    8 -
 .../recordcontainers/jdito/cacheKeyProcess.js |    0
 entity/Member_entity/Member_entity.aod        |    6 -
 entity/Person_entity/Person_entity.aod        |    2 +-
 .../DistrictPreview_view.aod                  |    4 -
 26 files changed, 1637 insertions(+), 448 deletions(-)
 delete mode 100644 .liquibase/Data_alias/basic/2020.2.0/Districts/create_districtResponsibleMemberRole.xml
 create mode 100644 .liquibase/Data_alias/basic/2020.2.0/Districts/create_indizes.xml
 create mode 100644 entity/DistrictResponsible_entity/documentation.adoc
 create mode 100644 entity/DistrictResponsible_entity/entityfields/districtresponsibles/documentation.adoc
 create mode 100644 entity/DistrictResponsible_entity/entityfields/organisationresponsibles/documentation.adoc
 delete mode 100644 entity/District_entity/afterUiInit.js
 create mode 100644 entity/District_entity/documentation.adoc
 delete mode 100644 entity/District_entity/entityfields/appliedfilter/onValueChange.js
 delete mode 100644 entity/District_entity/entityfields/logs/children/tablenames_param/valueProcess.js
 delete mode 100644 entity/District_entity/entityfields/parentdistrict_districtid/onValueChange.js
 delete mode 100644 entity/District_entity/entityfields/parentdistrict_districtid/stateProcess.js
 create mode 100644 entity/District_entity/entityfields/responsibledistricts/documentation.adoc
 delete mode 100644 entity/District_entity/recordcontainers/db/recordfieldmappings/parent_district.displayvalue/expression.js
 delete mode 100644 entity/District_entity/recordcontainers/jdito/cacheKeyProcess.js

diff --git a/.liquibase/Data_alias/basic/2020.2.0/Districts/changelog.xml b/.liquibase/Data_alias/basic/2020.2.0/Districts/changelog.xml
index a423a1456f..9fc9e12d38 100644
--- a/.liquibase/Data_alias/basic/2020.2.0/Districts/changelog.xml
+++ b/.liquibase/Data_alias/basic/2020.2.0/Districts/changelog.xml
@@ -4,4 +4,5 @@
     <include relativeToChangelogFile="true" file="create_district.xml"/>
     <include relativeToChangelogFile="true" file="create_districtresponsible.xml"/>
     <include relativeToChangelogFile="true" file="create_districtResponsibleKeyword.xml"/>
+    <include relativeToChangelogFile="true" file="create_indizes.xml"/>
 </databaseChangeLog>
diff --git a/.liquibase/Data_alias/basic/2020.2.0/Districts/create_districtResponsibleKeyword.xml b/.liquibase/Data_alias/basic/2020.2.0/Districts/create_districtResponsibleKeyword.xml
index 4e8f1db18e..5747db8f36 100644
--- a/.liquibase/Data_alias/basic/2020.2.0/Districts/create_districtResponsibleKeyword.xml
+++ b/.liquibase/Data_alias/basic/2020.2.0/Districts/create_districtResponsibleKeyword.xml
@@ -1,14 +1,14 @@
 <?xml version="1.1" encoding="UTF-8" standalone="no"?>
 <databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
-  <changeSet author="d.tran" id="04265522-bc51-4a4e-b637-335942dff147">
-    <insert tableName="AB_KEYWORD_ENTRY">
-      <column name="AB_KEYWORD_ENTRYID" value="997b4954-3108-41e0-a339-c1045ea2e01c"/>
-      <column name="KEYID" value="MEMBERROLEDISTRICTRESPONSIBLE"/>
-      <column name="TITLE" value="District Responsible"/>
-      <column name="CONTAINER" value="MemberRole"/>
-      <column name="SORTING" valueNumeric="0"/>
-      <column name="ISACTIVE" valueNumeric="1"/>
-      <column name="ISESSENTIAL" valueNumeric="0"/>
-    </insert>  
-  </changeSet>
-</databaseChangeLog>
\ No newline at end of file
+    <changeSet author="d.tran" id="d95ebf6c-1e34-4ba3-9f0b-386c5059444e">
+        <insert tableName="AB_KEYWORD_ENTRY">
+            <column name="AB_KEYWORD_ENTRYID" value="66d1563a-a76c-47ca-af6b-38586a2f3ce3"/>
+            <column name="KEYID" value="MEMROLEDISTRICTRESPONSIBLE"/>
+            <column name="TITLE" value="District Responsible"/>
+            <column name="CONTAINER" value="MemberRole"/>
+            <column name="SORTING" valueNumeric="0"/>
+            <column name="ISACTIVE" valueNumeric="1"/>
+            <column name="ISESSENTIAL" valueNumeric="0"/>
+        </insert>
+    </changeSet>
+</databaseChangeLog>
diff --git a/.liquibase/Data_alias/basic/2020.2.0/Districts/create_districtResponsibleMemberRole.xml b/.liquibase/Data_alias/basic/2020.2.0/Districts/create_districtResponsibleMemberRole.xml
deleted file mode 100644
index 5747db8f36..0000000000
--- a/.liquibase/Data_alias/basic/2020.2.0/Districts/create_districtResponsibleMemberRole.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?>
-<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
-    <changeSet author="d.tran" id="d95ebf6c-1e34-4ba3-9f0b-386c5059444e">
-        <insert tableName="AB_KEYWORD_ENTRY">
-            <column name="AB_KEYWORD_ENTRYID" value="66d1563a-a76c-47ca-af6b-38586a2f3ce3"/>
-            <column name="KEYID" value="MEMROLEDISTRICTRESPONSIBLE"/>
-            <column name="TITLE" value="District Responsible"/>
-            <column name="CONTAINER" value="MemberRole"/>
-            <column name="SORTING" valueNumeric="0"/>
-            <column name="ISACTIVE" valueNumeric="1"/>
-            <column name="ISESSENTIAL" valueNumeric="0"/>
-        </insert>
-    </changeSet>
-</databaseChangeLog>
diff --git a/.liquibase/Data_alias/basic/2020.2.0/Districts/create_indizes.xml b/.liquibase/Data_alias/basic/2020.2.0/Districts/create_indizes.xml
new file mode 100644
index 0000000000..eb677337df
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2020.2.0/Districts/create_indizes.xml
@@ -0,0 +1,15 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+                   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+    <changeSet author="d.tran" id="7dbaa3ae-ba37-4fd1-9b63-fab48975fb87">
+        <createIndex tableName="DISTRICTRESPONSIBLE" indexName="IDX_DEPARTMENT_ATTRIBUTE_ID">
+            <column name="DEPARTMENT_ATTRIBUTE_ID"/>
+        </createIndex>
+        <createIndex tableName="DISTRICTRESPONSIBLE" indexName="IDX_DISTRICTRESPONSIBLE_DISTRICT_ID">
+            <column name="DISTRICT_ID"/>
+        </createIndex>
+        <createIndex tableName="DISTRICTRESPONSIBLE" indexName="IDX_EMPLOYEE_CONTACT_ID">
+            <column name="EMPLOYEE_CONTACT_ID"/>
+        </createIndex>
+    </changeSet>
+</databaseChangeLog>
diff --git a/aliasDefinition/Data_alias/Data_alias.aod b/aliasDefinition/Data_alias/Data_alias.aod
index dde67708f2..9b001a59e7 100644
--- a/aliasDefinition/Data_alias/Data_alias.aod
+++ b/aliasDefinition/Data_alias/Data_alias.aod
@@ -15550,7 +15550,7 @@
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
-                <index v="false" />
+                <index v="true" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
@@ -15564,7 +15564,7 @@
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
-                <index v="false" />
+                <index v="true" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
@@ -15578,7 +15578,7 @@
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
-                <index v="false" />
+                <index v="true" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
diff --git a/aliasDefinition/_____SYSTEMALIAS/_____SYSTEMALIAS.aod b/aliasDefinition/_____SYSTEMALIAS/_____SYSTEMALIAS.aod
index 6f4f1b2dca..5d7d8837e5 100644
--- a/aliasDefinition/_____SYSTEMALIAS/_____SYSTEMALIAS.aod
+++ b/aliasDefinition/_____SYSTEMALIAS/_____SYSTEMALIAS.aod
@@ -19,9 +19,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
-                <notNull v="false" />
+                <size v="0" />
+                <scale v="0" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -32,9 +32,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
-                <notNull v="false" />
+                <size v="0" />
+                <scale v="0" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -47,7 +47,7 @@
                 <columnType v="12" />
                 <size v="255" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -58,9 +58,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="2004" />
-                <size v="2147483647" />
+                <size v="0" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -73,7 +73,7 @@
                 <columnType v="1" />
                 <size v="63" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="true" />
                 <index v="true" />
                 <title></title>
@@ -84,9 +84,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="4" />
-                <size v="10" />
+                <size v="0" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -99,9 +99,9 @@
                 <columnType v="12" />
                 <size v="63" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
-                <index v="false" />
+                <index v="true" />
                 <title></title>
                 <description></description>
               </entityFieldDb>
@@ -112,7 +112,7 @@
                 <columnType v="12" />
                 <size v="63" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -125,7 +125,7 @@
                 <columnType v="12" />
                 <size v="63" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -138,7 +138,7 @@
                 <columnType v="12" />
                 <size v="63" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -149,9 +149,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="2004" />
-                <size v="2147483647" />
+                <size v="0" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -172,9 +172,9 @@
                 <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
-                <index v="false" />
+                <index v="true" />
                 <title></title>
                 <description></description>
               </entityFieldDb>
@@ -183,9 +183,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="4" />
-                <size v="10" />
+                <size v="0" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -196,9 +196,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="4" />
-                <size v="10" />
+                <size v="0" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -211,7 +211,7 @@
                 <columnType v="12" />
                 <size v="127" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="true" />
                 <index v="true" />
                 <title></title>
@@ -231,9 +231,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="2004" />
-                <size v="2147483647" />
+                <size v="0" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -246,7 +246,7 @@
                 <columnType v="12" />
                 <size v="31" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -257,9 +257,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="-5" />
-                <size v="19" />
+                <size v="0" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -270,9 +270,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
-                <notNull v="false" />
+                <size v="0" />
+                <scale v="0" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -283,9 +283,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
-                <notNull v="false" />
+                <size v="0" />
+                <scale v="0" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -298,7 +298,7 @@
                 <columnType v="12" />
                 <size v="127" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -311,7 +311,7 @@
                 <columnType v="12" />
                 <size v="127" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -324,7 +324,7 @@
                 <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="true" />
                 <index v="true" />
                 <title></title>
@@ -337,7 +337,7 @@
                 <columnType v="12" />
                 <size v="255" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -350,7 +350,7 @@
                 <columnType v="12" />
                 <size v="127" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -363,7 +363,7 @@
                 <columnType v="12" />
                 <size v="1024" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -374,9 +374,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="2004" />
-                <size v="2147483647" />
+                <size v="0" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -389,7 +389,7 @@
                 <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="true" />
                 <title></title>
@@ -402,7 +402,7 @@
                 <columnType v="12" />
                 <size v="127" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -415,7 +415,7 @@
                 <columnType v="12" />
                 <size v="63" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -428,7 +428,7 @@
                 <columnType v="12" />
                 <size v="63" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -447,9 +447,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="4" />
-                <size v="10" />
+                <size v="0" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -462,7 +462,7 @@
                 <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="true" />
                 <index v="true" />
                 <title></title>
@@ -473,11 +473,11 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
-                <notNull v="false" />
+                <size v="0" />
+                <scale v="0" />
+                <notNull v="true" />
                 <isUnique v="false" />
-                <index v="false" />
+                <index v="true" />
                 <title></title>
                 <description></description>
               </entityFieldDb>
@@ -486,11 +486,11 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
-                <notNull v="false" />
+                <size v="0" />
+                <scale v="0" />
+                <notNull v="true" />
                 <isUnique v="false" />
-                <index v="false" />
+                <index v="true" />
                 <title></title>
                 <description></description>
               </entityFieldDb>
@@ -501,9 +501,9 @@
                 <columnType v="12" />
                 <size v="512" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
-                <index v="false" />
+                <index v="true" />
                 <title></title>
                 <description></description>
               </entityFieldDb>
@@ -512,11 +512,11 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
-                <notNull v="false" />
+                <size v="0" />
+                <scale v="0" />
+                <notNull v="true" />
                 <isUnique v="false" />
-                <index v="false" />
+                <index v="true" />
                 <title></title>
                 <description></description>
               </entityFieldDb>
@@ -525,11 +525,11 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="4" />
-                <size v="10" />
+                <size v="0" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
-                <index v="false" />
+                <index v="true" />
                 <title></title>
                 <description></description>
               </entityFieldDb>
@@ -538,9 +538,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="4" />
-                <size v="10" />
+                <size v="0" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -551,9 +551,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="4" />
-                <size v="10" />
+                <size v="0" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -564,11 +564,11 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
-                <notNull v="false" />
+                <size v="0" />
+                <scale v="0" />
+                <notNull v="true" />
                 <isUnique v="false" />
-                <index v="false" />
+                <index v="true" />
                 <title></title>
                 <description></description>
               </entityFieldDb>
@@ -579,9 +579,9 @@
                 <columnType v="12" />
                 <size v="255" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
-                <index v="false" />
+                <index v="true" />
                 <title></title>
                 <description></description>
               </entityFieldDb>
@@ -592,7 +592,7 @@
                 <columnType v="12" />
                 <size v="255" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -605,7 +605,7 @@
                 <columnType v="12" />
                 <size v="255" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -616,11 +616,11 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
-                <notNull v="false" />
+                <size v="0" />
+                <scale v="0" />
+                <notNull v="true" />
                 <isUnique v="false" />
-                <index v="false" />
+                <index v="true" />
                 <title></title>
                 <description></description>
               </entityFieldDb>
@@ -631,9 +631,9 @@
                 <columnType v="12" />
                 <size v="32" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
-                <index v="false" />
+                <index v="true" />
                 <title></title>
                 <description></description>
               </entityFieldDb>
@@ -644,7 +644,7 @@
                 <columnType v="12" />
                 <size v="255" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -657,7 +657,7 @@
                 <columnType v="1" />
                 <size v="1" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -668,9 +668,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="2005" />
-                <size v="2147483647" />
+                <size v="0" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -691,7 +691,7 @@
                 <columnType v="12" />
                 <size v="127" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -700,12 +700,12 @@
               <entityFieldDb>
                 <name>DBID</name>
                 <dbName></dbName>
-                <primaryKey v="true" />
+                <primaryKey v="false" />
                 <columnType v="12" />
-                <size v="191" />
+                <size v="1023" />
                 <scale v="0" />
                 <notNull v="true" />
-                <isUnique v="true" />
+                <isUnique v="false" />
                 <index v="true" />
                 <title></title>
                 <description></description>
@@ -717,7 +717,7 @@
                 <columnType v="12" />
                 <size v="127" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -730,7 +730,7 @@
                 <columnType v="12" />
                 <size v="127" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -743,9 +743,9 @@
                 <columnType v="12" />
                 <size v="512" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
-                <index v="false" />
+                <index v="true" />
                 <title></title>
                 <description></description>
               </entityFieldDb>
@@ -756,7 +756,7 @@
                 <columnType v="12" />
                 <size v="255" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -769,7 +769,7 @@
                 <columnType v="12" />
                 <size v="1023" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -778,13 +778,13 @@
               <entityFieldDb>
                 <name>ID</name>
                 <dbName></dbName>
-                <primaryKey v="false" />
+                <primaryKey v="true" />
                 <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
-                <notNull v="true" />
-                <isUnique v="false" />
-                <index v="false" />
+                <notNull v="false" />
+                <isUnique v="true" />
+                <index v="true" />
                 <title></title>
                 <description></description>
               </entityFieldDb>
@@ -795,7 +795,7 @@
                 <columnType v="12" />
                 <size v="2000" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -814,9 +814,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
-                <notNull v="false" />
+                <size v="0" />
+                <scale v="0" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -827,9 +827,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
-                <notNull v="false" />
+                <size v="0" />
+                <scale v="0" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -842,7 +842,7 @@
                 <columnType v="12" />
                 <size v="63" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="true" />
                 <title></title>
@@ -855,7 +855,7 @@
                 <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="true" />
                 <index v="true" />
                 <title></title>
@@ -868,7 +868,7 @@
                 <columnType v="12" />
                 <size v="63" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="true" />
                 <title></title>
@@ -881,9 +881,9 @@
                 <columnType v="12" />
                 <size v="1024" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
-                <index v="false" />
+                <index v="true" />
                 <title></title>
                 <description></description>
               </entityFieldDb>
@@ -894,9 +894,9 @@
                 <columnType v="12" />
                 <size v="1024" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
-                <index v="false" />
+                <index v="true" />
                 <title></title>
                 <description></description>
               </entityFieldDb>
@@ -905,9 +905,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="2005" />
-                <size v="2147483647" />
+                <size v="0" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -928,9 +928,9 @@
                 <columnType v="12" />
                 <size v="63" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
-                <index v="false" />
+                <index v="true" />
                 <title></title>
                 <description></description>
               </entityFieldDb>
@@ -939,9 +939,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
-                <notNull v="false" />
+                <size v="0" />
+                <scale v="0" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -952,9 +952,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
-                <notNull v="false" />
+                <size v="0" />
+                <scale v="0" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -964,10 +964,10 @@
                 <name>DESCRIPTION</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="2005" />
-                <size v="2147483647" />
+                <columnType v="12" />
+                <size v="255" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -978,9 +978,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="2004" />
-                <size v="2147483647" />
+                <size v="0" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -993,7 +993,7 @@
                 <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="true" />
                 <index v="true" />
                 <title></title>
@@ -1004,9 +1004,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="4" />
-                <size v="10" />
+                <size v="0" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -1019,8 +1019,8 @@
                 <columnType v="12" />
                 <size v="63" />
                 <scale v="0" />
-                <notNull v="true" />
-                <isUnique v="false" />
+                <notNull v="false" />
+                <isUnique v="true" />
                 <index v="false" />
                 <title></title>
                 <description></description>
@@ -1032,7 +1032,7 @@
                 <columnType v="12" />
                 <size v="63" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -1045,7 +1045,7 @@
                 <columnType v="12" />
                 <size v="63" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -1058,7 +1058,7 @@
                 <columnType v="12" />
                 <size v="63" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -1071,7 +1071,7 @@
                 <columnType v="12" />
                 <size v="63" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -1084,7 +1084,7 @@
                 <columnType v="12" />
                 <size v="63" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -1095,9 +1095,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="2004" />
-                <size v="2147483647" />
+                <size v="0" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -1118,7 +1118,7 @@
                 <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="true" />
                 <title></title>
@@ -1131,7 +1131,7 @@
                 <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="true" />
                 <index v="true" />
                 <title></title>
@@ -1142,9 +1142,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
-                <size v="15" />
+                <size v="16" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="true" />
                 <title></title>
@@ -1157,7 +1157,7 @@
                 <columnType v="12" />
                 <size v="63" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="true" />
                 <title></title>
@@ -1170,7 +1170,7 @@
                 <columnType v="12" />
                 <size v="15" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -1190,9 +1190,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="4" />
-                <size v="10" />
+                <size v="0" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -1205,7 +1205,7 @@
                 <columnType v="12" />
                 <size v="63" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -1218,7 +1218,7 @@
                 <columnType v="12" />
                 <size v="63" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -1231,7 +1231,7 @@
                 <columnType v="12" />
                 <size v="1023" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -1242,9 +1242,9 @@
                 <dbName></dbName>
                 <primaryKey v="true" />
                 <columnType v="1" />
-                <size v="36" />
+                <size v="63" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="true" />
                 <index v="true" />
                 <title></title>
@@ -1255,9 +1255,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="2005" />
-                <size v="2147483647" />
+                <size v="0" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -1268,9 +1268,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="4" />
-                <size v="10" />
+                <size v="0" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -1283,7 +1283,7 @@
                 <columnType v="12" />
                 <size v="63" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -1294,9 +1294,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="4" />
-                <size v="10" />
+                <size v="0" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -1307,9 +1307,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="4" />
-                <size v="10" />
+                <size v="0" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -1328,9 +1328,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="2005" />
-                <size v="2147483647" />
+                <size v="0" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -1343,7 +1343,7 @@
                 <columnType v="12" />
                 <size v="512" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -1356,7 +1356,7 @@
                 <columnType v="12" />
                 <size v="1023" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -1367,9 +1367,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="4" />
-                <size v="10" />
+                <size v="0" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -1382,7 +1382,7 @@
                 <columnType v="12" />
                 <size v="63" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -1393,9 +1393,9 @@
                 <dbName></dbName>
                 <primaryKey v="true" />
                 <columnType v="1" />
-                <size v="36" />
+                <size v="63" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="true" />
                 <index v="true" />
                 <title></title>
@@ -1408,7 +1408,7 @@
                 <columnType v="12" />
                 <size v="63" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -1419,9 +1419,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="2005" />
-                <size v="2147483647" />
+                <size v="0" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -1432,9 +1432,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="2005" />
-                <size v="2147483647" />
+                <size v="0" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -1445,9 +1445,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="4" />
-                <size v="10" />
+                <size v="0" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -1458,9 +1458,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="4" />
-                <size v="10" />
+                <size v="0" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -1473,7 +1473,7 @@
                 <columnType v="12" />
                 <size v="1023" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -1486,7 +1486,7 @@
                 <columnType v="12" />
                 <size v="63" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -1497,9 +1497,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
-                <size v="63" />
+                <size v="512" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -1532,7 +1532,7 @@
                 <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="true" />
                 <index v="true" />
                 <documentation></documentation>
@@ -1546,7 +1546,7 @@
                 <columnType v="12" />
                 <size v="15" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -1560,7 +1560,7 @@
                 <columnType v="12" />
                 <size v="1023" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -1572,9 +1572,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
-                <notNull v="false" />
+                <size v="0" />
+                <scale v="0" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -1586,9 +1586,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
-                <notNull v="false" />
+                <size v="0" />
+                <scale v="0" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -1602,7 +1602,7 @@
                 <columnType v="12" />
                 <size v="1023" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -1616,7 +1616,7 @@
                 <columnType v="12" />
                 <size v="1023" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -1628,9 +1628,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="4" />
-                <size v="10" />
+                <size v="0" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -1642,9 +1642,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="2005" />
-                <size v="2147483647" />
+                <size v="0" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -1658,7 +1658,7 @@
                 <columnType v="12" />
                 <size v="63" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -1670,9 +1670,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="2005" />
-                <size v="2147483647" />
+                <size v="0" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -1686,7 +1686,7 @@
                 <columnType v="12" />
                 <size v="512" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -1700,7 +1700,7 @@
                 <columnType v="12" />
                 <size v="63" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -1734,7 +1734,7 @@
                 <columnType v="12" />
                 <size v="255" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -1748,7 +1748,7 @@
                 <columnType v="12" />
                 <size v="255" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -1762,7 +1762,7 @@
                 <columnType v="1" />
                 <size v="1" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -1776,7 +1776,7 @@
                 <columnType v="12" />
                 <size v="255" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -1790,7 +1790,7 @@
                 <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -1804,7 +1804,7 @@
                 <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="true" />
                 <index v="true" />
                 <documentation></documentation>
@@ -1838,7 +1838,7 @@
                 <columnType v="12" />
                 <size v="255" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -1852,7 +1852,7 @@
                 <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -1866,7 +1866,7 @@
                 <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="true" />
                 <index v="true" />
                 <documentation></documentation>
@@ -1897,10 +1897,10 @@
                 <name>CONDTYPE</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="5" />
-                <size v="5" />
+                <columnType v="-6" />
+                <size v="0" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -1912,9 +1912,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="2005" />
-                <size v="2147483647" />
+                <size v="0" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -1928,7 +1928,7 @@
                 <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="true" />
                 <index v="true" />
                 <documentation></documentation>
@@ -1942,7 +1942,7 @@
                 <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -1976,7 +1976,7 @@
                 <columnType v="12" />
                 <size v="63" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -1990,7 +1990,7 @@
                 <columnType v="12" />
                 <size v="63" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -2004,7 +2004,7 @@
                 <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="true" />
                 <index v="true" />
                 <documentation></documentation>
@@ -2038,7 +2038,7 @@
                 <columnType v="12" />
                 <size v="63" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -2049,10 +2049,10 @@
                 <name>ASSIGNABLE</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="4" />
-                <size v="10" />
+                <columnType v="-6" />
+                <size v="0" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -2066,7 +2066,7 @@
                 <columnType v="12" />
                 <size v="63" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="true" />
                 <index v="true" />
                 <documentation></documentation>
@@ -2078,9 +2078,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="2005" />
-                <size v="2147483647" />
+                <size v="0" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -2094,7 +2094,7 @@
                 <columnType v="12" />
                 <size v="255" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -2126,9 +2126,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="4" />
-                <size v="10" />
+                <size v="0" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -2140,9 +2140,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="2005" />
-                <size v="2147483647" />
+                <size v="0" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -2156,7 +2156,7 @@
                 <columnType v="12" />
                 <size v="63" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -2168,9 +2168,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="4" />
-                <size v="10" />
+                <size v="0" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -2184,7 +2184,7 @@
                 <columnType v="1" />
                 <size v="63" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="true" />
                 <index v="true" />
                 <documentation></documentation>
@@ -2196,9 +2196,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="4" />
-                <size v="10" />
+                <size v="0" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -2210,9 +2210,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="4" />
-                <size v="10" />
+                <size v="0" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -2242,12 +2242,12 @@
               <entityFieldDb>
                 <name>DATAID</name>
                 <dbName></dbName>
-                <primaryKey v="true" />
+                <primaryKey v="false" />
                 <columnType v="1" />
                 <size v="63" />
                 <scale v="0" />
-                <notNull v="true" />
-                <isUnique v="true" />
+                <notNull v="false" />
+                <isUnique v="false" />
                 <index v="true" />
                 <documentation></documentation>
                 <title></title>
@@ -2260,7 +2260,7 @@
                 <columnType v="1" />
                 <size v="63" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -2272,9 +2272,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="2005" />
-                <size v="2147483647" />
+                <size v="0" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -2288,7 +2288,7 @@
                 <columnType v="12" />
                 <size v="255" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -2300,11 +2300,11 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
-                <notNull v="false" />
+                <size v="0" />
+                <scale v="0" />
+                <notNull v="true" />
                 <isUnique v="false" />
-                <index v="false" />
+                <index v="true" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
@@ -2336,9 +2336,9 @@
                 <columnType v="12" />
                 <size v="127" />
                 <scale v="0" />
-                <notNull v="true" />
-                <isUnique v="false" />
-                <index v="false" />
+                <notNull v="false" />
+                <isUnique v="true" />
+                <index v="true" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
@@ -2348,9 +2348,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
-                <notNull v="false" />
+                <size v="0" />
+                <scale v="0" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -2364,9 +2364,9 @@
                 <columnType v="12" />
                 <size v="127" />
                 <scale v="0" />
-                <notNull v="true" />
-                <isUnique v="false" />
-                <index v="false" />
+                <notNull v="false" />
+                <isUnique v="true" />
+                <index v="true" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
@@ -2614,7 +2614,7 @@
                 <columnType v="1" />
                 <size v="63" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="true" />
                 <index v="true" />
                 <documentation></documentation>
@@ -2624,13 +2624,13 @@
               <entityFieldDb>
                 <name>TAGNAME</name>
                 <dbName></dbName>
-                <primaryKey v="false" />
+                <primaryKey v="true" />
                 <columnType v="12" />
                 <size v="63" />
                 <scale v="0" />
                 <notNull v="false" />
-                <isUnique v="false" />
-                <index v="false" />
+                <isUnique v="true" />
+                <index v="true" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
@@ -2638,13 +2638,13 @@
               <entityFieldDb>
                 <name>TAGVALUE</name>
                 <dbName></dbName>
-                <primaryKey v="false" />
+                <primaryKey v="true" />
                 <columnType v="12" />
                 <size v="63" />
                 <scale v="0" />
                 <notNull v="false" />
-                <isUnique v="false" />
-                <index v="false" />
+                <isUnique v="true" />
+                <index v="true" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
@@ -2750,9 +2750,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="4" />
-                <size v="10" />
+                <size v="0" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -2764,9 +2764,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="4" />
-                <size v="10" />
+                <size v="0" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -2778,9 +2778,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
-                <notNull v="false" />
+                <size v="0" />
+                <scale v="0" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -2794,7 +2794,7 @@
                 <columnType v="12" />
                 <size v="5" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -2808,7 +2808,7 @@
                 <columnType v="12" />
                 <size v="5" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -2820,9 +2820,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
-                <notNull v="false" />
+                <size v="0" />
+                <scale v="0" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -2836,7 +2836,7 @@
                 <columnType v="12" />
                 <size v="127" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="true" />
                 <index v="true" />
                 <documentation></documentation>
@@ -2850,7 +2850,7 @@
                 <columnType v="12" />
                 <size v="255" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -2864,7 +2864,7 @@
                 <columnType v="12" />
                 <size v="255" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -2876,9 +2876,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="4" />
-                <size v="10" />
+                <size v="0" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -2892,7 +2892,7 @@
                 <columnType v="12" />
                 <size v="255" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -2904,9 +2904,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="4" />
-                <size v="10" />
+                <size v="0" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -2926,9 +2926,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
-                <notNull v="false" />
+                <size v="0" />
+                <scale v="0" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -2939,10 +2939,10 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
-                <notNull v="false" />
-                <isUnique v="false" />
+                <size v="0" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="false" />
                 <index v="false" />
                 <title></title>
                 <description></description>
@@ -2954,7 +2954,7 @@
                 <columnType v="12" />
                 <size v="63" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -2967,7 +2967,7 @@
                 <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="true" />
                 <index v="true" />
                 <title></title>
@@ -2980,7 +2980,7 @@
                 <columnType v="12" />
                 <size v="63" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -2993,7 +2993,7 @@
                 <columnType v="12" />
                 <size v="63" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -3006,7 +3006,7 @@
                 <columnType v="12" />
                 <size v="63" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -3019,7 +3019,7 @@
                 <columnType v="12" />
                 <size v="63" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -3030,9 +3030,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="4" />
-                <size v="10" />
+                <size v="0" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -3043,9 +3043,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
-                <notNull v="false" />
+                <size v="0" />
+                <scale v="0" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -3056,9 +3056,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="4" />
-                <size v="10" />
+                <size v="0" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -3069,9 +3069,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
-                <notNull v="false" />
+                <size v="0" />
+                <scale v="0" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -3104,7 +3104,7 @@
                 <columnType v="12" />
                 <size v="64" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -3118,7 +3118,7 @@
                 <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="true" />
                 <index v="true" />
                 <documentation></documentation>
@@ -3132,7 +3132,7 @@
                 <columnType v="12" />
                 <size v="256" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="true" />
                 <documentation></documentation>
@@ -3146,7 +3146,7 @@
                 <columnType v="1" />
                 <size v="46" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="true" />
                 <documentation></documentation>
@@ -3180,7 +3180,7 @@
                 <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="true" />
                 <index v="true" />
                 <documentation></documentation>
@@ -3194,7 +3194,7 @@
                 <columnType v="12" />
                 <size v="64" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="true" />
                 <documentation></documentation>
@@ -3208,7 +3208,7 @@
                 <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="true" />
                 <documentation></documentation>
@@ -3222,13 +3222,1227 @@
                 <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="false" />
+                <index v="true" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+            </entityFields>
+          </entityDb>
+          <entityDb>
+            <name>ASYS_ICONS</name>
+            <dbName></dbName>
+            <idColumn></idColumn>
+            <idGeneratorType v="0" />
+            <idGeneratorInterval v="0" />
+            <documentation></documentation>
+            <title></title>
+            <description></description>
+            <auditSyncConfig>
+              <name>auditSyncConfig</name>
+              <auditMode v="0" />
+              <syncActive v="false" />
+              <syncComplete v="true" />
+              <syncDirection v="1" />
+              <syncIds></syncIds>
+            </auditSyncConfig>
+            <entityFields>
+              <entityFieldDb>
+                <name>BINDATA</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="2004" />
+                <size v="0" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>DATE_EDIT</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="93" />
+                <size v="0" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>DATE_NEW</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="93" />
+                <size v="0" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>DESCRIPTION</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="127" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>ICON_TYPE</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="255" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>ID</name>
+                <dbName></dbName>
+                <primaryKey v="true" />
+                <columnType v="1" />
+                <size v="36" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="true" />
+                <index v="true" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>USER_EDIT</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="63" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>USER_NEW</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="63" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+            </entityFields>
+          </entityDb>
+          <entityDb>
+            <name>ASYS_MAILREPOSIT</name>
+            <dbName></dbName>
+            <idColumn></idColumn>
+            <idGeneratorType v="0" />
+            <idGeneratorInterval v="0" />
+            <documentation></documentation>
+            <title></title>
+            <description></description>
+            <auditSyncConfig>
+              <name>auditSyncConfig</name>
+              <auditMode v="0" />
+              <syncActive v="false" />
+              <syncComplete v="true" />
+              <syncDirection v="1" />
+              <syncIds></syncIds>
+            </auditSyncConfig>
+            <entityFields>
+              <entityFieldDb>
+                <name>FLAGGED</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="4" />
+                <size v="0" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>FOLDER</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="255" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>ID</name>
+                <dbName></dbName>
+                <primaryKey v="true" />
+                <columnType v="1" />
+                <size v="36" />
+                <scale v="0" />
                 <notNull v="false" />
+                <isUnique v="true" />
+                <index v="true" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>MAIL</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="2005" />
+                <size v="0" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>MAILUSER</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="255" />
+                <scale v="0" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="true" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
+              <entityFieldDb>
+                <name>RECEIVEDATE</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="93" />
+                <size v="0" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>RECENT</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="4" />
+                <size v="0" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="false" />
+                <index v="true" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>RECIPIENT</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="2046" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>SEEN</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="4" />
+                <size v="0" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>SENDER</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="127" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>SENTDATE</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="93" />
+                <size v="0" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>SUBJECT</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="1023" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+            </entityFields>
+          </entityDb>
+          <entityDb>
+            <name>ASYS_MAILREPOSIT_HASH</name>
+            <dbName></dbName>
+            <idColumn></idColumn>
+            <idGeneratorType v="0" />
+            <idGeneratorInterval v="0" />
+            <documentation></documentation>
+            <title></title>
+            <description></description>
+            <auditSyncConfig>
+              <name>auditSyncConfig</name>
+              <auditMode v="0" />
+              <syncActive v="false" />
+              <syncComplete v="true" />
+              <syncDirection v="1" />
+              <syncIds></syncIds>
+            </auditSyncConfig>
+            <entityFields>
+              <entityFieldDb>
+                <name>MAILHASH</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="31" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>MAILINFO</name>
+                <dbName></dbName>
+                <primaryKey v="true" />
+                <columnType v="12" />
+                <size v="127" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="true" />
+                <index v="true" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+            </entityFields>
+          </entityDb>
+          <entityDb>
+            <name>ASYS_CALENDARSYNC</name>
+            <dbName></dbName>
+            <idColumn></idColumn>
+            <idGeneratorType v="0" />
+            <idGeneratorInterval v="0" />
+            <documentation></documentation>
+            <title></title>
+            <description></description>
+            <auditSyncConfig>
+              <name>auditSyncConfig</name>
+              <auditMode v="0" />
+              <syncActive v="false" />
+              <syncComplete v="true" />
+              <syncDirection v="1" />
+              <syncIds></syncIds>
+            </auditSyncConfig>
+            <entityFields>
+              <entityFieldDb>
+                <name>LASTMODIFIED</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="93" />
+                <size v="0" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>MASTERUID</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="512" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="true" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>SLAVEUID</name>
+                <dbName></dbName>
+                <primaryKey v="true" />
+                <columnType v="12" />
+                <size v="127" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="true" />
+                <index v="true" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>SUSER</name>
+                <dbName></dbName>
+                <primaryKey v="true" />
+                <columnType v="12" />
+                <size v="63" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="true" />
+                <index v="true" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+            </entityFields>
+          </entityDb>
+          <entityDb>
+            <name>ASYS_UIDRESOLVER</name>
+            <dbName></dbName>
+            <idColumn></idColumn>
+            <idGeneratorType v="0" />
+            <idGeneratorInterval v="0" />
+            <documentation></documentation>
+            <title></title>
+            <description></description>
+            <auditSyncConfig>
+              <name>auditSyncConfig</name>
+              <auditMode v="0" />
+              <syncActive v="false" />
+              <syncComplete v="true" />
+              <syncDirection v="1" />
+              <syncIds></syncIds>
+            </auditSyncConfig>
+            <entityFields>
+              <entityFieldDb>
+                <name>ENTRY_TYPE</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="255" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>ENTRY_UID</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="512" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>ENTRY_USER</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="255" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+            </entityFields>
+          </entityDb>
+          <entityDb>
+            <name>ASYS_FARM</name>
+            <dbName></dbName>
+            <idColumn></idColumn>
+            <idGeneratorType v="0" />
+            <idGeneratorInterval v="0" />
+            <documentation></documentation>
+            <title></title>
+            <description></description>
+            <auditSyncConfig>
+              <name>auditSyncConfig</name>
+              <auditMode v="0" />
+              <syncActive v="false" />
+              <syncComplete v="true" />
+              <syncDirection v="1" />
+              <syncIds></syncIds>
+            </auditSyncConfig>
+            <entityFields>
+              <entityFieldDb>
+                <name>ADDRESS</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="255" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>CLIENTS</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="4" />
+                <size v="0" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>FARMVERSION</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="12" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>LICENSE</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="255" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>SENCODING</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="4" />
+                <size v="0" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>SERVERID</name>
+                <dbName></dbName>
+                <primaryKey v="true" />
+                <columnType v="12" />
+                <size v="127" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="true" />
+                <index v="true" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>WORKLOAD</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="4" />
+                <size v="0" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+            </entityFields>
+          </entityDb>
+          <entityDb>
+            <name>ASYS_FARM_CLIENT</name>
+            <dbName></dbName>
+            <idColumn></idColumn>
+            <idGeneratorType v="0" />
+            <idGeneratorInterval v="0" />
+            <documentation></documentation>
+            <title></title>
+            <description></description>
+            <auditSyncConfig>
+              <name>auditSyncConfig</name>
+              <auditMode v="0" />
+              <syncActive v="false" />
+              <syncComplete v="true" />
+              <syncDirection v="1" />
+              <syncIds></syncIds>
+            </auditSyncConfig>
+            <entityFields>
+              <entityFieldDb>
+                <name>CHARACTERISTIC</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="4" />
+                <size v="0" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>CLIENTID</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="255" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>ID</name>
+                <dbName></dbName>
+                <primaryKey v="true" />
+                <columnType v="1" />
+                <size v="36" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="true" />
+                <index v="true" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>SADDRESS</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="255" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>SERVERID</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="255" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>USERNAME</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="255" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+            </entityFields>
+          </entityDb>
+          <entityDb>
+            <name>ASYS_AUDIT</name>
+            <dbName></dbName>
+            <idColumn></idColumn>
+            <idGeneratorType v="0" />
+            <idGeneratorInterval v="0" />
+            <documentation></documentation>
+            <title></title>
+            <description></description>
+            <auditSyncConfig>
+              <name>auditSyncConfig</name>
+              <auditMode v="0" />
+              <syncActive v="false" />
+              <syncComplete v="true" />
+              <syncDirection v="1" />
+              <syncIds></syncIds>
+            </auditSyncConfig>
+            <entityFields>
+              <entityFieldDb>
+                <name>ACOLUMNNAME</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="127" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>ALIAS</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="255" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>ATABLENAME</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="127" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>ATIMESTAMP</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="93" />
+                <size v="0" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>AUSER</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="255" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>DATASETID</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="1023" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>DATASETNEWVALUE_BLOB</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="2004" />
+                <size v="0" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>DATASETNEWVALUE_CLOB</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="2005" />
+                <size v="0" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>DATASETNEWVALUE_STRING</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="1023" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>LOGTIME</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="93" />
+                <size v="0" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="false" />
+                <index v="true" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>LOGTYPE</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="4" />
+                <size v="0" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>LOGWRITERUID</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="127" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>SQLACTION</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="1" />
+                <size v="1" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+            </entityFields>
+          </entityDb>
+          <entityDb>
+            <name>ASYS_SYNCSLAVES</name>
+            <dbName></dbName>
+            <idColumn></idColumn>
+            <idGeneratorType v="0" />
+            <idGeneratorInterval v="0" />
+            <documentation></documentation>
+            <title></title>
+            <description></description>
+            <auditSyncConfig>
+              <name>auditSyncConfig</name>
+              <auditMode v="0" />
+              <syncActive v="false" />
+              <syncComplete v="true" />
+              <syncDirection v="1" />
+              <syncIds></syncIds>
+            </auditSyncConfig>
+            <entityFields>
+              <entityFieldDb>
+                <name>ACTIVE</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="4" />
+                <size v="0" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>DESCRIPTION</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="255" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>DEVICEID</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="40" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>INTERVALL</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="4" />
+                <size v="0" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>LASTSYNC</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="93" />
+                <size v="0" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>SLAVEUID</name>
+                <dbName></dbName>
+                <primaryKey v="true" />
+                <columnType v="12" />
+                <size v="127" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="true" />
+                <index v="true" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+            </entityFields>
+          </entityDb>
+          <entityDb>
+            <name>ASYS_XMPP_OFFLINESTANZA</name>
+            <dbName></dbName>
+            <idColumn></idColumn>
+            <idGeneratorType v="0" />
+            <idGeneratorInterval v="0" />
+            <documentation></documentation>
+            <title></title>
+            <description></description>
+            <auditSyncConfig>
+              <name>auditSyncConfig</name>
+              <auditMode v="0" />
+              <syncActive v="false" />
+              <syncComplete v="true" />
+              <syncDirection v="1" />
+              <syncIds></syncIds>
+            </auditSyncConfig>
+            <entityFields>
+              <entityFieldDb>
+                <name>ATIMESTAMP</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="93" />
+                <size v="0" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>JID</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="64" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="false" />
+                <index v="true" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>STANZA</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="2005" />
+                <size v="0" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+            </entityFields>
+          </entityDb>
+          <entityDb>
+            <name>ASYS_XMPP_HISTORY</name>
+            <dbName></dbName>
+            <idColumn></idColumn>
+            <idGeneratorType v="0" />
+            <idGeneratorInterval v="0" />
+            <documentation></documentation>
+            <title></title>
+            <description></description>
+            <auditSyncConfig>
+              <name>auditSyncConfig</name>
+              <auditMode v="0" />
+              <syncActive v="false" />
+              <syncComplete v="true" />
+              <syncDirection v="1" />
+              <syncIds></syncIds>
+            </auditSyncConfig>
+            <entityFields>
+              <entityFieldDb>
+                <name>ATIMESTAMP</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="93" />
+                <size v="0" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="false" />
+                <index v="true" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>CHATMARKER</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="16" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>JID_FROM</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="64" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="false" />
+                <index v="true" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>JID_TO</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="64" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="false" />
+                <index v="true" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>MSGMARKER</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="255" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="false" />
+                <index v="true" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>MSGTYPE</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="16" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>STANZA</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="2005" />
+                <size v="0" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
             </entityFields>
           </entityDb>
         </entities>
diff --git a/entity/DistrictResponsible_entity/DistrictResponsible_entity.aod b/entity/DistrictResponsible_entity/DistrictResponsible_entity.aod
index deda3b03d7..56d2c936c3 100644
--- a/entity/DistrictResponsible_entity/DistrictResponsible_entity.aod
+++ b/entity/DistrictResponsible_entity/DistrictResponsible_entity.aod
@@ -2,6 +2,7 @@
 <entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
   <name>DistrictResponsible_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
+  <documentation>%aditoprj%/entity/DistrictResponsible_entity/documentation.adoc</documentation>
   <icon>VAADIN:GLOBE</icon>
   <title>District Responsible</title>
   <contentTitleProcess>%aditoprj%/entity/DistrictResponsible_entity/contentTitleProcess.js</contentTitleProcess>
@@ -58,7 +59,7 @@
       <dependency>
         <name>dependency</name>
         <entityName>District_entity</entityName>
-        <fieldName>Districts</fieldName>
+        <fieldName>ResponsibleDistricts</fieldName>
       </dependency>
     </entityConsumer>
     <entityField>
@@ -83,6 +84,7 @@
     <entityProvider>
       <name>DistrictResponsibles</name>
       <lookupIdfield>DISTRICTRESPONSIBLEID</lookupIdfield>
+      <documentation>%aditoprj%/entity/DistrictResponsible_entity/entityfields/districtresponsibles/documentation.adoc</documentation>
       <dependencies>
         <entityDependency>
           <name>ef26fdb6-5fcf-416e-bcc8-380b5751b523</name>
@@ -139,10 +141,6 @@
         </entityParameter>
       </children>
     </entityConsumer>
-    <entityParameter>
-      <name>OnlyResponsibles_param</name>
-      <expose v="true" />
-    </entityParameter>
     <entityField>
       <name>departmentAttributeName</name>
       <title>Department</title>
@@ -151,6 +149,7 @@
     </entityField>
     <entityProvider>
       <name>OrganisationResponsibles</name>
+      <documentation>%aditoprj%/entity/DistrictResponsible_entity/entityfields/organisationresponsibles/documentation.adoc</documentation>
       <dependencies>
         <entityDependency>
           <name>9c2fe0da-9456-44ef-ac6c-28ac234b35f7</name>
@@ -158,28 +157,12 @@
           <fieldName>DistrictResponsibles</fieldName>
           <isConsumer v="false" />
         </entityDependency>
-        <entityDependency>
-          <name>7e71479b-8f39-4cd8-a31e-fac43df426d6</name>
-          <entityName>Salesproject_entity</entityName>
-          <fieldName>DistrictResponsibles</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
-        <entityDependency>
-          <name>97a448e1-05fb-4e42-ba83-11b419034f08</name>
-          <entityName>Member_entity</entityName>
-          <fieldName>DistrictResponsibles</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
       </dependencies>
       <children>
         <entityParameter>
           <name>DistrictId_param</name>
           <expose v="false" />
         </entityParameter>
-        <entityParameter>
-          <name>OnlyResponsibles_param</name>
-          <expose v="false" />
-        </entityParameter>
       </children>
     </entityProvider>
     <entityParameter>
@@ -190,6 +173,10 @@
       <name>#PROVIDER_AGGREGATES</name>
       <useAggregates v="true" />
     </entityProvider>
+    <entityParameter>
+      <name>CollectedDistrictIds_param</name>
+      <valueProcess>%aditoprj%/entity/DistrictResponsible_entity/entityfields/collecteddistrictids_param/valueProcess.js</valueProcess>
+    </entityParameter>
   </entityFields>
   <recordContainers>
     <dbRecordContainer>
@@ -256,7 +243,6 @@
         <dbRecordFieldMapping>
           <name>DEPARTMENT_ATTRIBUTE_ID.displayValue</name>
           <recordfield>DISTRICTRESPONSIBLE.DEPARTMENT_ATTRIBUTE_ID</recordfield>
-          <expression>%aditoprj%/entity/DistrictResponsible_entity/recordcontainers/db/recordfieldmappings/department_attribute_id.displayvalue/expression.js</expression>
         </dbRecordFieldMapping>
       </recordFieldMappings>
     </dbRecordContainer>
diff --git a/entity/DistrictResponsible_entity/documentation.adoc b/entity/DistrictResponsible_entity/documentation.adoc
new file mode 100644
index 0000000000..4cc601b1d8
--- /dev/null
+++ b/entity/DistrictResponsible_entity/documentation.adoc
@@ -0,0 +1,17 @@
+= DistrictResponsible_entity
+
+Overview:
+
+Definition: Entity, which is responsible for handling the district responsibles.
+Particularities: None known.
+
+Relations to other entities: 
+    - District_entity
+    - Attribute_entity
+    - Document_entity
+    - Employee_entity
+    - LogHistory_entity
+
+Best practices: None known.
+
+FAQs: None known.
\ No newline at end of file
diff --git a/entity/DistrictResponsible_entity/entityfields/collecteddistrictids_param/valueProcess.js b/entity/DistrictResponsible_entity/entityfields/collecteddistrictids_param/valueProcess.js
index 552eea46c9..2d41b30698 100644
--- a/entity/DistrictResponsible_entity/entityfields/collecteddistrictids_param/valueProcess.js
+++ b/entity/DistrictResponsible_entity/entityfields/collecteddistrictids_param/valueProcess.js
@@ -7,7 +7,7 @@ var orgUid = vars.get("$param.OrgUid_param");
 
 if(orgUid) 
 {
-    var orgDistrictIds = getDistrictIdsByOrgUid(orgUid);
+    var orgDistrictIds = _getDistrictIdsByOrgUid(orgUid);
     orgDistrictIds = JSON.stringify(orgDistrictIds);
 } else {
     orgDistrictIds = JSON.stringify([]);
diff --git a/entity/DistrictResponsible_entity/entityfields/districtresponsibles/documentation.adoc b/entity/DistrictResponsible_entity/entityfields/districtresponsibles/documentation.adoc
new file mode 100644
index 0000000000..4f7a48b890
--- /dev/null
+++ b/entity/DistrictResponsible_entity/entityfields/districtresponsibles/documentation.adoc
@@ -0,0 +1,3 @@
+= DistrictResponsible_entity - DistrictResponsibles
+
+Provider for the district entity, used to work with district responsibles from the district entity.
\ No newline at end of file
diff --git a/entity/DistrictResponsible_entity/entityfields/organisationresponsibles/documentation.adoc b/entity/DistrictResponsible_entity/entityfields/organisationresponsibles/documentation.adoc
new file mode 100644
index 0000000000..f9d4c6b31c
--- /dev/null
+++ b/entity/DistrictResponsible_entity/entityfields/organisationresponsibles/documentation.adoc
@@ -0,0 +1,3 @@
+= District_entity - OrganisationResponsibles
+
+Provider for the organisation entity, used to display the corrensponding district responsibles in the organisation main view.
\ No newline at end of file
diff --git a/entity/DistrictResponsible_entity/recordcontainers/db/conditionProcess.js b/entity/DistrictResponsible_entity/recordcontainers/db/conditionProcess.js
index 7fc53ff212..f734998dd1 100644
--- a/entity/DistrictResponsible_entity/recordcontainers/db/conditionProcess.js
+++ b/entity/DistrictResponsible_entity/recordcontainers/db/conditionProcess.js
@@ -4,7 +4,6 @@ import("system.vars");
 import("Sql_lib");
 
 var districtId = vars.get("$param.DistrictId_param");
-//var onlyResponsibles = vars.get("$param.OnlyResponsibles_param");
 var orgUid = vars.get("$param.OrgUid_param");
 var cond;
 
@@ -14,13 +13,13 @@ if (districtId)
 } 
 else if(orgUid) 
 {
-    var orgDistrictIds = getDistrictIdsByOrgUid(orgUid);
+    var orgDistrictIds = _getDistrictIdsByOrgUid(orgUid);
     cond = newWhere("DISTRICTRESPONSIBLE.DISTRICT_ID", orgDistrictIds, SqlBuilder.IN());
 }
 
 result.string(cond.toString());
 
-function getDistrictIdsByOrgUid(pOrgUid) {
+function _getDistrictIdsByOrgUid(pOrgUid) {
     
     var districtIds = [];
     var nonMatchedId = [];
@@ -40,7 +39,6 @@ function getDistrictIdsByOrgUid(pOrgUid) {
             var rowCountConfig = entities.createConfigForLoadingRows()
                                             .entity("Organisation_entity")
                                             .uid(pOrgUid)
-                                            //.provider()
                                             .filter(filter);
         
             var rowCount = entities.getRowCount(rowCountConfig);
diff --git a/entity/District_entity/District_entity.aod b/entity/District_entity/District_entity.aod
index 5748ce859c..f625fd4d88 100644
--- a/entity/District_entity/District_entity.aod
+++ b/entity/District_entity/District_entity.aod
@@ -2,10 +2,10 @@
 <entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
   <name>District_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
+  <documentation>%aditoprj%/entity/District_entity/documentation.adoc</documentation>
   <icon>VAADIN:GLOBE</icon>
   <title>District definition</title>
   <contentTitleProcess>%aditoprj%/entity/District_entity/contentTitleProcess.js</contentTitleProcess>
-  <afterUiInit>%aditoprj%/entity/District_entity/afterUiInit.js</afterUiInit>
   <titlePlural></titlePlural>
   <recordContainer>db</recordContainer>
   <entityFields>
@@ -46,11 +46,7 @@
     <entityField>
       <name>PARENTDISTRICT_DISTRICTID</name>
       <title>{$DISTRICT_PARENT_DISTRICT}</title>
-      <consumer>ParentDistricts</consumer>
-      <dropDownProcess>%aditoprj%/entity/District_entity/entityfields/parentdistrict_districtid/dropDownProcess.js</dropDownProcess>
-      <stateProcess>%aditoprj%/entity/District_entity/entityfields/parentdistrict_districtid/stateProcess.js</stateProcess>
       <displayValueProcess>%aditoprj%/entity/District_entity/entityfields/parentdistrict_districtid/displayValueProcess.js</displayValueProcess>
-      <onValueChange>%aditoprj%/entity/District_entity/entityfields/parentdistrict_districtid/onValueChange.js</onValueChange>
       <onValueChangeTypes>
         <element>MASK</element>
         <element>PROCESS</element>
@@ -83,8 +79,9 @@
       <displayValueProcess>%aditoprj%/entity/District_entity/entityfields/iso3/displayValueProcess.js</displayValueProcess>
     </entityField>
     <entityProvider>
-      <name>Districts</name>
+      <name>ResponsibleDistricts</name>
       <lookupIdfield>DISTRICTID</lookupIdfield>
+      <documentation>%aditoprj%/entity/District_entity/entityfields/responsibledistricts/documentation.adoc</documentation>
       <recordContainer>db</recordContainer>
       <dependencies>
         <entityDependency>
@@ -93,12 +90,6 @@
           <fieldName>Districts</fieldName>
           <isConsumer v="false" />
         </entityDependency>
-        <entityDependency>
-          <name>d2c383ee-7b5d-4242-b598-8343c1133fdd</name>
-          <entityName>District_entity</entityName>
-          <fieldName>ParentDistricts</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
       </dependencies>
     </entityProvider>
     <entityConsumer>
@@ -163,14 +154,6 @@
         <element>DISTRICT_NUMBER</element>
       </fields>
     </entityFieldGroup>
-    <entityConsumer>
-      <name>ParentDistricts</name>
-      <dependency>
-        <name>dependency</name>
-        <entityName>#ENTITY</entityName>
-        <fieldName>Districts</fieldName>
-      </dependency>
-    </entityConsumer>
     <entityConsumer>
       <name>Documents</name>
       <dependency>
@@ -196,12 +179,6 @@
         <entityName>LogHistory_entity</entityName>
         <fieldName>LogHistoryProvider</fieldName>
       </dependency>
-      <children>
-        <entityParameter>
-          <name>tablenames_param</name>
-          <valueProcess>%aditoprj%/entity/District_entity/entityfields/logs/children/tablenames_param/valueProcess.js</valueProcess>
-        </entityParameter>
-      </children>
     </entityConsumer>
     <entityField>
       <name>parentFilter</name>
@@ -210,20 +187,14 @@
       <state>READONLY</state>
       <stateProcess>%aditoprj%/entity/District_entity/entityfields/parentfilter/stateProcess.js</stateProcess>
       <valueProcess>%aditoprj%/entity/District_entity/entityfields/parentfilter/valueProcess.js</valueProcess>
-      <onValueChange>%aditoprj%/entity/District_entity/entityfields/parentfilter/onValueChange.js</onValueChange>
     </entityField>
     <entityParameter>
-      <name>OnlyResponsibleDistricts</name>
-      <expose v="true" />
-    </entityParameter>
-    <entityParameter>
-      <name>DistrictIdByOrgId_param</name>
+      <name>DistrictsByContactId_param</name>
       <expose v="true" />
     </entityParameter>
     <entityField>
       <name>appliedFilter</name>
       <valueProcess>%aditoprj%/entity/District_entity/entityfields/appliedfilter/valueProcess.js</valueProcess>
-      <onValueChange>%aditoprj%/entity/District_entity/entityfields/appliedfilter/onValueChange.js</onValueChange>
       <onValueChangeTypes>
         <element>MASK</element>
         <element>PROCESS</element>
@@ -315,10 +286,6 @@
           <recordfield>DISTRICT.USER_NEW</recordfield>
           <isLookupFilter v="true" />
         </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>PARENTDISTRICT_DISTRICTID.displayValue</name>
-          <expression>%aditoprj%/entity/District_entity/recordcontainers/db/recordfieldmappings/parent_district.displayvalue/expression.js</expression>
-        </dbRecordFieldMapping>
         <dbRecordFieldMapping>
           <name>appliedFilter.value</name>
           <isLookupFilter v="true" />
diff --git a/entity/District_entity/afterUiInit.js b/entity/District_entity/afterUiInit.js
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/entity/District_entity/documentation.adoc b/entity/District_entity/documentation.adoc
new file mode 100644
index 0000000000..a5a7cc1bf1
--- /dev/null
+++ b/entity/District_entity/documentation.adoc
@@ -0,0 +1,23 @@
+= District_entity
+
+Overview:
+
+Definition: Entity, which is responsible for handling districts.
+Purpose: Creating the ability to create e.g. sales areas or logical areas.
+Particularities: 
+    - Filters are used to implement the logic, to define a area/district. (District: Germany has the filter: Country = "Germany")
+        - The filters are separated into the corresponding district filter from the current tier, which is saved into the database
+          (e.g.: Country = Germany for the District: Germany) and the appliedFilter, which contains all the filter from the overlying 
+          districts in a nested form (including the filter of the current tier) (e.g: District: Munich: Country: "Germany" -> State: "Bavaria" 
+          -> City: "Munich").
+
+Relations to other entities: 
+    - DistrictResponsible_entity
+    - Document_entity
+    - Language_entity
+    - LogHistory_entity
+    - Organisation_entity
+
+Best practices: None known.
+
+FAQs: None known.
\ No newline at end of file
diff --git a/entity/District_entity/entityfields/appliedfilter/onValueChange.js b/entity/District_entity/entityfields/appliedfilter/onValueChange.js
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/entity/District_entity/entityfields/logs/children/tablenames_param/valueProcess.js b/entity/District_entity/entityfields/logs/children/tablenames_param/valueProcess.js
deleted file mode 100644
index 20ea950711..0000000000
--- a/entity/District_entity/entityfields/logs/children/tablenames_param/valueProcess.js
+++ /dev/null
@@ -1,9 +0,0 @@
-import("system.vars");
-import("system.result");
-import("Context_lib");
-
-var res = [{id: vars.get("$field.DISTRICTID"), tableNames: ["DISTRICT"]}];
-
-res = JSON.stringify(res);//currently only strings  can be passed as param
-
-result.object(res);
\ No newline at end of file
diff --git a/entity/District_entity/entityfields/parentdistrict_districtid/onValueChange.js b/entity/District_entity/entityfields/parentdistrict_districtid/onValueChange.js
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/entity/District_entity/entityfields/parentdistrict_districtid/stateProcess.js b/entity/District_entity/entityfields/parentdistrict_districtid/stateProcess.js
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/entity/District_entity/entityfields/responsibledistricts/documentation.adoc b/entity/District_entity/entityfields/responsibledistricts/documentation.adoc
new file mode 100644
index 0000000000..3ce2687340
--- /dev/null
+++ b/entity/District_entity/entityfields/responsibledistricts/documentation.adoc
@@ -0,0 +1,3 @@
+= District_entity - ResponsibleDistricts
+
+Provider for the person entity, used to display the responsible districts in the person main view.
\ No newline at end of file
diff --git a/entity/District_entity/recordcontainers/db/conditionProcess.js b/entity/District_entity/recordcontainers/db/conditionProcess.js
index f21e37720e..481f5dbd2c 100644
--- a/entity/District_entity/recordcontainers/db/conditionProcess.js
+++ b/entity/District_entity/recordcontainers/db/conditionProcess.js
@@ -3,7 +3,7 @@ import("system.vars");
 import("Sql_lib");
 
 
-var onlyResponsibleParam = vars.get("$param.OnlyResponsibleDistricts");
+var onlyResponsibleParam = vars.get("$param.DistrictsByContactId_param");
 
 if (onlyResponsibleParam)
 {
diff --git a/entity/District_entity/recordcontainers/db/recordfieldmappings/parent_district.displayvalue/expression.js b/entity/District_entity/recordcontainers/db/recordfieldmappings/parent_district.displayvalue/expression.js
deleted file mode 100644
index d5e9849d7e..0000000000
--- a/entity/District_entity/recordcontainers/db/recordfieldmappings/parent_district.displayvalue/expression.js
+++ /dev/null
@@ -1,8 +0,0 @@
-import("system.result");
-import("Sql_lib");
-
-
-result.string(newSelect("DISTRICT.DISTRICT_NAME")
-                .from("DISTRICT")
-                .where("DISTRICT.PARENTDISTRICT_DISTRICTID = DISTRICT.DISTRICTID")
-                .toString());
\ No newline at end of file
diff --git a/entity/District_entity/recordcontainers/jdito/cacheKeyProcess.js b/entity/District_entity/recordcontainers/jdito/cacheKeyProcess.js
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/entity/Member_entity/Member_entity.aod b/entity/Member_entity/Member_entity.aod
index 6d305e8e0c..328d826225 100644
--- a/entity/Member_entity/Member_entity.aod
+++ b/entity/Member_entity/Member_entity.aod
@@ -197,12 +197,6 @@
       <name>#PROVIDER_AGGREGATES</name>
       <useAggregates v="true" />
     </entityProvider>
-    <entityConsumer>
-      <name>DistrictResponsibles</name>
-      <dependency>
-        <name>dependency</name>
-      </dependency>
-    </entityConsumer>
     <entityProvider>
       <name>WithDistrictResponsibles</name>
       <recordContainer>jdito</recordContainer>
diff --git a/entity/Person_entity/Person_entity.aod b/entity/Person_entity/Person_entity.aod
index 3d84d402a3..63484e094c 100644
--- a/entity/Person_entity/Person_entity.aod
+++ b/entity/Person_entity/Person_entity.aod
@@ -1316,7 +1316,7 @@
       <dependency>
         <name>dependency</name>
         <entityName>District_entity</entityName>
-        <fieldName>Districts</fieldName>
+        <fieldName>ResponsibleDistricts</fieldName>
       </dependency>
       <children>
         <entityParameter>
diff --git a/neonView/DistrictPreview_view/DistrictPreview_view.aod b/neonView/DistrictPreview_view/DistrictPreview_view.aod
index 14f7d89a8f..041618ad4f 100644
--- a/neonView/DistrictPreview_view/DistrictPreview_view.aod
+++ b/neonView/DistrictPreview_view/DistrictPreview_view.aod
@@ -31,10 +31,6 @@
       <entityField>#ENTITY</entityField>
       <title>Further informations</title>
       <fields>
-        <entityFieldLink>
-          <name>cda733b1-3bf4-4ec0-9aef-8865b7704094</name>
-          <entityField>LANG</entityField>
-        </entityFieldLink>
         <entityFieldLink>
           <name>f1c69329-5a9f-456f-b37d-1ca1b0e4943c</name>
           <entityField>DISTRICT_INFO</entityField>
-- 
GitLab


From dc86bf839e2da35d2cc5309fcf1ddbef2cdb9ce3 Mon Sep 17 00:00:00 2001
From: Daniel Tran <d.tran@adito.de>
Date: Thu, 10 Sep 2020 08:50:48 +0000
Subject: [PATCH 285/309] #1058762 customizing dm

---
 .../DistrictResponsible_entity.aod            | 32 ++++++++++++++++++-
 .../district_id.displayvalue/expression.js    |  7 ++++
 .../mail.value/expression.js                  |  4 +++
 .../phone.value/expression.js                 |  4 +++
 .../recordcontainers/db/cacheKeyProcess.js    |  2 +-
 .../DistrictResponsibleList_view.aod          | 17 +++++++++-
 6 files changed, 63 insertions(+), 3 deletions(-)
 create mode 100644 entity/DistrictResponsible_entity/recordcontainers/db/recordfieldmappings/district_id.displayvalue/expression.js
 create mode 100644 entity/DistrictResponsible_entity/recordcontainers/db/recordfieldmappings/mail.value/expression.js
 create mode 100644 entity/DistrictResponsible_entity/recordcontainers/db/recordfieldmappings/phone.value/expression.js

diff --git a/entity/DistrictResponsible_entity/DistrictResponsible_entity.aod b/entity/DistrictResponsible_entity/DistrictResponsible_entity.aod
index 56d2c936c3..c5073fa41f 100644
--- a/entity/DistrictResponsible_entity/DistrictResponsible_entity.aod
+++ b/entity/DistrictResponsible_entity/DistrictResponsible_entity.aod
@@ -28,7 +28,9 @@
     </entityField>
     <entityField>
       <name>DISTRICT_ID</name>
+      <title>{$DISTRICT}</title>
       <consumer>Districts</consumer>
+      <linkedContext>District</linkedContext>
       <valueProcess>%aditoprj%/entity/DistrictResponsible_entity/entityfields/district_id/valueProcess.js</valueProcess>
     </entityField>
     <entityConsumer>
@@ -177,23 +179,39 @@
       <name>CollectedDistrictIds_param</name>
       <valueProcess>%aditoprj%/entity/DistrictResponsible_entity/entityfields/collecteddistrictids_param/valueProcess.js</valueProcess>
     </entityParameter>
+    <entityField>
+      <name>MAIL</name>
+      <title>Email</title>
+    </entityField>
+    <entityField>
+      <name>PHONE</name>
+      <title>Phone</title>
+    </entityField>
   </entityFields>
   <recordContainers>
     <dbRecordContainer>
       <name>db</name>
       <alias>Data_alias</alias>
       <isPageable v="false" />
+      <fromClauseProcess>%aditoprj%/entity/DistrictResponsible_entity/recordcontainers/db/fromClauseProcess.js</fromClauseProcess>
       <conditionProcess>%aditoprj%/entity/DistrictResponsible_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
       <cacheType>GLOBAL</cacheType>
       <cacheKeyProcess>%aditoprj%/entity/DistrictResponsible_entity/recordcontainers/db/cacheKeyProcess.js</cacheKeyProcess>
       <linkInformation>
         <linkInformation>
-          <name>d659c49e-363d-4a1a-93a5-1abcfcf9e51c</name>
+          <name>d24296ec-5040-4b40-ad5b-668d3e02b4aa</name>
           <tableName>DISTRICTRESPONSIBLE</tableName>
           <primaryKey>DISTRICTRESPONSIBLEID</primaryKey>
           <isUIDTable v="true" />
           <readonly v="false" />
         </linkInformation>
+        <linkInformation>
+          <name>86f9ab94-0d69-4a3a-9a04-615f61be2c23</name>
+          <tableName>CONTACT</tableName>
+          <primaryKey>CONTACTID</primaryKey>
+          <isUIDTable v="false" />
+          <readonly v="true" />
+        </linkInformation>
       </linkInformation>
       <recordFieldMappings>
         <dbRecordFieldMapping>
@@ -244,6 +262,18 @@
           <name>DEPARTMENT_ATTRIBUTE_ID.displayValue</name>
           <recordfield>DISTRICTRESPONSIBLE.DEPARTMENT_ATTRIBUTE_ID</recordfield>
         </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>MAIL.value</name>
+          <expression>%aditoprj%/entity/DistrictResponsible_entity/recordcontainers/db/recordfieldmappings/mail.value/expression.js</expression>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>PHONE.value</name>
+          <expression>%aditoprj%/entity/DistrictResponsible_entity/recordcontainers/db/recordfieldmappings/phone.value/expression.js</expression>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>DISTRICT_ID.displayValue</name>
+          <expression>%aditoprj%/entity/DistrictResponsible_entity/recordcontainers/db/recordfieldmappings/district_id.displayvalue/expression.js</expression>
+        </dbRecordFieldMapping>
       </recordFieldMappings>
     </dbRecordContainer>
   </recordContainers>
diff --git a/entity/DistrictResponsible_entity/recordcontainers/db/recordfieldmappings/district_id.displayvalue/expression.js b/entity/DistrictResponsible_entity/recordcontainers/db/recordfieldmappings/district_id.displayvalue/expression.js
new file mode 100644
index 0000000000..2bd6b5d017
--- /dev/null
+++ b/entity/DistrictResponsible_entity/recordcontainers/db/recordfieldmappings/district_id.displayvalue/expression.js
@@ -0,0 +1,7 @@
+import("system.result");
+import("Sql_lib");
+
+result.string(newSelect("DISTRICT.DISTRICT_NAME")
+                .from("DISTRICT")
+                .where("DISTRICT.DISTRICTID = DISTRICTRESPONSIBLE.DISTRICT_ID")
+                .toString());
diff --git a/entity/DistrictResponsible_entity/recordcontainers/db/recordfieldmappings/mail.value/expression.js b/entity/DistrictResponsible_entity/recordcontainers/db/recordfieldmappings/mail.value/expression.js
new file mode 100644
index 0000000000..9ced6fa694
--- /dev/null
+++ b/entity/DistrictResponsible_entity/recordcontainers/db/recordfieldmappings/mail.value/expression.js
@@ -0,0 +1,4 @@
+import("system.result");
+import("Communication_lib");
+
+result.string(CommUtil.getStandardSubSqlMail());
\ No newline at end of file
diff --git a/entity/DistrictResponsible_entity/recordcontainers/db/recordfieldmappings/phone.value/expression.js b/entity/DistrictResponsible_entity/recordcontainers/db/recordfieldmappings/phone.value/expression.js
new file mode 100644
index 0000000000..ce31b16dbb
--- /dev/null
+++ b/entity/DistrictResponsible_entity/recordcontainers/db/recordfieldmappings/phone.value/expression.js
@@ -0,0 +1,4 @@
+import("system.result");
+import("Communication_lib");
+
+result.string(CommUtil.getStandardSubSqlPhone());
\ No newline at end of file
diff --git a/entity/District_entity/recordcontainers/db/cacheKeyProcess.js b/entity/District_entity/recordcontainers/db/cacheKeyProcess.js
index 4e5a7a8939..e977dd02e2 100644
--- a/entity/District_entity/recordcontainers/db/cacheKeyProcess.js
+++ b/entity/District_entity/recordcontainers/db/cacheKeyProcess.js
@@ -4,6 +4,6 @@ import("system.result");
 
 var cacheKey;
 
-cacheKey = CachedRecordContainerUtils.getCommonKey("$param.OnlyResponsibleDistricts");
+cacheKey = CachedRecordContainerUtils.getCommonKey("$param.DistrictsByContactId_param");
 
 result.string(cacheKey);
\ No newline at end of file
diff --git a/neonView/DistrictResponsibleList_view/DistrictResponsibleList_view.aod b/neonView/DistrictResponsibleList_view/DistrictResponsibleList_view.aod
index 26598ff9fa..9a9327680d 100644
--- a/neonView/DistrictResponsibleList_view/DistrictResponsibleList_view.aod
+++ b/neonView/DistrictResponsibleList_view/DistrictResponsibleList_view.aod
@@ -13,12 +13,19 @@
       <name>tableViewTemplate</name>
       <hideActions v="true" />
       <entityField>#ENTITY</entityField>
-      <linkedColumns />
+      <linkedColumns>
+        <element>EMPLOYEE_CONTACT_ID</element>
+        <element>DISTRICT_ID</element>
+      </linkedColumns>
       <fixedFilterFields />
       <isCreatable v="false" />
       <isDeletable v="false" />
       <isEditable v="false" />
       <columns>
+        <neonTableColumn>
+          <name>158f589a-497f-4522-9b43-d7a6155c6818</name>
+          <entityField>DISTRICT_ID</entityField>
+        </neonTableColumn>
         <neonTableColumn>
           <name>32e7b066-76b4-4bd2-b440-bc7844c929a6</name>
           <entityField>EMPLOYEE_CONTACT_ID</entityField>
@@ -27,6 +34,14 @@
           <name>dc9bce22-9a99-4db9-a76a-8fd4a91d5f0f</name>
           <entityField>departmentAttributeName</entityField>
         </neonTableColumn>
+        <neonTableColumn>
+          <name>fd46a7b9-60bb-48d1-aac5-0ef28943eac9</name>
+          <entityField>PHONE</entityField>
+        </neonTableColumn>
+        <neonTableColumn>
+          <name>5ae3b723-14b5-4100-b78b-2ae2ffa39bae</name>
+          <entityField>MAIL</entityField>
+        </neonTableColumn>
       </columns>
     </tableViewTemplate>
   </children>
-- 
GitLab


From 47480a4aa2a8058cefcebf4fbbbe9137ee560f52 Mon Sep 17 00:00:00 2001
From: "j.goderbauer" <j.goderbauer@adito.de>
Date: Thu, 10 Sep 2020 11:14:33 +0200
Subject: [PATCH 286/309] Removed several logging.log  calls

---
 .../recordcontainers/jdito/contentProcess.js  |  2 --
 .../entityfields/uid/linkedContextProcess.js  | 24 -------------------
 .../filterValuesProcess.js                    |  3 ---
 process/ClassificationFilter_lib/process.js   |  2 --
 process/DuplicateScanner_lib/process.js       |  2 +-
 5 files changed, 1 insertion(+), 32 deletions(-)

diff --git a/entity/360Degree_entity/recordcontainers/jdito/contentProcess.js b/entity/360Degree_entity/recordcontainers/jdito/contentProcess.js
index 557b1ba4d8..60a8312eb2 100644
--- a/entity/360Degree_entity/recordcontainers/jdito/contentProcess.js
+++ b/entity/360Degree_entity/recordcontainers/jdito/contentProcess.js
@@ -1,4 +1,3 @@
-import("system.logging");
 import("system.util");
 import("system.db");
 import("system.vars");
@@ -12,7 +11,6 @@ if (vars.exists("$param.ObjectType_param") && vars.get("$param.ObjectType_param"
     var selectMap = ContextUtils.getSelectMap();
     if(vars.exists("$local.filter") && vars.get("$local.filter") )
     {
-        logging.log(JSON.stringify(vars.get("$local.filter")))
         var filter = vars.get("$local.filter");
         if (filter.filter)
             if(filter.filter.childs != null && filter.filter.childs.length > 0)
diff --git a/entity/ClassificationAdmin_entity/entityfields/uid/linkedContextProcess.js b/entity/ClassificationAdmin_entity/entityfields/uid/linkedContextProcess.js
index 7f329d1a50..e69de29bb2 100644
--- a/entity/ClassificationAdmin_entity/entityfields/uid/linkedContextProcess.js
+++ b/entity/ClassificationAdmin_entity/entityfields/uid/linkedContextProcess.js
@@ -1,24 +0,0 @@
-//import("system.neon");
-//import("system.text");
-//import("system.vars");
-//import("system.result");
-//import("system.logging");
-//
-//var value = vars.get("$this.value");
-//
-//if(value)
-//{
-//    var res;
-//    if(value.charAt(0) != ";" && value.charAt(value.length) != ";")
-//        res = "ClassificationGroup";
-//    else
-//    {
-//        decodedIdvalues = text.decodeMS(value);
-//        if(decodedIdvalues[0].charAt(0) != ";" && decodedIdvalues[0].charAt(decodedIdvalues[0].length) != ";")
-//            res = "ClassificationGrading";
-//        else
-//            res = "ClassificationScore";
-//    }
-//    neon.setFieldValue("$field.TARGET_CONTEXT" , res)
-//    logging.log(res)
-//}
\ No newline at end of file
diff --git a/entity/Favorite_entity/recordcontainers/jditorecordcontainer/filterextensions/groupgroupnameextension/filterValuesProcess.js b/entity/Favorite_entity/recordcontainers/jditorecordcontainer/filterextensions/groupgroupnameextension/filterValuesProcess.js
index 34c4eb2d23..f8a6e1919d 100644
--- a/entity/Favorite_entity/recordcontainers/jditorecordcontainer/filterextensions/groupgroupnameextension/filterValuesProcess.js
+++ b/entity/Favorite_entity/recordcontainers/jditorecordcontainer/filterextensions/groupgroupnameextension/filterValuesProcess.js
@@ -2,9 +2,6 @@ import("system.favorite");
 import("system.tools");
 import("system.result");
 import("Sql_lib");
-import("system.logging");
-
-logging.log("groupNameExtensionValuesProcess");
 
 var allTypes = [];
 
diff --git a/process/ClassificationFilter_lib/process.js b/process/ClassificationFilter_lib/process.js
index 35716cdec2..e2200e6e6e 100644
--- a/process/ClassificationFilter_lib/process.js
+++ b/process/ClassificationFilter_lib/process.js
@@ -1,4 +1,3 @@
-import("system.logging");
 import("Context_lib");
 import("Classification_lib");
 import("Entity_lib");
@@ -235,7 +234,6 @@ ClassificationGroupFilterUtils.getFilterFields = function(pObjectType)
         .provider("SpecificObjectTypeGroups")
         .addParameter("ObjectType_param", pObjectType);
     var classificationGroups = entities.getRows(config);
-    logging.log("classificationGroups>>" + JSON.stringify(classificationGroups));
     classificationGroups = ArrayUtils.sortArrayOfObjects(classificationGroups, "#CONTENTTITLE", true, false);
 
     classificationGroups.forEach(function(classificationGroup, idx){
diff --git a/process/DuplicateScanner_lib/process.js b/process/DuplicateScanner_lib/process.js
index 55607d8232..cd84a6b264 100644
--- a/process/DuplicateScanner_lib/process.js
+++ b/process/DuplicateScanner_lib/process.js
@@ -1023,7 +1023,7 @@ _DuplicateScannerUtils._isUseExternalWebservice = function(pFilterName, pTargetE
  */
 _DuplicateScannerUtils._callIndexSearch = function(pTargetEntity, pIndexPatternWithValues, pIdFilter, pResultFields, pResultSetRows)
 {
-    logging.log(pIndexPatternWithValues)
+    //logging.log(pIndexPatternWithValues)
     //The indexPattern can't be null because it is required to run the search.
     if(pIndexPatternWithValues == null || pIndexPatternWithValues == "")
         return null;
-- 
GitLab


From 03808e4f5ce5d95ea0c9c4440c6460ed5517a283 Mon Sep 17 00:00:00 2001
From: "j.goderbauer" <j.goderbauer@adito.de>
Date: Thu, 10 Sep 2020 12:55:15 +0200
Subject: [PATCH 287/309] DistrictResponsibles: extended documentation

---
 .../DistrictResponsible_entity.aod                |  1 +
 .../collecteddistrictids_param/documentation.adoc | 15 +++++++++++++++
 2 files changed, 16 insertions(+)
 create mode 100644 entity/DistrictResponsible_entity/entityfields/collecteddistrictids_param/documentation.adoc

diff --git a/entity/DistrictResponsible_entity/DistrictResponsible_entity.aod b/entity/DistrictResponsible_entity/DistrictResponsible_entity.aod
index c5073fa41f..0bc19e1860 100644
--- a/entity/DistrictResponsible_entity/DistrictResponsible_entity.aod
+++ b/entity/DistrictResponsible_entity/DistrictResponsible_entity.aod
@@ -178,6 +178,7 @@
     <entityParameter>
       <name>CollectedDistrictIds_param</name>
       <valueProcess>%aditoprj%/entity/DistrictResponsible_entity/entityfields/collecteddistrictids_param/valueProcess.js</valueProcess>
+      <documentation>%aditoprj%/entity/DistrictResponsible_entity/entityfields/collecteddistrictids_param/documentation.adoc</documentation>
     </entityParameter>
     <entityField>
       <name>MAIL</name>
diff --git a/entity/DistrictResponsible_entity/entityfields/collecteddistrictids_param/documentation.adoc b/entity/DistrictResponsible_entity/entityfields/collecteddistrictids_param/documentation.adoc
new file mode 100644
index 0000000000..cad2d37316
--- /dev/null
+++ b/entity/DistrictResponsible_entity/entityfields/collecteddistrictids_param/documentation.adoc
@@ -0,0 +1,15 @@
+Non exposed parameter that collects the districtIds for the given value of `OrgUid_param`.
+
+Advantages of encapsulation as a non exposed param:
+
+* one interface to other entities (e.g. the Organisation_entity)
+* logic for collecting districtIds is done within the `DistrictResponsible_entity` scope which means
+other entities don't have to collect the IDs themselfes. For example:
+The `Organisation_entity` doesn't have to collect the IDs because the `DistrictResponsible_entity` 
+_knows_ how to collect them.
+* the value of this `CollectedDistrictIds_param` can be passed to the `cacheKeyProcess` 
+(this enables us for example to cache district responsibles per Districtlist and not per Oranisation)
+* Calculation of the affected districtIds only when needed. For example: 
+The DistrictIds are not loaded when an Organisation is opened but when the 
+consumer data for the `DistrictResponsible_entity` is loaded 
+(=when the user changes the into the district responsibles tab)
\ No newline at end of file
-- 
GitLab


From 3cafc99e6221a4d6e8a40d447d76892da2d41ee1 Mon Sep 17 00:00:00 2001
From: "a.schindlbeck" <a.schindlbeck@adito.de>
Date: Thu, 10 Sep 2020 13:08:03 +0200
Subject: [PATCH 288/309] Notifications: title column position change

---
 .../NotificationFilter_view.aod                  | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/neonView/NotificationFilter_view/NotificationFilter_view.aod b/neonView/NotificationFilter_view/NotificationFilter_view.aod
index f1b5cbc587..8a6a92a861 100644
--- a/neonView/NotificationFilter_view/NotificationFilter_view.aod
+++ b/neonView/NotificationFilter_view/NotificationFilter_view.aod
@@ -54,14 +54,14 @@
           <name>1cff3be1-523d-4a5a-b7d1-389d7cbb726f</name>
           <entityField>ICON</entityField>
         </neonTableColumn>
-        <neonTableColumn>
-          <name>0ed20b46-be6a-424c-a583-a3f7496ec3f9</name>
-          <entityField>CREATEDATE</entityField>
-        </neonTableColumn>
         <neonTableColumn>
           <name>3bf425ed-227c-4768-b339-4794aa0d6063</name>
           <entityField>CAPTION</entityField>
         </neonTableColumn>
+        <neonTableColumn>
+          <name>0ed20b46-be6a-424c-a583-a3f7496ec3f9</name>
+          <entityField>CREATEDATE</entityField>
+        </neonTableColumn>
         <neonTableColumn>
           <name>ff33a6c1-7ac6-4acd-a083-e56a36f89977</name>
           <entityField>DESCRIPTION</entityField>
@@ -82,14 +82,14 @@
           <name>c8799a54-569a-4667-9bdd-aa11a2f6e21e</name>
           <entityField>ICON</entityField>
         </neonTreeTableColumn>
-        <neonTreeTableColumn>
-          <name>2b2d8359-3746-4fa2-8f51-859e50ead9ef</name>
-          <entityField>CREATEDATE</entityField>
-        </neonTreeTableColumn>
         <neonTreeTableColumn>
           <name>efefd3d9-7961-4299-aa7e-24d313ad6454</name>
           <entityField>CAPTION</entityField>
         </neonTreeTableColumn>
+        <neonTreeTableColumn>
+          <name>2b2d8359-3746-4fa2-8f51-859e50ead9ef</name>
+          <entityField>CREATEDATE</entityField>
+        </neonTreeTableColumn>
         <neonTreeTableColumn>
           <name>446c3d62-efa4-4f1a-85d4-e4f6a45019c7</name>
           <entityField>DESCRIPTION</entityField>
-- 
GitLab


From 614fdebd27ddf2f2ba66e85c5660effd70be4e06 Mon Sep 17 00:00:00 2001
From: "j.goderbauer" <j.goderbauer@adito.de>
Date: Thu, 10 Sep 2020 13:10:41 +0200
Subject: [PATCH 289/309] DistrictResponsible_entity: added missing
 codefragments

---
 .../recordcontainers/db/conditionProcess.js   | 48 ++++---------------
 .../recordcontainers/db/fromClauseProcess.js  |  5 ++
 2 files changed, 13 insertions(+), 40 deletions(-)
 create mode 100644 entity/DistrictResponsible_entity/recordcontainers/db/fromClauseProcess.js

diff --git a/entity/DistrictResponsible_entity/recordcontainers/db/conditionProcess.js b/entity/DistrictResponsible_entity/recordcontainers/db/conditionProcess.js
index f734998dd1..1942674d0c 100644
--- a/entity/DistrictResponsible_entity/recordcontainers/db/conditionProcess.js
+++ b/entity/DistrictResponsible_entity/recordcontainers/db/conditionProcess.js
@@ -5,51 +5,19 @@ import("Sql_lib");
 
 var districtId = vars.get("$param.DistrictId_param");
 var orgUid = vars.get("$param.OrgUid_param");
-var cond;
+var cond = newWhere();
 
 if (districtId)
 {
-    cond = newWhere("DISTRICTRESPONSIBLE.DISTRICT_ID", districtId);
+    cond.and("DISTRICTRESPONSIBLE.DISTRICT_ID", districtId);
 } 
 else if(orgUid) 
 {
-    var orgDistrictIds = _getDistrictIdsByOrgUid(orgUid);
-    cond = newWhere("DISTRICTRESPONSIBLE.DISTRICT_ID", orgDistrictIds, SqlBuilder.IN());
+    var orgDistrictIds = vars.get("$param.CollectedDistrictIds_param");
+    if (orgDistrictIds){
+        orgDistrictIds = JSON.parse(orgDistrictIds);
+    cond.and("DISTRICTRESPONSIBLE.DISTRICT_ID", orgDistrictIds, SqlBuilder.IN());
+    }
 }
 
-result.string(cond.toString());
-
-function _getDistrictIdsByOrgUid(pOrgUid) {
-    
-    var districtIds = [];
-    var nonMatchedId = [];
-    var loadingRowsConfig = entities.createConfigForLoadingRows()
-                                        .entity("District_entity")
-                                        .fields(["#UID", "appliedFilter", "DISTRICT_NAME", "PARENTDISTRICT_ID"]);
-    var districtRows = entities.getRows(loadingRowsConfig);
-    
-    for (i = 0; i < districtRows.length; i++) {
-        
-        if (districtRows[i]["PARENTDISTRICT_ID"] in nonMatchedId)
-        {
-            nonMatchedId.push(districtRows[i]["#UID"]);
-            continue;
-        } else {
-            var filter = JSON.stringify(JSON.parse(districtRows[i]["appliedFilter"]).filter);
-            var rowCountConfig = entities.createConfigForLoadingRows()
-                                            .entity("Organisation_entity")
-                                            .uid(pOrgUid)
-                                            .filter(filter);
-        
-            var rowCount = entities.getRowCount(rowCountConfig);
-        
-            if (rowCount > 0) 
-            {
-                districtIds.push(districtRows[i]["#UID"]);   
-            } else {
-                nonMatchedId.push(districtRows[i]["#UID"]);
-            }   
-        }
-    }
-    return districtIds;
-}
\ No newline at end of file
+result.string(cond.toString());
\ No newline at end of file
diff --git a/entity/DistrictResponsible_entity/recordcontainers/db/fromClauseProcess.js b/entity/DistrictResponsible_entity/recordcontainers/db/fromClauseProcess.js
new file mode 100644
index 0000000000..69390b7986
--- /dev/null
+++ b/entity/DistrictResponsible_entity/recordcontainers/db/fromClauseProcess.js
@@ -0,0 +1,5 @@
+import("system.result");
+
+var res = "DISTRICTRESPONSIBLE \n\
+    left join CONTACT on (CONTACT.CONTACTID = DISTRICTRESPONSIBLE.EMPLOYEE_CONTACT_ID)";
+result.string(res);
\ No newline at end of file
-- 
GitLab


From 9d145e01741300b1ef482d4c84be89f8f56c68e6 Mon Sep 17 00:00:00 2001
From: "j.goderbauer" <j.goderbauer@adito.de>
Date: Thu, 10 Sep 2020 13:20:28 +0200
Subject: [PATCH 290/309] Language update

---
 language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod |  6 +++---
 language/_____LANGUAGE_de/_____LANGUAGE_de.aod       |  4 ++++
 language/_____LANGUAGE_en/_____LANGUAGE_en.aod       | 10 ++++++++++
 3 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
index d8a6e1937e..9869c77425 100644
--- a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
+++ b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
@@ -7395,11 +7395,11 @@ select AB_COUNTRYINFO.NAME_LATIN from AB_COUNTRYINFO
 union
 select AB_OBJECTRELATIONTYPE.RELATION_TITLE from AB_OBJECTRELATIONTYPE
 union
-select TITLE from CLASSIFICATIONSCORE
+select distinct CLASSIFICATIONSCORE.TITLE from CLASSIFICATIONSCORE
 union
-select SCORETYPE from CLASSIFICATIONTYPE
+select distinct CLASSIFICATIONTYPE.SCORETYPE from CLASSIFICATIONTYPE
 union
-select distinct CLASSIFICATIONGROUP from CLASSIFICATIONTYPE
+select distinct CLASSIFICATIONGROUP.TITLE from CLASSIFICATIONGROUP
 union
 select AB_ATTRIBUTE.ATTRIBUTE_NAME from AB_ATTRIBUTE</element>
       </statements>
diff --git a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
index 9aa11d7e1e..c72543f26b 100644
--- a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
+++ b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
@@ -7854,6 +7854,7 @@ Bitte Datumseingabe prüfen</value>
     </entry>
     <entry>
       <key>${CANCELLED}</key>
+      <value>Abgebrochen</value>
     </entry>
     <entry>
       <key>Workflow signal</key>
@@ -8990,6 +8991,7 @@ Bitte Datumseingabe prüfen</value>
     </entry>
     <entry>
       <key>{SEND_MAIL}</key>
+      <value>Sende E-Mail</value>
     </entry>
     <entry>
       <key>Total in euros</key>
@@ -9120,6 +9122,7 @@ Bitte Datumseingabe prüfen</value>
     </entry>
     <entry>
       <key>{SENT_MAIL}</key>
+      <value>E-Mail versandt</value>
     </entry>
     <entry>
       <key>Password must contain numbers</key>
@@ -9349,6 +9352,7 @@ Bitte Datumseingabe prüfen</value>
     </entry>
     <entry>
       <key>{$PARENT_DISTRICT}</key>
+      <value>Ãœbergeordnetes Gebiet</value>
     </entry>
     <entry>
       <key>{$DISTRICT_NUMBER}</key>
diff --git a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
index 70bde122c6..ebbc6423c4 100644
--- a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
+++ b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
@@ -6105,6 +6105,7 @@
     </entry>
     <entry>
       <key>${CANCELLED}</key>
+      <value>Cancelled</value>
     </entry>
     <entry>
       <key>${WORKFLOW_SUSPEND}</key>
@@ -7120,6 +7121,7 @@
     </entry>
     <entry>
       <key>{SENT_MAIL}</key>
+      <value>Mail sent</value>
     </entry>
     <entry>
       <key>favorites</key>
@@ -7393,9 +7395,11 @@
     </entry>
     <entry>
       <key>{$DISTRICTNUMBER}</key>
+      <value>District Number</value>
     </entry>
     <entry>
       <key>{$DISTRICT_PARENT_DISTRICT}</key>
+      <value>Parent District</value>
     </entry>
     <entry>
       <key>Responsible Districts</key>
@@ -7408,18 +7412,22 @@
     </entry>
     <entry>
       <key>{$PARENT_DISTRICT}</key>
+      <value>Parent District</value>
     </entry>
     <entry>
       <key>{$DISTRICT_NUMBER}</key>
+      <value>District Number</value>
     </entry>
     <entry>
       <key>District definition</key>
     </entry>
     <entry>
       <key>{$DISTRICT_NO}</key>
+      <value>District Number</value>
     </entry>
     <entry>
       <key>{$DISTRICT}</key>
+      <value>District</value>
     </entry>
     <entry>
       <key>The district no has to be bigger than %0</key>
@@ -7429,9 +7437,11 @@
     </entry>
     <entry>
       <key>{$DISTRICT_RESPONSIBLE}</key>
+      <value>Responsible</value>
     </entry>
     <entry>
       <key>{$DISTRICT_TOTAL_TURNOVER}</key>
+      <value>Total Turnover</value>
     </entry>
     <entry>
       <key>Update all Classification entries in the system</key>
-- 
GitLab


From f47910bfbebb4cc770a3bcfeabbece355f619c73 Mon Sep 17 00:00:00 2001
From: "j.goderbauer" <j.goderbauer@adito.de>
Date: Thu, 10 Sep 2020 13:43:00 +0200
Subject: [PATCH 291/309] added a server process to invalidate the record
 container cache of all entities

---
 ...k_cachedrecordcontainers_invalid_serverProcess.aod | 11 +++++++++++
 .../process.js                                        |  3 +++
 2 files changed, 14 insertions(+)
 create mode 100644 process/mark_cachedrecordcontainers_invalid_serverProcess/mark_cachedrecordcontainers_invalid_serverProcess.aod
 create mode 100644 process/mark_cachedrecordcontainers_invalid_serverProcess/process.js

diff --git a/process/mark_cachedrecordcontainers_invalid_serverProcess/mark_cachedrecordcontainers_invalid_serverProcess.aod b/process/mark_cachedrecordcontainers_invalid_serverProcess/mark_cachedrecordcontainers_invalid_serverProcess.aod
new file mode 100644
index 0000000000..cfd92c9794
--- /dev/null
+++ b/process/mark_cachedrecordcontainers_invalid_serverProcess/mark_cachedrecordcontainers_invalid_serverProcess.aod
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.1">
+  <name>mark_cachedrecordcontainers_invalid_serverProcess</name>
+  <title>Mark all cached record containers as invalid</title>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <icon>VAADIN:RECYCLE</icon>
+  <process>%aditoprj%/process/mark_cachedrecordcontainers_invalid_serverProcess/process.js</process>
+  <variants>
+    <element>EXECUTABLE</element>
+  </variants>
+</process>
diff --git a/process/mark_cachedrecordcontainers_invalid_serverProcess/process.js b/process/mark_cachedrecordcontainers_invalid_serverProcess/process.js
new file mode 100644
index 0000000000..402e201144
--- /dev/null
+++ b/process/mark_cachedrecordcontainers_invalid_serverProcess/process.js
@@ -0,0 +1,3 @@
+import("system.entities");
+
+entities.invalidateCache();
\ No newline at end of file
-- 
GitLab


From b75ce690235a79e3df084cbe5be01b0c70fc0f3f Mon Sep 17 00:00:00 2001
From: "j.goderbauer" <j.goderbauer@adito.de>
Date: Thu, 10 Sep 2020 14:14:35 +0200
Subject: [PATCH 292/309] Districts: Performance and Layout

---
 entity/District_entity/District_entity.aod    | 89 ++++++++++++++-----
 .../district_status/valueProcess.js           |  7 ++
 .../excludeddistrictids_param/valueProcess.js |  6 ++
 .../displayValueProcess.js                    |  4 +-
 .../excludeddistrictids_param/valueProcess.js |  6 ++
 .../totalturnover/valueProcess.js             | 34 ++++---
 .../validparentdistricts/documentation.adoc   |  1 +
 entity/District_entity/iconIdProcess.js       |  4 +
 .../recordcontainers/db/cacheKeyProcess.js    |  6 +-
 .../recordcontainers/db/conditionProcess.js   | 19 ++--
 neonContext/District/District.aod             |  1 +
 .../DistrictFilter_view.aod                   |  7 +-
 .../OrganisationMain_view.aod                 | 10 +--
 13 files changed, 139 insertions(+), 55 deletions(-)
 create mode 100644 entity/District_entity/entityfields/district_status/valueProcess.js
 create mode 100644 entity/District_entity/entityfields/parentdistrict/children/excludeddistrictids_param/valueProcess.js
 create mode 100644 entity/District_entity/entityfields/parentdistricts/children/excludeddistrictids_param/valueProcess.js
 create mode 100644 entity/District_entity/entityfields/validparentdistricts/documentation.adoc
 create mode 100644 entity/District_entity/iconIdProcess.js

diff --git a/entity/District_entity/District_entity.aod b/entity/District_entity/District_entity.aod
index f625fd4d88..a469cee1fb 100644
--- a/entity/District_entity/District_entity.aod
+++ b/entity/District_entity/District_entity.aod
@@ -6,6 +6,7 @@
   <icon>VAADIN:GLOBE</icon>
   <title>District definition</title>
   <contentTitleProcess>%aditoprj%/entity/District_entity/contentTitleProcess.js</contentTitleProcess>
+  <iconIdProcess>%aditoprj%/entity/District_entity/iconIdProcess.js</iconIdProcess>
   <titlePlural></titlePlural>
   <recordContainer>db</recordContainer>
   <entityFields>
@@ -15,14 +16,12 @@
     <entityField>
       <name>DISTRICT_NAME</name>
       <title>Name</title>
-      <groupable v="true" />
       <mandatory v="true" />
     </entityField>
     <entityField>
       <name>DISTRICT_NUMBER</name>
       <title>{$DISTRICT_NUMBER}</title>
       <contentType>TEXT</contentType>
-      <groupable v="true" />
       <valueProcess>%aditoprj%/entity/District_entity/entityfields/district_number/valueProcess.js</valueProcess>
       <displayValueProcess>%aditoprj%/entity/District_entity/entityfields/district_number/displayValueProcess.js</displayValueProcess>
       <onValidation>%aditoprj%/entity/District_entity/entityfields/district_number/onValidation.js</onValidation>
@@ -38,14 +37,16 @@
     <entityField>
       <name>DISTRICT_STATUS</name>
       <title>Status</title>
-      <groupable v="true" />
+      <contentType>BOOLEAN</contentType>
       <mandatory v="true" />
       <dropDownProcess>%aditoprj%/entity/District_entity/entityfields/district_status/dropDownProcess.js</dropDownProcess>
       <selectionMode>SINGLE</selectionMode>
+      <valueProcess>%aditoprj%/entity/District_entity/entityfields/district_status/valueProcess.js</valueProcess>
     </entityField>
     <entityField>
       <name>PARENTDISTRICT_DISTRICTID</name>
       <title>{$DISTRICT_PARENT_DISTRICT}</title>
+      <consumer>ParentDistricts</consumer>
       <displayValueProcess>%aditoprj%/entity/District_entity/entityfields/parentdistrict_districtid/displayValueProcess.js</displayValueProcess>
       <onValueChangeTypes>
         <element>MASK</element>
@@ -62,20 +63,17 @@
     <entityField>
       <name>customerCounting</name>
       <title>Customer counting</title>
-      <groupable v="true" />
       <valueProcess>%aditoprj%/entity/District_entity/entityfields/customercounting/valueProcess.js</valueProcess>
     </entityField>
     <entityField>
       <name>totalTurnover</name>
       <title>{$DISTRICT_TOTAL_TURNOVER}</title>
-      <groupable v="true" />
       <valueProcess>%aditoprj%/entity/District_entity/entityfields/totalturnover/valueProcess.js</valueProcess>
     </entityField>
     <entityField>
       <name>ISO3</name>
       <title>Language</title>
       <consumer>Languages</consumer>
-      <groupable v="true" />
       <displayValueProcess>%aditoprj%/entity/District_entity/entityfields/iso3/displayValueProcess.js</displayValueProcess>
     </entityField>
     <entityProvider>
@@ -91,6 +89,12 @@
           <isConsumer v="false" />
         </entityDependency>
       </dependencies>
+      <children>
+        <entityParameter>
+          <name>ExcludedDistrictIds_param</name>
+          <expose v="false" />
+        </entityParameter>
+      </children>
     </entityProvider>
     <entityConsumer>
       <name>Languages</name>
@@ -128,7 +132,6 @@
     </entityField>
     <entityField>
       <name>DATE_EDIT</name>
-      <groupable v="false" />
       <valueProcess>%aditoprj%/entity/District_entity/entityfields/date_edit/valueProcess.js</valueProcess>
     </entityField>
     <entityConsumer>
@@ -206,6 +209,42 @@
       <name>#PROVIDER_AGGREGATES</name>
       <useAggregates v="true" />
     </entityProvider>
+    <entityConsumer>
+      <name>ParentDistricts</name>
+      <dependency>
+        <name>dependency</name>
+        <entityName>#ENTITY</entityName>
+        <fieldName>ValidParentDistricts</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>ExcludedDistrictIds_param</name>
+          <valueProcess>%aditoprj%/entity/District_entity/entityfields/parentdistricts/children/excludeddistrictids_param/valueProcess.js</valueProcess>
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityProvider>
+      <name>ValidParentDistricts</name>
+      <documentation>%aditoprj%/entity/District_entity/entityfields/validparentdistricts/documentation.adoc</documentation>
+      <dependencies>
+        <entityDependency>
+          <name>8b0738a4-e4cd-4f9e-8df1-f499046c81bf</name>
+          <entityName>District_entity</entityName>
+          <fieldName>ParentDistricts</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+      </dependencies>
+      <children>
+        <entityParameter>
+          <name>DistrictsByContactId_param</name>
+          <expose v="false" />
+        </entityParameter>
+      </children>
+    </entityProvider>
+    <entityParameter>
+      <name>ExcludedDistrictIds_param</name>
+      <expose v="true" />
+    </entityParameter>
   </entityFields>
   <recordContainers>
     <dbRecordContainer>
@@ -229,78 +268,86 @@
         <dbRecordFieldMapping>
           <name>DATE_EDIT.value</name>
           <recordfield>DISTRICT.DATE_EDIT</recordfield>
-          <isLookupFilter v="true" />
+          <isLookupFilter v="false" />
         </dbRecordFieldMapping>
         <dbRecordFieldMapping>
           <name>DATE_NEW.value</name>
           <recordfield>DISTRICT.DATE_NEW</recordfield>
-          <isLookupFilter v="true" />
+          <isLookupFilter v="false" />
         </dbRecordFieldMapping>
         <dbRecordFieldMapping>
           <name>DISTRICT_FILTER.value</name>
           <recordfield>DISTRICT.DISTRICT_FILTER</recordfield>
-          <isLookupFilter v="true" />
+          <isFilterable v="false" />
+          <isLookupFilter v="false" />
         </dbRecordFieldMapping>
         <dbRecordFieldMapping>
           <name>DISTRICT_INFO.value</name>
           <recordfield>DISTRICT.DISTRICT_INFO</recordfield>
-          <isLookupFilter v="true" />
+          <isFilterable v="true" />
+          <isLookupFilter v="false" />
         </dbRecordFieldMapping>
         <dbRecordFieldMapping>
           <name>DISTRICT_NAME.value</name>
           <recordfield>DISTRICT.DISTRICT_NAME</recordfield>
+          <isFilterable v="true" />
           <isLookupFilter v="true" />
         </dbRecordFieldMapping>
         <dbRecordFieldMapping>
           <name>DISTRICT_NUMBER.value</name>
           <recordfield>DISTRICT.DISTRICT_NUMBER</recordfield>
+          <isFilterable v="true" />
           <isLookupFilter v="true" />
         </dbRecordFieldMapping>
         <dbRecordFieldMapping>
           <name>DISTRICT_STATUS.value</name>
           <recordfield>DISTRICT.DISTRICT_STATUS</recordfield>
-          <isLookupFilter v="true" />
+          <isFilterable v="true" />
+          <isLookupFilter v="false" />
         </dbRecordFieldMapping>
         <dbRecordFieldMapping>
           <name>DISTRICTID.value</name>
           <recordfield>DISTRICT.DISTRICTID</recordfield>
-          <isLookupFilter v="true" />
+          <isLookupFilter v="false" />
         </dbRecordFieldMapping>
         <dbRecordFieldMapping>
           <name>ISO3.value</name>
           <recordfield>DISTRICT.ISO3</recordfield>
-          <isLookupFilter v="true" />
+          <isFilterable v="true" />
+          <isLookupFilter v="false" />
         </dbRecordFieldMapping>
         <dbRecordFieldMapping>
           <name>PARENTDISTRICT_DISTRICTID.value</name>
           <recordfield>DISTRICT.PARENTDISTRICT_DISTRICTID</recordfield>
-          <isLookupFilter v="true" />
+          <isFilterable v="true" />
+          <isLookupFilter v="false" />
         </dbRecordFieldMapping>
         <dbRecordFieldMapping>
           <name>USER_EDIT.value</name>
           <recordfield>DISTRICT.USER_EDIT</recordfield>
-          <isLookupFilter v="true" />
+          <isLookupFilter v="false" />
         </dbRecordFieldMapping>
         <dbRecordFieldMapping>
           <name>USER_NEW.value</name>
           <recordfield>DISTRICT.USER_NEW</recordfield>
-          <isLookupFilter v="true" />
+          <isFilterable v="false" />
+          <isLookupFilter v="false" />
         </dbRecordFieldMapping>
         <dbRecordFieldMapping>
           <name>appliedFilter.value</name>
-          <isLookupFilter v="true" />
+          <isLookupFilter v="false" />
         </dbRecordFieldMapping>
         <dbRecordFieldMapping>
           <name>customerCounting.value</name>
-          <isLookupFilter v="true" />
+          <isLookupFilter v="false" />
         </dbRecordFieldMapping>
         <dbRecordFieldMapping>
           <name>parentFilter.value</name>
-          <isLookupFilter v="true" />
+          <isLookupFilter v="false" />
         </dbRecordFieldMapping>
         <dbRecordFieldMapping>
           <name>totalTurnover.value</name>
-          <isLookupFilter v="true" />
+          <isLookupFilter v="false" />
         </dbRecordFieldMapping>
       </recordFieldMappings>
     </dbRecordContainer>
diff --git a/entity/District_entity/entityfields/district_status/valueProcess.js b/entity/District_entity/entityfields/district_status/valueProcess.js
new file mode 100644
index 0000000000..06be75dc39
--- /dev/null
+++ b/entity/District_entity/entityfields/district_status/valueProcess.js
@@ -0,0 +1,7 @@
+import("system.util");
+import("system.result");
+import("system.neon");
+import("system.vars");
+
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.get("$this.value") == null)
+    result.string("0");
\ No newline at end of file
diff --git a/entity/District_entity/entityfields/parentdistrict/children/excludeddistrictids_param/valueProcess.js b/entity/District_entity/entityfields/parentdistrict/children/excludeddistrictids_param/valueProcess.js
new file mode 100644
index 0000000000..bbd0a18395
--- /dev/null
+++ b/entity/District_entity/entityfields/parentdistrict/children/excludeddistrictids_param/valueProcess.js
@@ -0,0 +1,6 @@
+import("system.vars");
+import("system.result");
+
+var uid = vars.get("$field.DISTRICTID");
+var res = JSON.stringify([uid]);
+result.string(res);
\ No newline at end of file
diff --git a/entity/District_entity/entityfields/parentdistrict_districtid/displayValueProcess.js b/entity/District_entity/entityfields/parentdistrict_districtid/displayValueProcess.js
index a90a11a8f7..07a7c92ba4 100644
--- a/entity/District_entity/entityfields/parentdistrict_districtid/displayValueProcess.js
+++ b/entity/District_entity/entityfields/parentdistrict_districtid/displayValueProcess.js
@@ -1,8 +1,8 @@
+import("Context_lib");
 import("system.vars");
 import("system.result");
-import("Sql_lib");
 
 var parentDistrictId = vars.get("$field.PARENTDISTRICT_DISTRICTID");
-var parentDistrictName = newSelect("DISTRICT.DISTRICT_NAME").from("DISTRICT").where("DISTRICT.DISTRICTID", parentDistrictId).cell();
+var parentDistrictName = ContextUtils.loadContentTitle("District_entity", parentDistrictId);
 
 result.string(parentDistrictName);
\ No newline at end of file
diff --git a/entity/District_entity/entityfields/parentdistricts/children/excludeddistrictids_param/valueProcess.js b/entity/District_entity/entityfields/parentdistricts/children/excludeddistrictids_param/valueProcess.js
new file mode 100644
index 0000000000..bbd0a18395
--- /dev/null
+++ b/entity/District_entity/entityfields/parentdistricts/children/excludeddistrictids_param/valueProcess.js
@@ -0,0 +1,6 @@
+import("system.vars");
+import("system.result");
+
+var uid = vars.get("$field.DISTRICTID");
+var res = JSON.stringify([uid]);
+result.string(res);
\ No newline at end of file
diff --git a/entity/District_entity/entityfields/totalturnover/valueProcess.js b/entity/District_entity/entityfields/totalturnover/valueProcess.js
index d63350d1cb..a73247c1ab 100644
--- a/entity/District_entity/entityfields/totalturnover/valueProcess.js
+++ b/entity/District_entity/entityfields/totalturnover/valueProcess.js
@@ -1,27 +1,35 @@
+import("system.text");
+import("Sql_lib");
+import("system.SQLTYPES");
+import("Date_lib");
 import("system.logging");
 import("system.vars");
 import("system.result");
 import("system.entities");
 import("system.neon");
+import("system.db");
 
+var districtTurnover;
 var appliedFilter = vars.get("$field.DISTRICT_FILTER");
-var conf, rows, districtTurnover = 0;
-
 if (appliedFilter)
 {
     appliedFilter = JSON.parse(appliedFilter).filter;
     appliedFilter = JSON.stringify(appliedFilter);
-    
-    conf = entities.createConfigForLoadingRows()
-                        .entity("Organisation_entity")
-                        .fields(["TurnoverCurrentYear"])
-                        .filter(appliedFilter);
-                                
-    rows = entities.getRows(conf);
-    
-    for (i = 0; i < rows.length; i++) {
-        appliedFilter += Number(rows[i].TurnoverCurrentYear);
-    }
+
+    districtTurnover = newSelect("sum(NET)")
+        .from("SALESORDER")
+        .join("CONTACT", "CONTACT.CONTACTID = SALESORDER.CONTACT_ID")
+        .join("ORGANISATION", "CONTACT.ORGANISATION_ID = ORGANISATION.ORGANISATIONID")
+        .leftJoin("ADDRESS", "ADDRESS.ADDRESSID = CONTACT.ADDRESS_ID")
+        .leftJoin("CLASSIFICATIONSTORAGE", "CLASSIFICATIONSTORAGE.OBJECT_ROWID = CONTACT.CONTACTID")
+        .where("SALESORDER.SALESORDERDATE", DateUtils.getCurrentYear(), SqlBuilder.YEAR_EQUALS(), SQLTYPES.INTEGER)
+        .and(db.toFilterCondition(appliedFilter, "Organisation_entity"))
+        .cell();
 }
 
+if (districtTurnover)
+    text.formatDouble(districtTurnover, "#,##0.00");
+else
+    districtTurnover = "0";
+
 result.string(districtTurnover);
\ No newline at end of file
diff --git a/entity/District_entity/entityfields/validparentdistricts/documentation.adoc b/entity/District_entity/entityfields/validparentdistricts/documentation.adoc
new file mode 100644
index 0000000000..6882425fd2
--- /dev/null
+++ b/entity/District_entity/entityfields/validparentdistricts/documentation.adoc
@@ -0,0 +1 @@
+Provides a list of districts that can be set as parent district for one specific district entry.
\ No newline at end of file
diff --git a/entity/District_entity/iconIdProcess.js b/entity/District_entity/iconIdProcess.js
new file mode 100644
index 0000000000..c0e2f3aee7
--- /dev/null
+++ b/entity/District_entity/iconIdProcess.js
@@ -0,0 +1,4 @@
+import("system.vars");
+import("system.result");
+
+result.string("TEXT:" + (vars.getString("$field.DISTRICT_NAME")).trim());
\ No newline at end of file
diff --git a/entity/District_entity/recordcontainers/db/cacheKeyProcess.js b/entity/District_entity/recordcontainers/db/cacheKeyProcess.js
index e977dd02e2..d5c69b8e25 100644
--- a/entity/District_entity/recordcontainers/db/cacheKeyProcess.js
+++ b/entity/District_entity/recordcontainers/db/cacheKeyProcess.js
@@ -1,9 +1,5 @@
 import("CachedRecordContainer_lib");
 import("system.result");
 
-
-var cacheKey;
-
-cacheKey = CachedRecordContainerUtils.getCommonKey("$param.DistrictsByContactId_param");
-
+var cacheKey = CachedRecordContainerUtils.getCommonKey("$param.DistrictsByContactId_param", "$param.ExcludedDistrictIds_param");
 result.string(cacheKey);
\ No newline at end of file
diff --git a/entity/District_entity/recordcontainers/db/conditionProcess.js b/entity/District_entity/recordcontainers/db/conditionProcess.js
index 481f5dbd2c..550838ae02 100644
--- a/entity/District_entity/recordcontainers/db/conditionProcess.js
+++ b/entity/District_entity/recordcontainers/db/conditionProcess.js
@@ -2,9 +2,8 @@ import("system.result");
 import("system.vars");
 import("Sql_lib");
 
-
 var onlyResponsibleParam = vars.get("$param.DistrictsByContactId_param");
-
+var cond = newWhere();
 if (onlyResponsibleParam)
 {
     var responsibleDistricts = newSelect("DISTRICTRESPONSIBLE.DISTRICT_ID")
@@ -12,7 +11,15 @@ if (onlyResponsibleParam)
                                     .where("DISTRICTRESPONSIBLE.EMPLOYEE_CONTACT_ID", onlyResponsibleParam)
                                     .arrayColumn();
     
-    var cond = newWhere("DISTRICT.DISTRICTID", responsibleDistricts, SqlBuilder.IN());
-    
-    result.string(cond.toString());
-}
\ No newline at end of file
+    cond.and("DISTRICT.DISTRICTID", responsibleDistricts, SqlBuilder.IN());
+}
+
+
+var excludedDistrictIds = vars.get("$param.ExcludedDistrictIds_param");
+if (excludedDistrictIds) 
+{
+    excludedDistrictIds = JSON.parse(excludedDistrictIds);
+    cond.andIfSet("DISTRICT.DISTRICTID", excludedDistrictIds, SqlBuilder.NOT_IN());
+}
+
+result.string(cond.toString());
\ No newline at end of file
diff --git a/neonContext/District/District.aod b/neonContext/District/District.aod
index f595315a28..78099d98a2 100644
--- a/neonContext/District/District.aod
+++ b/neonContext/District/District.aod
@@ -8,6 +8,7 @@
   <filterView>DistrictFilter_view</filterView>
   <editView>DistrictEdit_view</editView>
   <previewView>DistrictPreview_view</previewView>
+  <lookupView>DistrictFilter_view</lookupView>
   <entity>District_entity</entity>
   <references>
     <neonViewReference>
diff --git a/neonView/DistrictFilter_view/DistrictFilter_view.aod b/neonView/DistrictFilter_view/DistrictFilter_view.aod
index d9ab4d5e1e..55eac41d35 100644
--- a/neonView/DistrictFilter_view/DistrictFilter_view.aod
+++ b/neonView/DistrictFilter_view/DistrictFilter_view.aod
@@ -15,9 +15,10 @@
       <hideContentSearch v="false" />
       <showChildrenCount v="false" />
       <entityField>#ENTITY</entityField>
-      <linkedColumns />
-      <defaultGroupFields />
-      <fixedFilterFields />
+      <linkedColumns>
+        <element>DISTRICT_NAME</element>
+        <element>DISTRICT_NUMBER</element>
+      </linkedColumns>
       <columns>
         <neonTreeTableColumn>
           <name>9f8e99dc-cfb3-4038-b949-27571f787db2</name>
diff --git a/neonView/OrganisationMain_view/OrganisationMain_view.aod b/neonView/OrganisationMain_view/OrganisationMain_view.aod
index 24ea1854e8..f02268bc9b 100644
--- a/neonView/OrganisationMain_view/OrganisationMain_view.aod
+++ b/neonView/OrganisationMain_view/OrganisationMain_view.aod
@@ -60,6 +60,11 @@
       <entityField>Documents</entityField>
       <view>DocumentFilter_view</view>
     </neonViewReference>
+    <neonViewReference>
+      <name>db26269b-32ae-47da-ba22-41e0a5952103</name>
+      <entityField>#ENTITY</entityField>
+      <view>OrganisationDistrictResponsibles_view</view>
+    </neonViewReference>
     <neonViewReference>
       <name>0686ad7e-8dc7-4b10-9df2-bf066ae3a310</name>
       <entityField>LogHistories</entityField>
@@ -70,10 +75,5 @@
       <entityField>SelfDuplicatesUncached</entityField>
       <view>OrganisationFilter_view</view>
     </neonViewReference>
-    <neonViewReference>
-      <name>db26269b-32ae-47da-ba22-41e0a5952103</name>
-      <entityField>#ENTITY</entityField>
-      <view>OrganisationDistrictResponsibles_view</view>
-    </neonViewReference>
   </children>
 </neonView>
-- 
GitLab


From c1d34917b464e56818051506152843de39544c2c Mon Sep 17 00:00:00 2001
From: "j.goderbauer" <j.goderbauer@adito.de>
Date: Thu, 10 Sep 2020 14:54:14 +0200
Subject: [PATCH 293/309] Districts: Layout and Bugfixing

---
 .../DistrictResponsible_entity.aod            |  7 ++++++
 .../targetcontext/valueProcess.js             |  3 +++
 entity/District_entity/District_entity.aod    |  5 ++++
 .../valueProcess.js                           |  3 +++
 .../totalturnover/valueProcess.js             |  6 ++---
 .../recordcontainers/db/conditionProcess.js   | 23 ++++++++++++++-----
 entity/Person_entity/Person_entity.aod        |  4 ++--
 .../valueProcess.js                           |  5 ++--
 .../_____LANGUAGE_de/_____LANGUAGE_de.aod     |  2 +-
 .../DistrictFilter_view.aod                   |  4 ++++
 .../DistrictList_view/DistrictList_view.aod   |  5 ++++
 .../DistrictResponsibleList_view.aod          |  1 -
 .../DistrictResponsibleMultiEdit_view.aod     |  1 -
 .../DistrictResponsiblePreviewList_view.aod   |  1 -
 neonView/PersonMain_view/PersonMain_view.aod  | 10 ++++----
 15 files changed, 57 insertions(+), 23 deletions(-)
 create mode 100644 entity/DistrictResponsible_entity/entityfields/targetcontext/valueProcess.js
 create mode 100644 entity/District_entity/entityfields/districtsbycontactid_param/valueProcess.js
 rename entity/Person_entity/entityfields/districts/children/{onlyresponsibledistricts => districtsbycontactid_param}/valueProcess.js (78%)

diff --git a/entity/DistrictResponsible_entity/DistrictResponsible_entity.aod b/entity/DistrictResponsible_entity/DistrictResponsible_entity.aod
index 0bc19e1860..bffe4b6257 100644
--- a/entity/DistrictResponsible_entity/DistrictResponsible_entity.aod
+++ b/entity/DistrictResponsible_entity/DistrictResponsible_entity.aod
@@ -87,6 +87,7 @@
       <name>DistrictResponsibles</name>
       <lookupIdfield>DISTRICTRESPONSIBLEID</lookupIdfield>
       <documentation>%aditoprj%/entity/DistrictResponsible_entity/entityfields/districtresponsibles/documentation.adoc</documentation>
+      <titlePlural>Responsibles</titlePlural>
       <dependencies>
         <entityDependency>
           <name>ef26fdb6-5fcf-416e-bcc8-380b5751b523</name>
@@ -151,6 +152,8 @@
     </entityField>
     <entityProvider>
       <name>OrganisationResponsibles</name>
+      <targetContextField>targetContext</targetContextField>
+      <targetIdField>EMPLOYEE_CONTACT_ID</targetIdField>
       <documentation>%aditoprj%/entity/DistrictResponsible_entity/entityfields/organisationresponsibles/documentation.adoc</documentation>
       <dependencies>
         <entityDependency>
@@ -188,6 +191,10 @@
       <name>PHONE</name>
       <title>Phone</title>
     </entityField>
+    <entityField>
+      <name>targetContext</name>
+      <valueProcess>%aditoprj%/entity/DistrictResponsible_entity/entityfields/targetcontext/valueProcess.js</valueProcess>
+    </entityField>
   </entityFields>
   <recordContainers>
     <dbRecordContainer>
diff --git a/entity/DistrictResponsible_entity/entityfields/targetcontext/valueProcess.js b/entity/DistrictResponsible_entity/entityfields/targetcontext/valueProcess.js
new file mode 100644
index 0000000000..8ba819b0b1
--- /dev/null
+++ b/entity/DistrictResponsible_entity/entityfields/targetcontext/valueProcess.js
@@ -0,0 +1,3 @@
+import("system.result");
+
+result.string("Person");
\ No newline at end of file
diff --git a/entity/District_entity/District_entity.aod b/entity/District_entity/District_entity.aod
index a469cee1fb..b42efad4e6 100644
--- a/entity/District_entity/District_entity.aod
+++ b/entity/District_entity/District_entity.aod
@@ -94,6 +94,10 @@
           <name>ExcludedDistrictIds_param</name>
           <expose v="false" />
         </entityParameter>
+        <entityParameter>
+          <name>DistrictsByContactId_param</name>
+          <mandatory v="true" />
+        </entityParameter>
       </children>
     </entityProvider>
     <entityConsumer>
@@ -193,6 +197,7 @@
     </entityField>
     <entityParameter>
       <name>DistrictsByContactId_param</name>
+      <valueProcess>%aditoprj%/entity/District_entity/entityfields/districtsbycontactid_param/valueProcess.js</valueProcess>
       <expose v="true" />
     </entityParameter>
     <entityField>
diff --git a/entity/District_entity/entityfields/districtsbycontactid_param/valueProcess.js b/entity/District_entity/entityfields/districtsbycontactid_param/valueProcess.js
new file mode 100644
index 0000000000..289f9107d4
--- /dev/null
+++ b/entity/District_entity/entityfields/districtsbycontactid_param/valueProcess.js
@@ -0,0 +1,3 @@
+import("system.result");
+
+result.string("$$$###ignore_param###$$$");//dummy value, for special treatment in the conditionProcess
\ No newline at end of file
diff --git a/entity/District_entity/entityfields/totalturnover/valueProcess.js b/entity/District_entity/entityfields/totalturnover/valueProcess.js
index a73247c1ab..40d9732b34 100644
--- a/entity/District_entity/entityfields/totalturnover/valueProcess.js
+++ b/entity/District_entity/entityfields/totalturnover/valueProcess.js
@@ -22,13 +22,13 @@ if (appliedFilter)
         .join("ORGANISATION", "CONTACT.ORGANISATION_ID = ORGANISATION.ORGANISATIONID")
         .leftJoin("ADDRESS", "ADDRESS.ADDRESSID = CONTACT.ADDRESS_ID")
         .leftJoin("CLASSIFICATIONSTORAGE", "CLASSIFICATIONSTORAGE.OBJECT_ROWID = CONTACT.CONTACTID")
-        .where("SALESORDER.SALESORDERDATE", DateUtils.getCurrentYear(), SqlBuilder.YEAR_EQUALS(), SQLTYPES.INTEGER)
-        .and(db.toFilterCondition(appliedFilter, "Organisation_entity"))
+        .where(db.toFilterCondition(appliedFilter, "Organisation_entity"))
+        //.and("SALESORDER.SALESORDERDATE", DateUtils.getCurrentYear(), SqlBuilder.YEAR_EQUALS(), SQLTYPES.INTEGER)
         .cell();
 }
 
 if (districtTurnover)
-    text.formatDouble(districtTurnover, "#,##0.00");
+    districtTurnover = text.formatDouble(districtTurnover, "#,##0.00", true);
 else
     districtTurnover = "0";
 
diff --git a/entity/District_entity/recordcontainers/db/conditionProcess.js b/entity/District_entity/recordcontainers/db/conditionProcess.js
index 550838ae02..8329757ab9 100644
--- a/entity/District_entity/recordcontainers/db/conditionProcess.js
+++ b/entity/District_entity/recordcontainers/db/conditionProcess.js
@@ -6,12 +6,23 @@ var onlyResponsibleParam = vars.get("$param.DistrictsByContactId_param");
 var cond = newWhere();
 if (onlyResponsibleParam)
 {
-    var responsibleDistricts = newSelect("DISTRICTRESPONSIBLE.DISTRICT_ID")
-                                    .from("DISTRICTRESPONSIBLE")
-                                    .where("DISTRICTRESPONSIBLE.EMPLOYEE_CONTACT_ID", onlyResponsibleParam)
-                                    .arrayColumn();
-    
-    cond.and("DISTRICT.DISTRICTID", responsibleDistricts, SqlBuilder.IN());
+    //dummy value, if the dummy value is here, we can safely ignore that param, otherwise we need to filter the district list
+    if (onlyResponsibleParam != "$$$###ignore_param###$$$")
+    {
+        var responsibleDistricts = newSelect("DISTRICTRESPONSIBLE.DISTRICT_ID")
+                                        .from("DISTRICTRESPONSIBLE")
+                                        .where("DISTRICTRESPONSIBLE.EMPLOYEE_CONTACT_ID", onlyResponsibleParam)
+                                        .arrayColumn();
+
+        cond.and("DISTRICT.DISTRICTID", responsibleDistricts, SqlBuilder.IN());
+    }
+}
+else
+{
+    //this will happen if the param was specified but is empty. This happen when you use the  consumer "ResponsibleDistricts" because the 
+    //parameter "DistrictsByContactId_param" is mandatory in that case. If the value is empty we must not return any data because we would see all
+    //districts otherwise
+    cond.and("1 = 2");
 }
 
 
diff --git a/entity/Person_entity/Person_entity.aod b/entity/Person_entity/Person_entity.aod
index 63484e094c..2cc3bad53c 100644
--- a/entity/Person_entity/Person_entity.aod
+++ b/entity/Person_entity/Person_entity.aod
@@ -1320,8 +1320,8 @@
       </dependency>
       <children>
         <entityParameter>
-          <name>OnlyResponsibleDistricts</name>
-          <valueProcess>%aditoprj%/entity/Person_entity/entityfields/districts/children/onlyresponsibledistricts/valueProcess.js</valueProcess>
+          <name>DistrictsByContactId_param</name>
+          <valueProcess>%aditoprj%/entity/Person_entity/entityfields/districts/children/districtsbycontactid_param/valueProcess.js</valueProcess>
         </entityParameter>
       </children>
     </entityConsumer>
diff --git a/entity/Person_entity/entityfields/districts/children/onlyresponsibledistricts/valueProcess.js b/entity/Person_entity/entityfields/districts/children/districtsbycontactid_param/valueProcess.js
similarity index 78%
rename from entity/Person_entity/entityfields/districts/children/onlyresponsibledistricts/valueProcess.js
rename to entity/Person_entity/entityfields/districts/children/districtsbycontactid_param/valueProcess.js
index e1c2fe5e69..e32550b2a4 100644
--- a/entity/Person_entity/entityfields/districts/children/onlyresponsibledistricts/valueProcess.js
+++ b/entity/Person_entity/entityfields/districts/children/districtsbycontactid_param/valueProcess.js
@@ -2,9 +2,8 @@ import("system.vars");
 import("system.result");
 import("Employee_lib");
 
-
 var contactId = vars.get("$field.CONTACTID");
-
-if (EmployeeUtils.isUser(contactId)) {
+if (EmployeeUtils.isUser(contactId)) 
+{
     result.string(contactId);
 } 
\ No newline at end of file
diff --git a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
index c72543f26b..a819b77306 100644
--- a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
+++ b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
@@ -9325,7 +9325,7 @@ Bitte Datumseingabe prüfen</value>
     </entry>
     <entry>
       <key>Responsibles</key>
-      <value>Gebietsverantwortliche</value>
+      <value>Verantwortliche</value>
     </entry>
     <entry>
       <key>Districts</key>
diff --git a/neonView/DistrictFilter_view/DistrictFilter_view.aod b/neonView/DistrictFilter_view/DistrictFilter_view.aod
index 55eac41d35..0ae033d234 100644
--- a/neonView/DistrictFilter_view/DistrictFilter_view.aod
+++ b/neonView/DistrictFilter_view/DistrictFilter_view.aod
@@ -20,6 +20,10 @@
         <element>DISTRICT_NUMBER</element>
       </linkedColumns>
       <columns>
+        <neonTreeTableColumn>
+          <name>923c5603-ed8f-4924-8a1d-9f6cc0d170e6</name>
+          <entityField>#ICON</entityField>
+        </neonTreeTableColumn>
         <neonTreeTableColumn>
           <name>9f8e99dc-cfb3-4038-b949-27571f787db2</name>
           <entityField>DISTRICT_NAME</entityField>
diff --git a/neonView/DistrictList_view/DistrictList_view.aod b/neonView/DistrictList_view/DistrictList_view.aod
index 4525f95ab6..161c81303a 100644
--- a/neonView/DistrictList_view/DistrictList_view.aod
+++ b/neonView/DistrictList_view/DistrictList_view.aod
@@ -13,6 +13,7 @@
       <name>treeTableViewTemplate</name>
       <parentField>PARENTDISTRICT_DISTRICTID</parentField>
       <hideActions v="true" />
+      <showChildrenCount v="false" />
       <entityField>#ENTITY</entityField>
       <linkedColumns />
       <defaultGroupFields />
@@ -22,6 +23,10 @@
       <isDeletable v="false" />
       <isEditable v="false" />
       <columns>
+        <neonTreeTableColumn>
+          <name>6c3d52d5-8a51-4fd5-9b26-a54485c8f5a6</name>
+          <entityField>#ICON</entityField>
+        </neonTreeTableColumn>
         <neonTreeTableColumn>
           <name>15a66360-dff7-4d21-b4e1-f48102f0bda1</name>
           <entityField>DISTRICT_NAME</entityField>
diff --git a/neonView/DistrictResponsibleList_view/DistrictResponsibleList_view.aod b/neonView/DistrictResponsibleList_view/DistrictResponsibleList_view.aod
index 9a9327680d..2d6c800894 100644
--- a/neonView/DistrictResponsibleList_view/DistrictResponsibleList_view.aod
+++ b/neonView/DistrictResponsibleList_view/DistrictResponsibleList_view.aod
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.6">
   <name>DistrictResponsibleList_view</name>
-  <title>Responsibles</title>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <layout>
     <noneLayout>
diff --git a/neonView/DistrictResponsibleMultiEdit_view/DistrictResponsibleMultiEdit_view.aod b/neonView/DistrictResponsibleMultiEdit_view/DistrictResponsibleMultiEdit_view.aod
index 5446115f96..b03d4f1669 100644
--- a/neonView/DistrictResponsibleMultiEdit_view/DistrictResponsibleMultiEdit_view.aod
+++ b/neonView/DistrictResponsibleMultiEdit_view/DistrictResponsibleMultiEdit_view.aod
@@ -12,7 +12,6 @@
     <genericMultipleViewTemplate>
       <name>genericViewTemplate</name>
       <entityField>#ENTITY</entityField>
-      <title>Responsible</title>
       <columns>
         <neonGenericMultipleTableColumn>
           <name>e1988e26-68a4-4a96-a484-4d9f7506505d</name>
diff --git a/neonView/DistrictResponsiblePreviewList_view/DistrictResponsiblePreviewList_view.aod b/neonView/DistrictResponsiblePreviewList_view/DistrictResponsiblePreviewList_view.aod
index d04097450b..7e50b1a724 100644
--- a/neonView/DistrictResponsiblePreviewList_view/DistrictResponsiblePreviewList_view.aod
+++ b/neonView/DistrictResponsiblePreviewList_view/DistrictResponsiblePreviewList_view.aod
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.6">
   <name>DistrictResponsiblePreviewList_view</name>
-  <title>Contactperson</title>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <layout>
     <noneLayout>
diff --git a/neonView/PersonMain_view/PersonMain_view.aod b/neonView/PersonMain_view/PersonMain_view.aod
index 1151edfebd..918eaa3936 100644
--- a/neonView/PersonMain_view/PersonMain_view.aod
+++ b/neonView/PersonMain_view/PersonMain_view.aod
@@ -49,6 +49,11 @@
       <entityField>Documents</entityField>
       <view>DocumentFilter_view</view>
     </neonViewReference>
+    <neonViewReference>
+      <name>f826f154-bf7f-4c7e-9ce2-3105cc629851</name>
+      <entityField>#ENTITY</entityField>
+      <view>PersonDistricts_view</view>
+    </neonViewReference>
     <neonViewReference>
       <name>5754fc3a-c81c-42ba-90ea-2859b10bb391</name>
       <entityField>LogHistories</entityField>
@@ -64,10 +69,5 @@
       <entityField>SelfDuplicatesUncached</entityField>
       <view>PersonFilter_view</view>
     </neonViewReference>
-    <neonViewReference>
-      <name>f826f154-bf7f-4c7e-9ce2-3105cc629851</name>
-      <entityField>#ENTITY</entityField>
-      <view>PersonDistricts_view</view>
-    </neonViewReference>
   </children>
 </neonView>
-- 
GitLab


From f458af871f61c598c6a5364068fd7e23a530864e Mon Sep 17 00:00:00 2001
From: "j.goderbauer" <j.goderbauer@adito.de>
Date: Thu, 10 Sep 2020 16:27:47 +0200
Subject: [PATCH 294/309] Bugfix: COMMUNICATION-table had wrong datatypes;
 links for communication phone or email did not work

---
 .../alter_ComunicationMedium_IdDatatype.xml   | 48 +++++++++++++++++++
 .../Data_alias/basic/2020.2.0/changelog.xml   |  1 +
 aliasDefinition/Data_alias/Data_alias.aod     |  2 +-
 3 files changed, 50 insertions(+), 1 deletion(-)
 create mode 100644 .liquibase/Data_alias/basic/2020.2.0/alter_ComunicationMedium_IdDatatype.xml

diff --git a/.liquibase/Data_alias/basic/2020.2.0/alter_ComunicationMedium_IdDatatype.xml b/.liquibase/Data_alias/basic/2020.2.0/alter_ComunicationMedium_IdDatatype.xml
new file mode 100644
index 0000000000..ec7089c394
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2020.2.0/alter_ComunicationMedium_IdDatatype.xml
@@ -0,0 +1,48 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+                   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">   
+    <!--*****
+        The data type has been changed by accident to CHAR(36) so let's change it back to VARCHAR(36) and update the data that is already persistant.
+        Tested on Apache Derby DB.
+    ******-->
+    <!--first: remove the index (if it's there) because on some dbms this prevents the column from changing/dropping-->
+    <changeSet author="j.goderbauer" id="763ea49e-8c9b-4262-9e2a-c59488358cd4">
+        <preConditions onFail="MARK_RAN">
+            <indexExists indexName="IDX_COMMUNICATION_MEDIUM_ID" tableName="COMMUNICATION"/>
+        </preConditions>
+        <dropIndex indexName="IDX_COMMUNICATION_MEDIUM_ID" tableName="COMMUNICATION" />
+    </changeSet>
+    <!--second: change the type, dependent on the dbms-->
+    <changeSet dbms="derby" author="j.goderbauer" id="c6e4a017-6e48-4238-80d7-41e2b210874d">
+        <sql>
+            ALTER TABLE COMMUNICATION ADD COLUMN MEDIUM_ID_NEW VARCHAR(36);
+            UPDATE COMMUNICATION SET MEDIUM_ID_NEW=MEDIUM_ID;
+            ALTER TABLE COMMUNICATION DROP COLUMN MEDIUM_ID;
+            RENAME COLUMN COMMUNICATION.MEDIUM_ID_NEW TO MEDIUM_ID;
+        </sql>
+    </changeSet>
+    <changeSet dbms="!derby" author="j.goderbauer" id="fbee4d8c-681d-4bea-b665-9fa951c3daa8">
+        <modifyDataType tableName="COMMUNICATION" columnName="MEDIUM_ID" newDataType="VARCHAR(36);"/>
+    </changeSet>
+    <!--third: update data that now contains the data with spaces at the end-->
+    <!--MS SQL supports the regular trim-function with  MS SQL 2017 or higher, so lets use the old ltrim/rtrim functions for better compability -->
+    <!--sauce: https://docs.microsoft.com/de-de/sql/t-sql/functions/trim-transact-sql?view=sql-server-ver15-->
+    <changeSet dbms="mssql" author="j.goderbauer" id="74b69edd-74f6-42c6-8164-e41614b47140">
+        <update tableName="COMMUNICATION">
+            <column name="MEDIUM_ID" valueComputed="ltrim(rtrim(MEDIUM_ID))" />
+            <where>MEDIUM_ID is not null</where>
+        </update>
+    </changeSet>
+    <changeSet dbms="!mssql" author="j.goderbauer" id="ee6466ce-ef57-44fd-b3c7-4e8fe305f25e">
+        <update tableName="COMMUNICATION">
+            <column name="MEDIUM_ID" valueComputed="trim(MEDIUM_ID)" />
+            <where>MEDIUM_ID is not null</where>
+        </update>
+    </changeSet>
+    <!--fourth: recreate the index with the original name-->
+    <changeSet author="j.goderbauer" id="071450d1-2cd6-487e-9b12-7f8b042f179c">
+        <createIndex indexName="IDX_COMMUNICATION_MEDIUM_ID" tableName="COMMUNICATION">
+            <column name="MEDIUM_ID"/>
+        </createIndex>
+    </changeSet>
+</databaseChangeLog>
diff --git a/.liquibase/Data_alias/basic/2020.2.0/changelog.xml b/.liquibase/Data_alias/basic/2020.2.0/changelog.xml
index 21311ae8db..7f2c9ff325 100644
--- a/.liquibase/Data_alias/basic/2020.2.0/changelog.xml
+++ b/.liquibase/Data_alias/basic/2020.2.0/changelog.xml
@@ -7,4 +7,5 @@
     <include relativeToChangelogFile="true" file="LeadimportMappingAssistant/changelog.xml"/>
     <include relativeToChangelogFile="true" file="optimizeIndizes.xml"/>
     <include relativeToChangelogFile="true" file="addNotificationStateKeywords/addNotificationStateKeyword.xml"/>
+    <include relativeToChangelogFile="true" file="alter_ComunicationMedium_IdDatatype.xml"/>
 </databaseChangeLog>
diff --git a/aliasDefinition/Data_alias/Data_alias.aod b/aliasDefinition/Data_alias/Data_alias.aod
index 9b001a59e7..a076f2356b 100644
--- a/aliasDefinition/Data_alias/Data_alias.aod
+++ b/aliasDefinition/Data_alias/Data_alias.aod
@@ -1208,7 +1208,7 @@
                 <name>MEDIUM_ID</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="1" />
+                <columnType v="12" />
                 <size v="36" />
                 <scale v="0" />
                 <notNull v="false" />
-- 
GitLab


From 4d6f89f0fe269e83b708b3e2fc0e73175d3930e3 Mon Sep 17 00:00:00 2001
From: "a.schindlbeck" <a.schindlbeck@adito.de>
Date: Fri, 11 Sep 2020 11:47:25 +0200
Subject: [PATCH 295/309] Favorites: grouping titles work

---
 neonView/FavoriteFilter_view/FavoriteFilter_view.aod | 1 -
 1 file changed, 1 deletion(-)

diff --git a/neonView/FavoriteFilter_view/FavoriteFilter_view.aod b/neonView/FavoriteFilter_view/FavoriteFilter_view.aod
index 8c10293e8a..15187d3318 100644
--- a/neonView/FavoriteFilter_view/FavoriteFilter_view.aod
+++ b/neonView/FavoriteFilter_view/FavoriteFilter_view.aod
@@ -29,7 +29,6 @@
   <children>
     <treeTableViewTemplate>
       <name>FavoriteTree</name>
-      <parentField>TITLE</parentField>
       <entityField>#ENTITY</entityField>
       <defaultGroupFields>
         <element>GROUP_TITLE</element>
-- 
GitLab


From 6aa714985ef85073e03a1426b9a1c287b4ce5784 Mon Sep 17 00:00:00 2001
From: "j.goderbauer" <j.goderbauer@adito.de>
Date: Fri, 11 Sep 2020 13:30:04 +0200
Subject: [PATCH 296/309] ScanServices: several fixes

---
 .aditoprj/ignoredScanServiceTasks.json        |    6 +
 .../_____SYSTEMALIAS/_____SYSTEMALIAS.aod     | 1868 +++--------------
 .../ClassificationAdmin_entity.aod            |    1 -
 .../entityfields/uid/linkedContextProcess.js  |    0
 .../excludeddistrictids_param/valueProcess.js |    6 -
 entity/Language_entity/Language_entity.aod    |    5 +
 .../entityfields/iso3name/documentation.adoc  |    6 +
 .../iso3namefiltered/documentation.adoc       |    6 +
 .../recordcontainers/db/cacheKeyProcess.js    |    6 +
 .../LogHistory_entity/LogHistory_entity.aod   |    2 +
 .../loghistoryprovider/documentation.adoc     |    3 +
 .../tablenames_param/documentation.adoc       |   10 +
 .../Notification_entity.aod                   |    7 -
 entity/TaskLink_entity/TaskLink_entity.aod    |    1 +
 .../entityfields/link/documentation.adoc      |    3 +
 entity/Task_entity/Task_entity.aod            |    1 +
 .../entityfields/tasks/documentation.adoc     |    1 +
 .../_____LANGUAGE_EXTRA.aod                   |    3 +
 .../_____LANGUAGE_de/_____LANGUAGE_de.aod     |    3 +
 .../_____LANGUAGE_en/_____LANGUAGE_en.aod     |    3 +
 neonContext/Classification/Classification.aod |    4 +-
 .../ClassificationPreview_view.aod            |   36 +-
 .../ClassificatonPreview_view.aod             |   43 -
 23 files changed, 412 insertions(+), 1612 deletions(-)
 delete mode 100644 entity/ClassificationAdmin_entity/entityfields/uid/linkedContextProcess.js
 delete mode 100644 entity/District_entity/entityfields/parentdistrict/children/excludeddistrictids_param/valueProcess.js
 create mode 100644 entity/Language_entity/entityfields/iso3name/documentation.adoc
 create mode 100644 entity/Language_entity/entityfields/iso3namefiltered/documentation.adoc
 create mode 100644 entity/Language_entity/recordcontainers/db/cacheKeyProcess.js
 create mode 100644 entity/LogHistory_entity/entityfields/loghistoryprovider/documentation.adoc
 create mode 100644 entity/LogHistory_entity/entityfields/tablenames_param/documentation.adoc
 create mode 100644 entity/TaskLink_entity/entityfields/link/documentation.adoc
 create mode 100644 entity/Task_entity/entityfields/tasks/documentation.adoc
 delete mode 100644 neonView/ClassificatonPreview_view/ClassificatonPreview_view.aod

diff --git a/.aditoprj/ignoredScanServiceTasks.json b/.aditoprj/ignoredScanServiceTasks.json
index 9885aa1275..876fa8e775 100644
--- a/.aditoprj/ignoredScanServiceTasks.json
+++ b/.aditoprj/ignoredScanServiceTasks.json
@@ -35,6 +35,12 @@
       "line": -1,
       "description": "The table \"DATABASECHANGELOG\" has no primary key [65]",
       "groupName": "nb-tasklist-warning"
+    },
+    {
+      "target": "aliasDefinition/_____SYSTEMALIAS/_____SYSTEMALIAS.aod",
+      "line": -1,
+      "description": "There is no index for the column \"DEPLOYMENT_ID\" in the table \"DATABASECHANGELOG\" [59]",
+      "groupName": "nb-tasklist-warning"
     }
   ]
 }
\ No newline at end of file
diff --git a/aliasDefinition/_____SYSTEMALIAS/_____SYSTEMALIAS.aod b/aliasDefinition/_____SYSTEMALIAS/_____SYSTEMALIAS.aod
index 5d7d8837e5..6f4f1b2dca 100644
--- a/aliasDefinition/_____SYSTEMALIAS/_____SYSTEMALIAS.aod
+++ b/aliasDefinition/_____SYSTEMALIAS/_____SYSTEMALIAS.aod
@@ -19,9 +19,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
-                <size v="0" />
-                <scale v="0" />
-                <notNull v="true" />
+                <size v="29" />
+                <scale v="9" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -32,9 +32,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
-                <size v="0" />
-                <scale v="0" />
-                <notNull v="true" />
+                <size v="29" />
+                <scale v="9" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -47,7 +47,7 @@
                 <columnType v="12" />
                 <size v="255" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -58,9 +58,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="2004" />
-                <size v="0" />
+                <size v="2147483647" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -73,7 +73,7 @@
                 <columnType v="1" />
                 <size v="63" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="true" />
                 <index v="true" />
                 <title></title>
@@ -84,9 +84,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="4" />
-                <size v="0" />
+                <size v="10" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -99,9 +99,9 @@
                 <columnType v="12" />
                 <size v="63" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
-                <index v="true" />
+                <index v="false" />
                 <title></title>
                 <description></description>
               </entityFieldDb>
@@ -112,7 +112,7 @@
                 <columnType v="12" />
                 <size v="63" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -125,7 +125,7 @@
                 <columnType v="12" />
                 <size v="63" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -138,7 +138,7 @@
                 <columnType v="12" />
                 <size v="63" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -149,9 +149,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="2004" />
-                <size v="0" />
+                <size v="2147483647" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -172,9 +172,9 @@
                 <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
-                <index v="true" />
+                <index v="false" />
                 <title></title>
                 <description></description>
               </entityFieldDb>
@@ -183,9 +183,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="4" />
-                <size v="0" />
+                <size v="10" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -196,9 +196,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="4" />
-                <size v="0" />
+                <size v="10" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -211,7 +211,7 @@
                 <columnType v="12" />
                 <size v="127" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="true" />
                 <index v="true" />
                 <title></title>
@@ -231,9 +231,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="2004" />
-                <size v="0" />
+                <size v="2147483647" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -246,7 +246,7 @@
                 <columnType v="12" />
                 <size v="31" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -257,9 +257,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="-5" />
-                <size v="0" />
+                <size v="19" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -270,9 +270,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
-                <size v="0" />
-                <scale v="0" />
-                <notNull v="true" />
+                <size v="29" />
+                <scale v="9" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -283,9 +283,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
-                <size v="0" />
-                <scale v="0" />
-                <notNull v="true" />
+                <size v="29" />
+                <scale v="9" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -298,7 +298,7 @@
                 <columnType v="12" />
                 <size v="127" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -311,7 +311,7 @@
                 <columnType v="12" />
                 <size v="127" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -324,7 +324,7 @@
                 <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="true" />
                 <index v="true" />
                 <title></title>
@@ -337,7 +337,7 @@
                 <columnType v="12" />
                 <size v="255" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -350,7 +350,7 @@
                 <columnType v="12" />
                 <size v="127" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -363,7 +363,7 @@
                 <columnType v="12" />
                 <size v="1024" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -374,9 +374,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="2004" />
-                <size v="0" />
+                <size v="2147483647" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -389,7 +389,7 @@
                 <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="true" />
                 <title></title>
@@ -402,7 +402,7 @@
                 <columnType v="12" />
                 <size v="127" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -415,7 +415,7 @@
                 <columnType v="12" />
                 <size v="63" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -428,7 +428,7 @@
                 <columnType v="12" />
                 <size v="63" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -447,9 +447,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="4" />
-                <size v="0" />
+                <size v="10" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -462,7 +462,7 @@
                 <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="true" />
                 <index v="true" />
                 <title></title>
@@ -473,11 +473,11 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
-                <size v="0" />
-                <scale v="0" />
-                <notNull v="true" />
+                <size v="29" />
+                <scale v="9" />
+                <notNull v="false" />
                 <isUnique v="false" />
-                <index v="true" />
+                <index v="false" />
                 <title></title>
                 <description></description>
               </entityFieldDb>
@@ -486,11 +486,11 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
-                <size v="0" />
-                <scale v="0" />
-                <notNull v="true" />
+                <size v="29" />
+                <scale v="9" />
+                <notNull v="false" />
                 <isUnique v="false" />
-                <index v="true" />
+                <index v="false" />
                 <title></title>
                 <description></description>
               </entityFieldDb>
@@ -501,9 +501,9 @@
                 <columnType v="12" />
                 <size v="512" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
-                <index v="true" />
+                <index v="false" />
                 <title></title>
                 <description></description>
               </entityFieldDb>
@@ -512,11 +512,11 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
-                <size v="0" />
-                <scale v="0" />
-                <notNull v="true" />
+                <size v="29" />
+                <scale v="9" />
+                <notNull v="false" />
                 <isUnique v="false" />
-                <index v="true" />
+                <index v="false" />
                 <title></title>
                 <description></description>
               </entityFieldDb>
@@ -525,11 +525,11 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="4" />
-                <size v="0" />
+                <size v="10" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
-                <index v="true" />
+                <index v="false" />
                 <title></title>
                 <description></description>
               </entityFieldDb>
@@ -538,9 +538,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="4" />
-                <size v="0" />
+                <size v="10" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -551,9 +551,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="4" />
-                <size v="0" />
+                <size v="10" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -564,11 +564,11 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
-                <size v="0" />
-                <scale v="0" />
-                <notNull v="true" />
+                <size v="29" />
+                <scale v="9" />
+                <notNull v="false" />
                 <isUnique v="false" />
-                <index v="true" />
+                <index v="false" />
                 <title></title>
                 <description></description>
               </entityFieldDb>
@@ -579,9 +579,9 @@
                 <columnType v="12" />
                 <size v="255" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
-                <index v="true" />
+                <index v="false" />
                 <title></title>
                 <description></description>
               </entityFieldDb>
@@ -592,7 +592,7 @@
                 <columnType v="12" />
                 <size v="255" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -605,7 +605,7 @@
                 <columnType v="12" />
                 <size v="255" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -616,11 +616,11 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
-                <size v="0" />
-                <scale v="0" />
-                <notNull v="true" />
+                <size v="29" />
+                <scale v="9" />
+                <notNull v="false" />
                 <isUnique v="false" />
-                <index v="true" />
+                <index v="false" />
                 <title></title>
                 <description></description>
               </entityFieldDb>
@@ -631,9 +631,9 @@
                 <columnType v="12" />
                 <size v="32" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
-                <index v="true" />
+                <index v="false" />
                 <title></title>
                 <description></description>
               </entityFieldDb>
@@ -644,7 +644,7 @@
                 <columnType v="12" />
                 <size v="255" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -657,7 +657,7 @@
                 <columnType v="1" />
                 <size v="1" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -668,9 +668,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="2005" />
-                <size v="0" />
+                <size v="2147483647" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -691,7 +691,7 @@
                 <columnType v="12" />
                 <size v="127" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -700,12 +700,12 @@
               <entityFieldDb>
                 <name>DBID</name>
                 <dbName></dbName>
-                <primaryKey v="false" />
+                <primaryKey v="true" />
                 <columnType v="12" />
-                <size v="1023" />
+                <size v="191" />
                 <scale v="0" />
                 <notNull v="true" />
-                <isUnique v="false" />
+                <isUnique v="true" />
                 <index v="true" />
                 <title></title>
                 <description></description>
@@ -717,7 +717,7 @@
                 <columnType v="12" />
                 <size v="127" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -730,7 +730,7 @@
                 <columnType v="12" />
                 <size v="127" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -743,9 +743,9 @@
                 <columnType v="12" />
                 <size v="512" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
-                <index v="true" />
+                <index v="false" />
                 <title></title>
                 <description></description>
               </entityFieldDb>
@@ -756,7 +756,7 @@
                 <columnType v="12" />
                 <size v="255" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -769,7 +769,7 @@
                 <columnType v="12" />
                 <size v="1023" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -778,13 +778,13 @@
               <entityFieldDb>
                 <name>ID</name>
                 <dbName></dbName>
-                <primaryKey v="true" />
+                <primaryKey v="false" />
                 <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
-                <notNull v="false" />
-                <isUnique v="true" />
-                <index v="true" />
+                <notNull v="true" />
+                <isUnique v="false" />
+                <index v="false" />
                 <title></title>
                 <description></description>
               </entityFieldDb>
@@ -795,7 +795,7 @@
                 <columnType v="12" />
                 <size v="2000" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -814,9 +814,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
-                <size v="0" />
-                <scale v="0" />
-                <notNull v="true" />
+                <size v="29" />
+                <scale v="9" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -827,9 +827,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
-                <size v="0" />
-                <scale v="0" />
-                <notNull v="true" />
+                <size v="29" />
+                <scale v="9" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -842,7 +842,7 @@
                 <columnType v="12" />
                 <size v="63" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="true" />
                 <title></title>
@@ -855,7 +855,7 @@
                 <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="true" />
                 <index v="true" />
                 <title></title>
@@ -868,7 +868,7 @@
                 <columnType v="12" />
                 <size v="63" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="true" />
                 <title></title>
@@ -881,9 +881,9 @@
                 <columnType v="12" />
                 <size v="1024" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
-                <index v="true" />
+                <index v="false" />
                 <title></title>
                 <description></description>
               </entityFieldDb>
@@ -894,9 +894,9 @@
                 <columnType v="12" />
                 <size v="1024" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
-                <index v="true" />
+                <index v="false" />
                 <title></title>
                 <description></description>
               </entityFieldDb>
@@ -905,9 +905,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="2005" />
-                <size v="0" />
+                <size v="2147483647" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -928,9 +928,9 @@
                 <columnType v="12" />
                 <size v="63" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
-                <index v="true" />
+                <index v="false" />
                 <title></title>
                 <description></description>
               </entityFieldDb>
@@ -939,9 +939,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
-                <size v="0" />
-                <scale v="0" />
-                <notNull v="true" />
+                <size v="29" />
+                <scale v="9" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -952,9 +952,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
-                <size v="0" />
-                <scale v="0" />
-                <notNull v="true" />
+                <size v="29" />
+                <scale v="9" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -964,10 +964,10 @@
                 <name>DESCRIPTION</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="255" />
+                <columnType v="2005" />
+                <size v="2147483647" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -978,9 +978,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="2004" />
-                <size v="0" />
+                <size v="2147483647" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -993,7 +993,7 @@
                 <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="true" />
                 <index v="true" />
                 <title></title>
@@ -1004,9 +1004,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="4" />
-                <size v="0" />
+                <size v="10" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -1019,8 +1019,8 @@
                 <columnType v="12" />
                 <size v="63" />
                 <scale v="0" />
-                <notNull v="false" />
-                <isUnique v="true" />
+                <notNull v="true" />
+                <isUnique v="false" />
                 <index v="false" />
                 <title></title>
                 <description></description>
@@ -1032,7 +1032,7 @@
                 <columnType v="12" />
                 <size v="63" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -1045,7 +1045,7 @@
                 <columnType v="12" />
                 <size v="63" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -1058,7 +1058,7 @@
                 <columnType v="12" />
                 <size v="63" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -1071,7 +1071,7 @@
                 <columnType v="12" />
                 <size v="63" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -1084,7 +1084,7 @@
                 <columnType v="12" />
                 <size v="63" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -1095,9 +1095,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="2004" />
-                <size v="0" />
+                <size v="2147483647" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -1118,7 +1118,7 @@
                 <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="true" />
                 <title></title>
@@ -1131,7 +1131,7 @@
                 <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="true" />
                 <index v="true" />
                 <title></title>
@@ -1142,9 +1142,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
-                <size v="16" />
+                <size v="15" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="true" />
                 <title></title>
@@ -1157,7 +1157,7 @@
                 <columnType v="12" />
                 <size v="63" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="true" />
                 <title></title>
@@ -1170,7 +1170,7 @@
                 <columnType v="12" />
                 <size v="15" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -1190,9 +1190,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="4" />
-                <size v="0" />
+                <size v="10" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -1205,7 +1205,7 @@
                 <columnType v="12" />
                 <size v="63" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -1218,7 +1218,7 @@
                 <columnType v="12" />
                 <size v="63" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -1231,7 +1231,7 @@
                 <columnType v="12" />
                 <size v="1023" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -1242,9 +1242,9 @@
                 <dbName></dbName>
                 <primaryKey v="true" />
                 <columnType v="1" />
-                <size v="63" />
+                <size v="36" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="true" />
                 <index v="true" />
                 <title></title>
@@ -1255,9 +1255,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="2005" />
-                <size v="0" />
+                <size v="2147483647" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -1268,9 +1268,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="4" />
-                <size v="0" />
+                <size v="10" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -1283,7 +1283,7 @@
                 <columnType v="12" />
                 <size v="63" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -1294,9 +1294,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="4" />
-                <size v="0" />
+                <size v="10" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -1307,9 +1307,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="4" />
-                <size v="0" />
+                <size v="10" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -1328,9 +1328,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="2005" />
-                <size v="0" />
+                <size v="2147483647" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -1343,7 +1343,7 @@
                 <columnType v="12" />
                 <size v="512" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -1356,7 +1356,7 @@
                 <columnType v="12" />
                 <size v="1023" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -1367,9 +1367,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="4" />
-                <size v="0" />
+                <size v="10" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -1382,7 +1382,7 @@
                 <columnType v="12" />
                 <size v="63" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -1393,9 +1393,9 @@
                 <dbName></dbName>
                 <primaryKey v="true" />
                 <columnType v="1" />
-                <size v="63" />
+                <size v="36" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="true" />
                 <index v="true" />
                 <title></title>
@@ -1408,7 +1408,7 @@
                 <columnType v="12" />
                 <size v="63" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -1419,9 +1419,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="2005" />
-                <size v="0" />
+                <size v="2147483647" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -1432,9 +1432,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="2005" />
-                <size v="0" />
+                <size v="2147483647" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -1445,9 +1445,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="4" />
-                <size v="0" />
+                <size v="10" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -1458,9 +1458,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="4" />
-                <size v="0" />
+                <size v="10" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -1473,7 +1473,7 @@
                 <columnType v="12" />
                 <size v="1023" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -1486,7 +1486,7 @@
                 <columnType v="12" />
                 <size v="63" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -1497,9 +1497,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
-                <size v="512" />
+                <size v="63" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -1532,7 +1532,7 @@
                 <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="true" />
                 <index v="true" />
                 <documentation></documentation>
@@ -1546,7 +1546,7 @@
                 <columnType v="12" />
                 <size v="15" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -1560,7 +1560,7 @@
                 <columnType v="12" />
                 <size v="1023" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -1572,9 +1572,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
-                <size v="0" />
-                <scale v="0" />
-                <notNull v="true" />
+                <size v="29" />
+                <scale v="9" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -1586,9 +1586,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
-                <size v="0" />
-                <scale v="0" />
-                <notNull v="true" />
+                <size v="29" />
+                <scale v="9" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -1602,7 +1602,7 @@
                 <columnType v="12" />
                 <size v="1023" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -1616,7 +1616,7 @@
                 <columnType v="12" />
                 <size v="1023" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -1628,9 +1628,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="4" />
-                <size v="0" />
+                <size v="10" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -1642,9 +1642,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="2005" />
-                <size v="0" />
+                <size v="2147483647" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -1658,7 +1658,7 @@
                 <columnType v="12" />
                 <size v="63" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -1670,9 +1670,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="2005" />
-                <size v="0" />
+                <size v="2147483647" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -1686,7 +1686,7 @@
                 <columnType v="12" />
                 <size v="512" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -1700,7 +1700,7 @@
                 <columnType v="12" />
                 <size v="63" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -1734,7 +1734,7 @@
                 <columnType v="12" />
                 <size v="255" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -1748,7 +1748,7 @@
                 <columnType v="12" />
                 <size v="255" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -1762,7 +1762,7 @@
                 <columnType v="1" />
                 <size v="1" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -1776,7 +1776,7 @@
                 <columnType v="12" />
                 <size v="255" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -1790,7 +1790,7 @@
                 <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -1804,7 +1804,7 @@
                 <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="true" />
                 <index v="true" />
                 <documentation></documentation>
@@ -1838,7 +1838,7 @@
                 <columnType v="12" />
                 <size v="255" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -1852,7 +1852,7 @@
                 <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -1866,7 +1866,7 @@
                 <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="true" />
                 <index v="true" />
                 <documentation></documentation>
@@ -1897,10 +1897,10 @@
                 <name>CONDTYPE</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="-6" />
-                <size v="0" />
+                <columnType v="5" />
+                <size v="5" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -1912,9 +1912,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="2005" />
-                <size v="0" />
+                <size v="2147483647" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -1928,7 +1928,7 @@
                 <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="true" />
                 <index v="true" />
                 <documentation></documentation>
@@ -1942,7 +1942,7 @@
                 <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -1976,7 +1976,7 @@
                 <columnType v="12" />
                 <size v="63" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -1990,7 +1990,7 @@
                 <columnType v="12" />
                 <size v="63" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -2004,7 +2004,7 @@
                 <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="true" />
                 <index v="true" />
                 <documentation></documentation>
@@ -2038,7 +2038,7 @@
                 <columnType v="12" />
                 <size v="63" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -2049,10 +2049,10 @@
                 <name>ASSIGNABLE</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="-6" />
-                <size v="0" />
+                <columnType v="4" />
+                <size v="10" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -2066,7 +2066,7 @@
                 <columnType v="12" />
                 <size v="63" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="true" />
                 <index v="true" />
                 <documentation></documentation>
@@ -2078,9 +2078,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="2005" />
-                <size v="0" />
+                <size v="2147483647" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -2094,7 +2094,7 @@
                 <columnType v="12" />
                 <size v="255" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -2126,9 +2126,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="4" />
-                <size v="0" />
+                <size v="10" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -2140,9 +2140,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="2005" />
-                <size v="0" />
+                <size v="2147483647" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -2156,7 +2156,7 @@
                 <columnType v="12" />
                 <size v="63" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -2168,9 +2168,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="4" />
-                <size v="0" />
+                <size v="10" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -2184,7 +2184,7 @@
                 <columnType v="1" />
                 <size v="63" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="true" />
                 <index v="true" />
                 <documentation></documentation>
@@ -2196,9 +2196,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="4" />
-                <size v="0" />
+                <size v="10" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -2210,9 +2210,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="4" />
-                <size v="0" />
+                <size v="10" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -2242,12 +2242,12 @@
               <entityFieldDb>
                 <name>DATAID</name>
                 <dbName></dbName>
-                <primaryKey v="false" />
+                <primaryKey v="true" />
                 <columnType v="1" />
                 <size v="63" />
                 <scale v="0" />
-                <notNull v="false" />
-                <isUnique v="false" />
+                <notNull v="true" />
+                <isUnique v="true" />
                 <index v="true" />
                 <documentation></documentation>
                 <title></title>
@@ -2260,7 +2260,7 @@
                 <columnType v="1" />
                 <size v="63" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -2272,9 +2272,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="2005" />
-                <size v="0" />
+                <size v="2147483647" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -2288,7 +2288,7 @@
                 <columnType v="12" />
                 <size v="255" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -2300,11 +2300,11 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
-                <size v="0" />
-                <scale v="0" />
-                <notNull v="true" />
+                <size v="29" />
+                <scale v="9" />
+                <notNull v="false" />
                 <isUnique v="false" />
-                <index v="true" />
+                <index v="false" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
@@ -2336,9 +2336,9 @@
                 <columnType v="12" />
                 <size v="127" />
                 <scale v="0" />
-                <notNull v="false" />
-                <isUnique v="true" />
-                <index v="true" />
+                <notNull v="true" />
+                <isUnique v="false" />
+                <index v="false" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
@@ -2348,9 +2348,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
-                <size v="0" />
-                <scale v="0" />
-                <notNull v="true" />
+                <size v="29" />
+                <scale v="9" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -2364,9 +2364,9 @@
                 <columnType v="12" />
                 <size v="127" />
                 <scale v="0" />
-                <notNull v="false" />
-                <isUnique v="true" />
-                <index v="true" />
+                <notNull v="true" />
+                <isUnique v="false" />
+                <index v="false" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
@@ -2614,7 +2614,7 @@
                 <columnType v="1" />
                 <size v="63" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="true" />
                 <index v="true" />
                 <documentation></documentation>
@@ -2624,13 +2624,13 @@
               <entityFieldDb>
                 <name>TAGNAME</name>
                 <dbName></dbName>
-                <primaryKey v="true" />
+                <primaryKey v="false" />
                 <columnType v="12" />
                 <size v="63" />
                 <scale v="0" />
                 <notNull v="false" />
-                <isUnique v="true" />
-                <index v="true" />
+                <isUnique v="false" />
+                <index v="false" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
@@ -2638,13 +2638,13 @@
               <entityFieldDb>
                 <name>TAGVALUE</name>
                 <dbName></dbName>
-                <primaryKey v="true" />
+                <primaryKey v="false" />
                 <columnType v="12" />
                 <size v="63" />
                 <scale v="0" />
                 <notNull v="false" />
-                <isUnique v="true" />
-                <index v="true" />
+                <isUnique v="false" />
+                <index v="false" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
@@ -2750,9 +2750,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="4" />
-                <size v="0" />
+                <size v="10" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -2764,9 +2764,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="4" />
-                <size v="0" />
+                <size v="10" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -2778,9 +2778,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
-                <size v="0" />
-                <scale v="0" />
-                <notNull v="true" />
+                <size v="29" />
+                <scale v="9" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -2794,7 +2794,7 @@
                 <columnType v="12" />
                 <size v="5" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -2808,7 +2808,7 @@
                 <columnType v="12" />
                 <size v="5" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -2820,9 +2820,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
-                <size v="0" />
-                <scale v="0" />
-                <notNull v="true" />
+                <size v="29" />
+                <scale v="9" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -2836,7 +2836,7 @@
                 <columnType v="12" />
                 <size v="127" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="true" />
                 <index v="true" />
                 <documentation></documentation>
@@ -2850,7 +2850,7 @@
                 <columnType v="12" />
                 <size v="255" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -2864,7 +2864,7 @@
                 <columnType v="12" />
                 <size v="255" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -2876,9 +2876,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="4" />
-                <size v="0" />
+                <size v="10" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -2892,7 +2892,7 @@
                 <columnType v="12" />
                 <size v="255" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -2904,9 +2904,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="4" />
-                <size v="0" />
+                <size v="10" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -2926,9 +2926,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
-                <size v="0" />
-                <scale v="0" />
-                <notNull v="true" />
+                <size v="29" />
+                <scale v="9" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -2939,11 +2939,11 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
-                <size v="0" />
-                <scale v="0" />
-                <notNull v="true" />
-                <isUnique v="false" />
-                <index v="false" />
+                <size v="29" />
+                <scale v="9" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
                 <title></title>
                 <description></description>
               </entityFieldDb>
@@ -2954,7 +2954,7 @@
                 <columnType v="12" />
                 <size v="63" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -2967,7 +2967,7 @@
                 <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="true" />
                 <index v="true" />
                 <title></title>
@@ -2980,7 +2980,7 @@
                 <columnType v="12" />
                 <size v="63" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -2993,7 +2993,7 @@
                 <columnType v="12" />
                 <size v="63" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -3006,7 +3006,7 @@
                 <columnType v="12" />
                 <size v="63" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -3019,7 +3019,7 @@
                 <columnType v="12" />
                 <size v="63" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -3030,9 +3030,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="4" />
-                <size v="0" />
+                <size v="10" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -3043,9 +3043,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
-                <size v="0" />
-                <scale v="0" />
-                <notNull v="true" />
+                <size v="29" />
+                <scale v="9" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -3056,9 +3056,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="4" />
-                <size v="0" />
+                <size v="10" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -3069,9 +3069,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
-                <size v="0" />
-                <scale v="0" />
-                <notNull v="true" />
+                <size v="29" />
+                <scale v="9" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -3104,7 +3104,7 @@
                 <columnType v="12" />
                 <size v="64" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -3118,7 +3118,7 @@
                 <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="true" />
                 <index v="true" />
                 <documentation></documentation>
@@ -3132,7 +3132,7 @@
                 <columnType v="12" />
                 <size v="256" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="true" />
                 <documentation></documentation>
@@ -3146,7 +3146,7 @@
                 <columnType v="1" />
                 <size v="46" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="true" />
                 <documentation></documentation>
@@ -3180,7 +3180,7 @@
                 <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="true" />
                 <index v="true" />
                 <documentation></documentation>
@@ -3194,7 +3194,7 @@
                 <columnType v="12" />
                 <size v="64" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="true" />
                 <documentation></documentation>
@@ -3208,7 +3208,7 @@
                 <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="true" />
                 <documentation></documentation>
@@ -3222,1227 +3222,13 @@
                 <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
-                <notNull v="true" />
-                <isUnique v="false" />
-                <index v="true" />
-                <documentation></documentation>
-                <title></title>
-                <description></description>
-              </entityFieldDb>
-            </entityFields>
-          </entityDb>
-          <entityDb>
-            <name>ASYS_ICONS</name>
-            <dbName></dbName>
-            <idColumn></idColumn>
-            <idGeneratorType v="0" />
-            <idGeneratorInterval v="0" />
-            <documentation></documentation>
-            <title></title>
-            <description></description>
-            <auditSyncConfig>
-              <name>auditSyncConfig</name>
-              <auditMode v="0" />
-              <syncActive v="false" />
-              <syncComplete v="true" />
-              <syncDirection v="1" />
-              <syncIds></syncIds>
-            </auditSyncConfig>
-            <entityFields>
-              <entityFieldDb>
-                <name>BINDATA</name>
-                <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="2004" />
-                <size v="0" />
-                <scale v="0" />
-                <notNull v="true" />
-                <isUnique v="false" />
-                <index v="false" />
-                <documentation></documentation>
-                <title></title>
-                <description></description>
-              </entityFieldDb>
-              <entityFieldDb>
-                <name>DATE_EDIT</name>
-                <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="93" />
-                <size v="0" />
-                <scale v="0" />
-                <notNull v="true" />
-                <isUnique v="false" />
-                <index v="false" />
-                <documentation></documentation>
-                <title></title>
-                <description></description>
-              </entityFieldDb>
-              <entityFieldDb>
-                <name>DATE_NEW</name>
-                <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="93" />
-                <size v="0" />
-                <scale v="0" />
-                <notNull v="true" />
-                <isUnique v="false" />
-                <index v="false" />
-                <documentation></documentation>
-                <title></title>
-                <description></description>
-              </entityFieldDb>
-              <entityFieldDb>
-                <name>DESCRIPTION</name>
-                <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="127" />
-                <scale v="0" />
-                <notNull v="true" />
-                <isUnique v="false" />
-                <index v="false" />
-                <documentation></documentation>
-                <title></title>
-                <description></description>
-              </entityFieldDb>
-              <entityFieldDb>
-                <name>ICON_TYPE</name>
-                <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="255" />
-                <scale v="0" />
-                <notNull v="true" />
-                <isUnique v="false" />
-                <index v="false" />
-                <documentation></documentation>
-                <title></title>
-                <description></description>
-              </entityFieldDb>
-              <entityFieldDb>
-                <name>ID</name>
-                <dbName></dbName>
-                <primaryKey v="true" />
-                <columnType v="1" />
-                <size v="36" />
-                <scale v="0" />
                 <notNull v="false" />
-                <isUnique v="true" />
-                <index v="true" />
-                <documentation></documentation>
-                <title></title>
-                <description></description>
-              </entityFieldDb>
-              <entityFieldDb>
-                <name>USER_EDIT</name>
-                <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="63" />
-                <scale v="0" />
-                <notNull v="true" />
-                <isUnique v="false" />
-                <index v="false" />
-                <documentation></documentation>
-                <title></title>
-                <description></description>
-              </entityFieldDb>
-              <entityFieldDb>
-                <name>USER_NEW</name>
-                <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="63" />
-                <scale v="0" />
-                <notNull v="true" />
-                <isUnique v="false" />
-                <index v="false" />
-                <documentation></documentation>
-                <title></title>
-                <description></description>
-              </entityFieldDb>
-            </entityFields>
-          </entityDb>
-          <entityDb>
-            <name>ASYS_MAILREPOSIT</name>
-            <dbName></dbName>
-            <idColumn></idColumn>
-            <idGeneratorType v="0" />
-            <idGeneratorInterval v="0" />
-            <documentation></documentation>
-            <title></title>
-            <description></description>
-            <auditSyncConfig>
-              <name>auditSyncConfig</name>
-              <auditMode v="0" />
-              <syncActive v="false" />
-              <syncComplete v="true" />
-              <syncDirection v="1" />
-              <syncIds></syncIds>
-            </auditSyncConfig>
-            <entityFields>
-              <entityFieldDb>
-                <name>FLAGGED</name>
-                <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="4" />
-                <size v="0" />
-                <scale v="0" />
-                <notNull v="true" />
-                <isUnique v="false" />
-                <index v="false" />
-                <documentation></documentation>
-                <title></title>
-                <description></description>
-              </entityFieldDb>
-              <entityFieldDb>
-                <name>FOLDER</name>
-                <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="255" />
-                <scale v="0" />
-                <notNull v="true" />
                 <isUnique v="false" />
-                <index v="false" />
-                <documentation></documentation>
-                <title></title>
-                <description></description>
-              </entityFieldDb>
-              <entityFieldDb>
-                <name>ID</name>
-                <dbName></dbName>
-                <primaryKey v="true" />
-                <columnType v="1" />
-                <size v="36" />
-                <scale v="0" />
-                <notNull v="false" />
-                <isUnique v="true" />
                 <index v="true" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
-              <entityFieldDb>
-                <name>MAIL</name>
-                <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="2005" />
-                <size v="0" />
-                <scale v="0" />
-                <notNull v="true" />
-                <isUnique v="false" />
-                <index v="false" />
-                <documentation></documentation>
-                <title></title>
-                <description></description>
-              </entityFieldDb>
-              <entityFieldDb>
-                <name>MAILUSER</name>
-                <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="255" />
-                <scale v="0" />
-                <notNull v="true" />
-                <isUnique v="false" />
-                <index v="true" />
-                <documentation></documentation>
-                <title></title>
-                <description></description>
-              </entityFieldDb>
-              <entityFieldDb>
-                <name>RECEIVEDATE</name>
-                <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="93" />
-                <size v="0" />
-                <scale v="0" />
-                <notNull v="true" />
-                <isUnique v="false" />
-                <index v="false" />
-                <documentation></documentation>
-                <title></title>
-                <description></description>
-              </entityFieldDb>
-              <entityFieldDb>
-                <name>RECENT</name>
-                <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="4" />
-                <size v="0" />
-                <scale v="0" />
-                <notNull v="true" />
-                <isUnique v="false" />
-                <index v="true" />
-                <documentation></documentation>
-                <title></title>
-                <description></description>
-              </entityFieldDb>
-              <entityFieldDb>
-                <name>RECIPIENT</name>
-                <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="2046" />
-                <scale v="0" />
-                <notNull v="true" />
-                <isUnique v="false" />
-                <index v="false" />
-                <documentation></documentation>
-                <title></title>
-                <description></description>
-              </entityFieldDb>
-              <entityFieldDb>
-                <name>SEEN</name>
-                <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="4" />
-                <size v="0" />
-                <scale v="0" />
-                <notNull v="true" />
-                <isUnique v="false" />
-                <index v="false" />
-                <documentation></documentation>
-                <title></title>
-                <description></description>
-              </entityFieldDb>
-              <entityFieldDb>
-                <name>SENDER</name>
-                <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="127" />
-                <scale v="0" />
-                <notNull v="true" />
-                <isUnique v="false" />
-                <index v="false" />
-                <documentation></documentation>
-                <title></title>
-                <description></description>
-              </entityFieldDb>
-              <entityFieldDb>
-                <name>SENTDATE</name>
-                <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="93" />
-                <size v="0" />
-                <scale v="0" />
-                <notNull v="true" />
-                <isUnique v="false" />
-                <index v="false" />
-                <documentation></documentation>
-                <title></title>
-                <description></description>
-              </entityFieldDb>
-              <entityFieldDb>
-                <name>SUBJECT</name>
-                <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="1023" />
-                <scale v="0" />
-                <notNull v="true" />
-                <isUnique v="false" />
-                <index v="false" />
-                <documentation></documentation>
-                <title></title>
-                <description></description>
-              </entityFieldDb>
-            </entityFields>
-          </entityDb>
-          <entityDb>
-            <name>ASYS_MAILREPOSIT_HASH</name>
-            <dbName></dbName>
-            <idColumn></idColumn>
-            <idGeneratorType v="0" />
-            <idGeneratorInterval v="0" />
-            <documentation></documentation>
-            <title></title>
-            <description></description>
-            <auditSyncConfig>
-              <name>auditSyncConfig</name>
-              <auditMode v="0" />
-              <syncActive v="false" />
-              <syncComplete v="true" />
-              <syncDirection v="1" />
-              <syncIds></syncIds>
-            </auditSyncConfig>
-            <entityFields>
-              <entityFieldDb>
-                <name>MAILHASH</name>
-                <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="31" />
-                <scale v="0" />
-                <notNull v="true" />
-                <isUnique v="false" />
-                <index v="false" />
-                <documentation></documentation>
-                <title></title>
-                <description></description>
-              </entityFieldDb>
-              <entityFieldDb>
-                <name>MAILINFO</name>
-                <dbName></dbName>
-                <primaryKey v="true" />
-                <columnType v="12" />
-                <size v="127" />
-                <scale v="0" />
-                <notNull v="false" />
-                <isUnique v="true" />
-                <index v="true" />
-                <documentation></documentation>
-                <title></title>
-                <description></description>
-              </entityFieldDb>
-            </entityFields>
-          </entityDb>
-          <entityDb>
-            <name>ASYS_CALENDARSYNC</name>
-            <dbName></dbName>
-            <idColumn></idColumn>
-            <idGeneratorType v="0" />
-            <idGeneratorInterval v="0" />
-            <documentation></documentation>
-            <title></title>
-            <description></description>
-            <auditSyncConfig>
-              <name>auditSyncConfig</name>
-              <auditMode v="0" />
-              <syncActive v="false" />
-              <syncComplete v="true" />
-              <syncDirection v="1" />
-              <syncIds></syncIds>
-            </auditSyncConfig>
-            <entityFields>
-              <entityFieldDb>
-                <name>LASTMODIFIED</name>
-                <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="93" />
-                <size v="0" />
-                <scale v="0" />
-                <notNull v="true" />
-                <isUnique v="false" />
-                <index v="false" />
-                <documentation></documentation>
-                <title></title>
-                <description></description>
-              </entityFieldDb>
-              <entityFieldDb>
-                <name>MASTERUID</name>
-                <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="512" />
-                <scale v="0" />
-                <notNull v="false" />
-                <isUnique v="false" />
-                <index v="true" />
-                <documentation></documentation>
-                <title></title>
-                <description></description>
-              </entityFieldDb>
-              <entityFieldDb>
-                <name>SLAVEUID</name>
-                <dbName></dbName>
-                <primaryKey v="true" />
-                <columnType v="12" />
-                <size v="127" />
-                <scale v="0" />
-                <notNull v="false" />
-                <isUnique v="true" />
-                <index v="true" />
-                <documentation></documentation>
-                <title></title>
-                <description></description>
-              </entityFieldDb>
-              <entityFieldDb>
-                <name>SUSER</name>
-                <dbName></dbName>
-                <primaryKey v="true" />
-                <columnType v="12" />
-                <size v="63" />
-                <scale v="0" />
-                <notNull v="false" />
-                <isUnique v="true" />
-                <index v="true" />
-                <documentation></documentation>
-                <title></title>
-                <description></description>
-              </entityFieldDb>
-            </entityFields>
-          </entityDb>
-          <entityDb>
-            <name>ASYS_UIDRESOLVER</name>
-            <dbName></dbName>
-            <idColumn></idColumn>
-            <idGeneratorType v="0" />
-            <idGeneratorInterval v="0" />
-            <documentation></documentation>
-            <title></title>
-            <description></description>
-            <auditSyncConfig>
-              <name>auditSyncConfig</name>
-              <auditMode v="0" />
-              <syncActive v="false" />
-              <syncComplete v="true" />
-              <syncDirection v="1" />
-              <syncIds></syncIds>
-            </auditSyncConfig>
-            <entityFields>
-              <entityFieldDb>
-                <name>ENTRY_TYPE</name>
-                <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="255" />
-                <scale v="0" />
-                <notNull v="true" />
-                <isUnique v="false" />
-                <index v="false" />
-                <documentation></documentation>
-                <title></title>
-                <description></description>
-              </entityFieldDb>
-              <entityFieldDb>
-                <name>ENTRY_UID</name>
-                <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="512" />
-                <scale v="0" />
-                <notNull v="true" />
-                <isUnique v="false" />
-                <index v="false" />
-                <documentation></documentation>
-                <title></title>
-                <description></description>
-              </entityFieldDb>
-              <entityFieldDb>
-                <name>ENTRY_USER</name>
-                <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="255" />
-                <scale v="0" />
-                <notNull v="true" />
-                <isUnique v="false" />
-                <index v="false" />
-                <documentation></documentation>
-                <title></title>
-                <description></description>
-              </entityFieldDb>
-            </entityFields>
-          </entityDb>
-          <entityDb>
-            <name>ASYS_FARM</name>
-            <dbName></dbName>
-            <idColumn></idColumn>
-            <idGeneratorType v="0" />
-            <idGeneratorInterval v="0" />
-            <documentation></documentation>
-            <title></title>
-            <description></description>
-            <auditSyncConfig>
-              <name>auditSyncConfig</name>
-              <auditMode v="0" />
-              <syncActive v="false" />
-              <syncComplete v="true" />
-              <syncDirection v="1" />
-              <syncIds></syncIds>
-            </auditSyncConfig>
-            <entityFields>
-              <entityFieldDb>
-                <name>ADDRESS</name>
-                <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="255" />
-                <scale v="0" />
-                <notNull v="true" />
-                <isUnique v="false" />
-                <index v="false" />
-                <documentation></documentation>
-                <title></title>
-                <description></description>
-              </entityFieldDb>
-              <entityFieldDb>
-                <name>CLIENTS</name>
-                <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="4" />
-                <size v="0" />
-                <scale v="0" />
-                <notNull v="true" />
-                <isUnique v="false" />
-                <index v="false" />
-                <documentation></documentation>
-                <title></title>
-                <description></description>
-              </entityFieldDb>
-              <entityFieldDb>
-                <name>FARMVERSION</name>
-                <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="12" />
-                <scale v="0" />
-                <notNull v="true" />
-                <isUnique v="false" />
-                <index v="false" />
-                <documentation></documentation>
-                <title></title>
-                <description></description>
-              </entityFieldDb>
-              <entityFieldDb>
-                <name>LICENSE</name>
-                <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="255" />
-                <scale v="0" />
-                <notNull v="true" />
-                <isUnique v="false" />
-                <index v="false" />
-                <documentation></documentation>
-                <title></title>
-                <description></description>
-              </entityFieldDb>
-              <entityFieldDb>
-                <name>SENCODING</name>
-                <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="4" />
-                <size v="0" />
-                <scale v="0" />
-                <notNull v="true" />
-                <isUnique v="false" />
-                <index v="false" />
-                <documentation></documentation>
-                <title></title>
-                <description></description>
-              </entityFieldDb>
-              <entityFieldDb>
-                <name>SERVERID</name>
-                <dbName></dbName>
-                <primaryKey v="true" />
-                <columnType v="12" />
-                <size v="127" />
-                <scale v="0" />
-                <notNull v="false" />
-                <isUnique v="true" />
-                <index v="true" />
-                <documentation></documentation>
-                <title></title>
-                <description></description>
-              </entityFieldDb>
-              <entityFieldDb>
-                <name>WORKLOAD</name>
-                <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="4" />
-                <size v="0" />
-                <scale v="0" />
-                <notNull v="true" />
-                <isUnique v="false" />
-                <index v="false" />
-                <documentation></documentation>
-                <title></title>
-                <description></description>
-              </entityFieldDb>
-            </entityFields>
-          </entityDb>
-          <entityDb>
-            <name>ASYS_FARM_CLIENT</name>
-            <dbName></dbName>
-            <idColumn></idColumn>
-            <idGeneratorType v="0" />
-            <idGeneratorInterval v="0" />
-            <documentation></documentation>
-            <title></title>
-            <description></description>
-            <auditSyncConfig>
-              <name>auditSyncConfig</name>
-              <auditMode v="0" />
-              <syncActive v="false" />
-              <syncComplete v="true" />
-              <syncDirection v="1" />
-              <syncIds></syncIds>
-            </auditSyncConfig>
-            <entityFields>
-              <entityFieldDb>
-                <name>CHARACTERISTIC</name>
-                <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="4" />
-                <size v="0" />
-                <scale v="0" />
-                <notNull v="true" />
-                <isUnique v="false" />
-                <index v="false" />
-                <documentation></documentation>
-                <title></title>
-                <description></description>
-              </entityFieldDb>
-              <entityFieldDb>
-                <name>CLIENTID</name>
-                <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="255" />
-                <scale v="0" />
-                <notNull v="true" />
-                <isUnique v="false" />
-                <index v="false" />
-                <documentation></documentation>
-                <title></title>
-                <description></description>
-              </entityFieldDb>
-              <entityFieldDb>
-                <name>ID</name>
-                <dbName></dbName>
-                <primaryKey v="true" />
-                <columnType v="1" />
-                <size v="36" />
-                <scale v="0" />
-                <notNull v="false" />
-                <isUnique v="true" />
-                <index v="true" />
-                <documentation></documentation>
-                <title></title>
-                <description></description>
-              </entityFieldDb>
-              <entityFieldDb>
-                <name>SADDRESS</name>
-                <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="255" />
-                <scale v="0" />
-                <notNull v="true" />
-                <isUnique v="false" />
-                <index v="false" />
-                <documentation></documentation>
-                <title></title>
-                <description></description>
-              </entityFieldDb>
-              <entityFieldDb>
-                <name>SERVERID</name>
-                <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="255" />
-                <scale v="0" />
-                <notNull v="true" />
-                <isUnique v="false" />
-                <index v="false" />
-                <documentation></documentation>
-                <title></title>
-                <description></description>
-              </entityFieldDb>
-              <entityFieldDb>
-                <name>USERNAME</name>
-                <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="255" />
-                <scale v="0" />
-                <notNull v="true" />
-                <isUnique v="false" />
-                <index v="false" />
-                <documentation></documentation>
-                <title></title>
-                <description></description>
-              </entityFieldDb>
-            </entityFields>
-          </entityDb>
-          <entityDb>
-            <name>ASYS_AUDIT</name>
-            <dbName></dbName>
-            <idColumn></idColumn>
-            <idGeneratorType v="0" />
-            <idGeneratorInterval v="0" />
-            <documentation></documentation>
-            <title></title>
-            <description></description>
-            <auditSyncConfig>
-              <name>auditSyncConfig</name>
-              <auditMode v="0" />
-              <syncActive v="false" />
-              <syncComplete v="true" />
-              <syncDirection v="1" />
-              <syncIds></syncIds>
-            </auditSyncConfig>
-            <entityFields>
-              <entityFieldDb>
-                <name>ACOLUMNNAME</name>
-                <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="127" />
-                <scale v="0" />
-                <notNull v="true" />
-                <isUnique v="false" />
-                <index v="false" />
-                <documentation></documentation>
-                <title></title>
-                <description></description>
-              </entityFieldDb>
-              <entityFieldDb>
-                <name>ALIAS</name>
-                <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="255" />
-                <scale v="0" />
-                <notNull v="true" />
-                <isUnique v="false" />
-                <index v="false" />
-                <documentation></documentation>
-                <title></title>
-                <description></description>
-              </entityFieldDb>
-              <entityFieldDb>
-                <name>ATABLENAME</name>
-                <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="127" />
-                <scale v="0" />
-                <notNull v="true" />
-                <isUnique v="false" />
-                <index v="false" />
-                <documentation></documentation>
-                <title></title>
-                <description></description>
-              </entityFieldDb>
-              <entityFieldDb>
-                <name>ATIMESTAMP</name>
-                <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="93" />
-                <size v="0" />
-                <scale v="0" />
-                <notNull v="true" />
-                <isUnique v="false" />
-                <index v="false" />
-                <documentation></documentation>
-                <title></title>
-                <description></description>
-              </entityFieldDb>
-              <entityFieldDb>
-                <name>AUSER</name>
-                <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="255" />
-                <scale v="0" />
-                <notNull v="true" />
-                <isUnique v="false" />
-                <index v="false" />
-                <documentation></documentation>
-                <title></title>
-                <description></description>
-              </entityFieldDb>
-              <entityFieldDb>
-                <name>DATASETID</name>
-                <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="1023" />
-                <scale v="0" />
-                <notNull v="true" />
-                <isUnique v="false" />
-                <index v="false" />
-                <documentation></documentation>
-                <title></title>
-                <description></description>
-              </entityFieldDb>
-              <entityFieldDb>
-                <name>DATASETNEWVALUE_BLOB</name>
-                <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="2004" />
-                <size v="0" />
-                <scale v="0" />
-                <notNull v="true" />
-                <isUnique v="false" />
-                <index v="false" />
-                <documentation></documentation>
-                <title></title>
-                <description></description>
-              </entityFieldDb>
-              <entityFieldDb>
-                <name>DATASETNEWVALUE_CLOB</name>
-                <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="2005" />
-                <size v="0" />
-                <scale v="0" />
-                <notNull v="true" />
-                <isUnique v="false" />
-                <index v="false" />
-                <documentation></documentation>
-                <title></title>
-                <description></description>
-              </entityFieldDb>
-              <entityFieldDb>
-                <name>DATASETNEWVALUE_STRING</name>
-                <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="1023" />
-                <scale v="0" />
-                <notNull v="true" />
-                <isUnique v="false" />
-                <index v="false" />
-                <documentation></documentation>
-                <title></title>
-                <description></description>
-              </entityFieldDb>
-              <entityFieldDb>
-                <name>LOGTIME</name>
-                <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="93" />
-                <size v="0" />
-                <scale v="0" />
-                <notNull v="true" />
-                <isUnique v="false" />
-                <index v="true" />
-                <documentation></documentation>
-                <title></title>
-                <description></description>
-              </entityFieldDb>
-              <entityFieldDb>
-                <name>LOGTYPE</name>
-                <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="4" />
-                <size v="0" />
-                <scale v="0" />
-                <notNull v="true" />
-                <isUnique v="false" />
-                <index v="false" />
-                <documentation></documentation>
-                <title></title>
-                <description></description>
-              </entityFieldDb>
-              <entityFieldDb>
-                <name>LOGWRITERUID</name>
-                <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="127" />
-                <scale v="0" />
-                <notNull v="true" />
-                <isUnique v="false" />
-                <index v="false" />
-                <documentation></documentation>
-                <title></title>
-                <description></description>
-              </entityFieldDb>
-              <entityFieldDb>
-                <name>SQLACTION</name>
-                <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="1" />
-                <size v="1" />
-                <scale v="0" />
-                <notNull v="true" />
-                <isUnique v="false" />
-                <index v="false" />
-                <documentation></documentation>
-                <title></title>
-                <description></description>
-              </entityFieldDb>
-            </entityFields>
-          </entityDb>
-          <entityDb>
-            <name>ASYS_SYNCSLAVES</name>
-            <dbName></dbName>
-            <idColumn></idColumn>
-            <idGeneratorType v="0" />
-            <idGeneratorInterval v="0" />
-            <documentation></documentation>
-            <title></title>
-            <description></description>
-            <auditSyncConfig>
-              <name>auditSyncConfig</name>
-              <auditMode v="0" />
-              <syncActive v="false" />
-              <syncComplete v="true" />
-              <syncDirection v="1" />
-              <syncIds></syncIds>
-            </auditSyncConfig>
-            <entityFields>
-              <entityFieldDb>
-                <name>ACTIVE</name>
-                <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="4" />
-                <size v="0" />
-                <scale v="0" />
-                <notNull v="true" />
-                <isUnique v="false" />
-                <index v="false" />
-                <documentation></documentation>
-                <title></title>
-                <description></description>
-              </entityFieldDb>
-              <entityFieldDb>
-                <name>DESCRIPTION</name>
-                <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="255" />
-                <scale v="0" />
-                <notNull v="true" />
-                <isUnique v="false" />
-                <index v="false" />
-                <documentation></documentation>
-                <title></title>
-                <description></description>
-              </entityFieldDb>
-              <entityFieldDb>
-                <name>DEVICEID</name>
-                <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="40" />
-                <scale v="0" />
-                <notNull v="true" />
-                <isUnique v="false" />
-                <index v="false" />
-                <documentation></documentation>
-                <title></title>
-                <description></description>
-              </entityFieldDb>
-              <entityFieldDb>
-                <name>INTERVALL</name>
-                <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="4" />
-                <size v="0" />
-                <scale v="0" />
-                <notNull v="true" />
-                <isUnique v="false" />
-                <index v="false" />
-                <documentation></documentation>
-                <title></title>
-                <description></description>
-              </entityFieldDb>
-              <entityFieldDb>
-                <name>LASTSYNC</name>
-                <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="93" />
-                <size v="0" />
-                <scale v="0" />
-                <notNull v="true" />
-                <isUnique v="false" />
-                <index v="false" />
-                <documentation></documentation>
-                <title></title>
-                <description></description>
-              </entityFieldDb>
-              <entityFieldDb>
-                <name>SLAVEUID</name>
-                <dbName></dbName>
-                <primaryKey v="true" />
-                <columnType v="12" />
-                <size v="127" />
-                <scale v="0" />
-                <notNull v="false" />
-                <isUnique v="true" />
-                <index v="true" />
-                <documentation></documentation>
-                <title></title>
-                <description></description>
-              </entityFieldDb>
-            </entityFields>
-          </entityDb>
-          <entityDb>
-            <name>ASYS_XMPP_OFFLINESTANZA</name>
-            <dbName></dbName>
-            <idColumn></idColumn>
-            <idGeneratorType v="0" />
-            <idGeneratorInterval v="0" />
-            <documentation></documentation>
-            <title></title>
-            <description></description>
-            <auditSyncConfig>
-              <name>auditSyncConfig</name>
-              <auditMode v="0" />
-              <syncActive v="false" />
-              <syncComplete v="true" />
-              <syncDirection v="1" />
-              <syncIds></syncIds>
-            </auditSyncConfig>
-            <entityFields>
-              <entityFieldDb>
-                <name>ATIMESTAMP</name>
-                <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="93" />
-                <size v="0" />
-                <scale v="0" />
-                <notNull v="true" />
-                <isUnique v="false" />
-                <index v="false" />
-                <documentation></documentation>
-                <title></title>
-                <description></description>
-              </entityFieldDb>
-              <entityFieldDb>
-                <name>JID</name>
-                <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="64" />
-                <scale v="0" />
-                <notNull v="true" />
-                <isUnique v="false" />
-                <index v="true" />
-                <documentation></documentation>
-                <title></title>
-                <description></description>
-              </entityFieldDb>
-              <entityFieldDb>
-                <name>STANZA</name>
-                <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="2005" />
-                <size v="0" />
-                <scale v="0" />
-                <notNull v="true" />
-                <isUnique v="false" />
-                <index v="false" />
-                <documentation></documentation>
-                <title></title>
-                <description></description>
-              </entityFieldDb>
-            </entityFields>
-          </entityDb>
-          <entityDb>
-            <name>ASYS_XMPP_HISTORY</name>
-            <dbName></dbName>
-            <idColumn></idColumn>
-            <idGeneratorType v="0" />
-            <idGeneratorInterval v="0" />
-            <documentation></documentation>
-            <title></title>
-            <description></description>
-            <auditSyncConfig>
-              <name>auditSyncConfig</name>
-              <auditMode v="0" />
-              <syncActive v="false" />
-              <syncComplete v="true" />
-              <syncDirection v="1" />
-              <syncIds></syncIds>
-            </auditSyncConfig>
-            <entityFields>
-              <entityFieldDb>
-                <name>ATIMESTAMP</name>
-                <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="93" />
-                <size v="0" />
-                <scale v="0" />
-                <notNull v="true" />
-                <isUnique v="false" />
-                <index v="true" />
-                <documentation></documentation>
-                <title></title>
-                <description></description>
-              </entityFieldDb>
-              <entityFieldDb>
-                <name>CHATMARKER</name>
-                <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="16" />
-                <scale v="0" />
-                <notNull v="true" />
-                <isUnique v="false" />
-                <index v="false" />
-                <documentation></documentation>
-                <title></title>
-                <description></description>
-              </entityFieldDb>
-              <entityFieldDb>
-                <name>JID_FROM</name>
-                <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="64" />
-                <scale v="0" />
-                <notNull v="true" />
-                <isUnique v="false" />
-                <index v="true" />
-                <documentation></documentation>
-                <title></title>
-                <description></description>
-              </entityFieldDb>
-              <entityFieldDb>
-                <name>JID_TO</name>
-                <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="64" />
-                <scale v="0" />
-                <notNull v="true" />
-                <isUnique v="false" />
-                <index v="true" />
-                <documentation></documentation>
-                <title></title>
-                <description></description>
-              </entityFieldDb>
-              <entityFieldDb>
-                <name>MSGMARKER</name>
-                <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="255" />
-                <scale v="0" />
-                <notNull v="true" />
-                <isUnique v="false" />
-                <index v="true" />
-                <documentation></documentation>
-                <title></title>
-                <description></description>
-              </entityFieldDb>
-              <entityFieldDb>
-                <name>MSGTYPE</name>
-                <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="16" />
-                <scale v="0" />
-                <notNull v="true" />
-                <isUnique v="false" />
-                <index v="false" />
-                <documentation></documentation>
-                <title></title>
-                <description></description>
-              </entityFieldDb>
-              <entityFieldDb>
-                <name>STANZA</name>
-                <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="2005" />
-                <size v="0" />
-                <scale v="0" />
-                <notNull v="true" />
-                <isUnique v="false" />
-                <index v="false" />
-                <documentation></documentation>
-                <title></title>
-                <description></description>
-              </entityFieldDb>
             </entityFields>
           </entityDb>
         </entities>
diff --git a/entity/ClassificationAdmin_entity/ClassificationAdmin_entity.aod b/entity/ClassificationAdmin_entity/ClassificationAdmin_entity.aod
index 2ceed05d81..5309f40eb9 100644
--- a/entity/ClassificationAdmin_entity/ClassificationAdmin_entity.aod
+++ b/entity/ClassificationAdmin_entity/ClassificationAdmin_entity.aod
@@ -63,7 +63,6 @@
     </entityField>
     <entityField>
       <name>UID</name>
-      <linkedContextProcess>%aditoprj%/entity/ClassificationAdmin_entity/entityfields/uid/linkedContextProcess.js</linkedContextProcess>
     </entityField>
     <entityField>
       <name>OBJECT_TYPE</name>
diff --git a/entity/ClassificationAdmin_entity/entityfields/uid/linkedContextProcess.js b/entity/ClassificationAdmin_entity/entityfields/uid/linkedContextProcess.js
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/entity/District_entity/entityfields/parentdistrict/children/excludeddistrictids_param/valueProcess.js b/entity/District_entity/entityfields/parentdistrict/children/excludeddistrictids_param/valueProcess.js
deleted file mode 100644
index bbd0a18395..0000000000
--- a/entity/District_entity/entityfields/parentdistrict/children/excludeddistrictids_param/valueProcess.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import("system.vars");
-import("system.result");
-
-var uid = vars.get("$field.DISTRICTID");
-var res = JSON.stringify([uid]);
-result.string(res);
\ No newline at end of file
diff --git a/entity/Language_entity/Language_entity.aod b/entity/Language_entity/Language_entity.aod
index 865dc46a9d..2afefb3f30 100644
--- a/entity/Language_entity/Language_entity.aod
+++ b/entity/Language_entity/Language_entity.aod
@@ -31,6 +31,7 @@
     <entityProvider>
       <name>ISO3Name</name>
       <lookupIdfield>ISO3</lookupIdfield>
+      <documentation>%aditoprj%/entity/Language_entity/entityfields/iso3name/documentation.adoc</documentation>
       <recordContainer>db</recordContainer>
       <dependencies>
         <entityDependency>
@@ -103,6 +104,8 @@
     </entityProvider>
     <entityProvider>
       <name>ISO3NameFiltered</name>
+      <lookupIdfield>ISO3</lookupIdfield>
+      <documentation>%aditoprj%/entity/Language_entity/entityfields/iso3namefiltered/documentation.adoc</documentation>
       <dependencies>
         <entityDependency>
           <name>2df9d0ed-c26b-4166-9667-786a55146e05</name>
@@ -133,6 +136,8 @@
       <alias>Data_alias</alias>
       <isPageable v="false" />
       <conditionProcess>%aditoprj%/entity/Language_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
+      <cacheType>GLOBAL</cacheType>
+      <cacheKeyProcess>%aditoprj%/entity/Language_entity/recordcontainers/db/cacheKeyProcess.js</cacheKeyProcess>
       <linkInformation>
         <linkInformation>
           <name>3cd06d7c-16c3-49e5-87cd-672a7222e613</name>
diff --git a/entity/Language_entity/entityfields/iso3name/documentation.adoc b/entity/Language_entity/entityfields/iso3name/documentation.adoc
new file mode 100644
index 0000000000..ee01db23ea
--- /dev/null
+++ b/entity/Language_entity/entityfields/iso3name/documentation.adoc
@@ -0,0 +1,6 @@
+Provides a list of languages, where the UID is the three character ISO-code
+ISO 639-2; see: https://de.wikipedia.org/wiki/ISO_639#ISO_639-2
+
+For example: `deu` for _German_
+
+No filter apply.
\ No newline at end of file
diff --git a/entity/Language_entity/entityfields/iso3namefiltered/documentation.adoc b/entity/Language_entity/entityfields/iso3namefiltered/documentation.adoc
new file mode 100644
index 0000000000..da968d6885
--- /dev/null
+++ b/entity/Language_entity/entityfields/iso3namefiltered/documentation.adoc
@@ -0,0 +1,6 @@
+Provides a list of languages, where the UID is the three character ISO-code
+ISO 639-2; see: https://de.wikipedia.org/wiki/ISO_639#ISO_639-2
+
+For example: `deu` for _German_
+
+A filter for excluding languages by paramvalues is applied.
\ No newline at end of file
diff --git a/entity/Language_entity/recordcontainers/db/cacheKeyProcess.js b/entity/Language_entity/recordcontainers/db/cacheKeyProcess.js
new file mode 100644
index 0000000000..050f117ec1
--- /dev/null
+++ b/entity/Language_entity/recordcontainers/db/cacheKeyProcess.js
@@ -0,0 +1,6 @@
+import("CachedRecordContainer_lib");
+import("system.result")
+
+//no locale in the key because the locale does not modify the result of the recordcontainer
+var res = CachedRecordContainerUtils.getKeyWithPreset(CachedRecordContainerFieldPresets.STANDARD(), "$param.ExcludedIds_param");
+result.string(res);
\ No newline at end of file
diff --git a/entity/LogHistory_entity/LogHistory_entity.aod b/entity/LogHistory_entity/LogHistory_entity.aod
index 5cb913b76a..6499fc00e0 100644
--- a/entity/LogHistory_entity/LogHistory_entity.aod
+++ b/entity/LogHistory_entity/LogHistory_entity.aod
@@ -38,6 +38,7 @@
     </entityField>
     <entityProvider>
       <name>LogHistoryProvider</name>
+      <documentation>%aditoprj%/entity/LogHistory_entity/entityfields/loghistoryprovider/documentation.adoc</documentation>
       <dependencies>
         <entityDependency>
           <name>23dbfa51-5340-48e3-bd60-e0dcb7d44ad3</name>
@@ -129,6 +130,7 @@
       <name>tablenames_param</name>
       <expose v="true" />
       <mandatory v="true" />
+      <documentation>%aditoprj%/entity/LogHistory_entity/entityfields/tablenames_param/documentation.adoc</documentation>
       <description>PARAMETER</description>
     </entityParameter>
     <entityField>
diff --git a/entity/LogHistory_entity/entityfields/loghistoryprovider/documentation.adoc b/entity/LogHistory_entity/entityfields/loghistoryprovider/documentation.adoc
new file mode 100644
index 0000000000..2712d5d5c6
--- /dev/null
+++ b/entity/LogHistory_entity/entityfields/loghistoryprovider/documentation.adoc
@@ -0,0 +1,3 @@
+Generic provider for log history entries. 
+
+A filter for given _tablenames_ is applied, see the documentation of the parameters for an example.
\ No newline at end of file
diff --git a/entity/LogHistory_entity/entityfields/tablenames_param/documentation.adoc b/entity/LogHistory_entity/entityfields/tablenames_param/documentation.adoc
new file mode 100644
index 0000000000..d0168dcdaf
--- /dev/null
+++ b/entity/LogHistory_entity/entityfields/tablenames_param/documentation.adoc
@@ -0,0 +1,10 @@
+Tablenames have to be given as stringified object-arrays, see the following example:
+
+[source,javascript]
+----
+var res = [];
+res.push({id: vars.get("$field.CONTACTID"), tableNames: ["CONTACT", "COMMUNICATION", "ADDRESS", "AB_ATTRIBUTERELATION"]});
+res.push({id: vars.get("$field.ORGANISATIONID"), tableNames: ["ORGANISATION"]});
+//stringify because currently only strings  can be passed as parameter
+res = JSON.stringify(res);//this is an example for the parameter-value
+----
\ No newline at end of file
diff --git a/entity/Notification_entity/Notification_entity.aod b/entity/Notification_entity/Notification_entity.aod
index a2e404cefe..ee2693457f 100644
--- a/entity/Notification_entity/Notification_entity.aod
+++ b/entity/Notification_entity/Notification_entity.aod
@@ -180,13 +180,6 @@
           <isUIDTable v="false" />
           <readonly v="true" />
         </linkInformation>
-        <linkInformation>
-          <name>0abd3811-b847-4999-90a5-dae0f8851433</name>
-          <tableName>ASYS_NOTIFICATIONS</tableName>
-          <primaryKey>ID</primaryKey>
-          <isUIDTable v="true" />
-          <readonly v="true" />
-        </linkInformation>
       </linkInformation>
       <recordFieldMappings>
         <dbRecordFieldMapping>
diff --git a/entity/TaskLink_entity/TaskLink_entity.aod b/entity/TaskLink_entity/TaskLink_entity.aod
index ad5dad51bb..759282daf3 100644
--- a/entity/TaskLink_entity/TaskLink_entity.aod
+++ b/entity/TaskLink_entity/TaskLink_entity.aod
@@ -37,6 +37,7 @@
       <name>Link</name>
       <targetContextField>OBJECT_TYPE</targetContextField>
       <targetIdField>OBJECT_ROWID</targetIdField>
+      <documentation>%aditoprj%/entity/TaskLink_entity/entityfields/link/documentation.adoc</documentation>
       <recordContainer>db</recordContainer>
       <dependencies>
         <entityDependency>
diff --git a/entity/TaskLink_entity/entityfields/link/documentation.adoc b/entity/TaskLink_entity/entityfields/link/documentation.adoc
new file mode 100644
index 0000000000..34f2521ccb
--- /dev/null
+++ b/entity/TaskLink_entity/entityfields/link/documentation.adoc
@@ -0,0 +1,3 @@
+Provides links of tasks where data is filtered for one specific task.
+
+Use case: "give me all task links for task X".
\ No newline at end of file
diff --git a/entity/Task_entity/Task_entity.aod b/entity/Task_entity/Task_entity.aod
index d425425dcf..9a00aa3164 100644
--- a/entity/Task_entity/Task_entity.aod
+++ b/entity/Task_entity/Task_entity.aod
@@ -288,6 +288,7 @@
     </entityConsumer>
     <entityProvider>
       <name>Tasks</name>
+      <documentation>%aditoprj%/entity/Task_entity/entityfields/tasks/documentation.adoc</documentation>
       <dependencies>
         <entityDependency>
           <name>dd79df43-264c-494b-9c92-cadf19e61db6</name>
diff --git a/entity/Task_entity/entityfields/tasks/documentation.adoc b/entity/Task_entity/entityfields/tasks/documentation.adoc
new file mode 100644
index 0000000000..2d404a4429
--- /dev/null
+++ b/entity/Task_entity/entityfields/tasks/documentation.adoc
@@ -0,0 +1 @@
+Generic provider that provides task where data is filtered for a given task link. (e.g.: "give me all tasks for Company X").
\ No newline at end of file
diff --git a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
index 9869c77425..d327524d16 100644
--- a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
+++ b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
@@ -7380,6 +7380,9 @@
     <entry>
       <key>Worklow started</key>
     </entry>
+    <entry>
+      <key>Mark all cached record containers as invalid</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 a819b77306..83ecdab25c 100644
--- a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
+++ b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
@@ -9407,6 +9407,9 @@ Bitte Datumseingabe prüfen</value>
       <key>Worklow started</key>
       <value>Worklow gestartet</value>
     </entry>
+    <entry>
+      <key>Mark all cached record containers as invalid</key>
+    </entry>
   </keyValueMap>
   <font name="Dialog" style="0" size="11" />
 </language>
diff --git a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
index ebbc6423c4..5a202e38fa 100644
--- a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
+++ b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
@@ -7461,6 +7461,9 @@
     <entry>
       <key>Worklow started</key>
     </entry>
+    <entry>
+      <key>Mark all cached record containers as invalid</key>
+    </entry>
   </keyValueMap>
   <font name="Dialog" style="0" size="11" />
 </language>
diff --git a/neonContext/Classification/Classification.aod b/neonContext/Classification/Classification.aod
index 9bf4ba49ac..b6c29daeda 100644
--- a/neonContext/Classification/Classification.aod
+++ b/neonContext/Classification/Classification.aod
@@ -3,7 +3,7 @@
   <name>Classification</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/neonContext/Classification/documentation.adoc</documentation>
-  <previewView>ClassificatonPreview_view</previewView>
+  <previewView>ClassificationPreview_view</previewView>
   <entity>Classification_entity</entity>
   <references>
     <neonViewReference>
@@ -12,7 +12,7 @@
     </neonViewReference>
     <neonViewReference>
       <name>50c0d5c5-c84f-452d-9f77-41b82ac0319f</name>
-      <view>ClassificatonPreview_view</view>
+      <view>ClassificationPreview_view</view>
     </neonViewReference>
   </references>
 </neonContext>
diff --git a/neonView/ClassificationPreview_view/ClassificationPreview_view.aod b/neonView/ClassificationPreview_view/ClassificationPreview_view.aod
index af9b4f0582..8c55fe145f 100644
--- a/neonView/ClassificationPreview_view/ClassificationPreview_view.aod
+++ b/neonView/ClassificationPreview_view/ClassificationPreview_view.aod
@@ -2,30 +2,42 @@
 <neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.6">
   <name>ClassificationPreview_view</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
+  <isOverlay v="false" />
+  <overlayOrientation>PORTRAIT</overlayOrientation>
   <layout>
-    <headerFooterLayout>
+    <boxLayout>
       <name>layout</name>
-    </headerFooterLayout>
+      <autoHeight v="true" />
+    </boxLayout>
   </layout>
   <children>
     <genericViewTemplate>
-      <name>Info</name>
+      <name>classification</name>
+      <showDrawer v="true" />
+      <fixedDrawer v="true" />
+      <hideLabels v="false" />
+      <hideEmptyFields v="false" />
       <entityField>#ENTITY</entityField>
       <fields>
         <entityFieldLink>
-          <name>51712a19-9a8c-4967-bd15-a448b5bffb77</name>
-          <entityField>CLASSNAME</entityField>
+          <name>dfdbc6f4-4859-495b-96e7-0853bdbc611f</name>
+          <entityField>CLASSIFICATIONSCORE_ID</entityField>
         </entityFieldLink>
+      </fields>
+    </genericViewTemplate>
+    <genericViewTemplate>
+      <name>info</name>
+      <showDrawer v="true" />
+      <fixedDrawer v="true" />
+      <entityField>#ENTITY</entityField>
+      <isEditable v="false" />
+      <title></title>
+      <fields>
         <entityFieldLink>
-          <name>c3621e4e-53b0-4932-b943-e1c07fe16a24</name>
-          <entityField>POINTS</entityField>
+          <name>2d1fae5e-1b2b-4e29-9bcb-646db9fd9653</name>
+          <entityField>Info</entityField>
         </entityFieldLink>
       </fields>
     </genericViewTemplate>
-    <neonViewReference>
-      <name>c6c26fdd-3812-495f-bd30-d3a6cdcd4eb0</name>
-      <entityField>SalesprojectClassificationEntries</entityField>
-      <view>SalesprojectClassificationEntryPreview_view</view>
-    </neonViewReference>
   </children>
 </neonView>
diff --git a/neonView/ClassificatonPreview_view/ClassificatonPreview_view.aod b/neonView/ClassificatonPreview_view/ClassificatonPreview_view.aod
deleted file mode 100644
index c66526bd77..0000000000
--- a/neonView/ClassificatonPreview_view/ClassificatonPreview_view.aod
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.6">
-  <name>ClassificatonPreview_view</name>
-  <majorModelMode>DISTRIBUTED</majorModelMode>
-  <isOverlay v="false" />
-  <overlayOrientation>PORTRAIT</overlayOrientation>
-  <layout>
-    <boxLayout>
-      <name>layout</name>
-      <autoHeight v="true" />
-    </boxLayout>
-  </layout>
-  <children>
-    <genericViewTemplate>
-      <name>classification</name>
-      <showDrawer v="true" />
-      <fixedDrawer v="true" />
-      <hideLabels v="false" />
-      <hideEmptyFields v="false" />
-      <entityField>#ENTITY</entityField>
-      <fields>
-        <entityFieldLink>
-          <name>dfdbc6f4-4859-495b-96e7-0853bdbc611f</name>
-          <entityField>CLASSIFICATIONSCORE_ID</entityField>
-        </entityFieldLink>
-      </fields>
-    </genericViewTemplate>
-    <genericViewTemplate>
-      <name>info</name>
-      <showDrawer v="true" />
-      <fixedDrawer v="true" />
-      <entityField>#ENTITY</entityField>
-      <isEditable v="false" />
-      <title></title>
-      <fields>
-        <entityFieldLink>
-          <name>2d1fae5e-1b2b-4e29-9bcb-646db9fd9653</name>
-          <entityField>Info</entityField>
-        </entityFieldLink>
-      </fields>
-    </genericViewTemplate>
-  </children>
-</neonView>
-- 
GitLab


From 12d62df12e527784cbb093b9f90dfff5c4c0496d Mon Sep 17 00:00:00 2001
From: "j.goderbauer" <j.goderbauer@adito.de>
Date: Fri, 11 Sep 2020 16:24:36 +0200
Subject: [PATCH 297/309] Classification: Display bugfix

---
 .../ClassificationAdmin_entity.aod            |  2 ++
 .../contentTitleProcess.js                    | 10 ++++++++
 .../target_context/valueProcess.js            | 24 ++++++++++++-------
 .../iconIdProcess.js                          |  4 ++++
 .../ClassificationAdminFilter_view.aod        | 12 ++--------
 5 files changed, 34 insertions(+), 18 deletions(-)
 create mode 100644 entity/ClassificationAdmin_entity/contentTitleProcess.js
 create mode 100644 entity/ClassificationAdmin_entity/iconIdProcess.js

diff --git a/entity/ClassificationAdmin_entity/ClassificationAdmin_entity.aod b/entity/ClassificationAdmin_entity/ClassificationAdmin_entity.aod
index 5309f40eb9..dc74f4716b 100644
--- a/entity/ClassificationAdmin_entity/ClassificationAdmin_entity.aod
+++ b/entity/ClassificationAdmin_entity/ClassificationAdmin_entity.aod
@@ -7,7 +7,9 @@
   <title>Classification</title>
   <grantUpdateProcess>%aditoprj%/entity/ClassificationAdmin_entity/grantUpdateProcess.js</grantUpdateProcess>
   <grantDeleteProcess>%aditoprj%/entity/ClassificationAdmin_entity/grantDeleteProcess.js</grantDeleteProcess>
+  <contentTitleProcess>%aditoprj%/entity/ClassificationAdmin_entity/contentTitleProcess.js</contentTitleProcess>
   <iconId>VAADIN:LIST_OL</iconId>
+  <iconIdProcess>%aditoprj%/entity/ClassificationAdmin_entity/iconIdProcess.js</iconIdProcess>
   <titlePlural>Classifications</titlePlural>
   <recordContainer>jDito</recordContainer>
   <entityFields>
diff --git a/entity/ClassificationAdmin_entity/contentTitleProcess.js b/entity/ClassificationAdmin_entity/contentTitleProcess.js
new file mode 100644
index 0000000000..9cedc1b443
--- /dev/null
+++ b/entity/ClassificationAdmin_entity/contentTitleProcess.js
@@ -0,0 +1,10 @@
+import("system.result");
+import("system.vars");
+
+var objectType = vars.get("$field.OBJECT_TYPE.displayValue");
+var classificationGroupTitle = vars.get("$field.CLASSIFICATIONGROUP.displayValue");
+var classificationTypeTitle = vars.get("$field.CLASSIFICATIONTYPEID.displayValue");
+
+var res = objectType || classificationGroupTitle || classificationTypeTitle || "";
+
+result.string(res);
\ No newline at end of file
diff --git a/entity/ClassificationAdmin_entity/entityfields/target_context/valueProcess.js b/entity/ClassificationAdmin_entity/entityfields/target_context/valueProcess.js
index 163b952b72..45336b55ef 100644
--- a/entity/ClassificationAdmin_entity/entityfields/target_context/valueProcess.js
+++ b/entity/ClassificationAdmin_entity/entityfields/target_context/valueProcess.js
@@ -3,14 +3,22 @@ import("Classification_lib");
 import("system.result");
 import("system.vars");
 
-var sysSelection = vars.get("$sys.selection");
-
-if(sysSelection.length > 0)
+var cat = vars.get("$field.recordCategory");
+var res;
+switch (cat) 
 {
-    var value = vars.get("$field.CLASSIFICATION_PARENT_ID");
-    
-    res = ClassificationUtils.decode(value)
-    if(res)
-        result.string(res);
+    case $ClassificationRecordCategories.CLASSIFICATION_CLASSIFICATION_TYPE():
+        res = "ClassificationType";
+        break;
+    case $ClassificationRecordCategories.CLASSIFICATION_CLASSIFICATION_GROUP():
+        res = "ClassificationGroup";
+        break;
+    case $ClassificationRecordCategories.CLASSIFICATION_OBJECT_TYPE():
+        res = "ClassificationGroup";
+        break;
+    default:
+        res = "";
+        break;
 }
 
+result.string(res);
\ No newline at end of file
diff --git a/entity/ClassificationAdmin_entity/iconIdProcess.js b/entity/ClassificationAdmin_entity/iconIdProcess.js
new file mode 100644
index 0000000000..82b6951435
--- /dev/null
+++ b/entity/ClassificationAdmin_entity/iconIdProcess.js
@@ -0,0 +1,4 @@
+import("system.vars");
+import("system.result");
+
+result.string("TEXT:" + vars.get("$field.#CONTENTTITLE"));
\ No newline at end of file
diff --git a/neonView/ClassificationAdminFilter_view/ClassificationAdminFilter_view.aod b/neonView/ClassificationAdminFilter_view/ClassificationAdminFilter_view.aod
index 0fd065096d..6160661883 100644
--- a/neonView/ClassificationAdminFilter_view/ClassificationAdminFilter_view.aod
+++ b/neonView/ClassificationAdminFilter_view/ClassificationAdminFilter_view.aod
@@ -18,16 +18,8 @@
       <fixedFilterFields />
       <columns>
         <neonTreeTableColumn>
-          <name>825a461f-65a1-4483-ae97-655b1f87bc0a</name>
-          <entityField>OBJECT_TYPE</entityField>
-        </neonTreeTableColumn>
-        <neonTreeTableColumn>
-          <name>4d53ba6d-f0a0-4f04-afaa-3278a45cce86</name>
-          <entityField>CLASSIFICATIONGROUP</entityField>
-        </neonTreeTableColumn>
-        <neonTreeTableColumn>
-          <name>299d5ef1-31a5-47d2-ae41-573e05a0b6c7</name>
-          <entityField>CLASSIFICATIONTYPEID</entityField>
+          <name>2e04e92e-9af8-46a6-9845-8bf822cd05f3</name>
+          <entityField>#CONTENTTITLE</entityField>
         </neonTreeTableColumn>
       </columns>
     </treeTableViewTemplate>
-- 
GitLab


From a3ebf1bf97be7d5d9147135b085cd8249587d73b Mon Sep 17 00:00:00 2001
From: "j.goderbauer" <j.goderbauer@adito.de>
Date: Mon, 14 Sep 2020 11:32:10 +0200
Subject: [PATCH 298/309] [Projekt: Entwicklung - Neon][TicketNr.:
 1065197][SqlBuilder: pValues-array: defaultverhalten ist ein = anstelle von
 in]

---
 process/Sql_lib/documentation.adoc | 14 +++++++++++---
 process/Sql_lib/process.js         |  4 +++-
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/process/Sql_lib/documentation.adoc b/process/Sql_lib/documentation.adoc
index 4330b3af21..8b903c2155 100644
--- a/process/Sql_lib/documentation.adoc
+++ b/process/Sql_lib/documentation.adoc
@@ -170,7 +170,12 @@ If used as pField, you can provide the table and column in different ways.
 * *pValue*
 This is the value of the condition: If, e.g., you need the SQL condition "FIRSTNAME = 'John'" then this parameter is "John")
 * *pCondition*
-This parameter defines what condition is used. You can use any SQL. # will be replaced by the pFieldOrCond and ? is used for the pValue (default is "# = ?"). If, e.g., you need the SQL condition "FIRSTNAME <> 'John'" then this parameter is "# <> ?" (or SqlBuilder.NOT_EQUAL()). You can use SqlBuilder constants here (for example SqlBuilder.NOT_EQUAL(), SqlBuilder.EXISTS())
+This parameter defines what condition is used. You can use any SQL. `#` will be replaced by the pFieldOrCond and `?` is used for the pValue (default is `# = ?`). 
+If, e.g., you need the SQL condition `FIRSTNAME <> 'John'` then this parameter is `# <> ?` (or `SqlBuilder.NOT_EQUAL()`). 
+You can use SqlBuilder constants here (for example `SqlBuilder.NOT_EQUAL()`, `SqlBuilder.EXISTS()`)
+For better useability, it is also possible to give the value without the bracets like this: `SqlBuilder.NOT_EQUAL`
+It is possible to escape the # symbol with a backslash, note that to write a backslash in a string it needs to be escaped itself.
+Example: `cond.and("MYTABLE.MYCOLUMN", "XYZ", "\\## = ?");` results in _( #MYTABLE.MYCOLUMN = 'XYZ' )_
 * *pFieldType*
 This parameter is for specifying the SQLTYPE explicitly. In most cases, you won't need it, as the type is loaded from the db by the table name and the column name you specified in pFieldOrCond.
 
@@ -552,7 +557,7 @@ var cond = newWhere("TABLE.FIELD", aSqlBuilderContainingFullSelect);
 === IN statement with array of values
 
 pValue can also be an array of values which is automatically transfered into a SQL prepared statement SQL like this:
- ["(?, ?, ?)", [["Peter", SQLTYPES.VARCHAR], ["Paul", SQLTYPES.VARCHAR], ["Mary", SQLTYPES.VARCHAR]]]
+ `["(?, ?, ?)", [["Peter", SQLTYPES.VARCHAR], ["Paul", SQLTYPES.VARCHAR], ["Mary", SQLTYPES.VARCHAR]]]`
 
 With this it is very easy to create a in-statement:
 [source,js]
@@ -560,7 +565,10 @@ With this it is very easy to create a in-statement:
 var cond = newWhere("PERSON.FIRSTNAME", ["Peter", "Paul", "Mary"], SqlBuilder.IN()) // SqlBuilder.IN() == "in ?"
 // Note that also SqlBuilder.NOT_IN() is possible here
 ----
-Note that an empty array is threated like null or undefined: using .where throws an error, using .whereIfSet ignores the whole condition.
+Note that an empty array is treated like null or undefined: using .where throws an error, using .whereIfSet ignores the whole condition.
+
+TIP: Passing nothing as condition will result in an SqlBuilder.IN when the values are an array. 
+For example `myCondition.and("PERSON.FIRSTNAME", ["Peter", "Paul", "Mary"])`
 
 === IN statement with subquery
 
diff --git a/process/Sql_lib/process.js b/process/Sql_lib/process.js
index 247df44a33..c202ee1387 100644
--- a/process/Sql_lib/process.js
+++ b/process/Sql_lib/process.js
@@ -1549,7 +1549,9 @@ SqlBuilder.prototype._addWhere = function(pFieldOrCond, pValue, pMandatory, pCon
                     if (pFieldType === undefined || pFieldType === null)
                         pFieldType = SqlUtils.getSingleColumnType(parsedField, undefined, this.alias);
                 }
-                                
+                //overwrite condition to set a default behaviour
+                if (pCondition == undefined)
+                    pCondition = SqlBuilder.IN();
                 // value-array -> convert it to a prepared statement ["(?, ?, ?)", [[val1, type1], [val2, type2], [val3, type3]]]
                 this._whereCondition(this._prepare(field, SqlUtils.getSqlInStatement(undefined, pValue, undefined, true, pFieldType), pCondition, pFieldType, false), undefined, pAddPreparedConditionCallback, true);
                 return this;
-- 
GitLab


From 8026e5e52db88fc59b24b36897c6f92f3dd96ddb Mon Sep 17 00:00:00 2001
From: "a.schindlbeck" <a.schindlbeck@adito.de>
Date: Mon, 14 Sep 2020 13:08:59 +0200
Subject: [PATCH 299/309] Calendar_lib: exchangeEmail Fix

---
 process/Calendar_lib/process.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/process/Calendar_lib/process.js b/process/Calendar_lib/process.js
index 551b030800..0a9a4b99e7 100644
--- a/process/Calendar_lib/process.js
+++ b/process/Calendar_lib/process.js
@@ -108,7 +108,7 @@ CalendarUtil.getEffectiveCalendarIdFromUser = function(pUser)
     var email = userParams["email"];
     
     if(exchangeEmail)
-        return exhangeEmail;
+        return exchangeEmail;
     else if(calendarId)
         return calendarId;
     else if(email)
-- 
GitLab


From 40f6feff0a4470d3ca5d24148ae53d8ca65563e0 Mon Sep 17 00:00:00 2001
From: "j.goderbauer" <j.goderbauer@adito.de>
Date: Mon, 14 Sep 2020 15:14:52 +0200
Subject: [PATCH 300/309] Liquibase fix wrong script

---
 .../basic/2020.2.0/alter_ComunicationMedium_IdDatatype.xml      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.liquibase/Data_alias/basic/2020.2.0/alter_ComunicationMedium_IdDatatype.xml b/.liquibase/Data_alias/basic/2020.2.0/alter_ComunicationMedium_IdDatatype.xml
index ec7089c394..c96e25152e 100644
--- a/.liquibase/Data_alias/basic/2020.2.0/alter_ComunicationMedium_IdDatatype.xml
+++ b/.liquibase/Data_alias/basic/2020.2.0/alter_ComunicationMedium_IdDatatype.xml
@@ -22,7 +22,7 @@
         </sql>
     </changeSet>
     <changeSet dbms="!derby" author="j.goderbauer" id="fbee4d8c-681d-4bea-b665-9fa951c3daa8">
-        <modifyDataType tableName="COMMUNICATION" columnName="MEDIUM_ID" newDataType="VARCHAR(36);"/>
+        <modifyDataType tableName="COMMUNICATION" columnName="MEDIUM_ID" newDataType="VARCHAR(36)"/>
     </changeSet>
     <!--third: update data that now contains the data with spaces at the end-->
     <!--MS SQL supports the regular trim-function with  MS SQL 2017 or higher, so lets use the old ltrim/rtrim functions for better compability -->
-- 
GitLab


From c8b6411685b5257bc39b89cd54eea47b314c8fdf Mon Sep 17 00:00:00 2001
From: "j.goderbauer" <j.goderbauer@adito.de>
Date: Mon, 14 Sep 2020 16:12:41 +0200
Subject: [PATCH 301/309] Offer: adding Offeritems caused an exception when the
 product has been selected

---
 entity/Offer_entity/Offer_entity.aod          |  1 +
 .../children/contactid_param/valueProcess.js  |  4 ++++
 entity/Offeritem_entity/Offeritem_entity.aod  | 20 +++++++++----------
 3 files changed, 15 insertions(+), 10 deletions(-)
 create mode 100644 entity/Offer_entity/entityfields/offeritems/children/contactid_param/valueProcess.js

diff --git a/entity/Offer_entity/Offer_entity.aod b/entity/Offer_entity/Offer_entity.aod
index d511b462fa..90825b3106 100644
--- a/entity/Offer_entity/Offer_entity.aod
+++ b/entity/Offer_entity/Offer_entity.aod
@@ -134,6 +134,7 @@
         </entityParameter>
         <entityParameter>
           <name>ContactId_param</name>
+          <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/offeritems/children/contactid_param/valueProcess.js</valueProcess>
           <expose v="true" />
           <mandatory v="true" />
         </entityParameter>
diff --git a/entity/Offer_entity/entityfields/offeritems/children/contactid_param/valueProcess.js b/entity/Offer_entity/entityfields/offeritems/children/contactid_param/valueProcess.js
new file mode 100644
index 0000000000..ef0d5bcac5
--- /dev/null
+++ b/entity/Offer_entity/entityfields/offeritems/children/contactid_param/valueProcess.js
@@ -0,0 +1,4 @@
+import("system.vars");
+import("system.result");
+
+result.string(vars.get("$field.CONTACT_ID"));
\ No newline at end of file
diff --git a/entity/Offeritem_entity/Offeritem_entity.aod b/entity/Offeritem_entity/Offeritem_entity.aod
index dc0d84d447..a900e6473e 100644
--- a/entity/Offeritem_entity/Offeritem_entity.aod
+++ b/entity/Offeritem_entity/Offeritem_entity.aod
@@ -278,13 +278,13 @@
           <name>DISCOUNT.value</name>
           <recordfield>OFFERITEM.DISCOUNT</recordfield>
           <isFilterable v="true" />
-          <isLookupFilter v="true" />
+          <isLookupFilter v="false" />
         </dbRecordFieldMapping>
         <dbRecordFieldMapping>
           <name>GROUPCODEID.value</name>
           <recordfield>OFFERITEM.GROUPCODEID</recordfield>
           <isFilterable v="true" />
-          <isLookupFilter v="true" />
+          <isLookupFilter v="false" />
         </dbRecordFieldMapping>
         <dbRecordFieldMapping>
           <name>ITEMNAME.value</name>
@@ -296,7 +296,7 @@
           <name>ITEMPOSITION.value</name>
           <recordfield>OFFERITEM.ITEMPOSITION</recordfield>
           <isFilterable v="true" />
-          <isLookupFilter v="true" />
+          <isLookupFilter v="false" />
         </dbRecordFieldMapping>
         <dbRecordFieldMapping>
           <name>ITEMSORT.value</name>
@@ -314,43 +314,43 @@
           <name>OPTIONAL.value</name>
           <recordfield>OFFERITEM.OPTIONAL</recordfield>
           <isFilterable v="true" />
-          <isLookupFilter v="true" />
+          <isLookupFilter v="false" />
         </dbRecordFieldMapping>
         <dbRecordFieldMapping>
           <name>PRICE.value</name>
           <recordfield>OFFERITEM.PRICE</recordfield>
           <isFilterable v="true" />
-          <isLookupFilter v="true" />
+          <isLookupFilter v="false" />
         </dbRecordFieldMapping>
         <dbRecordFieldMapping>
           <name>PRODUCT_ID.value</name>
           <recordfield>OFFERITEM.PRODUCT_ID</recordfield>
           <isFilterable v="true" />
-          <isLookupFilter v="true" />
+          <isLookupFilter v="false" />
         </dbRecordFieldMapping>
         <dbRecordFieldMapping>
           <name>QUANTITY.value</name>
           <recordfield>OFFERITEM.QUANTITY</recordfield>
           <isFilterable v="true" />
-          <isLookupFilter v="true" />
+          <isLookupFilter v="false" />
         </dbRecordFieldMapping>
         <dbRecordFieldMapping>
           <name>UNIT.value</name>
           <recordfield>OFFERITEM.UNIT</recordfield>
           <isFilterable v="true" />
-          <isLookupFilter v="true" />
+          <isLookupFilter v="false" />
         </dbRecordFieldMapping>
         <dbRecordFieldMapping>
           <name>VAT.value</name>
           <recordfield>OFFERITEM.VAT</recordfield>
           <isFilterable v="true" />
-          <isLookupFilter v="true" />
+          <isLookupFilter v="false" />
         </dbRecordFieldMapping>
         <dbRecordFieldMapping>
           <name>INFO.value</name>
           <recordfield>OFFERITEM.INFO</recordfield>
           <isFilterable v="true" />
-          <isLookupFilter v="true" />
+          <isLookupFilter v="false" />
         </dbRecordFieldMapping>
         <dbRecordFieldMapping>
           <name>GROUPCODEID.displayValue</name>
-- 
GitLab


From 13c3769f0cf93963d3dabe341e8a71d1eeff44fb Mon Sep 17 00:00:00 2001
From: "j.goderbauer" <j.goderbauer@adito.de>
Date: Mon, 14 Sep 2020 16:12:51 +0200
Subject: [PATCH 302/309] Scanservices

---
 .../entityfields/testaction/onActionProcess.js       |  5 -----
 neonContext/Organisation/Organisation.aod            |  4 ++++
 neonView/AttributeEdit_view/AttributeEdit_view.aod   |  4 ----
 .../CampaignStepAddParticipants_view.aod             |  4 ----
 .../CompetitionEdit_view/CompetitionEdit_view.aod    | 12 ------------
 neonView/ForecastEdit_view/ForecastEdit_view.aod     |  4 ----
 neonView/ForecastFilter_view/ForecastFilter_view.aod |  1 -
 .../OfferitemFilter_view/OfferitemFilter_view.aod    |  1 -
 neonView/OrderFilter_view/OrderFilter_view.aod       |  2 +-
 neonView/OrderPreview_view/OrderPreview_view.aod     |  4 ----
 neonView/PersonDetail_view/PersonDetail_view.aod     |  4 ----
 neonView/ProductEdit_view/ProductEdit_view.aod       |  4 ----
 .../SalesprojectMilestoneInfo_view.aod               |  2 +-
 .../SalesprojectPreview_view.aod                     |  4 ----
 .../SalesprojectSourceFilter_view.aod                |  1 -
 .../SupportTicketFilter_view.aod                     |  1 -
 .../TimetrackingFilter_view.aod                      |  4 ++--
 .../VisitPlanEntryEdit_view.aod                      |  4 ++--
 .../VisitPlanEntryFilter_view.aod                    |  2 +-
 19 files changed, 11 insertions(+), 56 deletions(-)
 delete mode 100644 entity/Order_entity/entityfields/testaction/onActionProcess.js

diff --git a/entity/Order_entity/entityfields/testaction/onActionProcess.js b/entity/Order_entity/entityfields/testaction/onActionProcess.js
deleted file mode 100644
index 232cd1d982..0000000000
--- a/entity/Order_entity/entityfields/testaction/onActionProcess.js
+++ /dev/null
@@ -1,5 +0,0 @@
-import("system.vars");
-import("system.question");
-
-var r = vars.get("$field.#CONTENTTITLE");
-question.showMessage(r);
\ No newline at end of file
diff --git a/neonContext/Organisation/Organisation.aod b/neonContext/Organisation/Organisation.aod
index 03cdfd02c6..46f4d763f7 100644
--- a/neonContext/Organisation/Organisation.aod
+++ b/neonContext/Organisation/Organisation.aod
@@ -59,6 +59,10 @@
       <name>d27a8b2d-2fcf-4626-843c-e709c2ed71b0</name>
       <view>OrganisationClassification</view>
     </neonViewReference>
+    <neonViewReference>
+      <name>d9065774-5ef3-4d1c-b96f-b2f98e6a581c</name>
+      <view>OrganisationNoNoiseTable_view</view>
+    </neonViewReference>
     <neonViewReference>
       <name>0b052872-d6b4-41ac-ad0b-580575893e1b</name>
       <view>OrganisationLesserNoiseTable_view</view>
diff --git a/neonView/AttributeEdit_view/AttributeEdit_view.aod b/neonView/AttributeEdit_view/AttributeEdit_view.aod
index f9a869de8f..f0540f0420 100644
--- a/neonView/AttributeEdit_view/AttributeEdit_view.aod
+++ b/neonView/AttributeEdit_view/AttributeEdit_view.aod
@@ -39,10 +39,6 @@
           <name>d26696ac-199c-45f0-9147-b75dee3f4b65</name>
           <entityField>ATTRIBUTE_ACTIVE</entityField>
         </entityFieldLink>
-        <entityFieldLink>
-          <name>c8a5f45e-8092-45f4-ac22-681700447235</name>
-          <entityField>ATTRIBUTE_LEVEL</entityField>
-        </entityFieldLink>
       </fields>
     </genericViewTemplate>
     <neonViewReference>
diff --git a/neonView/CampaignStepAddParticipants_view/CampaignStepAddParticipants_view.aod b/neonView/CampaignStepAddParticipants_view/CampaignStepAddParticipants_view.aod
index 52b5809134..975475f463 100644
--- a/neonView/CampaignStepAddParticipants_view/CampaignStepAddParticipants_view.aod
+++ b/neonView/CampaignStepAddParticipants_view/CampaignStepAddParticipants_view.aod
@@ -22,10 +22,6 @@
           <name>62805d6e-3b77-4af3-b282-13720dd615df</name>
           <entityField>CAMPAIGNSTEPID</entityField>
         </entityFieldLink>
-        <entityFieldLink>
-          <name>6c1ec68e-64fd-4eaf-8d74-047e9a8703fa</name>
-          <entityField>ADDPARTICIPANTSMESSAGE</entityField>
-        </entityFieldLink>
       </fields>
     </genericViewTemplate>
   </children>
diff --git a/neonView/CompetitionEdit_view/CompetitionEdit_view.aod b/neonView/CompetitionEdit_view/CompetitionEdit_view.aod
index ae4b045d5f..2dc804c8fa 100644
--- a/neonView/CompetitionEdit_view/CompetitionEdit_view.aod
+++ b/neonView/CompetitionEdit_view/CompetitionEdit_view.aod
@@ -39,18 +39,6 @@
           <name>087036b6-4b07-4f7e-90fe-b35c5ceb6dd9</name>
           <entityField>REASON</entityField>
         </entityFieldLink>
-        <entityFieldLink>
-          <name>cb795feb-20f0-48d8-a147-5edb6a911d19</name>
-          <entityField>PRICE_POLITICS</entityField>
-        </entityFieldLink>
-        <entityFieldLink>
-          <name>755e1dc3-08f6-4a03-a572-3bb84ec73b05</name>
-          <entityField>STRENGTH</entityField>
-        </entityFieldLink>
-        <entityFieldLink>
-          <name>e14f29e5-36ff-4740-ae72-854d713c3f8f</name>
-          <entityField>WEAKNESS</entityField>
-        </entityFieldLink>
       </fields>
     </genericViewTemplate>
   </children>
diff --git a/neonView/ForecastEdit_view/ForecastEdit_view.aod b/neonView/ForecastEdit_view/ForecastEdit_view.aod
index fe71618bad..28debe56d0 100644
--- a/neonView/ForecastEdit_view/ForecastEdit_view.aod
+++ b/neonView/ForecastEdit_view/ForecastEdit_view.aod
@@ -31,10 +31,6 @@
           <name>f5e95dd2-c853-48be-ad18-e5fdbe714873</name>
           <entityField>INFO</entityField>
         </entityFieldLink>
-        <entityFieldLink>
-          <name>382caf7e-d3db-4bac-af99-a95d62504da7</name>
-          <entityField>CONTACT_ID</entityField>
-        </entityFieldLink>
       </fields>
     </genericViewTemplate>
   </children>
diff --git a/neonView/ForecastFilter_view/ForecastFilter_view.aod b/neonView/ForecastFilter_view/ForecastFilter_view.aod
index 400bfb57ed..ffa08904f6 100644
--- a/neonView/ForecastFilter_view/ForecastFilter_view.aod
+++ b/neonView/ForecastFilter_view/ForecastFilter_view.aod
@@ -14,7 +14,6 @@
       <iconField>#ICON</iconField>
       <titleField>GROUPCODE</titleField>
       <subtitleField>VOLUME</subtitleField>
-      <descriptionField>TYPE</descriptionField>
       <entityField>#ENTITY</entityField>
       <columns>
         <neonTableColumn>
diff --git a/neonView/OfferitemFilter_view/OfferitemFilter_view.aod b/neonView/OfferitemFilter_view/OfferitemFilter_view.aod
index 6965423af4..cd9156a57c 100644
--- a/neonView/OfferitemFilter_view/OfferitemFilter_view.aod
+++ b/neonView/OfferitemFilter_view/OfferitemFilter_view.aod
@@ -11,7 +11,6 @@
   <children>
     <treeTableViewTemplate>
       <name>OfferitemsTreeTable</name>
-      <parentField>ASSIGNEDTO</parentField>
       <entityField>#ENTITY</entityField>
       <columns>
         <neonTreeTableColumn>
diff --git a/neonView/OrderFilter_view/OrderFilter_view.aod b/neonView/OrderFilter_view/OrderFilter_view.aod
index e60953c96a..b98d0e4d4a 100644
--- a/neonView/OrderFilter_view/OrderFilter_view.aod
+++ b/neonView/OrderFilter_view/OrderFilter_view.aod
@@ -54,7 +54,7 @@
       <inlineEdit v="true" />
       <iconField>IMAGE</iconField>
       <titleField>SALESORDERCODE</titleField>
-      <subtitleField>STATUS</subtitleField>
+      <subtitleField>ORDERSTATUS</subtitleField>
       <descriptionField>NET</descriptionField>
       <entityField>#ENTITY</entityField>
       <linkedColumns>
diff --git a/neonView/OrderPreview_view/OrderPreview_view.aod b/neonView/OrderPreview_view/OrderPreview_view.aod
index 0e82bce97a..449cb53093 100644
--- a/neonView/OrderPreview_view/OrderPreview_view.aod
+++ b/neonView/OrderPreview_view/OrderPreview_view.aod
@@ -35,10 +35,6 @@
           <name>0ee64080-2459-4a56-b4b9-cab2cac0f8c3</name>
           <entityField>SALESORDERDATE</entityField>
         </entityFieldLink>
-        <entityFieldLink>
-          <name>d7bb0f49-34db-4485-9908-598e83f3e73b</name>
-          <entityField>ORDERDATE</entityField>
-        </entityFieldLink>
         <entityFieldLink>
           <name>beb2d15c-6ed9-41fb-b59b-f874568a9896</name>
           <entityField>ORDERTYPE</entityField>
diff --git a/neonView/PersonDetail_view/PersonDetail_view.aod b/neonView/PersonDetail_view/PersonDetail_view.aod
index c4073f2110..bf877ec44c 100644
--- a/neonView/PersonDetail_view/PersonDetail_view.aod
+++ b/neonView/PersonDetail_view/PersonDetail_view.aod
@@ -25,10 +25,6 @@
           <name>39ca0ab2-b2d5-4d56-9ded-f8df1ae4dd0a</name>
           <entityField>LANGUAGE</entityField>
         </entityFieldLink>
-        <entityFieldLink>
-          <name>86e3b7c4-44ee-4fd4-83f1-2842a0eabda7</name>
-          <entityField>ORGNAME</entityField>
-        </entityFieldLink>
       </fields>
     </genericViewTemplate>
   </children>
diff --git a/neonView/ProductEdit_view/ProductEdit_view.aod b/neonView/ProductEdit_view/ProductEdit_view.aod
index 6cafb03d52..768f479d12 100644
--- a/neonView/ProductEdit_view/ProductEdit_view.aod
+++ b/neonView/ProductEdit_view/ProductEdit_view.aod
@@ -25,10 +25,6 @@
           <name>77197b19-54ea-493c-8d12-27391cd54a7a</name>
           <entityField>MINSTOCK</entityField>
         </entityFieldLink>
-        <entityFieldLink>
-          <name>472939e5-a69b-4eba-986f-0b47e72d0e9d</name>
-          <entityField>ORGANISATION_ID</entityField>
-        </entityFieldLink>
         <entityFieldLink>
           <name>cefb3dc8-8d9b-47c4-a0f8-e78e66303ec7</name>
           <entityField>PRODUCTCODE</entityField>
diff --git a/neonView/SalesprojectMilestoneInfo_view/SalesprojectMilestoneInfo_view.aod b/neonView/SalesprojectMilestoneInfo_view/SalesprojectMilestoneInfo_view.aod
index a43785597b..178eb3816f 100644
--- a/neonView/SalesprojectMilestoneInfo_view/SalesprojectMilestoneInfo_view.aod
+++ b/neonView/SalesprojectMilestoneInfo_view/SalesprojectMilestoneInfo_view.aod
@@ -21,7 +21,7 @@
       <columns>
         <neonTableColumn>
           <name>4c261b96-17d3-424e-8297-3ff46d780516</name>
-          <entityField>VALUE</entityField>
+          <entityField>MILESTONEVALUE</entityField>
         </neonTableColumn>
         <neonTableColumn>
           <name>c055c340-0f7b-4c91-a0a6-22e20511d2a9</name>
diff --git a/neonView/SalesprojectPreview_view/SalesprojectPreview_view.aod b/neonView/SalesprojectPreview_view/SalesprojectPreview_view.aod
index 97bfa5d73f..ab9b03eab9 100644
--- a/neonView/SalesprojectPreview_view/SalesprojectPreview_view.aod
+++ b/neonView/SalesprojectPreview_view/SalesprojectPreview_view.aod
@@ -37,10 +37,6 @@
       <drawerCaption>Details</drawerCaption>
       <entityField>#ENTITY</entityField>
       <fields>
-        <entityFieldLink>
-          <name>f2b33601-12e8-463f-a920-6e1ae9745491</name>
-          <entityField>RELATION_ID</entityField>
-        </entityFieldLink>
         <entityFieldLink>
           <name>b3e902de-072f-4a41-8562-f4d30ad9a564</name>
           <entityField>STATUS</entityField>
diff --git a/neonView/SalesprojectSourceFilter_view/SalesprojectSourceFilter_view.aod b/neonView/SalesprojectSourceFilter_view/SalesprojectSourceFilter_view.aod
index 6bac528005..ca41ad24d8 100644
--- a/neonView/SalesprojectSourceFilter_view/SalesprojectSourceFilter_view.aod
+++ b/neonView/SalesprojectSourceFilter_view/SalesprojectSourceFilter_view.aod
@@ -12,7 +12,6 @@
     <tableViewTemplate>
       <name>Entries</name>
       <iconField>#ICON</iconField>
-      <titleField>SOURCE</titleField>
       <subtitleField>ENTRYDATE</subtitleField>
       <descriptionField>INFO</descriptionField>
       <entityField>#ENTITY</entityField>
diff --git a/neonView/SupportTicketFilter_view/SupportTicketFilter_view.aod b/neonView/SupportTicketFilter_view/SupportTicketFilter_view.aod
index f233e247a8..4dcf1f49a4 100644
--- a/neonView/SupportTicketFilter_view/SupportTicketFilter_view.aod
+++ b/neonView/SupportTicketFilter_view/SupportTicketFilter_view.aod
@@ -37,7 +37,6 @@
   <children>
     <timelineViewTemplate>
       <name>TicketsTimeline</name>
-      <favoriteActionGroup1>tableActions</favoriteActionGroup1>
       <dateField>TASK_MATURITY_DATE</dateField>
       <titleField>TASK_SUBJECT_DETAILS</titleField>
       <descriptionField>TASK_DESCRIPTION</descriptionField>
diff --git a/neonView/TimetrackingFilter_view/TimetrackingFilter_view.aod b/neonView/TimetrackingFilter_view/TimetrackingFilter_view.aod
index d56fbc0ca0..c05c5db874 100644
--- a/neonView/TimetrackingFilter_view/TimetrackingFilter_view.aod
+++ b/neonView/TimetrackingFilter_view/TimetrackingFilter_view.aod
@@ -14,8 +14,8 @@
       <name>Timetrackings</name>
       <iconField>#IMAGE</iconField>
       <titleField>CONTACT_ID</titleField>
-      <subtitleField>MINUTES</subtitleField>
-      <descriptionField>DATE</descriptionField>
+      <subtitleField>TRACKINGMINUTES</subtitleField>
+      <descriptionField>TRACKINGDATE</descriptionField>
       <entityField>#ENTITY</entityField>
       <columns>
         <neonTableColumn>
diff --git a/neonView/VisitPlanEntryEdit_view/VisitPlanEntryEdit_view.aod b/neonView/VisitPlanEntryEdit_view/VisitPlanEntryEdit_view.aod
index 950d8706d1..4a216530f8 100644
--- a/neonView/VisitPlanEntryEdit_view/VisitPlanEntryEdit_view.aod
+++ b/neonView/VisitPlanEntryEdit_view/VisitPlanEntryEdit_view.aod
@@ -17,8 +17,8 @@
       <isEditable v="true" />
       <fields>
         <entityFieldLink>
-          <name>6cb39117-71cf-432b-afe7-b3446921d89e</name>
-          <entityField>ORGANISATION_ID</entityField>
+          <name>8c3a2df7-3928-43d4-baa9-686747ed020c</name>
+          <entityField>ORGANISATION_CONTACT_ID</entityField>
         </entityFieldLink>
         <entityFieldLink>
           <name>7584baf6-340c-419b-ad16-03c75b96aa39</name>
diff --git a/neonView/VisitPlanEntryFilter_view/VisitPlanEntryFilter_view.aod b/neonView/VisitPlanEntryFilter_view/VisitPlanEntryFilter_view.aod
index d7dcd500c7..4233a41959 100644
--- a/neonView/VisitPlanEntryFilter_view/VisitPlanEntryFilter_view.aod
+++ b/neonView/VisitPlanEntryFilter_view/VisitPlanEntryFilter_view.aod
@@ -54,7 +54,7 @@
         </neonTreeTableColumn>
         <neonTreeTableColumn>
           <name>646193df-c713-4b40-85cc-0fbe6f8cb316</name>
-          <entityField>ORGANISATION_ID</entityField>
+          <entityField>ORGANISATION_CONTACT_ID</entityField>
         </neonTreeTableColumn>
         <neonTreeTableColumn>
           <name>bcaf81b5-0e84-47e0-91aa-b62cec49ed17</name>
-- 
GitLab


From dde8ed6956ee6be8cbdadea43b640aaa69422730 Mon Sep 17 00:00:00 2001
From: "b.ulrich" <b.ulrich@adito.de>
Date: Tue, 15 Sep 2020 08:55:43 +0200
Subject: [PATCH 303/309] [Projekt: Entwicklung - Neon][TicketNr.:
 1065247][Scanservice-meldungen von DocumentTemplate und ExportTemplate
 Entities fixien]

---
 .../DocumentTemplateLink_entity.aod                            | 1 +
 .../entityfields/links/documentation.adoc                      | 3 +++
 .../DocumentTemplatePlaceOfUse_entity.aod                      | 2 ++
 .../documenttemplateplaceofuse_param/documentation.adoc        | 3 +++
 .../entityfields/documenttemplateplaceofuse/documentation.adoc | 3 +++
 .../DocumentTemplateTypeCategory_entity.aod                    | 1 +
 .../entityfields/bycategory/documentation.adoc                 | 3 +++
 entity/DocumentTemplate_entity/DocumentTemplate_entity.aod     | 2 ++
 .../entityfields/attachments/documentation.adoc                | 3 +++
 .../entityfields/documenttemplateprovider/documentation.adoc   | 3 +++
 .../ExportTemplateField_entity/ExportTemplateField_entity.aod  | 1 +
 .../entityfields/exporttemplatefields/documentation.adoc       | 3 +++
 .../ExportTemplatePlaceOfUse_entity.aod                        | 1 +
 .../entityfields/exporttemplateplaceofuser/documentation.adoc  | 3 +++
 entity/ExportTemplate_entity/ExportTemplate_entity.aod         | 2 ++
 .../entityfields/exporttemplateids/documentation.adoc          | 3 +++
 16 files changed, 37 insertions(+)
 create mode 100644 entity/DocumentTemplateLink_entity/entityfields/links/documentation.adoc
 create mode 100644 entity/DocumentTemplatePlaceOfUse_entity/entityfields/documenttemplateplaceofuse/children/documenttemplateplaceofuse_param/documentation.adoc
 create mode 100644 entity/DocumentTemplatePlaceOfUse_entity/entityfields/documenttemplateplaceofuse/documentation.adoc
 create mode 100644 entity/DocumentTemplateTypeCategory_entity/entityfields/bycategory/documentation.adoc
 create mode 100644 entity/DocumentTemplate_entity/entityfields/attachments/documentation.adoc
 create mode 100644 entity/DocumentTemplate_entity/entityfields/documenttemplateprovider/documentation.adoc
 create mode 100644 entity/ExportTemplateField_entity/entityfields/exporttemplatefields/documentation.adoc
 create mode 100644 entity/ExportTemplatePlaceOfUse_entity/entityfields/exporttemplateplaceofuser/documentation.adoc
 create mode 100644 entity/ExportTemplate_entity/entityfields/exporttemplateids/documentation.adoc

diff --git a/entity/DocumentTemplateLink_entity/DocumentTemplateLink_entity.aod b/entity/DocumentTemplateLink_entity/DocumentTemplateLink_entity.aod
index dcd594f7b7..e848d6cbed 100644
--- a/entity/DocumentTemplateLink_entity/DocumentTemplateLink_entity.aod
+++ b/entity/DocumentTemplateLink_entity/DocumentTemplateLink_entity.aod
@@ -67,6 +67,7 @@
     <entityProvider>
       <name>Links</name>
       <targetIdField>DOCUMENTTEMPLATE_ID_CHILD</targetIdField>
+      <documentation>%aditoprj%/entity/DocumentTemplateLink_entity/entityfields/links/documentation.adoc</documentation>
       <recordContainer>db</recordContainer>
       <dependencies>
         <entityDependency>
diff --git a/entity/DocumentTemplateLink_entity/entityfields/links/documentation.adoc b/entity/DocumentTemplateLink_entity/entityfields/links/documentation.adoc
new file mode 100644
index 0000000000..7a84ce185c
--- /dev/null
+++ b/entity/DocumentTemplateLink_entity/entityfields/links/documentation.adoc
@@ -0,0 +1,3 @@
+= DocumentTemplateLink_entity - Links
+
+needed instead of the #PROVIDER so the DocumentId_param and Type_param can be used
\ No newline at end of file
diff --git a/entity/DocumentTemplatePlaceOfUse_entity/DocumentTemplatePlaceOfUse_entity.aod b/entity/DocumentTemplatePlaceOfUse_entity/DocumentTemplatePlaceOfUse_entity.aod
index 3164b4edae..3e77638a51 100644
--- a/entity/DocumentTemplatePlaceOfUse_entity/DocumentTemplatePlaceOfUse_entity.aod
+++ b/entity/DocumentTemplatePlaceOfUse_entity/DocumentTemplatePlaceOfUse_entity.aod
@@ -47,6 +47,7 @@
     </entityConsumer>
     <entityProvider>
       <name>DocumentTemplatePlaceOfUse</name>
+      <documentation>%aditoprj%/entity/DocumentTemplatePlaceOfUse_entity/entityfields/documenttemplateplaceofuse/documentation.adoc</documentation>
       <dependencies>
         <entityDependency>
           <name>bc05b556-ecca-478c-9a92-b77e4d98d6f3</name>
@@ -59,6 +60,7 @@
         <entityParameter>
           <name>DocumentTemplatePlaceOfUse_param</name>
           <valueProcess>%aditoprj%/entity/DocumentTemplatePlaceOfUse_entity/entityfields/documenttemplateplaceofuse/children/documenttemplateplaceofuse_param/valueProcess.js</valueProcess>
+          <documentation>%aditoprj%/entity/DocumentTemplatePlaceOfUse_entity/entityfields/documenttemplateplaceofuse/children/documenttemplateplaceofuse_param/documentation.adoc</documentation>
         </entityParameter>
       </children>
     </entityProvider>
diff --git a/entity/DocumentTemplatePlaceOfUse_entity/entityfields/documenttemplateplaceofuse/children/documenttemplateplaceofuse_param/documentation.adoc b/entity/DocumentTemplatePlaceOfUse_entity/entityfields/documenttemplateplaceofuse/children/documenttemplateplaceofuse_param/documentation.adoc
new file mode 100644
index 0000000000..01180d3457
--- /dev/null
+++ b/entity/DocumentTemplatePlaceOfUse_entity/entityfields/documenttemplateplaceofuse/children/documenttemplateplaceofuse_param/documentation.adoc
@@ -0,0 +1,3 @@
+= DocumentTemplatePlaceOfUse_entity - DocumentTemplatePlaceOfUse
+
+needed instead of the #PROVIDER so the DocumentTemplatePlaceOfUse_param can be used to specify the place of use
\ No newline at end of file
diff --git a/entity/DocumentTemplatePlaceOfUse_entity/entityfields/documenttemplateplaceofuse/documentation.adoc b/entity/DocumentTemplatePlaceOfUse_entity/entityfields/documenttemplateplaceofuse/documentation.adoc
new file mode 100644
index 0000000000..fb626b8cd6
--- /dev/null
+++ b/entity/DocumentTemplatePlaceOfUse_entity/entityfields/documenttemplateplaceofuse/documentation.adoc
@@ -0,0 +1,3 @@
+= DocumentTemplatePlaceOfUse_entity - DocumentTemplatePlaceOfUse
+
+needed instead of the #PROVIDER so DocumentTemplatePlaceOfUse_param can be used
\ No newline at end of file
diff --git a/entity/DocumentTemplateTypeCategory_entity/DocumentTemplateTypeCategory_entity.aod b/entity/DocumentTemplateTypeCategory_entity/DocumentTemplateTypeCategory_entity.aod
index b70fb4f064..bea4c1751d 100644
--- a/entity/DocumentTemplateTypeCategory_entity/DocumentTemplateTypeCategory_entity.aod
+++ b/entity/DocumentTemplateTypeCategory_entity/DocumentTemplateTypeCategory_entity.aod
@@ -30,6 +30,7 @@
     <entityProvider>
       <name>ByCategory</name>
       <lookupIdfield>KEYID</lookupIdfield>
+      <documentation>%aditoprj%/entity/DocumentTemplateTypeCategory_entity/entityfields/bycategory/documentation.adoc</documentation>
       <recordContainer>db</recordContainer>
       <dependencies>
         <entityDependency>
diff --git a/entity/DocumentTemplateTypeCategory_entity/entityfields/bycategory/documentation.adoc b/entity/DocumentTemplateTypeCategory_entity/entityfields/bycategory/documentation.adoc
new file mode 100644
index 0000000000..3b14b668f8
--- /dev/null
+++ b/entity/DocumentTemplateTypeCategory_entity/entityfields/bycategory/documentation.adoc
@@ -0,0 +1,3 @@
+= DocumentTemplateTypeCategory_entity - ByCategory
+
+needed instead of the #PROVIDER so the usageFilter_param can be used
\ No newline at end of file
diff --git a/entity/DocumentTemplate_entity/DocumentTemplate_entity.aod b/entity/DocumentTemplate_entity/DocumentTemplate_entity.aod
index 1c1eb5c7b7..3cace11c7a 100644
--- a/entity/DocumentTemplate_entity/DocumentTemplate_entity.aod
+++ b/entity/DocumentTemplate_entity/DocumentTemplate_entity.aod
@@ -193,6 +193,7 @@
       <name>Attachments</name>
       <targetContextField>TARGET_CONTEXT</targetContextField>
       <targetIdField>DOCUMENTTEMPLATEID</targetIdField>
+      <documentation>%aditoprj%/entity/DocumentTemplate_entity/entityfields/attachments/documentation.adoc</documentation>
       <titlePlural>Attachments</titlePlural>
       <recordContainer>db</recordContainer>
       <dependencies>
@@ -232,6 +233,7 @@
     </entityParameter>
     <entityProvider>
       <name>DocumentTemplateProvider</name>
+      <documentation>%aditoprj%/entity/DocumentTemplate_entity/entityfields/documenttemplateprovider/documentation.adoc</documentation>
       <dependencies>
         <entityDependency>
           <name>9c10883d-eb73-4587-b758-693a66367a4c</name>
diff --git a/entity/DocumentTemplate_entity/entityfields/attachments/documentation.adoc b/entity/DocumentTemplate_entity/entityfields/attachments/documentation.adoc
new file mode 100644
index 0000000000..fffc7bdb91
--- /dev/null
+++ b/entity/DocumentTemplate_entity/entityfields/attachments/documentation.adoc
@@ -0,0 +1,3 @@
+= DocumentTemplate_entity - Attachments
+
+needed instead of the #PROVIDER so the DocumentTemplateType_param can be used
\ No newline at end of file
diff --git a/entity/DocumentTemplate_entity/entityfields/documenttemplateprovider/documentation.adoc b/entity/DocumentTemplate_entity/entityfields/documenttemplateprovider/documentation.adoc
new file mode 100644
index 0000000000..6b0863e66e
--- /dev/null
+++ b/entity/DocumentTemplate_entity/entityfields/documenttemplateprovider/documentation.adoc
@@ -0,0 +1,3 @@
+= DocumentTemplate_entity - DocumentTemplateProvider
+
+Provides the docTemplates to all the entities that need them using the comingFrom_param to specify which ones to display
\ No newline at end of file
diff --git a/entity/ExportTemplateField_entity/ExportTemplateField_entity.aod b/entity/ExportTemplateField_entity/ExportTemplateField_entity.aod
index 51ae4c0b8c..e010ab9f6c 100644
--- a/entity/ExportTemplateField_entity/ExportTemplateField_entity.aod
+++ b/entity/ExportTemplateField_entity/ExportTemplateField_entity.aod
@@ -32,6 +32,7 @@
     </entityField>
     <entityProvider>
       <name>ExportTemplateFields</name>
+      <documentation>%aditoprj%/entity/ExportTemplateField_entity/entityfields/exporttemplatefields/documentation.adoc</documentation>
       <dependencies>
         <entityDependency>
           <name>b111615c-cde3-46b7-b229-46cc2db004fd</name>
diff --git a/entity/ExportTemplateField_entity/entityfields/exporttemplatefields/documentation.adoc b/entity/ExportTemplateField_entity/entityfields/exporttemplatefields/documentation.adoc
new file mode 100644
index 0000000000..745d56fde3
--- /dev/null
+++ b/entity/ExportTemplateField_entity/entityfields/exporttemplatefields/documentation.adoc
@@ -0,0 +1,3 @@
+= ExoirtTemplateField_entity - ExportTemplateFields
+
+needed instead of the #PROVIDER so the ExportTemplateField_param can be used
\ No newline at end of file
diff --git a/entity/ExportTemplatePlaceOfUse_entity/ExportTemplatePlaceOfUse_entity.aod b/entity/ExportTemplatePlaceOfUse_entity/ExportTemplatePlaceOfUse_entity.aod
index dec30f9107..0dc5e1fc3a 100644
--- a/entity/ExportTemplatePlaceOfUse_entity/ExportTemplatePlaceOfUse_entity.aod
+++ b/entity/ExportTemplatePlaceOfUse_entity/ExportTemplatePlaceOfUse_entity.aod
@@ -55,6 +55,7 @@
     </entityParameter>
     <entityProvider>
       <name>ExportTemplatePlaceOfUser</name>
+      <documentation>%aditoprj%/entity/ExportTemplatePlaceOfUse_entity/entityfields/exporttemplateplaceofuser/documentation.adoc</documentation>
       <dependencies>
         <entityDependency>
           <name>c60a238a-51f0-4538-8c53-6921481ddd4c</name>
diff --git a/entity/ExportTemplatePlaceOfUse_entity/entityfields/exporttemplateplaceofuser/documentation.adoc b/entity/ExportTemplatePlaceOfUse_entity/entityfields/exporttemplateplaceofuser/documentation.adoc
new file mode 100644
index 0000000000..9713220ef6
--- /dev/null
+++ b/entity/ExportTemplatePlaceOfUse_entity/entityfields/exporttemplateplaceofuser/documentation.adoc
@@ -0,0 +1,3 @@
+= ExportTemplatePlaceOfUse_entity - ExportTemplatePlaceOfUser
+
+needed instead of the #PROVIDER so the ExportTemplatePlaceOfUse_param can be used
\ No newline at end of file
diff --git a/entity/ExportTemplate_entity/ExportTemplate_entity.aod b/entity/ExportTemplate_entity/ExportTemplate_entity.aod
index ff7e047785..fa020ece78 100644
--- a/entity/ExportTemplate_entity/ExportTemplate_entity.aod
+++ b/entity/ExportTemplate_entity/ExportTemplate_entity.aod
@@ -3,6 +3,7 @@
   <name>ExportTemplate_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/ExportTemplate_entity/documentation.adoc</documentation>
+  <icon>NEON:EXPORT</icon>
   <title>Export Template</title>
   <grantCreate v="true" />
   <grantUpdate v="true" />
@@ -108,6 +109,7 @@
     </entityConsumer>
     <entityProvider>
       <name>ExportTemplateIDs</name>
+      <documentation>%aditoprj%/entity/ExportTemplate_entity/entityfields/exporttemplateids/documentation.adoc</documentation>
       <recordContainer>db</recordContainer>
       <dependencies>
         <entityDependency>
diff --git a/entity/ExportTemplate_entity/entityfields/exporttemplateids/documentation.adoc b/entity/ExportTemplate_entity/entityfields/exporttemplateids/documentation.adoc
new file mode 100644
index 0000000000..2d3b77143c
--- /dev/null
+++ b/entity/ExportTemplate_entity/entityfields/exporttemplateids/documentation.adoc
@@ -0,0 +1,3 @@
+= ExportTemplate_entity - ExportTemplateIDs
+
+needed instead of the #PROVIDER so the comingFrom_param and ExportTemplateID_param can be used
\ No newline at end of file
-- 
GitLab


From 7375f2757e34ea953df66542f07f1de04ca0ce00 Mon Sep 17 00:00:00 2001
From: "j.goderbauer" <j.goderbauer@adito.de>
Date: Tue, 15 Sep 2020 09:17:33 +0200
Subject: [PATCH 304/309] Scanservice: dead reference

---
 neonView/LeadimportPreview_view/LeadimportPreview_view.aod | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/neonView/LeadimportPreview_view/LeadimportPreview_view.aod b/neonView/LeadimportPreview_view/LeadimportPreview_view.aod
index 1280e17697..4e376d9f72 100644
--- a/neonView/LeadimportPreview_view/LeadimportPreview_view.aod
+++ b/neonView/LeadimportPreview_view/LeadimportPreview_view.aod
@@ -16,7 +16,7 @@
       <titleField>NAME</titleField>
       <subtitleField>IMPORTSOURCE</subtitleField>
       <entityField>#ENTITY</entityField>
-      <informationField>SENTENCESEPERATOR</informationField>
+      <informationField>SENTENCESEPARATOR</informationField>
     </cardViewTemplate>
     <favoriteViewTemplate>
       <name>Favorites</name>
-- 
GitLab


From dc6ff32c77369ec31f0f16701cb8af9c87c4c52b Mon Sep 17 00:00:00 2001
From: Benjamin Ulrich <b.ulrich@adito.de>
Date: Tue, 15 Sep 2020 07:19:09 +0000
Subject: [PATCH 305/309] [Projekt: Entwicklung - Neon][TicketNr.:
 1058900][Ausweisung der Klassifizierung in Firma (FilterView und
 PreviewView)]

---
 .../classificationtypeid/valueProcess.js      |  4 +-
 .../recordcontainers/jdito/onUpdate.js        | 48 ++++++++++---------
 2 files changed, 28 insertions(+), 24 deletions(-)

diff --git a/entity/ClassificationAdmin_entity/entityfields/classificationtypeid/valueProcess.js b/entity/ClassificationAdmin_entity/entityfields/classificationtypeid/valueProcess.js
index 97abbd1464..7c575abe67 100644
--- a/entity/ClassificationAdmin_entity/entityfields/classificationtypeid/valueProcess.js
+++ b/entity/ClassificationAdmin_entity/entityfields/classificationtypeid/valueProcess.js
@@ -6,5 +6,5 @@ import("Classification_lib");
 
 if(vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_NEW && !vars.get("$this.value"))
     result.string(util.getNewUUID());
-else if(vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_EDIT && !vars.get("$this.value"))
-    result.string($ClassificationPlaceholder.TOPSECRETPLACEHOLDER());
\ No newline at end of file
+else if(vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_EDIT && !vars.get("$this.value")) // this means we are editing one of the classificationgroups
+    result.string($ClassificationPlaceholder.TOPSECRETPLACEHOLDER()); //this placeholder is set for the onUpdateProcess further explanation in there
\ No newline at end of file
diff --git a/entity/ClassificationAdmin_entity/recordcontainers/jdito/onUpdate.js b/entity/ClassificationAdmin_entity/recordcontainers/jdito/onUpdate.js
index b5eae575a4..43a6304543 100644
--- a/entity/ClassificationAdmin_entity/recordcontainers/jdito/onUpdate.js
+++ b/entity/ClassificationAdmin_entity/recordcontainers/jdito/onUpdate.js
@@ -1,12 +1,12 @@
+import("Classification_lib");
+import("Sql_lib");
+import("system.db");
+import("system.eMath");
 import("system.entities");
-import("system.util");
-import("system.text");
 import("system.neon");
-import("system.db");
-import("Sql_lib");
+import("system.text");
+import("system.util");
 import("system.vars");
-import("Classification_lib");
-import("system.eMath");
 
 try
 {
@@ -45,11 +45,12 @@ function _update()
 
     var i;
     var isGroupDataSet = false;
-    if(rowdata["CLASSIFICATIONTYPEID.value"] == $ClassificationPlaceholder.TOPSECRETPLACEHOLDER())
+//    the classificationtypeId.value has the placeholder set when editing a classificationgroup dataset to allow us 
+//    to handle the updating differently depending on whether its an classifcation group dataset or an classification type dataset
+//    since you want changes to the name of groups to effect only the group name and changes to the group of an classificationtype to change it's group
+    if(rowdata["CLASSIFICATIONTYPEID.value"] == $ClassificationPlaceholder.TOPSECRETPLACEHOLDER()) 
         isGroupDataSet = true;
 
-
-
     vars.get("$local.changed").forEach(function (field, i)
     {
         var dbField = dbFields[field];
@@ -63,14 +64,14 @@ function _update()
 
     if(!isGroupDataSet) //-> update the classification type dataset
     {
-        var groupIds = ClassificationUtils.getAllGroups(vars.get("$field.OBJECT_TYPE"));
+        var groupIds = ClassificationUtils.getAllGroups(vars.get("$field.OBJECT_TYPE")); //gets all existing groups of the object_type
         var newGroupId;
         var newGroupName;
         var insertGroup = false;
         var groupchange = true;
         var newId;
         for (i = 0; i < columns.length; i++) {
-            if(columns[i] == "CLASSIFICATIONGROUP_ID")
+            if(columns[i] == "CLASSIFICATIONGROUP_ID")//if the classificationgroup_Id changed: determine whether or not a new group has to be inserted
             {
                 if(!groupIds.toString().includes(values[i]))
                 {
@@ -101,23 +102,27 @@ function _update()
                 }
         }
 
-
         if(groupchange == true)
         {
             var gradeColumn, gradeTable, multiplicand, update, gradingTable;
             var oldGroup = ClassificationUtils.getClassificationGroup(text.decodeMS(uid)[1]);
             var newMax = ClassificationUtils.getMaxScoreExcludeType(oldGroup, text.decodeMS(uid)[1]);
             gradingTable = ClassificationUtils.getGradingTableByGroupId(oldGroup); 
-            var lostScore = parseInt(newSelect("max(SCORE)").from("CLASSIFICATIONSCORE").where("CLASSIFICATIONSCORE.CLASSIFICATIONTYPE_ID", text.decodeMS(uid)[1]).cell());
-            if(insertGroup)
+            
+            var lostScore = parseInt(newSelect("max(SCORE)")
+                                                .from("CLASSIFICATIONSCORE")
+                                                .where("CLASSIFICATIONSCORE.CLASSIFICATIONTYPE_ID", text.decodeMS(uid)[1])
+                                                .cell()); //the greatest score of the "moved" classificationtype affects the classificationGradings
+            
+            if(insertGroup) //new group has to be inserted
             {
                 var maxSorting = newSelect("distinct CLASSIFICATIONGROUP.CLASSIFICATIONGROUPID, CLASSIFICATIONGROUP.SORTING")
                                             .from("CLASSIFICATIONGROUP")
                                             .join("CLASSIFICATIONTYPE", "CLASSIFICATIONTYPE.CLASSIFICATIONGROUP_ID = CLASSIFICATIONGROUP.CLASSIFICATIONGROUPID")
                                             .where("CLASSIFICATIONTYPE.OBJECT_TYPE", vars.get("$field.OBJECT_TYPE"))
                                             .orderBy("CLASSIFICATIONGROUP.SORTING desc")
-                                            .table()[0][1];
-                db.insertData("CLASSIFICATIONGROUP", ["CLASSIFICATIONGROUPID", "TITLE", "SORTING"], null, [newGroupId, newGroupName, eMath.addInt(maxSorting, 1)]) //insert the new group
+                                            .table()[0][1]; //gets the greatest sorting value of the object_type
+                db.insertData("CLASSIFICATIONGROUP", ["CLASSIFICATIONGROUPID", "TITLE", "SORTING"], null, [newGroupId, newGroupName, eMath.addInt(maxSorting, 1)]) //insert the new group (sorting is greater than the greatest one
 
                 var gradingColumns = [
                 "CLASSIFICATIONGRADINGID",
@@ -133,13 +138,13 @@ function _update()
                 newGroupId
                 ];
 
-                db.insertData("CLASSIFICATIONGRADING", gradingColumns, null, gradingValues); // insert a "dummy" classificationGradingValue
+                db.insertData("CLASSIFICATIONGRADING", gradingColumns, null, gradingValues); // insert a "dummy" classificationGradingValue, since not having one results in problems
             }
-            else
+            else // classificationtype has to be moved to another classificatingroup
             {
-                newId = vars.get("$field.CLASSIFICATIONGROUP");
-                newGradingTable = ClassificationUtils.getGradingTableByGroupId(newId); 
-                newNewMax = eMath.addInt(newMax, lostScore)
+                newId = vars.get("$field.CLASSIFICATIONGROUP"); //we know that the field has the classificationgroupId of the new group set
+                newGradingTable = ClassificationUtils.getGradingTableByGroupId(newId); //we use this id to get the gradingtable of the new group
+                newNewMax = eMath.addInt(newGradingTable[0][1], lostScore) //maxvalue of the gradingtable with the added lostScore = the new maxValue
                 if(newGradingTable[0][1] != newNewMax) //update existing classificationGrading if the maxValue has changed
                 {
                     gradeColumn = ["MAXGRADEFORSCORE"];
@@ -173,7 +178,6 @@ function _update()
             }
         }
 
-
         cond = newWhereIfSet("CLASSIFICATIONTYPE.CLASSIFICATIONTYPEID = '" + text.decodeMS(uid)[1] + "'");
         columns.push("SCORETYPE");
         values.push(vars.get("$field.CLASSIFICATIONTYPEIDDISPLAYVALUE"));
-- 
GitLab


From a030ac8ba3ed62a9c6cffa44c1590d8e77561e8e Mon Sep 17 00:00:00 2001
From: Benjamin Ulrich <b.ulrich@adito.de>
Date: Tue, 15 Sep 2020 07:22:16 +0000
Subject: [PATCH 306/309] [Projekt: Entwicklung - Neon][TicketNr.:
 1065178][Besuchsplanung VISITRECOMMENDATION.PRIORITY ist das Feld vom Typ
 CHAR(36) anstelle von VARCHAR]

---
 ...er_VisitrecommendationpriorityDatatype.xml | 103 ++++++++++++++++++
 .../Data_alias/basic/2020.2.0/changelog.xml   |   1 +
 .../_demoData/generatedData/visitplan.xml     |  20 ++--
 aliasDefinition/Data_alias/Data_alias.aod     |   6 +-
 .../KeywordEntry_entity.aod                   |   6 +
 .../VisitRecommendation_entity.aod            |  16 +++
 .../containername_param/valueProcess.js       |   5 +
 .../priority_source/displayValueProcess.js    |   6 +
 .../recordcontainers/jdito/contentProcess.js  |   8 +-
 process/KeywordRegistry_basic/process.js      |  32 +++---
 10 files changed, 169 insertions(+), 34 deletions(-)
 create mode 100644 .liquibase/Data_alias/basic/2020.2.0/alter_VisitrecommendationpriorityDatatype.xml
 create mode 100644 entity/VisitRecommendation_entity/entityfields/keywordvisitrecommendationsource/children/containername_param/valueProcess.js
 create mode 100644 entity/VisitRecommendation_entity/entityfields/priority_source/displayValueProcess.js

diff --git a/.liquibase/Data_alias/basic/2020.2.0/alter_VisitrecommendationpriorityDatatype.xml b/.liquibase/Data_alias/basic/2020.2.0/alter_VisitrecommendationpriorityDatatype.xml
new file mode 100644
index 0000000000..23fcaf6c04
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2020.2.0/alter_VisitrecommendationpriorityDatatype.xml
@@ -0,0 +1,103 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+                   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">   
+    <changeSet author="b.ulrich" id="2c14c955-e312-4085-bf3e-9a07cf8a39b6">
+        <update tableName="AB_KEYWORD_ENTRY">
+            <column name="KEYID" value="VISITSTATUSPLANNED"/>
+            <where>AB_KEYWORD_ENTRYID='9d427420-2c87-4ada-9349-a799972bda0f'</where>
+        </update>
+        <update tableName="AB_KEYWORD_ENTRY">
+            <column name="KEYID" value="VISITSTATUSAPPPLANED"/>
+            <where>AB_KEYWORD_ENTRYID='2f740f93-12ed-4e22-a158-adba5da81b40'</where>
+        </update>
+        <update tableName="AB_KEYWORD_ENTRY">
+            <column name="KEYID" value="VISITSTATUSREPORTCREATED"/>
+            <where>AB_KEYWORD_ENTRYID='dd276100-b867-489c-8128-a3b71aa7564f'</where>
+        </update>
+        <update tableName="AB_KEYWORD_ENTRY">
+            <column name="KEYID" value="MANUAL"/>
+            <where>AB_KEYWORD_ENTRYID='2f162837-868a-4517-810e-677cd423be56'</where>
+        </update>
+        <update tableName="AB_KEYWORD_ENTRY">
+            <column name="KEYID" value="VISITFREQUENCY"/>
+            <where>AB_KEYWORD_ENTRYID='17905c4d-1c88-4cee-83da-164c13bbe848'</where>
+        </update>
+        <update tableName="AB_KEYWORD_ENTRY">
+            <column name="KEYID" value="VISITPRIOCRITICAL"/>
+            <where>AB_KEYWORD_ENTRYID='91d7417e-fd45-429e-9ce9-a46f25c0c1d1'</where>
+        </update>
+        <update tableName="AB_KEYWORD_ENTRY">
+            <column name="KEYID" value="VISITPRIOCVERYHIGH"/>
+            <where>AB_KEYWORD_ENTRYID='c0147b73-f678-4136-b3c4-0fde7e943a84'</where>
+        </update>
+        <update tableName="AB_KEYWORD_ENTRY">
+            <column name="KEYID" value="VISITPRIOHIGH"/>
+            <where>AB_KEYWORD_ENTRYID='4ac4c7e1-d73b-4a26-9a6d-bc06505b9611'</where>
+        </update>
+        <update tableName="AB_KEYWORD_ENTRY">
+            <column name="KEYID" value="VISITPRIOMEDIUM"/>
+            <where>AB_KEYWORD_ENTRYID='facb77a6-5bc1-4e2f-8dd0-72200b57c326'</where>
+        </update>
+        <update tableName="AB_KEYWORD_ENTRY">
+            <column name="KEYID" value="VISITPRIOLOW"/>
+            <where>AB_KEYWORD_ENTRYID='036cbf6f-a8bd-4f25-b885-f1a689927bf1'</where>
+        </update>
+    </changeSet>
+    <!--*****
+        The data type has been set to CHAR(36) by accident, so let's change it back to VARCHAR(36) and update the data that is already persistant.
+        Tested on Apache Derby DB.
+    ******-->
+    <!--second: change the type, dependent on the dbms-->
+    <changeSet dbms="derby" author="b.ulrich" id="30bdc4ef-1b99-43c6-8637-da20f64772c9">
+        <sql>
+            ALTER TABLE VISITRECOMMENDATION ADD COLUMN PRIORITY_NEW VARCHAR(36);
+            UPDATE VISITRECOMMENDATION SET PRIORITY_NEW=PRIORITY;
+            ALTER TABLE VISITRECOMMENDATION DROP COLUMN PRIORITY;
+            RENAME COLUMN VISITRECOMMENDATION.PRIORITY_NEW TO PRIORITY;
+            ALTER TABLE VISITPLANENTRY ADD COLUMN STATUS_NEW VARCHAR(36);
+            UPDATE VISITPLANENTRY SET STATUS_NEW=STATUS;
+            ALTER TABLE VISITPLANENTRY DROP COLUMN STATUS;
+            RENAME COLUMN VISITPLANENTRY.STATUS_NEW TO STATUS;
+            ALTER TABLE VISITRECOMMENDATION ADD COLUMN SOURCE_NEW VARCHAR(36);
+            UPDATE VISITRECOMMENDATION SET SOURCE_NEW=SOURCE;
+            ALTER TABLE VISITRECOMMENDATION DROP COLUMN SOURCE;
+            RENAME COLUMN VISITRECOMMENDATION.SOURCE_NEW TO SOURCE;
+        </sql>
+    </changeSet>
+    <changeSet dbms="!derby" author="b.ulrich" id="ec6f82ad-491b-4e0a-a24c-e45ea0e494de">
+        <modifyDataType tableName="VISITRECOMMENDATION" columnName="PRIORITY" newDataType="VARCHAR(36)"/>
+        <modifyDataType tableName="VISITPLANENTRY" columnName="STATUS" newDataType="VARCHAR(36)"/>
+        <modifyDataType tableName="VISITRECOMMENDATION" columnName="SOURCE" newDataType="VARCHAR(36)"/>
+    </changeSet>
+    <!--third: update data that now contains the data with spaces at the end-->
+    <!--MS SQL supports the regular trim-function with  MS SQL 2017 or higher, so lets use the old ltrim/rtrim functions for better compability -->
+    <!--sauce: https://docs.microsoft.com/de-de/sql/t-sql/functions/trim-transact-sql?view=sql-server-ver15-->
+    <changeSet dbms="mssql" author="b.ulrich" id="d306d290-c3cf-42e2-8f28-e4a4cfa7d16f">
+        <update tableName="VISITRECOMMENDATION">
+            <column name="PRIORITY" valueComputed="ltrim(rtrim(PRIORITY))" />
+            <where>PRIORITY is not null</where>
+        </update>
+        <update tableName="VISITPLANENTRY">
+            <column name="STATUS" valueComputed="ltrim(rtrim(STATUS))" />
+            <where>STATUS is not null</where>
+        </update>
+        <update tableName="VISITRECOMMENDATION">
+            <column name="SOURCE" valueComputed="ltrim(rtrim(SOURCE))" />
+            <where>SOURCE is not null</where>
+        </update>
+    </changeSet>
+    <changeSet dbms="!mssql" author="b.ulrich" id="3fcc49d0-eb7d-4976-aff4-0e8b911e95af">
+        <update tableName="VISITRECOMMENDATION">
+            <column name="PRIORITY" valueComputed="trim(PRIORITY)" />
+            <where>PRIORITY is not null</where>
+        </update>
+        <update tableName="VISITPLANENTRY">
+            <column name="STATUS" valueComputed="trim(STATUS)" />
+            <where>STATUS is not null</where>
+        </update>
+        <update tableName="VISITRECOMMENDATION">
+            <column name="SOURCE" valueComputed="trim(SOURCE)" />
+            <where>SOURCE is not null</where>
+        </update>
+    </changeSet>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/2020.2.0/changelog.xml b/.liquibase/Data_alias/basic/2020.2.0/changelog.xml
index 7f2c9ff325..92370f459f 100644
--- a/.liquibase/Data_alias/basic/2020.2.0/changelog.xml
+++ b/.liquibase/Data_alias/basic/2020.2.0/changelog.xml
@@ -8,4 +8,5 @@
     <include relativeToChangelogFile="true" file="optimizeIndizes.xml"/>
     <include relativeToChangelogFile="true" file="addNotificationStateKeywords/addNotificationStateKeyword.xml"/>
     <include relativeToChangelogFile="true" file="alter_ComunicationMedium_IdDatatype.xml"/>
+    <include relativeToChangelogFile="true" file="alter_VisitrecommendationpriorityDatatype.xml"/>
 </databaseChangeLog>
diff --git a/.liquibase/Data_alias/basic/_demoData/generatedData/visitplan.xml b/.liquibase/Data_alias/basic/_demoData/generatedData/visitplan.xml
index 5c29131bd0..b42ed24286 100644
--- a/.liquibase/Data_alias/basic/_demoData/generatedData/visitplan.xml
+++ b/.liquibase/Data_alias/basic/_demoData/generatedData/visitplan.xml
@@ -1,7 +1,6 @@
 <?xml version="1.1" encoding="UTF-8" standalone="no"?>
 <databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
     <changeSet author="autogenerated" id="62ad16a9-7312-4dda-9e4b-460673b9af82">
-        <!--
         <insert tableName="VISITPLANEMPLOYEEWEEK">
           <column name="VISITPLANEMPLOYEEWEEKID" value="821b3424-b6d2-41f8-b0b2-6a7c2c050214"/>
           <column name="VISITPLAN_YEAR" valueNumeric="2020"/>
@@ -18,7 +17,7 @@
           <column name="ORGANISATION_CONTACT_ID" value="f7b8f0c3-7702-4466-b502-d21fa4fa0010"/>
           <column name ="CONTACT_ID" value="6c612f91-0160-4f09-9103-dccee7f7a6b7"/>
           <column name="VISITPLANEMPLOYEEWEEK_ID" value="821b3424-b6d2-41f8-b0b2-6a7c2c050214"/>
-          <column name="STATUS" value="VISITSTATUSPLANNED                  "/>
+          <column name="STATUS" value="VISITSTATUSPLANNED"/>
         </insert>
         <insert tableName="VISITPLANENTRY">
           <column name="VISITPLANENTRYID" value="9c6b378b-4738-47b6-9f19-3a1e26f3428e"/>
@@ -28,7 +27,7 @@
           <column name="ORGANISATION_CONTACT_ID" value="2c63e0de-f21c-474f-89d7-bff8ba1dbf43"/>
           <column name ="CONTACT_ID" value="45635aca-7971-43df-a683-c80c86cb58cc"/>
           <column name="VISITPLANEMPLOYEEWEEK_ID" value="821b3424-b6d2-41f8-b0b2-6a7c2c050214"/>
-          <column name="STATUS" value="VISITSTATUSPLANNED                  "/>
+          <column name="STATUS" value="VISITSTATUSPLANNED"/>
         </insert>
         <insert tableName="VISITPLANENTRY">
           <column name="VISITPLANENTRYID" value="bd7b38d1-9ae1-4424-8c65-d9b0f3b000ba"/>
@@ -38,7 +37,7 @@
           <column name="ORGANISATION_CONTACT_ID" value="06006801-c6a1-4321-9fde-95f9d3f9b786"/>
           <column name ="CONTACT_ID" value="ef345d11-a40d-59e0-a24c-afcb6095d2cb"/>
           <column name="VISITPLANEMPLOYEEWEEK_ID" value="821b3424-b6d2-41f8-b0b2-6a7c2c050214"/>
-          <column name="STATUS" value="VISITSTATUSPLANNED                  "/>
+          <column name="STATUS" value="VISITSTATUSPLANNED"/>
         </insert>
         <insert tableName="VISITPLANENTRY">
           <column name="VISITPLANENTRYID" value="5102104c-6baa-404f-9c71-157a8c79663a"/>
@@ -48,7 +47,7 @@
           <column name="ORGANISATION_CONTACT_ID" value="13e60843-5d6d-45ee-88c7-46db41874138"/>
           <column name ="CONTACT_ID" value="79ce56fc-0022-4d5c-91b1-080c0f1e2191"/>
           <column name="VISITPLANEMPLOYEEWEEK_ID" value="821b3424-b6d2-41f8-b0b2-6a7c2c050214"/>
-          <column name="STATUS" value="VISITSTATUSPLANNED                  "/>
+          <column name="STATUS" value="VISITSTATUSPLANNED"/>
         </insert>
         
         <insert tableName="VISITPLANEMPLOYEEWEEK">
@@ -66,7 +65,7 @@
           <column name="END_TIME" value="11:00"/>
           <column name="ORGANISATION_CONTACT_ID" value="f7b8f0c3-7702-4466-b502-d21fa4fa0010"/>
           <column name="VISITPLANEMPLOYEEWEEK_ID" value="73fbf25a-5668-411f-9ef5-42603d163a77"/>
-          <column name="STATUS" value="VISITSTATUSPLANNED                  "/>
+          <column name="STATUS" value="VISITSTATUSPLANNED"/>
         </insert>
         <insert tableName="VISITPLANENTRY">
           <column name="VISITPLANENTRYID" value="f799a0cd-31bb-4be3-9fd9-0cbd0a3d55ac"/>
@@ -75,7 +74,7 @@
           <column name="END_TIME" value="11:00"/>
           <column name="ORGANISATION_CONTACT_ID" value="82c7b72d-da4e-4fab-a6cc-31e1be07dd08"/>
           <column name="VISITPLANEMPLOYEEWEEK_ID" value="73fbf25a-5668-411f-9ef5-42603d163a77"/>
-          <column name="STATUS" value="VISITSTATUSPLANNED                  "/>
+          <column name="STATUS" value="VISITSTATUSPLANNED"/>
         </insert>
         <insert tableName="VISITPLANENTRY">
           <column name="VISITPLANENTRYID" value="ad325402-616c-495e-a7f5-a5ae6def0399"/>
@@ -84,18 +83,17 @@
           <column name="END_TIME" value="11:00"/>
           <column name="ORGANISATION_CONTACT_ID" value="62175b31-b432-4ec6-932f-8e69033884c6"/>
           <column name="VISITPLANEMPLOYEEWEEK_ID" value="73fbf25a-5668-411f-9ef5-42603d163a77"/>
-          <column name="STATUS" value="VISITSTATUSPLANNED                  "/>
+          <column name="STATUS" value="VISITSTATUSPLANNED"/>
         </insert>
 
 
         <insert tableName="VISITRECOMMENDATION">
           <column name="VISITRECOMMENDATIONID" value="487eeff9-6807-41f6-95e9-5f0f61b45a05"/>
           <column name="DUE_DATE" valueDate="2020-04-16T10:43:23"/>
-          <column name="PRIORITY" value="VISITPRIOMEDIUM                     "/>
-          <column name="SOURCE" value="MANUAL                              "/>
+          <column name="PRIORITY" value="VISITPRIOMEDIUM"/>
+          <column name="SOURCE" value="MANUAL"/>
           <column name="CONTACT_ID" value="fc465f2f-803b-4a1f-b79d-7b466d7ecff4"/>
           <column name="INFO" value="Kontrolltermin"/>
         </insert>
-        -->
     </changeSet>
 </databaseChangeLog>
\ No newline at end of file
diff --git a/aliasDefinition/Data_alias/Data_alias.aod b/aliasDefinition/Data_alias/Data_alias.aod
index a076f2356b..afddf43c8b 100644
--- a/aliasDefinition/Data_alias/Data_alias.aod
+++ b/aliasDefinition/Data_alias/Data_alias.aod
@@ -14630,7 +14630,7 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
-                <size v="255" />
+                <size v="36" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -14671,7 +14671,7 @@
                 <name>PRIORITY</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="1" />
+                <columnType v="12" />
                 <size v="36" />
                 <scale v="0" />
                 <notNull v="false" />
@@ -14809,7 +14809,7 @@
                 <name>STATUS</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="1" />
+                <columnType v="12" />
                 <size v="36" />
                 <scale v="0" />
                 <notNull v="false" />
diff --git a/entity/KeywordEntry_entity/KeywordEntry_entity.aod b/entity/KeywordEntry_entity/KeywordEntry_entity.aod
index 2d7eb1b4f1..ad9c6c6627 100644
--- a/entity/KeywordEntry_entity/KeywordEntry_entity.aod
+++ b/entity/KeywordEntry_entity/KeywordEntry_entity.aod
@@ -583,6 +583,12 @@
           <fieldName>KeywordImportFields</fieldName>
           <isConsumer v="false" />
         </entityDependency>
+        <entityDependency>
+          <name>2823f5a0-2b1d-41f4-abf1-3e7b332fa176</name>
+          <entityName>VisitRecommendation_entity</entityName>
+          <fieldName>KeywordVisitRecommendationSource</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
       </dependencies>
       <children>
         <entityParameter>
diff --git a/entity/VisitRecommendation_entity/VisitRecommendation_entity.aod b/entity/VisitRecommendation_entity/VisitRecommendation_entity.aod
index d70a400985..a52a61b1da 100644
--- a/entity/VisitRecommendation_entity/VisitRecommendation_entity.aod
+++ b/entity/VisitRecommendation_entity/VisitRecommendation_entity.aod
@@ -58,6 +58,8 @@
     <entityField>
       <name>PRIORITY_SOURCE</name>
       <title>Priority Source</title>
+      <consumer>KeywordVisitRecommendationSource</consumer>
+      <displayValueProcess>%aditoprj%/entity/VisitRecommendation_entity/entityfields/priority_source/displayValueProcess.js</displayValueProcess>
     </entityField>
     <entityField>
       <name>DUE_DATE</name>
@@ -158,6 +160,20 @@
       <name>#PROVIDER_AGGREGATES</name>
       <useAggregates v="true" />
     </entityProvider>
+    <entityConsumer>
+      <name>KeywordVisitRecommendationSource</name>
+      <dependency>
+        <name>dependency</name>
+        <entityName>KeywordEntry_entity</entityName>
+        <fieldName>SpecificContainerKeywords</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>ContainerName_param</name>
+          <valueProcess>%aditoprj%/entity/VisitRecommendation_entity/entityfields/keywordvisitrecommendationsource/children/containername_param/valueProcess.js</valueProcess>
+        </entityParameter>
+      </children>
+    </entityConsumer>
   </entityFields>
   <recordContainers>
     <jDitoRecordContainer>
diff --git a/entity/VisitRecommendation_entity/entityfields/keywordvisitrecommendationsource/children/containername_param/valueProcess.js b/entity/VisitRecommendation_entity/entityfields/keywordvisitrecommendationsource/children/containername_param/valueProcess.js
new file mode 100644
index 0000000000..06491a0184
--- /dev/null
+++ b/entity/VisitRecommendation_entity/entityfields/keywordvisitrecommendationsource/children/containername_param/valueProcess.js
@@ -0,0 +1,5 @@
+import("system.result"); 
+import("Keyword_lib"); 
+import("KeywordRegistry_basic");
+
+result.string($KeywordRegistry.visitRecommendationPrioSource());
\ No newline at end of file
diff --git a/entity/VisitRecommendation_entity/entityfields/priority_source/displayValueProcess.js b/entity/VisitRecommendation_entity/entityfields/priority_source/displayValueProcess.js
new file mode 100644
index 0000000000..a52185f9fc
--- /dev/null
+++ b/entity/VisitRecommendation_entity/entityfields/priority_source/displayValueProcess.js
@@ -0,0 +1,6 @@
+import("system.result");
+import("system.vars");
+import("Keyword_lib");
+import("KeywordRegistry_basic");
+
+result.string(KeywordUtils.getViewValue($KeywordRegistry.visitRecommendationPrioSource(), vars.get("$field.PRIORITY_SOURCE")));
\ No newline at end of file
diff --git a/entity/VisitRecommendation_entity/recordcontainers/jdito/contentProcess.js b/entity/VisitRecommendation_entity/recordcontainers/jdito/contentProcess.js
index c6952bf184..2dcf9d4752 100644
--- a/entity/VisitRecommendation_entity/recordcontainers/jdito/contentProcess.js
+++ b/entity/VisitRecommendation_entity/recordcontainers/jdito/contentProcess.js
@@ -44,7 +44,7 @@ if(idValues == false)
                                                         .leftJoin("ORGANISATION", "ORGANISATION.ORGANISATIONID = CONTACT.ORGANISATION_ID")
                                                         .where("AB_ATTRIBUTE.AB_ATTRIBUTEID", $AttributeRegistry.visitPlanPointOfContact())
                                                         .cell(), AddressUtils.formatOnelineSql(), 
-                                                        "visitPlanFrequency.ID_VALUE", "'VISITFREQUENCY                      '", activitySubQuery, "CONTACTID",
+                                                        "visitPlanFrequency.ID_VALUE", "'" + $KeywordRegistry.visitRecommendationPrioSource$visitFrequency()+"'" , activitySubQuery, "CONTACTID",
                                             newSelect("min(ENTRYDATE)")
                                                         .from("VISITPLANENTRY") 
                                                         .where("CONTACT.CONTACTID", "VISITPLANENTRY.ORGANISATION_CONTACT_ID") 
@@ -132,11 +132,12 @@ for( let i = 0; i < recommendationSQLData.length; i++)
     tmpData[1] = organisationName;                          //Organisation Name
     tmpData[3] = recommendationSQLData[i][6];               //Address
     tmpData[4] = prio; 
-    tmpData[5] = recommendationSQLData[i][4];               //Source of Priority
+    tmpData[5] = recommendationSQLData[i][4];               //Source of Priority (Id)
     tmpData[7] = recommendationSQLData[i][3];               //Due Date
     tmpData[8] = recommendationSQLData[i][5];               //Info
     tmpData[9] = recommendationSQLData[i][1];               //CONTACT_ID
     tmpData[2] = recommendationSQLData[i][8];               //Data_planned
+    tmpData[6] = KeywordUtils.getViewValue($KeywordRegistry.visitRecommendationPrioSource(), recommendationSQLData[i][4]) //Source of Priority (displayvalue)
     
 
     recommendationData.push(tmpData);
@@ -164,11 +165,12 @@ if(idValues == false)
         tmpData[0] = visitFrequencyData[i][0];                 //UID
         tmpData[1] = visitFrequencyData[i][1];                 //Organisation Name
         tmpData[3] = visitFrequencyData[i][2];                 //Address
-        tmpData[5] = visitFrequencyData[i][4];                 //Source of Priority
+        tmpData[5] = visitFrequencyData[i][4];                 //Source of Priority (Id)
         tmpData[8] = "";
         tmpData[4] = visitFrequencyData[i][5];                 //last visit
         tmpData[9] = visitFrequencyData[i][6];                 //ContactId
         tmpData[2] = visitFrequencyData[i][1];                 //OrganisationId
+        tmpData[6] = KeywordUtils.getViewValue($KeywordRegistry.visitRecommendationPrioSource(), visitFrequencyData[i][4]) //Source of Priority (displayvalue)
         var dueDate = "";
         var lastVisitDate = "";
 
diff --git a/process/KeywordRegistry_basic/process.js b/process/KeywordRegistry_basic/process.js
index b36a20300d..41a3be1f1b 100644
--- a/process/KeywordRegistry_basic/process.js
+++ b/process/KeywordRegistry_basic/process.js
@@ -16,8 +16,6 @@
  * $KeywordRegistry.activityDirection()
  */
 function $KeywordRegistry(){}
-// this function can also be found as StringUtils.pad36() in Util_lib and is just here to avoid an import because this registry is heavily used.
-$KeywordRegistry._autoPad = function(pKey){return (pKey + "                                    ").slice(0, 36)}; 
 
 $KeywordRegistry.attributeType = function(){return "AttributeType";};
 $KeywordRegistry.keywordAttributeType = function(){return "KeywordAttributeType";};
@@ -276,21 +274,21 @@ $KeywordRegistry.workflowActivityType$intermediateCatchEvent = function(){return
 $KeywordRegistry.workflowActivityType$intermediateThrowEvent = function(){return "intermediateThrowEvent";};
 $KeywordRegistry.exportTemplateSeparator$tab = function(){return "TAB";};
 
-$KeywordRegistry.visitRecommendationPriority = function(){return $KeywordRegistry._autoPad("VisitRecommendationPriority");};
-$KeywordRegistry.visitRecommendationPriority$critical = function(){return $KeywordRegistry._autoPad("VISITPRIOCRITICAL");};
-$KeywordRegistry.visitRecommendationPriority$veryHigh = function(){return $KeywordRegistry._autoPad("VISITPRIOCVERYHIGH");};
-$KeywordRegistry.visitRecommendationPriority$high = function(){return $KeywordRegistry._autoPad("VISITPRIOHIGH");};
-$KeywordRegistry.visitRecommendationPriority$medium = function(){return $KeywordRegistry._autoPad("VISITPRIOMEDIUM");};
-$KeywordRegistry.visitRecommendationPriority$low = function(){return $KeywordRegistry._autoPad("VISITPRIOLOW");};
-
-$KeywordRegistry.visitPlanEntryStatus = function(){return $KeywordRegistry._autoPad("VisitPlanEntryStatus");};
-$KeywordRegistry.visitPlanEntryStatus$planned = function(){return $KeywordRegistry._autoPad("VISITSTATUSPLANNED");};
-$KeywordRegistry.visitPlanEntryStatus$Appointmentarranged = function(){return $KeywordRegistry._autoPad("VISITSTATUSAPPPLANED");};
-$KeywordRegistry.visitPlanEntryStatus$Visitreportcreated = function(){return $KeywordRegistry._autoPad("VISITSTATUSREPORTCREATED");};
-
-$KeywordRegistry.visitRecommendationPrioSource = function(){return $KeywordRegistry._autoPad("VisitRecommendationPrioSource");};
-$KeywordRegistry.visitRecommendationPrioSource$visitFrequency = function(){return $KeywordRegistry._autoPad("VISITFREQUENCY");};
-$KeywordRegistry.visitRecommendationPrioSource$manual = function(){return $KeywordRegistry._autoPad("MANUAL");};
+$KeywordRegistry.visitRecommendationPriority = function(){return "VisitRecommendationPriority";};
+$KeywordRegistry.visitRecommendationPriority$critical = function(){return "VISITPRIOCRITICAL";};
+$KeywordRegistry.visitRecommendationPriority$veryHigh = function(){return "VISITPRIOCVERYHIGH";};
+$KeywordRegistry.visitRecommendationPriority$high = function(){return "VISITPRIOHIGH";};
+$KeywordRegistry.visitRecommendationPriority$medium = function(){return "VISITPRIOMEDIUM";};
+$KeywordRegistry.visitRecommendationPriority$low = function(){return "VISITPRIOLOW";};
+
+$KeywordRegistry.visitPlanEntryStatus = function(){return "VisitPlanEntryStatus";};
+$KeywordRegistry.visitPlanEntryStatus$planned = function(){return "VISITSTATUSPLANNED";};
+$KeywordRegistry.visitPlanEntryStatus$Appointmentarranged = function(){return "VISITSTATUSAPPPLANED";};
+$KeywordRegistry.visitPlanEntryStatus$Visitreportcreated = function(){return "VISITSTATUSREPORTCREATED";};
+
+$KeywordRegistry.visitRecommendationPrioSource = function(){return "VisitRecommendationPrioSource";};
+$KeywordRegistry.visitRecommendationPrioSource$visitFrequency = function(){return "VISITFREQUENCY";};
+$KeywordRegistry.visitRecommendationPrioSource$manual = function(){return "MANUAL";};
 
 $KeywordRegistry.workflowCategory = function(){return "WorkflowCategory";};
 
-- 
GitLab


From bb0df21243d488402abce484654fff190ae46106 Mon Sep 17 00:00:00 2001
From: Daniel Tran <d.tran@adito.de>
Date: Tue, 15 Sep 2020 07:41:55 +0000
Subject: [PATCH 307/309] #1058564 report dispatch impl2

---
 .../add_DocumentTemplatePlaceOfUse.xml        |  55 ++++
 .../Data_alias/basic/2020.2.0/changelog.xml   |   1 +
 .../documenttemplateplaceofuse.xml            |   5 -
 entity/DSGVOInfo_entity/DSGVOInfo_entity.aod  |   6 +
 .../recipient_param/valueProcess.js           |   4 +
 .../reporttype_param/valueProcess.js          |   0
 .../DSGVOReport_entity/DSGVOReport_entity.aod |  14 +-
 .../dispatchdsgvoreport/onActionProcess.js    |  28 ++
 .../entityfields/report_data/valueProcess.js  |   2 +-
 entity/DSGVO_entity/DSGVO_entity.aod          |   1 +
 entity/Email_entity/Email_entity.aod          |   4 +-
 .../offerid_param/documentation.adoc          |   3 -
 .../entityfields/recipient/valueProcess.js    |   2 +-
 .../entityfields/sendmail/onActionProcess.js  |  25 +-
 .../dispatchofferreport/onActionProcess.js    |  23 +-
 entity/Order_entity/Order_entity.aod          | 114 ++++---
 .../dispatchorderreport/onActionProcess.js    |  30 ++
 .../dispatchorderreport/stateProcess.js       |  10 +
 .../dispatchreminderreport/onActionProcess.js |  28 ++
 .../dispatchreminderreport/stateProcess.js    |   9 +
 .../Organisation_entity.aod                   |  13 +
 .../dispatchorgreport/iconIdProcess.js        |   9 +
 .../dispatchorgreport/onActionProcess.js      |  24 ++
 .../_____LANGUAGE_EXTRA.aod                   | 297 +++++++++---------
 .../_____LANGUAGE_de/_____LANGUAGE_de.aod     |  69 ++--
 .../_____LANGUAGE_en/_____LANGUAGE_en.aod     | 151 ++++-----
 .../DSGVOReport_view/DSGVOReport_view.aod     |   1 +
 .../OrderFilter_view/OrderFilter_view.aod     |   3 +
 .../OrderReminderReport_view.aod              |   1 +
 .../OrderReport_view/OrderReport_view.aod     |   2 +
 .../OrganisationReport_view.aod               |   1 +
 process/DataPrivacy_lib/process.js            |   2 +-
 process/Email_lib/process.js                  |  22 +-
 33 files changed, 589 insertions(+), 370 deletions(-)
 create mode 100644 .liquibase/Data_alias/basic/2020.2.0/ReportDispatchImpl/add_DocumentTemplatePlaceOfUse.xml
 create mode 100644 entity/DSGVOInfo_entity/entityfields/recipient_param/valueProcess.js
 create mode 100644 entity/DSGVOInfo_entity/entityfields/reporttype_param/valueProcess.js
 create mode 100644 entity/DSGVOReport_entity/entityfields/dsgvoreportdispatch/children/dispatchdsgvoreport/onActionProcess.js
 delete mode 100644 entity/Email_entity/entityfields/offerid_param/documentation.adoc
 create mode 100644 entity/Order_entity/entityfields/orderreportdispatch/children/dispatchorderreport/onActionProcess.js
 create mode 100644 entity/Order_entity/entityfields/orderreportdispatch/children/dispatchorderreport/stateProcess.js
 create mode 100644 entity/Order_entity/entityfields/reminderreportdispatch/children/dispatchreminderreport/onActionProcess.js
 create mode 100644 entity/Order_entity/entityfields/reminderreportdispatch/children/dispatchreminderreport/stateProcess.js
 create mode 100644 entity/Organisation_entity/entityfields/orgreportdispatch/children/dispatchorgreport/iconIdProcess.js
 create mode 100644 entity/Organisation_entity/entityfields/orgreportdispatch/children/dispatchorgreport/onActionProcess.js

diff --git a/.liquibase/Data_alias/basic/2020.2.0/ReportDispatchImpl/add_DocumentTemplatePlaceOfUse.xml b/.liquibase/Data_alias/basic/2020.2.0/ReportDispatchImpl/add_DocumentTemplatePlaceOfUse.xml
new file mode 100644
index 0000000000..d8b5060371
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2020.2.0/ReportDispatchImpl/add_DocumentTemplatePlaceOfUse.xml
@@ -0,0 +1,55 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+    <changeSet author="d.tran" id="b16e0a6e-74b7-414a-9cc2-fb7f8f1c3d72">
+        <insert tableName="DOCUMENTTEMPLATEPLACEOFUSE">
+            <column name="DOCUMENTTEMPLATEPLACEOFUSEID" value="bbd50206-c4d5-42e0-a19a-2d11e957af1f"/>
+            <column name="DOCUMENTTEMPLATE_ID" value="12da39a8-6fc9-4220-b09d-179cd611a814"/>
+            <column name="PLACEOFUSE" value="DSGVOReport"/>
+        </insert>
+        <insert tableName="DOCUMENTTEMPLATEPLACEOFUSE">
+            <column name="DOCUMENTTEMPLATEPLACEOFUSEID" value="63f5b453-24af-47a2-8ef1-ee5c91003428"/>
+            <column name="DOCUMENTTEMPLATE_ID" value="12da39a8-6fc9-4220-b09d-179cd611a814"/>
+            <column name="PLACEOFUSE" value="Order"/>
+        </insert>
+        <insert tableName="DOCUMENTTEMPLATEPLACEOFUSE">
+            <column name="DOCUMENTTEMPLATEPLACEOFUSEID" value="910939c0-fe4f-4142-9656-d06ed1fe6d04"/>
+            <column name="DOCUMENTTEMPLATE_ID" value="1cabdde7-870e-4094-a0f7-a335ded3536a"/>
+            <column name="PLACEOFUSE" value="DSGVOReport"/>
+        </insert>
+        <insert tableName="DOCUMENTTEMPLATEPLACEOFUSE">
+            <column name="DOCUMENTTEMPLATEPLACEOFUSEID" value="a5ccf0e5-2c4d-4782-8970-61af4db2dd31"/>
+            <column name="DOCUMENTTEMPLATE_ID" value="1cabdde7-870e-4094-a0f7-a335ded3536a"/>
+            <column name="PLACEOFUSE" value="Order"/>
+        </insert>
+        <insert tableName="DOCUMENTTEMPLATEPLACEOFUSE">
+            <column name="DOCUMENTTEMPLATEPLACEOFUSEID" value="460e8b4c-5124-4b83-ab81-16ad919abe35"/>
+            <column name="DOCUMENTTEMPLATE_ID" value="5e494f97-4d29-4cce-abf7-9eaa2577337f"/>
+            <column name="PLACEOFUSE" value="Organisation"/>
+        </insert>
+        <insert tableName="DOCUMENTTEMPLATEPLACEOFUSE">
+            <column name="DOCUMENTTEMPLATEPLACEOFUSEID" value="346113a2-e3b6-41e5-b058-13342e45984a"/>
+            <column name="DOCUMENTTEMPLATE_ID" value="5e494f97-4d29-4cce-abf7-9eaa2577337f"/>
+            <column name="PLACEOFUSE" value="DSGVOReport"/>
+        </insert>
+        <insert tableName="DOCUMENTTEMPLATEPLACEOFUSE">
+            <column name="DOCUMENTTEMPLATEPLACEOFUSEID" value="b741dc23-8e46-46a6-9485-56a9033d944a"/>
+            <column name="DOCUMENTTEMPLATE_ID" value="5e494f97-4d29-4cce-abf7-9eaa2577337f"/>
+            <column name="PLACEOFUSE" value="Order"/>
+        </insert>
+        <insert tableName="DOCUMENTTEMPLATEPLACEOFUSE">
+            <column name="DOCUMENTTEMPLATEPLACEOFUSEID" value="50cd8a91-5a48-479d-a329-aa9c1d1a3835"/>
+            <column name="DOCUMENTTEMPLATE_ID" value="fb237ade-ce63-40bd-aa41-33d7417fca2c"/>
+            <column name="PLACEOFUSE" value="Organisation"/>
+        </insert>
+        <insert tableName="DOCUMENTTEMPLATEPLACEOFUSE">
+            <column name="DOCUMENTTEMPLATEPLACEOFUSEID" value="5e2011ef-87aa-4b51-bea4-34cbfa11722f"/>
+            <column name="DOCUMENTTEMPLATE_ID" value="fb237ade-ce63-40bd-aa41-33d7417fca2c"/>
+            <column name="PLACEOFUSE" value="DSGVOReport"/>
+        </insert>
+        <insert tableName="DOCUMENTTEMPLATEPLACEOFUSE">
+            <column name="DOCUMENTTEMPLATEPLACEOFUSEID" value="e1422fa3-dcd2-4863-b972-1a3fb4b4fdc6"/>
+            <column name="DOCUMENTTEMPLATE_ID" value="fb237ade-ce63-40bd-aa41-33d7417fca2c"/>
+            <column name="PLACEOFUSE" value="Order"/>
+        </insert>
+    </changeSet>
+</databaseChangeLog>
diff --git a/.liquibase/Data_alias/basic/2020.2.0/changelog.xml b/.liquibase/Data_alias/basic/2020.2.0/changelog.xml
index 92370f459f..52e4a7e0cd 100644
--- a/.liquibase/Data_alias/basic/2020.2.0/changelog.xml
+++ b/.liquibase/Data_alias/basic/2020.2.0/changelog.xml
@@ -8,5 +8,6 @@
     <include relativeToChangelogFile="true" file="optimizeIndizes.xml"/>
     <include relativeToChangelogFile="true" file="addNotificationStateKeywords/addNotificationStateKeyword.xml"/>
     <include relativeToChangelogFile="true" file="alter_ComunicationMedium_IdDatatype.xml"/>
+    <include relativeToChangelogFile="true" file="ReportDispatchImpl/add_DocumentTemplatePlaceOfUse.xml"/>
     <include relativeToChangelogFile="true" file="alter_VisitrecommendationpriorityDatatype.xml"/>
 </databaseChangeLog>
diff --git a/.liquibase/Data_alias/basic/_demoData/generatedData/documenttemplateplaceofuse.xml b/.liquibase/Data_alias/basic/_demoData/generatedData/documenttemplateplaceofuse.xml
index dd6292ff8c..318aef6335 100644
--- a/.liquibase/Data_alias/basic/_demoData/generatedData/documenttemplateplaceofuse.xml
+++ b/.liquibase/Data_alias/basic/_demoData/generatedData/documenttemplateplaceofuse.xml
@@ -16,11 +16,6 @@
             <column name="DOCUMENTTEMPLATE_ID" value="12da39a8-6fc9-4220-b09d-179cd611a814"/>
             <column name="PLACEOFUSE" value="Organisation"/>
         </insert>
-        <insert tableName="DOCUMENTTEMPLATEPLACEOFUSE">
-            <column name="DOCUMENTTEMPLATEPLACEOFUSEID" value="b4fafa76-73f2-43ee-8a88-12d30946f1bb"/>
-            <column name="DOCUMENTTEMPLATE_ID" value="12da39a8-6fc9-4220-b09d-179cd611a814"/>
-            <column name="PLACEOFUSE" value="Organisation"/>
-        </insert>
         <insert tableName="DOCUMENTTEMPLATEPLACEOFUSE">
             <column name="DOCUMENTTEMPLATEPLACEOFUSEID" value="256dad02-7433-45b3-9584-ec335e0bdcab"/>
             <column name="DOCUMENTTEMPLATE_ID" value="3acf26f9-4807-4661-8084-c0c21c593c81"/>
diff --git a/entity/DSGVOInfo_entity/DSGVOInfo_entity.aod b/entity/DSGVOInfo_entity/DSGVOInfo_entity.aod
index 5baf9ac2bf..dd8ae2f623 100644
--- a/entity/DSGVOInfo_entity/DSGVOInfo_entity.aod
+++ b/entity/DSGVOInfo_entity/DSGVOInfo_entity.aod
@@ -52,6 +52,7 @@
     </entityParameter>
     <entityParameter>
       <name>ReportType_param</name>
+      <valueProcess>%aditoprj%/entity/DSGVOInfo_entity/entityfields/reporttype_param/valueProcess.js</valueProcess>
       <expose v="true" />
     </entityParameter>
     <entityProvider>
@@ -156,6 +157,11 @@
       <name>#PROVIDER_AGGREGATES</name>
       <useAggregates v="true" />
     </entityProvider>
+    <entityParameter>
+      <name>Recipient_param</name>
+      <valueProcess>%aditoprj%/entity/DSGVOInfo_entity/entityfields/recipient_param/valueProcess.js</valueProcess>
+      <expose v="true" />
+    </entityParameter>
   </entityFields>
   <recordContainers>
     <dbRecordContainer>
diff --git a/entity/DSGVOInfo_entity/entityfields/recipient_param/valueProcess.js b/entity/DSGVOInfo_entity/entityfields/recipient_param/valueProcess.js
new file mode 100644
index 0000000000..c9be9208d3
--- /dev/null
+++ b/entity/DSGVOInfo_entity/entityfields/recipient_param/valueProcess.js
@@ -0,0 +1,4 @@
+import("system.vars");
+import("system.result");
+
+result.string(vars.get("$field.RECIPIENT"));
\ No newline at end of file
diff --git a/entity/DSGVOInfo_entity/entityfields/reporttype_param/valueProcess.js b/entity/DSGVOInfo_entity/entityfields/reporttype_param/valueProcess.js
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/entity/DSGVOReport_entity/DSGVOReport_entity.aod b/entity/DSGVOReport_entity/DSGVOReport_entity.aod
index b6fe8ca524..b96cb3a3db 100644
--- a/entity/DSGVOReport_entity/DSGVOReport_entity.aod
+++ b/entity/DSGVOReport_entity/DSGVOReport_entity.aod
@@ -9,7 +9,7 @@
       <name>#PROVIDER</name>
     </entityProvider>
     <entityParameter>
-      <name>ContactID_param</name>
+      <name>ContactId_param</name>
       <expose v="true" />
       <mandatory v="false" />
     </entityParameter>
@@ -36,6 +36,18 @@
       <name>#PROVIDER_AGGREGATES</name>
       <useAggregates v="true" />
     </entityProvider>
+    <entityActionGroup>
+      <name>dsgvoReportDispatch</name>
+      <children>
+        <entityActionField>
+          <name>dispatchDSGVOReport</name>
+          <title>Dispatch as mail</title>
+          <onActionProcess>%aditoprj%/entity/DSGVOReport_entity/entityfields/dsgvoreportdispatch/children/dispatchdsgvoreport/onActionProcess.js</onActionProcess>
+          <isObjectAction v="false" />
+          <iconId>VAADIN:AT</iconId>
+        </entityActionField>
+      </children>
+    </entityActionGroup>
   </entityFields>
   <recordContainers>
     <jDitoRecordContainer>
diff --git a/entity/DSGVOReport_entity/entityfields/dsgvoreportdispatch/children/dispatchdsgvoreport/onActionProcess.js b/entity/DSGVOReport_entity/entityfields/dsgvoreportdispatch/children/dispatchdsgvoreport/onActionProcess.js
new file mode 100644
index 0000000000..e7ffc71bed
--- /dev/null
+++ b/entity/DSGVOReport_entity/entityfields/dsgvoreportdispatch/children/dispatchdsgvoreport/onActionProcess.js
@@ -0,0 +1,28 @@
+import("system.logging");
+import("system.translate");
+import("system.vars");
+import("system.db");
+import("Contact_lib");
+import("MimeType_lib");
+import("Email_lib");
+import("Sql_lib");
+import("Entity_lib");
+
+var reportType = vars.get("$param.ReportName_param");
+var contactId = vars.get("$param.ContactId_param");
+var recipient = JSON.parse(vars.get("$param.DSGVOInfo_param"))["recipient"];
+
+var dsgvoReport = {};
+var attachmentArray = [];
+var reportData = vars.get("$field.REPORT_DATA");
+var emailFilename = translate.text(reportType == "DSGVO_Disclosure_report" ? "Disclosure Report" : "Information Report");
+var fullname = ContactUtils.getTitleByContactId(contactId);
+emailFilename = emailFilename + " " + fullname;
+
+dsgvoReport.content = reportData;
+dsgvoReport.mimeType = MimeTypes.PDF();
+dsgvoReport.filename = emailFilename + ".pdf";
+
+attachmentArray[0] = dsgvoReport;
+
+EmailWritingUtils.sendReportAsMail(recipient, attachmentArray, "DSGVOReport", null, emailFilename, null, null);
diff --git a/entity/DSGVOReport_entity/entityfields/report_data/valueProcess.js b/entity/DSGVOReport_entity/entityfields/report_data/valueProcess.js
index 2e61138143..f32c424884 100644
--- a/entity/DSGVOReport_entity/entityfields/report_data/valueProcess.js
+++ b/entity/DSGVOReport_entity/entityfields/report_data/valueProcess.js
@@ -3,4 +3,4 @@ import("system.vars");
 import("system.logging");
 import("DataPrivacy_lib")
 
-result.string(DataPrivacyUtils.buildReport(vars.get("$param.ContactID_param"), vars.get("$param.ReportName_param"), JSON.parse(vars.get("$param.DSGVOInfo_param"))));
\ No newline at end of file
+result.string(DataPrivacyUtils.buildReport(vars.get("$param.ContactId_param"), vars.get("$param.ReportName_param"), JSON.parse(vars.get("$param.DSGVOInfo_param"))));
\ No newline at end of file
diff --git a/entity/DSGVO_entity/DSGVO_entity.aod b/entity/DSGVO_entity/DSGVO_entity.aod
index 19cefc3a19..6fd134a3a8 100644
--- a/entity/DSGVO_entity/DSGVO_entity.aod
+++ b/entity/DSGVO_entity/DSGVO_entity.aod
@@ -13,6 +13,7 @@
   </siblings>
   <grantCreate v="false" />
   <grantDelete v="false" />
+  <afterSave>%aditoprj%/entity/DSGVO_entity/afterSave.js</afterSave>
   <titlePlural></titlePlural>
   <recordContainer>jdito</recordContainer>
   <entityFields>
diff --git a/entity/Email_entity/Email_entity.aod b/entity/Email_entity/Email_entity.aod
index 3ca3d9550c..f0721f5e93 100644
--- a/entity/Email_entity/Email_entity.aod
+++ b/entity/Email_entity/Email_entity.aod
@@ -129,10 +129,8 @@
       <expose v="true" />
     </entityParameter>
     <entityParameter>
-      <name>OfferId_param</name>
+      <name>UpdateStatements_param</name>
       <expose v="true" />
-      <mandatory v="true" />
-      <documentation>%aditoprj%/entity/Email_entity/entityfields/offerid_param/documentation.adoc</documentation>
     </entityParameter>
     <entityProvider>
       <name>#PROVIDER_AGGREGATES</name>
diff --git a/entity/Email_entity/entityfields/offerid_param/documentation.adoc b/entity/Email_entity/entityfields/offerid_param/documentation.adoc
deleted file mode 100644
index cc60a8f815..0000000000
--- a/entity/Email_entity/entityfields/offerid_param/documentation.adoc
+++ /dev/null
@@ -1,3 +0,0 @@
-=OfferId_pram
-
-optional param needed for the offerEmails, to change the status of the offer
\ No newline at end of file
diff --git a/entity/Email_entity/entityfields/recipient/valueProcess.js b/entity/Email_entity/entityfields/recipient/valueProcess.js
index 28712f38d1..e26a2de2a8 100644
--- a/entity/Email_entity/entityfields/recipient/valueProcess.js
+++ b/entity/Email_entity/entityfields/recipient/valueProcess.js
@@ -10,7 +10,7 @@ if (vars.get("$this.value") == null)
     else if (vars.exists("$param.ContactId_param") && vars.get("$param.ContactId_param"))
         result.string(CommUtil.getStandardMail(vars.get("$param.ContactId_param")));
 }
-else if (!vars.get("$field.RECIPIENT").includes("@"))
+else if (!vars.get("$field.RECIPIENT").includes("@") && vars.get("$field.RECIPIENT") != "")
     result.string(newSelect("ADDR")
                         .from("COMMUNICATION")
                         .where("COMMUNICATION.COMMUNICATIONID", vars.get("$this.value")).cell());
\ No newline at end of file
diff --git a/entity/Email_entity/entityfields/sendmail/onActionProcess.js b/entity/Email_entity/entityfields/sendmail/onActionProcess.js
index 74810743f4..8d7f805dd0 100644
--- a/entity/Email_entity/entityfields/sendmail/onActionProcess.js
+++ b/entity/Email_entity/entityfields/sendmail/onActionProcess.js
@@ -1,14 +1,15 @@
-import("KeywordRegistry_basic");
-import("Sql_lib");
-import("system.translate");
-import("ActivityTask_lib");
+import("system.db");
 import("system.neon");
-import("Employee_lib");
 import("system.vars");
+import("system.question");
+import("system.translate");
+import("Sql_lib");
 import("Email_lib");
 import("Contact_lib");
 import("Document_lib");
-import("system.question");
+import("Employee_lib");
+import("ActivityTask_lib");
+import("KeywordRegistry_basic");
 
 var attachments = JSON.parse(vars.get("$param.Attachments_param"));
 var senderContactId = vars.get("$param.ContactId_param");
@@ -17,9 +18,10 @@ var emailFilename = vars.get("$param.EmailFilename");
 var notificationMsg = vars.get("$param.NotificationMsg_param");
 var notificationTitle = translate.text("Offer status changed");
 var subject = vars.get("$field.subject");
-
+var updateStatements = JSON.parse(vars.get("$param.UpdateStatements_param"));
 var additionalPlaceholders = null;
-if (vars.exists("$param.AdditionalPlaceholders_param") && vars.get("$param.AdditionalPlaceholders_param"))
+
+if (vars.exists("$param.AdditionalPlaceholders_param") && vars.get("$param.AdditionalPlaceholders_param") != "null")
 {
     additionalPlaceholders = JSON.parse(vars.get("$param.AdditionalPlaceholders_param")).map(function (placeholder)
     {
@@ -40,11 +42,10 @@ var eml = EmailWritingUtils.openMailTemplate(
     additionalPlaceholders
 );
 
-if(vars.get("$param.ComingFrom_param") == "Offer")
+if(updateStatements)
 {
-    newWhere("OFFER.OFFERID", vars.get("$param.OfferId_param"))
-    .updateData(true, "OFFER", ["STATUS"], null, [$KeywordRegistry.offerStatus$sent()]);
+    db.updates(updateStatements);
 }
 
 if (notificationMsg)
-    question.showMessage(notificationMsg, question.INFORMATION, notificationTitle);
\ No newline at end of file
+    question.showMessage(notificationMsg, question.INFORMATION, notificationTitle);
diff --git a/entity/Offer_entity/entityfields/offerreportdispatch/children/dispatchofferreport/onActionProcess.js b/entity/Offer_entity/entityfields/offerreportdispatch/children/dispatchofferreport/onActionProcess.js
index 108e16a156..0f003f4454 100644
--- a/entity/Offer_entity/entityfields/offerreportdispatch/children/dispatchofferreport/onActionProcess.js
+++ b/entity/Offer_entity/entityfields/offerreportdispatch/children/dispatchofferreport/onActionProcess.js
@@ -1,31 +1,32 @@
+import("system.db");
+import("system.vars");
 import("system.question");
 import("system.translate");
-import("system.vars");
 import("KeywordRegistry_basic");
-import("system.translate");
+import("Placeholder_lib");
 import("Offer_lib");
 import("Email_lib");
 import("Sql_lib");
 import("MimeType_lib");
-import("Placeholder_lib");
 
-var offerReport = {};
+var offerReport = {}
 var attachmentArray = [];
-var notificationMsg = translate.text("The status of the offer was changed to \"Sent\".");
+var updateStatements = [["OFFER", ["STATUS"], db.getColumnTypes("OFFER", ["STATUS"]), [$KeywordRegistry.offerStatus$sent()], newWhere("OFFER.OFFERID", vars.get("$field.OFFERID")).build()]];
+var notificationMsg = translate.text("The status of the offer was changed to \"sent\".");
 var contactId = vars.get("$field.CONTACT_ID");
 var arrayReport = OfferUtils.buildOfferReport(vars.get("$field.OFFERID"));
 var emailFilename = translate.text("Offerrequest");
+var offerId = vars.get("$field.OFFERID")
+var additionalPlaceholders = [
+    new Placeholder("offerCode", Placeholder.types.FIXEDVALUE, vars.get("$field.FullOfferCode"))
+];
 
 if (vars.get("$field.CONTACT_ID") == null || "") contactId = vars.get("$field.CONTACT_ORG_ID");
 
 offerReport.content = arrayReport[1];
-offerReport.contentType = MimeTypes.PDF();
+offerReport.mimeType = MimeTypes.PDF();
 offerReport.filename = translate.text("Offer No.") + vars.get("$field.#CONTENTTITLE") + ".pdf";
 
 attachmentArray[0] = offerReport;
 
-var additionalPlaceholders = [
-    new Placeholder("offerCode", Placeholder.types.FIXEDVALUE, vars.get("$field.FullOfferCode"))
-];
-var offerId = vars.get("$field.OFFERID")
-EmailWritingUtils.sendReportAsMail(contactId, attachmentArray, "Offer", notificationMsg, emailFilename, additionalPlaceholders, offerId);
\ No newline at end of file
+EmailWritingUtils.sendReportAsMail(contactId, attachmentArray, "Offer", notificationMsg, emailFilename, additionalPlaceholders, updateStatements);
diff --git a/entity/Order_entity/Order_entity.aod b/entity/Order_entity/Order_entity.aod
index d38b802de3..cb7b3dcde5 100644
--- a/entity/Order_entity/Order_entity.aod
+++ b/entity/Order_entity/Order_entity.aod
@@ -752,6 +752,49 @@
         <element>PROCESS_SETVALUE</element>
       </onValueChangeTypes>
     </entityField>
+    <entityField>
+      <name>REMINDER_REPORT_DATA</name>
+      <valueProcess>%aditoprj%/entity/Order_entity/entityfields/reminder_report_data/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>ORDER_REPORT_DATA</name>
+      <valueProcess>%aditoprj%/entity/Order_entity/entityfields/order_report_data/valueProcess.js</valueProcess>
+    </entityField>
+    <entityConsumer>
+      <name>Organisations</name>
+      <dependency>
+        <name>dependency</name>
+        <entityName>Organisation_entity</entityName>
+        <fieldName>Organisations</fieldName>
+      </dependency>
+    </entityConsumer>
+    <entityConsumer>
+      <name>Persons</name>
+      <dependency>
+        <name>dependency</name>
+        <entityName>Person_entity</entityName>
+        <fieldName>Contacts</fieldName>
+      </dependency>
+    </entityConsumer>
+    <entityParameter>
+      <name>Copy_param</name>
+      <expose v="true" />
+      <documentation>%aditoprj%/entity/Order_entity/entityfields/copy_param/documentation.adoc</documentation>
+    </entityParameter>
+    <entityField>
+      <name>ORDER_OBJECTTYPE</name>
+      <valueProcess>%aditoprj%/entity/Order_entity/entityfields/order_objecttype/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>COUNT</name>
+      <title>Count</title>
+      <contentType>NUMBER</contentType>
+    </entityField>
+    <entityAggregateField>
+      <name>COUNT_aggregate</name>
+      <parentField>COUNT</parentField>
+      <title>Count</title>
+    </entityAggregateField>
     <entityActionField>
       <name>newOrder</name>
       <documentation>%aditoprj%/entity/Order_entity/entityfields/neworder/documentation.adoc</documentation>
@@ -846,53 +889,36 @@
       <iconId>VAADIN:CURLY_BRACKETS</iconId>
       <stateProcess>%aditoprj%/entity/Order_entity/entityfields/openadminview/stateProcess.js</stateProcess>
     </entityActionField>
-    <entityField>
-      <name>REMINDER_REPORT_DATA</name>
-      <valueProcess>%aditoprj%/entity/Order_entity/entityfields/reminder_report_data/valueProcess.js</valueProcess>
-    </entityField>
-    <entityField>
-      <name>ORDER_REPORT_DATA</name>
-      <valueProcess>%aditoprj%/entity/Order_entity/entityfields/order_report_data/valueProcess.js</valueProcess>
-    </entityField>
-    <entityConsumer>
-      <name>Organisations</name>
-      <dependency>
-        <name>dependency</name>
-        <entityName>Organisation_entity</entityName>
-        <fieldName>Organisations</fieldName>
-      </dependency>
-    </entityConsumer>
-    <entityConsumer>
-      <name>Persons</name>
-      <dependency>
-        <name>dependency</name>
-        <entityName>Person_entity</entityName>
-        <fieldName>Contacts</fieldName>
-      </dependency>
-    </entityConsumer>
-    <entityParameter>
-      <name>Copy_param</name>
-      <expose v="true" />
-      <documentation>%aditoprj%/entity/Order_entity/entityfields/copy_param/documentation.adoc</documentation>
-    </entityParameter>
-    <entityField>
-      <name>ORDER_OBJECTTYPE</name>
-      <valueProcess>%aditoprj%/entity/Order_entity/entityfields/order_objecttype/valueProcess.js</valueProcess>
-    </entityField>
-    <entityField>
-      <name>COUNT</name>
-      <title>Count</title>
-      <contentType>NUMBER</contentType>
-    </entityField>
-    <entityAggregateField>
-      <name>COUNT_aggregate</name>
-      <parentField>COUNT</parentField>
-      <title>Count</title>
-    </entityAggregateField>
-    <entityProvider>
+    <entityActionGroup>
+      <name>orderReportDispatch</name>
+      <children>
+        <entityActionField>
+          <name>dispatchOrderReport</name>
+          <title>Dispatch as mail</title>
+          <onActionProcess>%aditoprj%/entity/Order_entity/entityfields/orderreportdispatch/children/dispatchorderreport/onActionProcess.js</onActionProcess>
+          <isObjectAction v="false" />
+          <iconId>VAADIN:AT</iconId>
+          <stateProcess>%aditoprj%/entity/Order_entity/entityfields/orderreportdispatch/children/dispatchorderreport/stateProcess.js</stateProcess>
+        </entityActionField>
+      </children>
+    </entityActionGroup>
+    <entityActionGroup>
+      <name>reminderReportDispatch</name>
+      <children>
+        <entityActionField>
+          <name>dispatchReminderReport</name>
+          <title>Dispatch as mail</title>
+          <onActionProcess>%aditoprj%/entity/Order_entity/entityfields/reminderreportdispatch/children/dispatchreminderreport/onActionProcess.js</onActionProcess>
+          <isObjectAction v="false" />
+          <iconId>VAADIN:AT</iconId>
+          <stateProcess>%aditoprj%/entity/Order_entity/entityfields/reminderreportdispatch/children/dispatchreminderreport/stateProcess.js</stateProcess>
+        </entityActionField>
+      </children>
+        <entityProvider>
       <name>#PROVIDER_AGGREGATES</name>
       <useAggregates v="true" />
     </entityProvider>
+</entityActionGroup>
   </entityFields>
   <recordContainers>
     <dbRecordContainer>
diff --git a/entity/Order_entity/entityfields/orderreportdispatch/children/dispatchorderreport/onActionProcess.js b/entity/Order_entity/entityfields/orderreportdispatch/children/dispatchorderreport/onActionProcess.js
new file mode 100644
index 0000000000..44cf00055a
--- /dev/null
+++ b/entity/Order_entity/entityfields/orderreportdispatch/children/dispatchorderreport/onActionProcess.js
@@ -0,0 +1,30 @@
+import("system.question");
+import("system.translate");
+import("system.vars");
+import("system.db");
+import("MimeType_lib");
+import("Email_lib");
+import("Sql_lib");
+
+var orderReport = {};
+var attachmentArray = [];
+var updateStatements = [["SALESORDER", ["ORDERSTATUS"], db.getColumnTypes("SALESORDER", ["ORDERSTATUS"]), ["1"], newWhere("SALESORDER.SALESORDERID", vars.get("$field.SALESORDERID")).build()]];
+var notificationMsg = translate.text("The status of the order was changed to \"sent\".");
+var contactId = vars.get("$field.CONTACT_ID");
+var orgContactId = vars.get("$field.CONTACT_ORG_ID");
+var reportData = vars.get("$field.ORDER_REPORT_DATA");
+var emailFilename = vars.get("$field.#CONTENTTITLE");
+var orderNo = emailFilename.substring(emailFilename.indexOf(" ", 0)+1, emailFilename.length);
+emailFilename = emailFilename.substring(0, emailFilename.indexOf(" ", 0));
+emailFilename = emailFilename + " " + orderNo;
+
+if (contactId == null || "") 
+    contactId = orgContactId;
+
+orderReport.content = reportData;
+orderReport.mimeType = MimeTypes.PDF();
+orderReport.filename = emailFilename + ".pdf";
+
+attachmentArray[0] = orderReport;
+
+EmailWritingUtils.sendReportAsMail(contactId, attachmentArray, "Order", notificationMsg, emailFilename, null, updateStatements);
diff --git a/entity/Order_entity/entityfields/orderreportdispatch/children/dispatchorderreport/stateProcess.js b/entity/Order_entity/entityfields/orderreportdispatch/children/dispatchorderreport/stateProcess.js
new file mode 100644
index 0000000000..3411dae9c8
--- /dev/null
+++ b/entity/Order_entity/entityfields/orderreportdispatch/children/dispatchorderreport/stateProcess.js
@@ -0,0 +1,10 @@
+import("system.neon");
+import("system.vars");
+import("system.result");
+import("KeywordRegistry_basic");
+
+var orderStatus = vars.get("$field.ORDERSTATUS");
+var isOfferCancelled = vars.get("$field.CANCELLATION");
+
+if (orderStatus == 1 || isOfferCancelled == 1) 
+    result.string(neon.COMPONENTSTATE_DISABLED);
diff --git a/entity/Order_entity/entityfields/reminderreportdispatch/children/dispatchreminderreport/onActionProcess.js b/entity/Order_entity/entityfields/reminderreportdispatch/children/dispatchreminderreport/onActionProcess.js
new file mode 100644
index 0000000000..7538162cac
--- /dev/null
+++ b/entity/Order_entity/entityfields/reminderreportdispatch/children/dispatchreminderreport/onActionProcess.js
@@ -0,0 +1,28 @@
+import("system.question");
+import("system.translate");
+import("system.vars");
+import("system.db");
+import("MimeType_lib");
+import("Email_lib");
+import("Order_lib");
+import("Sql_lib");
+
+var orderReport = {};
+var attachmentArray = [];
+var contactId = vars.get("$field.CONTACT_ID");
+var orgContactId = vars.get("$field.CONTACT_ORG_ID");
+var reportData = OrderUtils.buildReminderReport(vars.get("$field.SALESORDERID"));
+var emailFilename = vars.get("$field.#CONTENTTITLE");
+var orderNo = emailFilename.substring(emailFilename.indexOf(" ", 0)+1, emailFilename.length);
+emailFilename = translate.text("Reminder") + " " + orderNo;
+
+if (contactId == null || "") 
+    contactId = orgContactId;
+
+orderReport.content = reportData;
+orderReport.mimeType = MimeTypes.PDF();
+orderReport.filename = emailFilename + ".pdf";
+
+attachmentArray[0] = orderReport;
+
+EmailWritingUtils.sendReportAsMail(contactId, attachmentArray, "Order", null, emailFilename, null, null);
diff --git a/entity/Order_entity/entityfields/reminderreportdispatch/children/dispatchreminderreport/stateProcess.js b/entity/Order_entity/entityfields/reminderreportdispatch/children/dispatchreminderreport/stateProcess.js
new file mode 100644
index 0000000000..211643d5aa
--- /dev/null
+++ b/entity/Order_entity/entityfields/reminderreportdispatch/children/dispatchreminderreport/stateProcess.js
@@ -0,0 +1,9 @@
+import("system.neon");
+import("system.vars");
+import("system.result");
+import("KeywordRegistry_basic");
+
+var isOfferCancelled = vars.get("$field.CANCELLATION");
+
+if (isOfferCancelled == 1) 
+    result.string(neon.COMPONENTSTATE_DISABLED);
diff --git a/entity/Organisation_entity/Organisation_entity.aod b/entity/Organisation_entity/Organisation_entity.aod
index 43d7463ef6..d877dda51e 100644
--- a/entity/Organisation_entity/Organisation_entity.aod
+++ b/entity/Organisation_entity/Organisation_entity.aod
@@ -1384,6 +1384,19 @@
         </entityParameter>
       </children>
     </entityProvider>
+    <entityActionGroup>
+      <name>orgReportDispatch</name>
+      <children>
+        <entityActionField>
+          <name>dispatchOrgReport</name>
+          <title>Dispatch as mail</title>
+          <onActionProcess>%aditoprj%/entity/Organisation_entity/entityfields/orgreportdispatch/children/dispatchorgreport/onActionProcess.js</onActionProcess>
+          <isObjectAction v="false" />
+          <iconId>VAADIN:AT</iconId>
+          <iconIdProcess>%aditoprj%/entity/Organisation_entity/entityfields/orgreportdispatch/children/dispatchorgreport/iconIdProcess.js</iconIdProcess>
+        </entityActionField>
+      </children>
+    </entityActionGroup>
   </entityFields>
   <recordContainers>
     <dbRecordContainer>
diff --git a/entity/Organisation_entity/entityfields/orgreportdispatch/children/dispatchorgreport/iconIdProcess.js b/entity/Organisation_entity/entityfields/orgreportdispatch/children/dispatchorgreport/iconIdProcess.js
new file mode 100644
index 0000000000..e0d420de99
--- /dev/null
+++ b/entity/Organisation_entity/entityfields/orgreportdispatch/children/dispatchorgreport/iconIdProcess.js
@@ -0,0 +1,9 @@
+import("system.vars");
+import("system.neon");
+import("system.result");
+import("KeywordRegistry_basic");
+
+var orgStatus = vars.get("$field.STATUS");
+
+if (orgStatus == $KeywordRegistry.contactStatus$inactive())
+    result.string(COMPONENTSTATE_DISABLED);
diff --git a/entity/Organisation_entity/entityfields/orgreportdispatch/children/dispatchorgreport/onActionProcess.js b/entity/Organisation_entity/entityfields/orgreportdispatch/children/dispatchorgreport/onActionProcess.js
new file mode 100644
index 0000000000..ca54b8d0ce
--- /dev/null
+++ b/entity/Organisation_entity/entityfields/orgreportdispatch/children/dispatchorgreport/onActionProcess.js
@@ -0,0 +1,24 @@
+import("system.logging");
+import("Organisation_lib");
+import("system.translate");
+import("system.vars");
+import("system.db");
+import("MimeType_lib");
+import("Email_lib");
+import("Order_lib");
+import("Sql_lib");
+
+var orgReport = {};
+var attachmentArray = [];
+var reportData = vars.get("$field.ORGANISATION_REPORT_DATA");
+var orgContactId = vars.get("$field.CONTACTID");
+var emailFilename = vars.get("$field.#CONTENTTITLE");
+emailFilename = translate.text("Customer Base Sheet") + " " + emailFilename;
+
+orgReport.content = reportData;
+orgReport.mimeType = MimeTypes.PDF();
+orgReport.filename = emailFilename + ".pdf";
+
+attachmentArray[0] = orgReport;
+
+EmailWritingUtils.sendReportAsMail(orgContactId, attachmentArray, "Organisation", null, emailFilename, null, null);
diff --git a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
index d327524d16..323d581e71 100644
--- a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
+++ b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
@@ -2082,12 +2082,6 @@
     <entry>
       <key>Entrydate (Day)</key>
     </entry>
-    <entry>
-      <key>Date (Month)</key>
-    </entry>
-    <entry>
-      <key>Date (Day)</key>
-    </entry>
     <entry>
       <key>My Dashboard</key>
     </entry>
@@ -3201,9 +3195,6 @@
     <entry>
       <key>Entrydate must not be in the future</key>
     </entry>
-    <entry>
-      <key>Date must not be in the future</key>
-    </entry>
     <entry>
       <key>Delivery specification</key>
     </entry>
@@ -4734,9 +4725,6 @@
     <entry>
       <key>Entrydate (Year)</key>
     </entry>
-    <entry>
-      <key>Date (Year)</key>
-    </entry>
     <entry>
       <key>Attributes must be unique!</key>
     </entry>
@@ -6275,9 +6263,6 @@
     <entry>
       <key>Entrydate has to be in the selected calendar week!</key>
     </entry>
-    <entry>
-      <key>Date has to be in the selected calendar week!</key>
-    </entry>
     <entry>
       <key>Invalid year!</key>
     </entry>
@@ -6798,303 +6783,293 @@
       <key>Offerrequest</key>
     </entry>
     <entry>
-      <key>Full Permissions</key>
-    </entry>
-    <entry>
-      <key>Full permissions already assigned</key>
-    </entry>
-    <entry>
-      <key>Import Daten</key>
+      <key>Number of employees</key>
     </entry>
     <entry>
-      <key>Import Logs</key>
+      <key>2. Customer value</key>
     </entry>
     <entry>
-      <key>Transferdaten</key>
+      <key>Product preference</key>
     </entry>
     <entry>
-      <key>Valid from (as </key>
+      <key>Business development</key>
     </entry>
     <entry>
-      <key>${SQL_LIB_FIELD_WRONG_FORMAT}</key>
+      <key>Headquarters</key>
     </entry>
     <entry>
-      <key>Settings</key>
+      <key>Current supply share</key>
     </entry>
     <entry>
-      <key>No new recipients found that can be added to the bulk mail.</key>
+      <key>Purchasing potential p. a.</key>
     </entry>
     <entry>
-      <key>Add Recipients</key>
+      <key>ScoreTargetGgroup</key>
     </entry>
     <entry>
-      <key>Add Participants</key>
+      <key>Stagnated</key>
     </entry>
     <entry>
-      <key>Download letter and create Activity</key>
+      <key>Negative</key>
     </entry>
     <entry>
-      <key>and open Report</key>
+      <key>1. Target group</key>
     </entry>
     <entry>
-      <key>export</key>
+      <key>Positive</key>
     </entry>
     <entry>
-      <key>export using the selected  template</key>
+      <key>0-50</key>
     </entry>
     <entry>
-      <key>No new recipients found that can be added to the serial letter.</key>
+      <key>Till Score</key>
     </entry>
     <entry>
-      <key>send mail</key>
+      <key>251-1000</key>
     </entry>
     <entry>
-      <key>and open modeler</key>
+      <key>ab 1000</key>
     </entry>
     <entry>
-      <key>Create model</key>
+      <key>Full Permissions</key>
     </entry>
     <entry>
-      <key>Edit workflow</key>
+      <key>200-349 T€</key>
     </entry>
     <entry>
-      <key>Receive new Department Permission</key>
+      <key>100-199 T€</key>
     </entry>
     <entry>
-      <key>Receive new User Permission</key>
+      <key>Full permissions already assigned</key>
     </entry>
     <entry>
-      <key>workflow notification</key>
+      <key>51-100</key>
     </entry>
     <entry>
-      <key>Workflow Model</key>
+      <key>Import Daten</key>
     </entry>
     <entry>
-      <key>Current Recipients</key>
+      <key>ab 350 T€</key>
     </entry>
     <entry>
-      <key>The workflow could not be deployed</key>
+      <key>0-49 T€</key>
     </entry>
     <entry>
-      <key>Workflow deploy failed</key>
+      <key>Grading</key>
     </entry>
     <entry>
-      <key>%0 new recipients will be added to the bulk mail. \n\&#xD;
-                            %1 of the chosen records are already recipients or don't have an e-mail set</key>
+      <key>Import Logs</key>
     </entry>
     <entry>
-      <key>Recipients after adding</key>
+      <key>Transferdaten</key>
     </entry>
     <entry>
-      <key>%0 of the chosen records are already recipients or don't have an e-mail set</key>
+      <key>50-99 T€</key>
     </entry>
     <entry>
-      <key>Organisations will be exported</key>
+      <key>101-250</key>
     </entry>
     <entry>
-      <key>Contacts will be exported</key>
+      <key>Gradings</key>
     </entry>
     <entry>
-      <key>%0 new participants will be added to the campaign.</key>
+      <key>Valid from (as </key>
     </entry>
     <entry>
-      <key>%0 of the chosen records are already in the campaign</key>
+      <key>${SQL_LIB_FIELD_WRONG_FORMAT}</key>
     </entry>
     <entry>
-      <key>Permission received</key>
+      <key>yellow</key>
     </entry>
     <entry>
-      <key>leadimport notification</key>
+      <key>Borrow</key>
     </entry>
     <entry>
-      <key>granted permission</key>
+      <key>Is unlinked activity</key>
     </entry>
     <entry>
-      <key>Bulk mail sent</key>
+      <key>Fantasy</key>
     </entry>
     <entry>
-      <key>download ready</key>
+      <key>Extend</key>
     </entry>
     <entry>
-      <key>Total in euros</key>
+      <key>Krimi</key>
     </entry>
     <entry>
-      <key>{SENT_MAIL}</key>
+      <key>red</key>
     </entry>
     <entry>
-      <key>The Sales Project can only be filled when a company has been specified</key>
+      <key>Return</key>
     </entry>
     <entry>
-      <key>Ø Probability</key>
+      <key>green</key>
     </entry>
     <entry>
-      <key>Probability AI</key>
+      <key>Actionthriller</key>
     </entry>
     <entry>
-      <key>{SEND_MAIL}</key>
+      <key>No new recipients found that can be added to the bulk mail.</key>
     </entry>
     <entry>
-      <key>New</key>
+      <key>Add Recipients</key>
     </entry>
     <entry>
-      <key>Release</key>
+      <key>Add Participants</key>
     </entry>
     <entry>
-      <key>Archived</key>
+      <key>Download letter and create Activity</key>
     </entry>
     <entry>
-      <key>asdf</key>
+      <key>and open Report</key>
     </entry>
     <entry>
-      <key>Latitude</key>
+      <key>export</key>
     </entry>
     <entry>
-      <key>Longitude</key>
+      <key>export using the selected  template</key>
     </entry>
     <entry>
-      <key>Favorites</key>
+      <key>No new recipients found that can be added to the serial letter.</key>
     </entry>
     <entry>
-      <key>Favorite</key>
+      <key>send mail</key>
     </entry>
     <entry>
-      <key>Show all Favorites</key>
+      <key>and open modeler</key>
     </entry>
     <entry>
-      <key>Default</key>
+      <key>Create model</key>
     </entry>
     <entry>
-      <key>Grant new Department Permission</key>
+      <key>Edit workflow</key>
     </entry>
     <entry>
-      <key>Permission Procurer Department</key>
+      <key>Receive new Department Permission</key>
     </entry>
     <entry>
-      <key>Permission Procurer User</key>
+      <key>Receive new User Permission</key>
     </entry>
     <entry>
-      <key>Grant new User Permission</key>
+      <key>workflow notification</key>
     </entry>
     <entry>
-      <key>yellow</key>
+      <key>Permission received</key>
     </entry>
     <entry>
-      <key>Number of employees</key>
+      <key>leadimport notification</key>
     </entry>
     <entry>
-      <key>Borrow</key>
+      <key>granted permission</key>
     </entry>
     <entry>
-      <key>Selection placeholder</key>
+      <key>Bulk mail sent</key>
     </entry>
     <entry>
-      <key>0-50</key>
+      <key>download ready</key>
     </entry>
     <entry>
-      <key>2. Customer value</key>
+      <key>Total in euros</key>
     </entry>
     <entry>
-      <key>Product preference</key>
+      <key>Workflow Model</key>
     </entry>
     <entry>
-      <key>Business development</key>
+      <key>{SENT_MAIL}</key>
     </entry>
     <entry>
-      <key>Till Score</key>
+      <key>The Sales Project can only be filled when a company has been specified</key>
     </entry>
     <entry>
-      <key>Current password</key>
+      <key>The workflow could not be deployed</key>
     </entry>
     <entry>
-      <key>Headquarters</key>
+      <key>Workflow deploy failed</key>
     </entry>
     <entry>
-      <key>Calendar maintime start</key>
+      <key>Ø Probability</key>
     </entry>
     <entry>
-      <key>251-1000</key>
+      <key>Probability AI</key>
     </entry>
     <entry>
-      <key>ab 1000</key>
+      <key>{SEND_MAIL}</key>
     </entry>
     <entry>
-      <key>favorties</key>
+      <key>New</key>
     </entry>
     <entry>
-      <key>Gradings</key>
+      <key>Release</key>
     </entry>
     <entry>
-      <key>200-349 T€</key>
+      <key>Archived</key>
     </entry>
     <entry>
-      <key>Fantasy</key>
+      <key>asdf</key>
     </entry>
     <entry>
-      <key>100-199 T€</key>
+      <key>Settings</key>
     </entry>
     <entry>
-      <key>Password must contain special characters</key>
+      <key>Latitude</key>
     </entry>
     <entry>
-      <key>Current supply share</key>
+      <key>Longitude</key>
     </entry>
     <entry>
-      <key>51-100</key>
+      <key>Favorites</key>
     </entry>
     <entry>
-      <key>Password must be at least %0 characters</key>
+      <key>Favorite</key>
     </entry>
     <entry>
-      <key>Purchasing potential p. a.</key>
+      <key>Show all Favorites</key>
     </entry>
     <entry>
-      <key>favorite</key>
+      <key>Default</key>
     </entry>
     <entry>
-      <key>Repeat password</key>
+      <key>Titel</key>
     </entry>
     <entry>
-      <key>Extend</key>
+      <key>Set missing address locations</key>
     </entry>
     <entry>
-      <key>%0: %1/%2points = %3</key>
+      <key>FavoriteFilter_view</key>
     </entry>
     <entry>
-      <key>ab 350 T€</key>
+      <key>Typ</key>
     </entry>
     <entry>
-      <key>Krimi</key>
+      <key>Set all address locations</key>
     </entry>
     <entry>
-      <key>red</key>
+      <key>favorties</key>
     </entry>
     <entry>
-      <key>0-49 T€</key>
+      <key>Gruppenname</key>
     </entry>
     <entry>
-      <key>Return</key>
+      <key>Password must contain special characters</key>
     </entry>
     <entry>
-      <key>Grading</key>
+      <key>Password must be at least %0 characters</key>
     </entry>
     <entry>
-      <key>SELECTION_NULL</key>
+      <key>favorite</key>
     </entry>
     <entry>
-      <key>ScoreTargetGgroup</key>
+      <key>Repeat password</key>
     </entry>
     <entry>
-      <key>Stagnated</key>
+      <key>%0: %1/%2points = %3</key>
     </entry>
     <entry>
-      <key>Is unlinked activity</key>
+      <key>SELECTION_NULL</key>
     </entry>
     <entry>
       <key>Selection ignore case</key>
     </entry>
-    <entry>
-      <key>Negative</key>
-    </entry>
     <entry>
       <key>Calendar maintime end</key>
     </entry>
@@ -7113,9 +7088,6 @@
     <entry>
       <key>Indicator</key>
     </entry>
-    <entry>
-      <key>green</key>
-    </entry>
     <entry>
       <key>favorites</key>
     </entry>
@@ -7125,9 +7097,6 @@
     <entry>
       <key>Run ServerProcess</key>
     </entry>
-    <entry>
-      <key>1. Target group</key>
-    </entry>
     <entry>
       <key>SELECTION_NEITHER</key>
     </entry>
@@ -7137,27 +7106,15 @@
     <entry>
       <key>New password</key>
     </entry>
-    <entry>
-      <key>Actionthriller</key>
-    </entry>
     <entry>
       <key>Calendar hour divider</key>
     </entry>
-    <entry>
-      <key>Positive</key>
-    </entry>
     <entry>
       <key>SELECTION_BOTH</key>
     </entry>
-    <entry>
-      <key>50-99 T€</key>
-    </entry>
     <entry>
       <key>SELECTION_POSTFIX</key>
     </entry>
-    <entry>
-      <key>101-250</key>
-    </entry>
     <entry>
       <key>Password must contain letters</key>
     </entry>
@@ -7203,33 +7160,15 @@
     <entry>
       <key>Mapping</key>
     </entry>
-    <entry>
-      <key>Typ</key>
-    </entry>
     <entry>
       <key>Mappings</key>
     </entry>
     <entry>
       <key>Radius in km</key>
     </entry>
-    <entry>
-      <key>Titel</key>
-    </entry>
-    <entry>
-      <key>Set missing address locations</key>
-    </entry>
-    <entry>
-      <key>FavoriteFilter_view</key>
-    </entry>
-    <entry>
-      <key>Set all address locations</key>
-    </entry>
     <entry>
       <key>Members</key>
     </entry>
-    <entry>
-      <key>Gruppenname</key>
-    </entry>
     <entry>
       <key>The radius has to be %0 or lesser.</key>
     </entry>
@@ -7380,6 +7319,52 @@
     <entry>
       <key>Worklow started</key>
     </entry>
+    <entry>
+      <key>Selection placeholder</key>
+    </entry>
+    <entry>
+      <key>%0 new recipients will be added to the bulk mail. \n\&#xD;
+                            %1 of the chosen records are already recipients or don't have an e-mail set</key>
+    </entry>
+    <entry>
+      <key>Grant new Department Permission</key>
+    </entry>
+    <entry>
+      <key>Current password</key>
+    </entry>
+    <entry>
+      <key>Calendar maintime start</key>
+    </entry>
+    <entry>
+      <key>The status of the offer was changed to \"sent\".</key>
+    </entry>
+    <entry>
+      <key>Permission Procurer Department</key>
+    </entry>
+    <entry>
+      <key>%0 of the chosen records are already recipients or don't have an e-mail set</key>
+    </entry>
+    <entry>
+      <key>Organisations will be exported</key>
+    </entry>
+    <entry>
+      <key>Recipients after adding</key>
+    </entry>
+    <entry>
+      <key>Contacts will be exported</key>
+    </entry>
+    <entry>
+      <key>%0 new participants will be added to the campaign.</key>
+    </entry>
+    <entry>
+      <key>%0 of the chosen records are already in the campaign</key>
+    </entry>
+    <entry>
+      <key>Permission Procurer User</key>
+    </entry>
+    <entry>
+      <key>The status of the order was changed to \"sent\".</key>
+    </entry>
     <entry>
       <key>Mark all cached record containers as invalid</key>
     </entry>
diff --git a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
index 83ecdab25c..de19fa8cb0 100644
--- a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
+++ b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
@@ -387,10 +387,6 @@
       <key>Entrydate (Day)</key>
       <value>Eingangsdatum (Tag)</value>
     </entry>
-    <entry>
-      <key>Date (Day)</key>
-      <value>Datum (Tag)</value>
-    </entry>
     <entry>
       <key>still incorrect</key>
       <value>weiterhin fehlerhaft</value>
@@ -543,10 +539,6 @@
       <key>Entrydate (Month)</key>
       <value>Eingangsdatum (Monat)</value>
     </entry>
-    <entry>
-      <key>Date (Month)</key>
-      <value>Datum (Monat)</value>
-    </entry>
     <entry>
       <key>Usage</key>
       <value>Verwendung</value>
@@ -2009,10 +2001,6 @@
       <key>Entrydate must not be in the future</key>
       <value>Eingangsdatum darf nicht in der Zukunft liegen</value>
     </entry>
-    <entry>
-      <key>Date must not be in the future</key>
-      <value>Datum darf nicht in der Zukunft liegen</value>
-    </entry>
     <entry>
       <key>Copy receipt</key>
       <value>Beleg kopieren</value>
@@ -6472,7 +6460,7 @@
     </entry>
     <entry>
       <key>Print order</key>
-      <value>Beleg drucken</value>
+      <value>Beleg anzeigen</value>
     </entry>
     <entry>
       <key>Order number</key>
@@ -6547,10 +6535,6 @@
       <key>Entrydate (Year)</key>
       <value>Eingangsdatum (Jahr)</value>
     </entry>
-    <entry>
-      <key>Date (Year)</key>
-      <value>Datum (Jahr)</value>
-    </entry>
     <entry>
       <key>Attributes must be unique!</key>
       <value>Attribute müssen eindeutig sein</value>
@@ -8221,6 +8205,10 @@ Bitte Datumseingabe prüfen</value>
       <key>Monthly</key>
       <value>monatlich</value>
     </entry>
+    <entry>
+      <key>The status of the order was changed to \"sent\".</key>
+      <value>Der Status des Belegs wurde auf \"versendet\" gesetzt.</value>
+    </entry>
     <entry>
       <key>Yearly</key>
       <value>jährlich</value>
@@ -8233,10 +8221,6 @@ Bitte Datumseingabe prüfen</value>
       <key>Entrydate has to be in the selected calendar week!</key>
       <value>Eingangsdatum muss in der ausgewählten Kalenderwoche liegen!</value>
     </entry>
-    <entry>
-      <key>Date has to be in the selected calendar week!</key>
-      <value>Datum muss in der ausgewählten Kalenderwoche liegen!</value>
-    </entry>
     <entry>
       <key>Invalid year!</key>
       <value>Ungültiges jahr!</value>
@@ -8484,8 +8468,8 @@ Bitte Datumseingabe prüfen</value>
       <value>Angebot anzeigen</value>
     </entry>
     <entry>
-      <key>The status of the offer was changed to \"Sent\".</key>
-      <value>Der Status des Angebots wurde auf \"Versendet\" gesetzt.</value>
+      <key>The status of the offer was changed to \"sent\".</key>
+      <value>Der Status des Angebots wurde auf \"versendet\" gesetzt.</value>
     </entry>
     <entry>
       <key>pCallbackFn is not a function</key>
@@ -8925,11 +8909,10 @@ Bitte Datumseingabe prüfen</value>
       <key>export</key>
     </entry>
     <entry>
-      <key>export using the selected  template</key>
+      <key>Receive new Department Permission</key>
     </entry>
     <entry>
       <key>No new recipients found that can be added to the serial letter.</key>
-      <value>Keine neuen Teilnehmer gefunden die zum Serienbrief hinzugefügt werden können.</value>
     </entry>
     <entry>
       <key>New</key>
@@ -8958,8 +8941,14 @@ Bitte Datumseingabe prüfen</value>
       <value>Workflow deploy fehlgeschlagen</value>
     </entry>
     <entry>
-      <key>Current Recipients</key>
-      <value>Aktuelle Empfänger</value>
+      <key>Total in euros</key>
+    </entry>
+    <entry>
+      <key>export using the selected  template</key>
+    </entry>
+    <entry>
+      <key>send mail</key>
+      <value>E-Mail versenden</value>
     </entry>
     <entry>
       <key>%0: %1/%2points = %3</key>
@@ -8985,12 +8974,14 @@ Bitte Datumseingabe prüfen</value>
     </entry>
     <entry>
       <key>and open Report</key>
+      <value>und Report öffnen</value>
     </entry>
     <entry>
       <key>Add Recipients</key>
     </entry>
     <entry>
       <key>{SEND_MAIL}</key>
+      <value>Email versenden</value>
       <value>Sende E-Mail</value>
     </entry>
     <entry>
@@ -9038,13 +9029,6 @@ Bitte Datumseingabe prüfen</value>
       <key>export using the selected template</key>
       <value>Mit der ausgewählten Vorlage Exportieren</value>
     </entry>
-    <entry>
-      <key>send mail</key>
-      <value>E-Mail versenden</value>
-    </entry>
-    <entry>
-      <key>Receive new Department Permission</key>
-    </entry>
     <entry>
       <key>Selection placeholder</key>
       <value>Suche Platzhalter</value>
@@ -9160,8 +9144,7 @@ Bitte Datumseingabe prüfen</value>
       <key>No new recipients found that can be added to the bulk mail.</key>
     </entry>
     <entry>
-      <key>Grant new User Permission</key>
-      <value>Neue Benutzer-Berechtigung vergeben</value>
+      <key>Titel</key>
     </entry>
     <entry>
       <key>Password must contain spaces</key>
@@ -9174,7 +9157,7 @@ Bitte Datumseingabe prüfen</value>
       <key>Startdatum</key>
     </entry>
     <entry>
-      <key>favorites</key>
+      <key>Set all address locations</key>
     </entry>
     <entry>
       <key>Input value</key>
@@ -9221,12 +9204,6 @@ Bitte Datumseingabe prüfen</value>
     <entry>
       <key>Set missing address locations</key>
     </entry>
-    <entry>
-      <key>Set all address locations</key>
-    </entry>
-    <entry>
-      <key>Titel</key>
-    </entry>
     <entry>
       <key>Gruppenname</key>
     </entry>
@@ -9407,6 +9384,12 @@ Bitte Datumseingabe prüfen</value>
       <key>Worklow started</key>
       <value>Worklow gestartet</value>
     </entry>
+    <entry>
+      <key>The status of the offer was changed to \"Sent\".</key>
+    </entry>
+    <entry>
+      <key>favorites</key>
+    </entry>
     <entry>
       <key>Mark all cached record containers as invalid</key>
     </entry>
diff --git a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
index 5a202e38fa..0d03c169c6 100644
--- a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
+++ b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
@@ -2115,12 +2115,6 @@
     <entry>
       <key>Entrydate (Day)</key>
     </entry>
-    <entry>
-      <key>Date (Month)</key>
-    </entry>
-    <entry>
-      <key>Date (Day)</key>
-    </entry>
     <entry>
       <key>My Dashboard</key>
     </entry>
@@ -3279,9 +3273,6 @@
     <entry>
       <key>Entrydate must not be in the future</key>
     </entry>
-    <entry>
-      <key>Date must not be in the future</key>
-    </entry>
     <entry>
       <key>Delivery specification</key>
     </entry>
@@ -4811,9 +4802,6 @@
     <entry>
       <key>Entrydate (Year)</key>
     </entry>
-    <entry>
-      <key>Date (Year)</key>
-    </entry>
     <entry>
       <key>Attributes must be unique!</key>
     </entry>
@@ -6334,9 +6322,6 @@
     <entry>
       <key>Entrydate has to be in the selected calendar week!</key>
     </entry>
-    <entry>
-      <key>Date has to be in the selected calendar week!</key>
-    </entry>
     <entry>
       <key>Invalid year!</key>
     </entry>
@@ -6513,7 +6498,7 @@
       <key>Show offer</key>
     </entry>
     <entry>
-      <key>The status of the offer was changed to \"Sent\".</key>
+      <key>The status of the offer was changed to \"sent\".</key>
     </entry>
     <entry>
       <key>pCallbackFn is not a function</key>
@@ -7022,19 +7007,13 @@
       <key>send mail</key>
     </entry>
     <entry>
-      <key>and open modeler</key>
-    </entry>
-    <entry>
-      <key>Workflow Model</key>
-    </entry>
-    <entry>
-      <key>Current Recipients</key>
+      <key>Receive new Department Permission</key>
     </entry>
     <entry>
-      <key>The workflow could not be deployed</key>
+      <key>Receive new User Permission</key>
     </entry>
     <entry>
-      <key>Workflow deploy failed</key>
+      <key>and open modeler</key>
     </entry>
     <entry>
       <key>Create model</key>
@@ -7042,34 +7021,6 @@
     <entry>
       <key>Edit workflow</key>
     </entry>
-    <entry>
-      <key>%0 new recipients will be added to the bulk mail. \n\&#xD;
-                            %1 of the chosen records are already recipients or don't have an e-mail set</key>
-    </entry>
-    <entry>
-      <key>Recipients after adding</key>
-    </entry>
-    <entry>
-      <key>%0 of the chosen records are already recipients or don't have an e-mail set</key>
-    </entry>
-    <entry>
-      <key>Organisations will be exported</key>
-    </entry>
-    <entry>
-      <key>Contacts will be exported</key>
-    </entry>
-    <entry>
-      <key>%0 new participants will be added to the campaign.</key>
-    </entry>
-    <entry>
-      <key>%0 of the chosen records are already in the campaign</key>
-    </entry>
-    <entry>
-      <key>Receive new Department Permission</key>
-    </entry>
-    <entry>
-      <key>Receive new User Permission</key>
-    </entry>
     <entry>
       <key>workflow notification</key>
     </entry>
@@ -7091,6 +7042,9 @@
     <entry>
       <key>Total in euros</key>
     </entry>
+    <entry>
+      <key>Workflow Model</key>
+    </entry>
     <entry>
       <key>The Sales Project can only be filled when a company has been specified</key>
     </entry>
@@ -7175,28 +7129,22 @@
       <key>Default</key>
     </entry>
     <entry>
-      <key>Grant new Department Permission</key>
-    </entry>
-    <entry>
-      <key>Permission Procurer Department</key>
-    </entry>
-    <entry>
-      <key>Permission Procurer User</key>
+      <key>Titel</key>
     </entry>
     <entry>
-      <key>Grant new User Permission</key>
+      <key>Set missing address locations</key>
     </entry>
     <entry>
-      <key>Selection placeholder</key>
+      <key>FavoriteFilter_view</key>
     </entry>
     <entry>
-      <key>Current password</key>
+      <key>Typ</key>
     </entry>
     <entry>
-      <key>Calendar maintime start</key>
+      <key>Set all address locations</key>
     </entry>
     <entry>
-      <key>Password must contain special characters</key>
+      <key>Gruppenname</key>
     </entry>
     <entry>
       <key>Password must be at least %0 characters</key>
@@ -7264,33 +7212,15 @@
     <entry>
       <key>Mapping</key>
     </entry>
-    <entry>
-      <key>Typ</key>
-    </entry>
     <entry>
       <key>Mappings</key>
     </entry>
     <entry>
       <key>Radius in km</key>
     </entry>
-    <entry>
-      <key>Titel</key>
-    </entry>
-    <entry>
-      <key>Set missing address locations</key>
-    </entry>
-    <entry>
-      <key>FavoriteFilter_view</key>
-    </entry>
-    <entry>
-      <key>Set all address locations</key>
-    </entry>
     <entry>
       <key>Members</key>
     </entry>
-    <entry>
-      <key>Gruppenname</key>
-    </entry>
     <entry>
       <key>The radius has to be %0 or lesser.</key>
     </entry>
@@ -7461,6 +7391,61 @@
     <entry>
       <key>Worklow started</key>
     </entry>
+    <entry>
+      <key>Selection placeholder</key>
+    </entry>
+    <entry>
+      <key>%0 new recipients will be added to the bulk mail. \n\&#xD;
+                            %1 of the chosen records are already recipients or don't have an e-mail set</key>
+    </entry>
+    <entry>
+      <key>Grant new Department Permission</key>
+    </entry>
+    <entry>
+      <key>Current password</key>
+    </entry>
+    <entry>
+      <key>Calendar maintime start</key>
+    </entry>
+    <entry>
+      <key>Password must contain special characters</key>
+    </entry>
+    <entry>
+      <key>Permission Procurer Department</key>
+    </entry>
+    <entry>
+      <key>%0 of the chosen records are already recipients or don't have an e-mail set</key>
+    </entry>
+    <entry>
+      <key>Organisations will be exported</key>
+    </entry>
+    <entry>
+      <key>Recipients after adding</key>
+    </entry>
+    <entry>
+      <key>Contacts will be exported</key>
+    </entry>
+    <entry>
+      <key>The status of the offer was changed to \"Sent\".</key>
+    </entry>
+    <entry>
+      <key>The workflow could not be deployed</key>
+    </entry>
+    <entry>
+      <key>Workflow deploy failed</key>
+    </entry>
+    <entry>
+      <key>%0 new participants will be added to the campaign.</key>
+    </entry>
+    <entry>
+      <key>%0 of the chosen records are already in the campaign</key>
+    </entry>
+    <entry>
+      <key>Permission Procurer User</key>
+    </entry>
+    <entry>
+      <key>The status of the order was changed to \"sent\".</key>
+    </entry>
     <entry>
       <key>Mark all cached record containers as invalid</key>
     </entry>
diff --git a/neonView/DSGVOReport_view/DSGVOReport_view.aod b/neonView/DSGVOReport_view/DSGVOReport_view.aod
index bd894e65e4..3835fcb15b 100644
--- a/neonView/DSGVOReport_view/DSGVOReport_view.aod
+++ b/neonView/DSGVOReport_view/DSGVOReport_view.aod
@@ -11,6 +11,7 @@
     <reportViewTemplate>
       <name>Report</name>
       <reportData>REPORT_DATA</reportData>
+      <favoriteActionGroup1>dsgvoReportDispatch</favoriteActionGroup1>
       <entityField>#ENTITY</entityField>
     </reportViewTemplate>
   </children>
diff --git a/neonView/OrderFilter_view/OrderFilter_view.aod b/neonView/OrderFilter_view/OrderFilter_view.aod
index b98d0e4d4a..31110f64b9 100644
--- a/neonView/OrderFilter_view/OrderFilter_view.aod
+++ b/neonView/OrderFilter_view/OrderFilter_view.aod
@@ -60,6 +60,7 @@
       <linkedColumns>
         <element>SALESORDERCODE</element>
       </linkedColumns>
+      <fixedFilterFields />
       <columns>
         <neonTableColumn>
           <name>71f23753-601d-49fa-810d-daa02a1323d8</name>
@@ -101,10 +102,12 @@
     </tableViewTemplate>
     <treeTableViewTemplate>
       <name>tree</name>
+      <defaultGroupFields />
       <entityField>#ENTITY</entityField>
       <linkedColumns>
         <element>SALESORDERCODE</element>
       </linkedColumns>
+      <fixedFilterFields />
       <columns>
         <neonTreeTableColumn>
           <name>b55edb3a-ecbc-4d4c-958e-6e491777895b</name>
diff --git a/neonView/OrderReminderReport_view/OrderReminderReport_view.aod b/neonView/OrderReminderReport_view/OrderReminderReport_view.aod
index ca78ae38cf..8c0ed255d6 100644
--- a/neonView/OrderReminderReport_view/OrderReminderReport_view.aod
+++ b/neonView/OrderReminderReport_view/OrderReminderReport_view.aod
@@ -11,6 +11,7 @@
     <reportViewTemplate>
       <name>Report</name>
       <reportData>REMINDER_REPORT_DATA</reportData>
+      <favoriteActionGroup1>reminderReportDispatch</favoriteActionGroup1>
       <entityField>#ENTITY</entityField>
     </reportViewTemplate>
   </children>
diff --git a/neonView/OrderReport_view/OrderReport_view.aod b/neonView/OrderReport_view/OrderReport_view.aod
index 8a4fdcad3c..0f3487512a 100644
--- a/neonView/OrderReport_view/OrderReport_view.aod
+++ b/neonView/OrderReport_view/OrderReport_view.aod
@@ -11,6 +11,8 @@
     <reportViewTemplate>
       <name>Report</name>
       <reportData>ORDER_REPORT_DATA</reportData>
+      <favoriteActionGroup1>orderReportDispatch</favoriteActionGroup1>
+      <favoriteActionGroup2></favoriteActionGroup2>
       <entityField>#ENTITY</entityField>
     </reportViewTemplate>
   </children>
diff --git a/neonView/OrganisationReport_view/OrganisationReport_view.aod b/neonView/OrganisationReport_view/OrganisationReport_view.aod
index f8d29baac5..0c10fa2a0b 100644
--- a/neonView/OrganisationReport_view/OrganisationReport_view.aod
+++ b/neonView/OrganisationReport_view/OrganisationReport_view.aod
@@ -11,6 +11,7 @@
     <reportViewTemplate>
       <name>Report</name>
       <reportData>ORGANISATION_REPORT_DATA</reportData>
+      <favoriteActionGroup1>orgReportDispatch</favoriteActionGroup1>
       <entityField>#ENTITY</entityField>
     </reportViewTemplate>
   </children>
diff --git a/process/DataPrivacy_lib/process.js b/process/DataPrivacy_lib/process.js
index 3ed75b1706..da986784dd 100644
--- a/process/DataPrivacy_lib/process.js
+++ b/process/DataPrivacy_lib/process.js
@@ -564,7 +564,7 @@ DataPrivacyUtils.openReport = function(pContactId, pReportName, pDSGVOInfo, pLoc
 {
     neon.openContext("DSGVOReport", "DSGVOReport_view", [], neon.OPERATINGSTATE_VIEW, {
         "param.ReportName_param": pReportName,
-        "param.ContactID_param": pContactId,
+        "param.ContactId_param": pContactId,
         "param.DSGVOInfo_param": JSON.stringify(pDSGVOInfo)
     });
 }
diff --git a/process/Email_lib/process.js b/process/Email_lib/process.js
index 34ae40ebfa..0a29f110ad 100644
--- a/process/Email_lib/process.js
+++ b/process/Email_lib/process.js
@@ -68,6 +68,8 @@ EmailWritingUtils.openMailTemplate = function (pToRecipients, pSenderContactId,
     return email.downloadEML(pEmailFilename);
 }
 
+
+
 /**
  * opens a view where a new mail can be sent. In the view the use CAN select a DocumentTemplate if needed
  * 
@@ -78,9 +80,9 @@ EmailWritingUtils.openMailTemplate = function (pToRecipients, pSenderContactId,
  * @param {String} pComingFrom source from where you started (e.g. "Person", "Organisation" )
  * @param {String} pEmailFilename optional file name of the email.
  * @param {String} [pAdditionalPlaceholders] additional placeholders for the email
- * @param {String} [pOfferId] optional needed for the offerEmails, to change the status of the offer
+ * @param {Array[]} [pUpdateStatements] an array with update statements which will be executed after email is downloaded/sent.
  */
-EmailWritingUtils.openNewMail = function (pToContactId, pToEmailAddress, pComingFrom, pAttachmentArray, pNotificationMsg, pEmailFilename, pAdditionalPlaceholders, pOfferId)
+EmailWritingUtils.openNewMail = function (pToContactId, pToEmailAddress, pComingFrom, pAttachmentArray, pNotificationMsg, pEmailFilename, pAdditionalPlaceholders, pUpdateStatements)
 {
     var params = {
         "ContactId_param" : pToContactId,
@@ -89,7 +91,7 @@ EmailWritingUtils.openNewMail = function (pToContactId, pToEmailAddress, pComing
         "NotificationMsg_param" : pNotificationMsg,
         "EmailFilename" : pEmailFilename,
         "AdditionalPlaceholders_param" : JSON.stringify(pAdditionalPlaceholders),
-        "OfferId_param" : pOfferId
+        "UpdateStatements_param" : JSON.stringify(pUpdateStatements)
     };
     
     if (pToEmailAddress)
@@ -98,6 +100,7 @@ EmailWritingUtils.openNewMail = function (pToContactId, pToEmailAddress, pComing
     neon.openContext("Email", "EmailEdit_view", null, neon.OPERATINGSTATE_VIEW, params);
 }
 
+
 EmailWritingUtils.getMailbridgeAddress = function ()
 {
     return "mailbridge@domain.local"; //TODO: not hardcoded
@@ -118,9 +121,16 @@ EmailWritingUtils.getMailbridgeAddress = function ()
  */
 EmailWritingUtils.sendReportAsMail = function (pRecipient, pReportArray, pComingFrom, pNotificationMsg, pEmailFilename, pAdditionalPlaceholders, pOfferId)
 {
-    var pRecpientEmail = newSelect("COMMUNICATION.ADDR").from("COMMUNICATION")
-    .where("COMMUNICATION.CONTACT_ID", pRecipient).and("COMMUNICATION.MEDIUM_ID", "COMMEMAIL").cell();
-            
+    var pRecpientEmail;
+    
+    if (pRecipient)
+    {
+        pRecpientEmail = newSelect("COMMUNICATION.ADDR").from("COMMUNICATION")
+                                .where("COMMUNICATION.CONTACT_ID", pRecipient).and("COMMUNICATION.MEDIUM_ID", "COMMEMAIL").cell();        
+    } else{
+        pRecpientEmail = null;
+    }
+    
     EmailWritingUtils.openNewMail(pRecipient, pRecpientEmail, pComingFrom, pReportArray, pNotificationMsg, pEmailFilename, pAdditionalPlaceholders, pOfferId);
 }
 
-- 
GitLab


From 676768b860ac9b4cdcc897347090e9c5c0c5bb7d Mon Sep 17 00:00:00 2001
From: Tom Lutzenberger <t.lutzenberger@adito.de>
Date: Fri, 21 Aug 2020 13:38:18 +0200
Subject: [PATCH 308/309] #1064010: Adjust campaign cost layout

---
 .../CampaignCost_entity.aod                   | 11 --------
 .../alter/children/edit/onActionProcess.js    |  7 -----
 neonContext/Campaign/Campaign.aod             |  4 ---
 neonContext/CampaignCost/CampaignCost.aod     |  4 +++
 .../CampaignCostFix_view.aod                  | 26 ++++++++++++++-----
 .../CampaignCostVariable_view.aod             |  2 --
 .../CampaignCost_view/CampaignCost_view.aod   |  4 +--
 7 files changed, 25 insertions(+), 33 deletions(-)
 delete mode 100644 entity/CampaignCost_entity/entityfields/alter/children/edit/onActionProcess.js

diff --git a/entity/CampaignCost_entity/CampaignCost_entity.aod b/entity/CampaignCost_entity/CampaignCost_entity.aod
index 8481518fc0..2af24acc0d 100644
--- a/entity/CampaignCost_entity/CampaignCost_entity.aod
+++ b/entity/CampaignCost_entity/CampaignCost_entity.aod
@@ -184,17 +184,6 @@
         </entityParameter>
       </children>
     </entityConsumer>
-    <entityActionGroup>
-      <name>alter</name>
-      <children>
-        <entityActionField>
-          <name>edit</name>
-          <onActionProcess>%aditoprj%/entity/CampaignCost_entity/entityfields/alter/children/edit/onActionProcess.js</onActionProcess>
-          <isSelectionAction v="true" />
-          <iconId>NEON:PENCIL</iconId>
-        </entityActionField>
-      </children>
-    </entityActionGroup>
     <entityParameter>
       <name>CampaignId_param</name>
       <expose v="true" />
diff --git a/entity/CampaignCost_entity/entityfields/alter/children/edit/onActionProcess.js b/entity/CampaignCost_entity/entityfields/alter/children/edit/onActionProcess.js
deleted file mode 100644
index 2f19601f3e..0000000000
--- a/entity/CampaignCost_entity/entityfields/alter/children/edit/onActionProcess.js
+++ /dev/null
@@ -1,7 +0,0 @@
-import("system.neon");
-import("system.vars");
-
-var params = {
-    "Uid_param" : vars.get("$sys.uid")
-}
-neon.openContext("CampaignCost", "CampaignCostEdit_view", null, neon.OPERATINGSTATE_EDIT, params);
\ No newline at end of file
diff --git a/neonContext/Campaign/Campaign.aod b/neonContext/Campaign/Campaign.aod
index 355bc08150..36cdf48333 100644
--- a/neonContext/Campaign/Campaign.aod
+++ b/neonContext/Campaign/Campaign.aod
@@ -39,9 +39,5 @@
       <name>11240bc6-700c-443a-bfa3-1190ad58fccd</name>
       <view>CampaignOverview_view</view>
     </neonViewReference>
-    <neonViewReference>
-      <name>c32002ad-92ff-408c-a399-2998868f94d0</name>
-      <view>CampaignCostFix_view</view>
-    </neonViewReference>
   </references>
 </neonContext>
diff --git a/neonContext/CampaignCost/CampaignCost.aod b/neonContext/CampaignCost/CampaignCost.aod
index 56cc86e548..53037d6407 100644
--- a/neonContext/CampaignCost/CampaignCost.aod
+++ b/neonContext/CampaignCost/CampaignCost.aod
@@ -22,5 +22,9 @@
       <name>a4f131e8-2371-4070-83f7-fd69dfd6a7df</name>
       <view>CampaignCostExtendedFilter_view</view>
     </neonViewReference>
+    <neonViewReference>
+      <name>4d06f59b-f801-460e-8efd-3c08b14541ec</name>
+      <view>CampaignCostFix_view</view>
+    </neonViewReference>
   </references>
 </neonContext>
diff --git a/neonView/CampaignCostFix_view/CampaignCostFix_view.aod b/neonView/CampaignCostFix_view/CampaignCostFix_view.aod
index 810bd1d346..4397f42cbf 100644
--- a/neonView/CampaignCostFix_view/CampaignCostFix_view.aod
+++ b/neonView/CampaignCostFix_view/CampaignCostFix_view.aod
@@ -1,17 +1,29 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.6">
   <name>CampaignCostFix_view</name>
+  <title>Fix costs</title>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <layout>
-    <noneLayout>
+    <drawerLayout>
       <name>layout</name>
-    </noneLayout>
+      <layoutCaption>Fix costs</layoutCaption>
+      <fixedDrawer v="true" />
+    </drawerLayout>
   </layout>
   <children>
-    <neonViewReference>
-      <name>127a0cab-ec21-47e6-ba6c-c091cb31c794</name>
-      <entityField>CampaignCosts</entityField>
-      <view>CampaignCostFilter_view</view>
-    </neonViewReference>
+    <tableViewTemplate>
+      <name>CampaignCostFix</name>
+      <entityField>#ENTITY</entityField>
+      <columns>
+        <neonTableColumn>
+          <name>1b2b3ce3-eaff-472b-a873-5e054adac89a</name>
+          <entityField>CATEGORY</entityField>
+        </neonTableColumn>
+        <neonTableColumn>
+          <name>00630ccd-689f-4cf7-9dfc-cc0a67771c0c</name>
+          <entityField>NET</entityField>
+        </neonTableColumn>
+      </columns>
+    </tableViewTemplate>
   </children>
 </neonView>
diff --git a/neonView/CampaignCostVariable_view/CampaignCostVariable_view.aod b/neonView/CampaignCostVariable_view/CampaignCostVariable_view.aod
index 5821748a90..95a79e654d 100644
--- a/neonView/CampaignCostVariable_view/CampaignCostVariable_view.aod
+++ b/neonView/CampaignCostVariable_view/CampaignCostVariable_view.aod
@@ -14,8 +14,6 @@
   <children>
     <treeTableViewTemplate>
       <name>CostTreeTable</name>
-      <favoriteActionGroup1>alter</favoriteActionGroup1>
-      <entityField>#ENTITY</entityField>
       <defaultGroupFields>
         <element>CAMPAIGNSTEP_ID</element>
       </defaultGroupFields>
diff --git a/neonView/CampaignCost_view/CampaignCost_view.aod b/neonView/CampaignCost_view/CampaignCost_view.aod
index 5fdcc86527..03ccab3dbb 100644
--- a/neonView/CampaignCost_view/CampaignCost_view.aod
+++ b/neonView/CampaignCost_view/CampaignCost_view.aod
@@ -17,8 +17,8 @@
       <view>CampaignCostVariable_view</view>
     </neonViewReference>
     <neonViewReference>
-      <name>c4476130-ca57-4707-9448-266138c09880</name>
-      <entityField>#ENTITY</entityField>
+      <name>cc960341-1f55-4ad5-8ae9-dece0df73b5c</name>
+      <entityField>CampaignCosts</entityField>
       <view>CampaignCostFix_view</view>
     </neonViewReference>
     <neonViewReference>
-- 
GitLab


From e9e006a00bc9f083357a0fd70acfa6ce7f1ce7de Mon Sep 17 00:00:00 2001
From: "j.goderbauer" <j.goderbauer@adito.de>
Date: Tue, 15 Sep 2020 10:29:53 +0200
Subject: [PATCH 309/309] Auto-language-changes

---
 .../_____LANGUAGE_EXTRA.aod                   | 15 +++++++++++++++
 .../_____LANGUAGE_de/_____LANGUAGE_de.aod     | 19 +++++++++++++++----
 .../_____LANGUAGE_en/_____LANGUAGE_en.aod     | 15 +++++++++++++++
 3 files changed, 45 insertions(+), 4 deletions(-)

diff --git a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
index 323d581e71..ee5347bbda 100644
--- a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
+++ b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
@@ -7368,6 +7368,21 @@
     <entry>
       <key>Mark all cached record containers as invalid</key>
     </entry>
+    <entry>
+      <key>Current Recipients</key>
+    </entry>
+    <entry>
+      <key>Date (Month)</key>
+    </entry>
+    <entry>
+      <key>Date (Year)</key>
+    </entry>
+    <entry>
+      <key>Date (Day)</key>
+    </entry>
+    <entry>
+      <key>Grant new User Permission</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 de19fa8cb0..383204d77c 100644
--- a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
+++ b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
@@ -8982,10 +8982,6 @@ Bitte Datumseingabe prüfen</value>
     <entry>
       <key>{SEND_MAIL}</key>
       <value>Email versenden</value>
-      <value>Sende E-Mail</value>
-    </entry>
-    <entry>
-      <key>Total in euros</key>
     </entry>
     <entry>
       <key>The workflow could not be deployed</key>
@@ -9393,6 +9389,21 @@ Bitte Datumseingabe prüfen</value>
     <entry>
       <key>Mark all cached record containers as invalid</key>
     </entry>
+    <entry>
+      <key>Current Recipients</key>
+    </entry>
+    <entry>
+      <key>Date (Month)</key>
+    </entry>
+    <entry>
+      <key>Date (Year)</key>
+    </entry>
+    <entry>
+      <key>Date (Day)</key>
+    </entry>
+    <entry>
+      <key>Grant new User Permission</key>
+    </entry>
   </keyValueMap>
   <font name="Dialog" style="0" size="11" />
 </language>
diff --git a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
index 0d03c169c6..9aeb4aa1c6 100644
--- a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
+++ b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
@@ -7449,6 +7449,21 @@
     <entry>
       <key>Mark all cached record containers as invalid</key>
     </entry>
+    <entry>
+      <key>Current Recipients</key>
+    </entry>
+    <entry>
+      <key>Date (Month)</key>
+    </entry>
+    <entry>
+      <key>Date (Year)</key>
+    </entry>
+    <entry>
+      <key>Date (Day)</key>
+    </entry>
+    <entry>
+      <key>Grant new User Permission</key>
+    </entry>
   </keyValueMap>
   <font name="Dialog" style="0" size="11" />
 </language>
-- 
GitLab