merged 2020.1 into #1055236-Übersetzung-LeadimportReset

.liquibase/Data_alias/basic/2020.1.2/AddNullableToDateNew.xml

+<?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="0aa81d84-7456-4240-91e0-a915f38abbd7" author="s.pongratz" >
+        <addNotNullConstraint columnName="DATE_NEW" tableName="CAMPAIGNCOST" columnDataType="DATETIME" validate="true"/>
+        <addNotNullConstraint columnName="DATE_NEW" tableName="CAMPAIGNPARTICIPANT" columnDataType="DATETIME" validate="true"/>
+        <addNotNullConstraint columnName="DATE_NEW" tableName="CAMPAIGNSTEP" columnDataType="DATETIME" validate="true"/>
+        <addNotNullConstraint columnName="DATE_NEW" tableName="DOCUMENTTEMPLATELINK" columnDataType="DATETIME" validate="true"/>
+        <addNotNullConstraint columnName="DATE_NEW" tableName="DUPLICATESCANNER" columnDataType="DATETIME" validate="true"/>
+        <addNotNullConstraint columnName="DATE_NEW" tableName="DUPLICATESCANNERRESULTFIELDCONFIG" columnDataType="DATETIME" validate="true"/>
+        <addNotNullConstraint columnName="DATE_NEW" tableName="CAMPAIGN" columnDataType="DATETIME" validate="true"/>
+    </changeSet>
+</databaseChangeLog>

.liquibase/Data_alias/basic/2020.1.2/changelog.xml

@@ -2,4 +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="AlterDocumentTemplatePlaceOfUseDatatype/changelog.xml" relativeToChangelogFile="true"/>
+    <include file="AddNullableToDateNew.xml" relativeToChangelogFile="true" />
+    <include file="insert_workflowCategory_keyword.xml" relativeToChangelogFile="true"/>
 </databaseChangeLog>

.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"/>-->

entity/Activity_entity/Activity_entity.aod

@@ -611,6 +611,16 @@
       <title> number of connections</title>
       <valueProcess>%aditoprj%/entity/Activity_entity/entityfields/countlinks/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>
   </entityFields>
   <recordContainers>
     <dbRecordContainer>
@@ -712,6 +722,15 @@
           <name>entryDateDateFormat.value</name>
           <expression>%aditoprj%/entity/Activity_entity/recordcontainers/db/recordfieldmappings/entrydatedateformat.value/expression.js</expression>
         </dbRecordFieldMapping>
+        <aggregateFieldDbMapping>
+          <name>COUNT_aggregate.value</name>
+          <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>

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>
-  <afterUiInit>%aditoprj%/entity/AnyContact_entity/afterUiInit.js</afterUiInit>
+  <onInit>%aditoprj%/entity/AnyContact_entity/onInit.js</onInit>
   <imageProcess>%aditoprj%/entity/AnyContact_entity/imageProcess.js</imageProcess>
   <recordContainer>db</recordContainer>
   <entityFields>

entity/Contact_entity/afterUiInit.js → entity/AnyContact_entity/onInit.js

@@ -8,7 +8,7 @@ var statusFilterElement = {
         "name":"STATUS",
         "operator":"NOT_EQUAL",
         "key":$KeywordRegistry.contactStatus$inactive(),
-        "contenttype": vars.get("$property.STATUS.contentType")
+        "contenttype": "TEXT"
 };
     
 statusFilterElement.value = KeywordUtils.getViewValue($KeywordRegistry.contactStatus(), statusFilterElement.key);

entity/CampaignParticipant_entity/entityfields/campaign_id/onValueChange.js

@@ -2,7 +2,7 @@ import("system.neon");
 import("Campaign_lib");
 import("system.vars");
 
-if(vasr.get("$sys.operatingstate") == neon.OPERATINGSTATE_NEW)
+if(vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_NEW)
 {
     var stepId = CampaignUtils.getDefaultCampaignStep(vars.get("local.value"));
     neon.setFieldValue("$field.CAMPAIGNSTEP_ID", stepId);

entity/Campaign_entity/Campaign_entity.aod

@@ -517,6 +517,16 @@
         </entityParameter>
       </children>
     </entityConsumer>
+    <entityField>
+      <name>COUNT</name>
+      <title>Count</title>
+      <contentType>NUMBER</contentType>
+    </entityField>
+    <entityAggregateField>
+      <name>COUNT_aggregate</name>
+      <parentField>COUNT</parentField>
+      <title>Count</title>
+    </entityAggregateField>
   </entityFields>
   <recordContainers>
     <dbRecordContainer>
@@ -614,6 +624,15 @@
           <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>
+          <aggregateType>COUNT</aggregateType>
+        </aggregateFieldDbMapping>
       </recordFieldMappings>
       <filterExtensions>
         <filterExtensionSet>

entity/Contact_entity/Contact_entity.aod

@@ -8,7 +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>
+  <onInit>%aditoprj%/entity/Contact_entity/onInit.js</onInit>
   <onValidation>%aditoprj%/entity/Contact_entity/onValidation.js</onValidation>
   <iconId>VAADIN:USERS</iconId>
   <titlePlural>Contacts</titlePlural>

entity/Contract_entity/Contract_entity.aod

@@ -383,6 +383,15 @@
       <iconId>VAADIN:CURLY_BRACKETS</iconId>
       <stateProcess>%aditoprj%/entity/Contract_entity/entityfields/openadminview/stateProcess.js</stateProcess>
     </entityActionField>
+    <entityField>
+      <name>COUNT</name>
+      <title>Count</title>
+    </entityField>
+    <entityAggregateField>
+      <name>COUNT_aggregate</name>
+      <parentField>COUNT</parentField>
+      <title>Count</title>
+    </entityAggregateField>
   </entityFields>
   <recordContainers>
     <dbRecordContainer>
@@ -520,6 +529,15 @@
           <isFilterable v="true" />
           <filtertype>EXTENDED</filtertype>
         </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>
+          <recordfield>CONTRACT.CONTRACTID</recordfield>
+          <aggregateType>COUNT</aggregateType>
+        </aggregateFieldDbMapping>
       </recordFieldMappings>
       <filterExtensions>
         <filterExtensionSet>

entity/ExportTemplateField_entity/entityfields/field/dropDownProcess.js

@@ -9,7 +9,7 @@ import("system.text")
 
     
 var placeholders = PlaceholderUtils.getPlaceholders(null, true).map(function (placeholder){
-    return [placeholder.placeholderName, placeholder.title || placeholder.placeholderName];
+    return [placeholder.getFormattedName(), placeholder.title || placeholder.getFormattedName()];
 })
 
 result.object(placeholders);
\ No newline at end of file

entity/KeywordEntry_entity/KeywordEntry_entity.aod

@@ -577,6 +577,12 @@
           <fieldName>KeywordVisitRecommendationPriority</fieldName>
           <isConsumer v="false" />
         </entityDependency>
+        <entityDependency>
+          <name>54410e7f-e5e6-4dd1-8f60-7864ed907aed</name>
+          <entityName>WorkflowDefinition_entity</entityName>
+          <fieldName>CategoryKeyword</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
       </dependencies>
       <children>
         <entityParameter>

entity/Offer_entity/Offer_entity.aod

@@ -1023,6 +1023,16 @@
       <name>NET_aggregate</name>
       <parentField>NET</parentField>
     </entityAggregateField>
+    <entityField>
+      <name>COUNT</name>
+      <title>Count</title>
+      <contentType>NUMBER</contentType>
+    </entityField>
+    <entityAggregateField>
+      <name>COUNT_aggregate</name>
+      <parentField>COUNT</parentField>
+      <title>Count</title>
+    </entityAggregateField>
   </entityFields>
   <recordContainers>
     <dbRecordContainer>
@@ -1261,6 +1271,15 @@
           <recordfield>OFFER.NET</recordfield>
           <aggregateType>SUM</aggregateType>
         </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>
+          <recordfield>OFFER.OFFER_ID</recordfield>
+          <aggregateType>COUNT</aggregateType>
+        </aggregateFieldDbMapping>
       </recordFieldMappings>
       <filterExtensions>
         <filterExtensionSet>

entity/Order_entity/Order_entity.aod

@@ -987,6 +987,16 @@
         <fieldName>Contacts</fieldName>
       </dependency>
     </entityConsumer>
+    <entityField>
+      <name>COUNT</name>
+      <title>Count</title>
+      <contentType>NUMBER</contentType>
+    </entityField>
+    <entityAggregateField>
+      <name>COUNT_aggregate</name>
+      <parentField>COUNT</parentField>
+      <title>Count</title>
+    </entityAggregateField>
   </entityFields>
   <recordContainers>
     <dbRecordContainer>
@@ -1201,6 +1211,15 @@
           <name>ISOLANGUAGE.displayValue</name>
           <expression>%aditoprj%/entity/Order_entity/recordcontainers/db/recordfieldmappings/isolanguage.displayvalue/expression.js</expression>
         </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>
+          <recordfield>SALESORDER.SALESORDERID</recordfield>
+          <aggregateType>COUNT</aggregateType>
+        </aggregateFieldDbMapping>
       </recordFieldMappings>
     </dbRecordContainer>
     <indexRecordContainer>

entity/Organisation_entity/Organisation_entity.aod

@@ -7,7 +7,7 @@
   <title>Company</title>
   <grantDeleteProcess>%aditoprj%/entity/Organisation_entity/grantDeleteProcess.js</grantDeleteProcess>
   <contentTitleProcess>%aditoprj%/entity/Organisation_entity/contentTitleProcess.js</contentTitleProcess>
-  <afterUiInit>%aditoprj%/entity/Organisation_entity/afterUiInit.js</afterUiInit>
+  <onInit>%aditoprj%/entity/Organisation_entity/onInit.js</onInit>
   <afterOperatingState>%aditoprj%/entity/Organisation_entity/afterOperatingState.js</afterOperatingState>
   <iconId>VAADIN:BUILDING</iconId>
   <imageProcess>%aditoprj%/entity/Organisation_entity/imageProcess.js</imageProcess>
@@ -788,7 +788,7 @@
       <title>Turnover Current Year</title>
       <contentType>NUMBER</contentType>
       <outputFormat>#,##0.00€</outputFormat>
-      <groupable v="true" />
+      <groupable v="false" />
       <valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/turnovercurrentyear/valueProcess.js</valueProcess>
     </entityField>
     <entityField>
@@ -796,7 +796,7 @@
       <title>Turnover Last Year</title>
       <contentType>NUMBER</contentType>
       <outputFormat>#,##0.00€</outputFormat>
-      <groupable v="true" />
+      <groupable v="false" />
       <valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/turnoverlastyear/valueProcess.js</valueProcess>
     </entityField>
     <entityField>
@@ -804,6 +804,7 @@
       <title>Turnover change</title>
       <colorProcess>%aditoprj%/entity/Organisation_entity/entityfields/turnoverpercentdiff/colorProcess.js</colorProcess>
       <contentType>TEXT</contentType>
+      <groupable v="false" />
       <valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/turnoverpercentdiff/valueProcess.js</valueProcess>
     </entityField>
     <entityField>
@@ -1102,6 +1103,16 @@
       <onActionProcess>%aditoprj%/entity/Organisation_entity/entityfields/openlocation/onActionProcess.js</onActionProcess>
       <iconId>NEON:TACKED</iconId>
     </entityActionField>
+    <entityField>
+      <name>COUNT</name>
+      <title>Count</title>
+      <contentType>NUMBER</contentType>
+    </entityField>
+    <entityAggregateField>
+      <name>COUNT_aggregate</name>
+      <parentField>COUNT</parentField>
+      <title>Count</title>
+    </entityAggregateField>
   </entityFields>
   <recordContainers>
     <dbRecordContainer>
@@ -1308,6 +1319,15 @@
           <name>STANDARD_ZIP.value</name>
           <recordfield>ADDRESS.ZIP</recordfield>
         </dbRecordFieldMapping>
+        <aggregateFieldDbMapping>
+          <name>COUNT_aggregate.value</name>
+          <recordfield>ORGANISATION.ORGANISATIONID</recordfield>
+          <aggregateType>COUNT</aggregateType>
+        </aggregateFieldDbMapping>
+        <dbRecordFieldMapping>
+          <name>COUNT.value</name>
+          <expression>%aditoprj%/entity/Organisation_entity/recordcontainers/db/recordfieldmappings/count.value/expression.js</expression>
+        </dbRecordFieldMapping>
       </recordFieldMappings>
       <filterExtensions>
         <filterExtensionSet>

entity/Organisation_entity/afterUiInit.js → entity/Organisation_entity/onInit.js

-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": 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);
-
-if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
-{
-    AttributeRelationUtils.presetMandatoryAttributes(ContextUtils.getCurrentContextId(), "Attributes");
-}
+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");
+}

entity/PermissionCalendar_entity/PermissionCalendar_entity.aod

@@ -90,9 +90,9 @@
       <description></description>
       <children>
         <entityActionField>
-          <name>addNewUserPermissionDealerAction</name>
-          <title>Add new User Permission</title>
-          <onActionProcess>%aditoprj%/entity/PermissionCalendar_entity/entityfields/addactions/children/addnewuserpermissiondealeraction/onActionProcess.js</onActionProcess>
+          <name>receiveNewUserPermissionDealerAction</name>
+          <title>Receive new User Permission</title>
+          <onActionProcess>%aditoprj%/entity/PermissionCalendar_entity/entityfields/addactions/children/receivenewuserpermissiondealeraction/onActionProcess.js</onActionProcess>
           <isMenuAction v="true" />
           <isObjectAction v="false" />
           <isSelectionAction v="false" />
@@ -100,9 +100,9 @@
           <tooltip></tooltip>
         </entityActionField>
         <entityActionField>
-          <name>addNewDepartmentPermissionDealterAction</name>
-          <title>Add new Department Permission</title>
-          <onActionProcess>%aditoprj%/entity/PermissionCalendar_entity/entityfields/addactions/children/addnewdepartmentpermissiondealteraction/onActionProcess.js</onActionProcess>
+          <name>receiveNewDepartmentPermissionDealterAction</name>
+          <title>Receive new Department Permission</title>
+          <onActionProcess>%aditoprj%/entity/PermissionCalendar_entity/entityfields/addactions/children/receivenewdepartmentpermissiondealteraction/onActionProcess.js</onActionProcess>
           <isObjectAction v="false" />
           <state>AUTO</state>
         </entityActionField>