diff --git a/.aditoprj/blueprints/Blueprint_ create Open Admin View Action.xml b/.aditoprj/blueprints/Blueprint_ create Open Admin View Action.xml
deleted file mode 100644
index 3c54223f12e95349145e94e70f95fe8d0486bf69..0000000000000000000000000000000000000000
--- a/.aditoprj/blueprints/Blueprint_ create Open Admin View Action.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<blueprint name="'OpenAdminView' Action">
- <type>entityField</type>
- <parameters>
- </parameters>
- <data>
- <document name="entity"><![CDATA[
-<entity VERSION="1.3.17">
- <entityFields>
- <entityActionField>
- <name>openAdminView</name>
- <title>Open admin view</title>
- <onActionProcess>
-import("system.vars");
-import("Context_lib");
-
-AdminViewUtils.open("", []);
- </onActionProcess>
- <isObjectAction v="true" />
- <isMenuAction v="true" />
- <iconId>VAADIN:CURLY_BRACKETS</iconId>
- <stateProcess>
-import("Context_lib");
-import("system.result");
-
-result.string(AdminViewUtils.getActionState());
- </stateProcess>
- </entityActionField>
- </entityFields>
-</entity>
- ]]></document>
- </data>
-</blueprint>
\ No newline at end of file
diff --git a/entity/AdvertisingItem_entity/AdvertisingItem_entity.aod b/entity/AdvertisingItem_entity/AdvertisingItem_entity.aod
index 2d98540b29f8ee3f3ef14bfa1b2ffe45ed6cccac..aa1f2ac81227ebcf9ecfaa9bc41cb95b15674ec6 100644
--- a/entity/AdvertisingItem_entity/AdvertisingItem_entity.aod
+++ b/entity/AdvertisingItem_entity/AdvertisingItem_entity.aod
@@ -8,15 +8,6 @@
<titlePlural>Advertising items</titlePlural>
<recordContainer>db</recordContainer>
<entityFields>
- <entityActionField>
- <name>openAdminView</name>
- <title>Open admin view</title>
- <onActionProcess>%aditoprj%/entity/AdvertisingItem_entity/entityfields/openadminview/onActionProcess.js</onActionProcess>
- <isMenuAction v="true" />
- <isObjectAction v="true" />
- <iconId>VAADIN:CURLY_BRACKETS</iconId>
- <stateProcess>%aditoprj%/entity/AdvertisingItem_entity/entityfields/openadminview/stateProcess.js</stateProcess>
- </entityActionField>
<entityProvider>
<name>#PROVIDER</name>
</entityProvider>
@@ -236,10 +227,6 @@
<name>OnlyDigital_param</name>
<expose v="true" />
</entityParameter>
- <entityField>
- <name>PICTURE</name>
- <contentType>IMAGE</contentType>
- </entityField>
</entityFields>
<recordContainers>
<dbRecordContainer>
@@ -333,10 +320,6 @@
<name>PRODUCT_ID.displayValue</name>
<expression>%aditoprj%/entity/AdvertisingItem_entity/recordcontainers/db/recordfieldmappings/product_id.displayvalue/expression.js</expression>
</dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>PICTURE.value</name>
- <expression>%aditoprj%/entity/AdvertisingItem_entity/recordcontainers/db/recordfieldmappings/picture.value/expression.js</expression>
- </dbRecordFieldMapping>
</recordFieldMappings>
<linkInformation>
<linkInformation>
diff --git a/entity/AdvertisingItem_entity/entityfields/openadminview/onActionProcess.js b/entity/AdvertisingItem_entity/entityfields/openadminview/onActionProcess.js
deleted file mode 100644
index 40a7d88213184afea21f2fdb0ab1f48d4c67aafd..0000000000000000000000000000000000000000
--- a/entity/AdvertisingItem_entity/entityfields/openadminview/onActionProcess.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import("system.vars");
-import("Context_lib");
-
-AdminViewUtils.open("ADVERTISINGITEMID", []);
\ No newline at end of file
diff --git a/entity/AdvertisingItem_entity/entityfields/openadminview/stateProcess.js b/entity/AdvertisingItem_entity/entityfields/openadminview/stateProcess.js
deleted file mode 100644
index 38f2298db7304b4d44a15fbad7f720558c02da99..0000000000000000000000000000000000000000
--- a/entity/AdvertisingItem_entity/entityfields/openadminview/stateProcess.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import("Context_lib");
-import("system.result");
-
-result.string(AdminViewUtils.getActionState());
\ No newline at end of file
diff --git a/entity/AdvertisingItem_entity/recordcontainers/db/recordfieldmappings/picture.value/expression.js b/entity/AdvertisingItem_entity/recordcontainers/db/recordfieldmappings/picture.value/expression.js
deleted file mode 100644
index cc3052f7f79d4336b0436637daba611d984ba1ea..0000000000000000000000000000000000000000
--- a/entity/AdvertisingItem_entity/recordcontainers/db/recordfieldmappings/picture.value/expression.js
+++ /dev/null
@@ -1,9 +0,0 @@
-import("Product_lib");
-import("system.result");
-import("Sql_lib");
-var sqlMask = new SqlMaskingUtils();
-
-var sql = sqlMask.concatenate(["'TEXT:'", "(" + ProductUtils.getProductNameSubSql("ADVERTISINGITEM.PRODUCT_ID") + ")"]);
-
-result.string(sql.toString());
-
diff --git a/entity/AnyContact_entity/initFilterProcess.js b/entity/AnyContact_entity/initFilterProcess.js
index b9382cae8ba84fd39e3c7a7ec9247ccdef455b9a..c33a0cbce2a1e1a58e2c625c13dc34e40af3f62f 100644
--- a/entity/AnyContact_entity/initFilterProcess.js
+++ b/entity/AnyContact_entity/initFilterProcess.js
@@ -4,7 +4,7 @@ import("system.result");
import("Keyword_lib");
import("KeywordRegistry_basic");
-if ([neon.CONTEXT_PRESENTATIONMODE_FILTER, neon.CONTEXT_PRESENTATIONMODE_DASHBOARD].includes(vars.get("$sys.presentationmode")))
+if (vars.get("$sys.presentationmode") === neon.CONTEXT_PRESENTATIONMODE_FILTER)
{
var statusInactive = $KeywordRegistry.contactStatus$inactive();
var filter = {
diff --git a/entity/AuditLogHistory_entity/initFilterProcess.js b/entity/AuditLogHistory_entity/initFilterProcess.js
index c700bb03caf63fcf3bd43ae90c63941dc712eac7..a8178441551129fa5dd8ccd88ad7b6b9ff4b6a1c 100644
--- a/entity/AuditLogHistory_entity/initFilterProcess.js
+++ b/entity/AuditLogHistory_entity/initFilterProcess.js
@@ -3,12 +3,15 @@ import("system.neon");
import("system.datetime");
import("system.vars");
-if ([neon.CONTEXT_PRESENTATIONMODE_FILTER, neon.CONTEXT_PRESENTATIONMODE_DASHBOARD].includes(vars.get("$sys.presentationmode")))
+let presMode = vars.get("$sys.presentationmode");
+let curDate = datetime.toDate(vars.get("$sys.date"), "dd.MM.yyyy");
+
+if (presMode == neon.CONTEXT_PRESENTATIONMODE_FILTER || presMode == neon.CONTEXT_PRESENTATIONMODE_DASHBOARD)
{
var filter = {
"type":"group",
"operator":"AND",
- "timestamp": datetime.toDate(vars.get("$sys.date"), "dd.MM.yyyy"),
+ "timestamp": curDate,
"childs":
[
{
diff --git a/entity/CampaignPlanning_entity/initFilterProcess.js b/entity/CampaignPlanning_entity/initFilterProcess.js
index 10eaa4283fb74cce6a357659c765f8fa1ea1771e..7e2f9702cf230d3282a97c186e33a49db5923303 100644
--- a/entity/CampaignPlanning_entity/initFilterProcess.js
+++ b/entity/CampaignPlanning_entity/initFilterProcess.js
@@ -3,7 +3,8 @@ import("system.neon");
import("system.vars");
import("system.result");
-if([neon.CONTEXT_PRESENTATIONMODE_FILTER, neon.CONTEXT_PRESENTATIONMODE_DASHBOARD].includes(vars.get("$sys.presentationmode")))
+
+if(vars.get("$sys.presentationmode") === neon.CONTEXT_PRESENTATIONMODE_FILTER)
{
var filter = JSON.stringify({
type: "group",
diff --git a/entity/CampaignStep_entity/CampaignStep_entity.aod b/entity/CampaignStep_entity/CampaignStep_entity.aod
index 66369d8d6fab0ece8a6fa5fb5f74be58bf5f61e4..a38be8ee20843c49023799a79c176754162d6cd3 100644
--- a/entity/CampaignStep_entity/CampaignStep_entity.aod
+++ b/entity/CampaignStep_entity/CampaignStep_entity.aod
@@ -272,6 +272,20 @@
</entityParameter>
</children>
</entityConsumer>
+ <entityActionField>
+ <name>newActivity</name>
+ <title>New activity</title>
+ <onActionProcess>%aditoprj%/entity/CampaignStep_entity/entityfields/newactivity/onActionProcess.js</onActionProcess>
+ <iconId>VAADIN:HOURGLASS</iconId>
+ <tooltip>New activity</tooltip>
+ <tooltipProcess>%aditoprj%/entity/CampaignStep_entity/entityfields/newactivity/tooltipProcess.js</tooltipProcess>
+ </entityActionField>
+ <entityActionField>
+ <name>newTask</name>
+ <title>New task</title>
+ <onActionProcess>%aditoprj%/entity/CampaignStep_entity/entityfields/newtask/onActionProcess.js</onActionProcess>
+ <iconId>VAADIN:TASKS</iconId>
+ </entityActionField>
<entityField>
<name>PREDECESSORSTEP_ID</name>
<title>Predecessor</title>
@@ -326,6 +340,12 @@
<name>maxSort_param</name>
<expose v="true" />
</entityParameter>
+ <entityActionField>
+ <name>newCampaignStep</name>
+ <title>New step</title>
+ <onActionProcess>%aditoprj%/entity/CampaignStep_entity/entityfields/newcampaignstep/onActionProcess.js</onActionProcess>
+ <iconId>NEON:GROUP_APPOINTMENT</iconId>
+ </entityActionField>
<entityParameter>
<name>predecessorstepId_param</name>
<expose v="true" />
@@ -352,39 +372,6 @@
</entityParameter>
</children>
</entityConsumer>
- <entityField>
- <name>WORKFLOWDEFINITION_KEY</name>
- <title>Workflow</title>
- <consumer>Workflows</consumer>
- </entityField>
- <entityConsumer>
- <name>Workflows</name>
- <dependency>
- <name>dependency</name>
- <entityName>WorkflowDefinition_entity</entityName>
- <fieldName>#PROVIDER</fieldName>
- </dependency>
- </entityConsumer>
- <entityActionField>
- <name>newActivity</name>
- <title>New activity</title>
- <onActionProcess>%aditoprj%/entity/CampaignStep_entity/entityfields/newactivity/onActionProcess.js</onActionProcess>
- <iconId>VAADIN:HOURGLASS</iconId>
- <tooltip>New activity</tooltip>
- <tooltipProcess>%aditoprj%/entity/CampaignStep_entity/entityfields/newactivity/tooltipProcess.js</tooltipProcess>
- </entityActionField>
- <entityActionField>
- <name>newTask</name>
- <title>New task</title>
- <onActionProcess>%aditoprj%/entity/CampaignStep_entity/entityfields/newtask/onActionProcess.js</onActionProcess>
- <iconId>VAADIN:TASKS</iconId>
- </entityActionField>
- <entityActionField>
- <name>newCampaignStep</name>
- <title>New step</title>
- <onActionProcess>%aditoprj%/entity/CampaignStep_entity/entityfields/newcampaignstep/onActionProcess.js</onActionProcess>
- <iconId>NEON:GROUP_APPOINTMENT</iconId>
- </entityActionField>
<entityActionGroup>
<name>group</name>
<children>
@@ -426,15 +413,19 @@
</entityActionField>
</children>
</entityActionGroup>
- <entityActionField>
- <name>openAdminView</name>
- <title>Open admin view</title>
- <onActionProcess>%aditoprj%/entity/CampaignStep_entity/entityfields/openadminview/onActionProcess.js</onActionProcess>
- <isMenuAction v="true" />
- <isObjectAction v="true" />
- <iconId>VAADIN:CURLY_BRACKETS</iconId>
- <stateProcess>%aditoprj%/entity/CampaignStep_entity/entityfields/openadminview/stateProcess.js</stateProcess>
- </entityActionField>
+ <entityField>
+ <name>WORKFLOWDEFINITION_KEY</name>
+ <title>Workflow</title>
+ <consumer>Workflows</consumer>
+ </entityField>
+ <entityConsumer>
+ <name>Workflows</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>WorkflowDefinition_entity</entityName>
+ <fieldName>#PROVIDER</fieldName>
+ </dependency>
+ </entityConsumer>
</entityFields>
<recordContainers>
<dbRecordContainer>
diff --git a/entity/CampaignStep_entity/entityfields/openadminview/onActionProcess.js b/entity/CampaignStep_entity/entityfields/openadminview/onActionProcess.js
deleted file mode 100644
index 58a9e2c7423765822c79414671f0be9c80e99fe6..0000000000000000000000000000000000000000
--- a/entity/CampaignStep_entity/entityfields/openadminview/onActionProcess.js
+++ /dev/null
@@ -1,9 +0,0 @@
-import("system.vars");
-import("Context_lib");
-
-AdminViewUtils.open("CAMPAIGNSTEPID", [
- ["DATE_NEW", vars.get("$field.DATE_NEW"), "DATE"],
- ["DATE_EDIT", vars.get("$field.DATE_EDIT"), "DATE"],
- ["USER_NEW", vars.get("$field.USER_NEW")],
- ["USER_EDIT", vars.get("$field.USER_EDIT")]
-]);
\ No newline at end of file
diff --git a/entity/CampaignStep_entity/entityfields/openadminview/stateProcess.js b/entity/CampaignStep_entity/entityfields/openadminview/stateProcess.js
deleted file mode 100644
index 38f2298db7304b4d44a15fbad7f720558c02da99..0000000000000000000000000000000000000000
--- a/entity/CampaignStep_entity/entityfields/openadminview/stateProcess.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import("Context_lib");
-import("system.result");
-
-result.string(AdminViewUtils.getActionState());
\ No newline at end of file
diff --git a/entity/CommunicationSettings_entity/CommunicationSettings_entity.aod b/entity/CommunicationSettings_entity/CommunicationSettings_entity.aod
index 1e0c4a6ae685927eab667d7e32220b5762248419..ee03291546c62fa53d3341ee371d1aaef3dcc44b 100644
--- a/entity/CommunicationSettings_entity/CommunicationSettings_entity.aod
+++ b/entity/CommunicationSettings_entity/CommunicationSettings_entity.aod
@@ -10,15 +10,6 @@
<titlePlural>Communication Settings</titlePlural>
<recordContainer>db</recordContainer>
<entityFields>
- <entityActionField>
- <name>openAdminView</name>
- <title>Open admin view</title>
- <onActionProcess>%aditoprj%/entity/CommunicationSettings_entity/entityfields/openadminview/onActionProcess.js</onActionProcess>
- <isMenuAction v="true" />
- <isObjectAction v="true" />
- <iconId>VAADIN:CURLY_BRACKETS</iconId>
- <stateProcess>%aditoprj%/entity/CommunicationSettings_entity/entityfields/openadminview/stateProcess.js</stateProcess>
- </entityActionField>
<entityProvider>
<name>#PROVIDER</name>
</entityProvider>
diff --git a/entity/CommunicationSettings_entity/entityfields/openadminview/onActionProcess.js b/entity/CommunicationSettings_entity/entityfields/openadminview/onActionProcess.js
deleted file mode 100644
index a0c4826f36fa9a83935e90ee0cb6d73820626a21..0000000000000000000000000000000000000000
--- a/entity/CommunicationSettings_entity/entityfields/openadminview/onActionProcess.js
+++ /dev/null
@@ -1,9 +0,0 @@
-import("system.vars");
-import("Context_lib");
-
-AdminViewUtils.open("COMMUNICATIONSETTINGSID", [
- ["DATE_NEW", vars.get("$field.DATE_NEW"), "DATE"],
- ["DATE_EDIT", vars.get("$field.DATE_EDIT"), "DATE"],
- ["USER_NEW", vars.get("$field.USER_NEW")],
- ["USER_EDIT", vars.get("$field.USER_EDIT")]
- ]);
\ No newline at end of file
diff --git a/entity/CommunicationSettings_entity/entityfields/openadminview/stateProcess.js b/entity/CommunicationSettings_entity/entityfields/openadminview/stateProcess.js
deleted file mode 100644
index 38f2298db7304b4d44a15fbad7f720558c02da99..0000000000000000000000000000000000000000
--- a/entity/CommunicationSettings_entity/entityfields/openadminview/stateProcess.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import("Context_lib");
-import("system.result");
-
-result.string(AdminViewUtils.getActionState());
\ No newline at end of file
diff --git a/entity/CommunicationSettings_entity/initFilterProcess.js b/entity/CommunicationSettings_entity/initFilterProcess.js
index 6a15d3066141af4308cf79e5e623822796bcc206..373746ab79a62074311f7e01308ed8f05f7b0798 100644
--- a/entity/CommunicationSettings_entity/initFilterProcess.js
+++ b/entity/CommunicationSettings_entity/initFilterProcess.js
@@ -3,9 +3,10 @@ import("system.result");
import("system.neon");
import("system.vars");
-if ([neon.CONTEXT_PRESENTATIONMODE_FILTER, neon.CONTEXT_PRESENTATIONMODE_DASHBOARD].includes(vars.get("$sys.presentationmode")))
+var filter;
+if (vars.get("$sys.presentationmode") === neon.CONTEXT_PRESENTATIONMODE_FILTER)
{
- var filter = JSON.stringify({
+ filter = JSON.stringify({
type: "group",
operator: "AND",
childs: [{
@@ -17,5 +18,9 @@ if ([neon.CONTEXT_PRESENTATIONMODE_FILTER, neon.CONTEXT_PRESENTATIONMODE_DASHBOA
value: "1"
}]
});
+
+}
+if(filter)
+{
result.string(filter);
}
\ No newline at end of file
diff --git a/entity/Competition_entity/Competition_entity.aod b/entity/Competition_entity/Competition_entity.aod
index ffda6e7ac70084253972f939b3f6ec1831d4c2a9..b43f51cac27d3c24901388362180f772de3954d6 100644
--- a/entity/Competition_entity/Competition_entity.aod
+++ b/entity/Competition_entity/Competition_entity.aod
@@ -7,15 +7,6 @@
<titlePlural>Competition</titlePlural>
<recordContainer>db</recordContainer>
<entityFields>
- <entityActionField>
- <name>openAdminView</name>
- <title>Open admin view</title>
- <onActionProcess>%aditoprj%/entity/Competition_entity/entityfields/openadminview/onActionProcess.js</onActionProcess>
- <isMenuAction v="true" />
- <isObjectAction v="true" />
- <iconId>VAADIN:CURLY_BRACKETS</iconId>
- <stateProcess>%aditoprj%/entity/Competition_entity/entityfields/openadminview/stateProcess.js</stateProcess>
- </entityActionField>
<entityProvider>
<name>#PROVIDER</name>
</entityProvider>
diff --git a/entity/Competition_entity/entityfields/openadminview/onActionProcess.js b/entity/Competition_entity/entityfields/openadminview/onActionProcess.js
deleted file mode 100644
index aeba20d43a51e178bfe96596613a2e801002401c..0000000000000000000000000000000000000000
--- a/entity/Competition_entity/entityfields/openadminview/onActionProcess.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import("system.vars");
-import("Context_lib");
-
-AdminViewUtils.open("COMPETITIONID", []);
\ No newline at end of file
diff --git a/entity/Competition_entity/entityfields/openadminview/stateProcess.js b/entity/Competition_entity/entityfields/openadminview/stateProcess.js
deleted file mode 100644
index 38f2298db7304b4d44a15fbad7f720558c02da99..0000000000000000000000000000000000000000
--- a/entity/Competition_entity/entityfields/openadminview/stateProcess.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import("Context_lib");
-import("system.result");
-
-result.string(AdminViewUtils.getActionState());
\ No newline at end of file
diff --git a/entity/DescriptionTranslation_entity/DescriptionTranslation_entity.aod b/entity/DescriptionTranslation_entity/DescriptionTranslation_entity.aod
index 70e4dd249f67e648deb52f11ecf1957f50268bef..de4a3074d378fac4b2ddf8aa90c01cebe02c608e 100644
--- a/entity/DescriptionTranslation_entity/DescriptionTranslation_entity.aod
+++ b/entity/DescriptionTranslation_entity/DescriptionTranslation_entity.aod
@@ -7,15 +7,6 @@
<titlePlural>Descriptions</titlePlural>
<recordContainer>db</recordContainer>
<entityFields>
- <entityActionField>
- <name>openAdminView</name>
- <title>Open admin view</title>
- <onActionProcess>%aditoprj%/entity/DescriptionTranslation_entity/entityfields/openadminview/onActionProcess.js</onActionProcess>
- <isMenuAction v="true" />
- <isObjectAction v="true" />
- <iconId>VAADIN:CURLY_BRACKETS</iconId>
- <stateProcess>%aditoprj%/entity/DescriptionTranslation_entity/entityfields/openadminview/stateProcess.js</stateProcess>
- </entityActionField>
<entityProvider>
<name>#PROVIDER</name>
</entityProvider>
diff --git a/entity/DescriptionTranslation_entity/entityfields/openadminview/onActionProcess.js b/entity/DescriptionTranslation_entity/entityfields/openadminview/onActionProcess.js
deleted file mode 100644
index dddbe75128a0d4d92e945d241c507afb045bed41..0000000000000000000000000000000000000000
--- a/entity/DescriptionTranslation_entity/entityfields/openadminview/onActionProcess.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import("system.vars");
-import("Context_lib");
-
-AdminViewUtils.open("KNOWLEDGEMANAGEMENTID", []);
\ No newline at end of file
diff --git a/entity/DescriptionTranslation_entity/entityfields/openadminview/stateProcess.js b/entity/DescriptionTranslation_entity/entityfields/openadminview/stateProcess.js
deleted file mode 100644
index 38f2298db7304b4d44a15fbad7f720558c02da99..0000000000000000000000000000000000000000
--- a/entity/DescriptionTranslation_entity/entityfields/openadminview/stateProcess.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import("Context_lib");
-import("system.result");
-
-result.string(AdminViewUtils.getActionState());
\ No newline at end of file
diff --git a/entity/EmployeeGroupRuleGroup_entity/EmployeeGroupRuleGroup_entity.aod b/entity/EmployeeGroupRuleGroup_entity/EmployeeGroupRuleGroup_entity.aod
index 7ca780a9c5ac1f8f15b35f2aefe4f1ea7f8f2641..2d96b5aaf88b57df50d9a2aa00d84db3d68502d4 100644
--- a/entity/EmployeeGroupRuleGroup_entity/EmployeeGroupRuleGroup_entity.aod
+++ b/entity/EmployeeGroupRuleGroup_entity/EmployeeGroupRuleGroup_entity.aod
@@ -9,15 +9,6 @@
<titlePlural>Employee group rule groups</titlePlural>
<recordContainer>db</recordContainer>
<entityFields>
- <entityActionField>
- <name>openAdminView</name>
- <title>Open admin view</title>
- <onActionProcess>%aditoprj%/entity/EmployeeGroupRuleGroup_entity/entityfields/openadminview/onActionProcess.js</onActionProcess>
- <isMenuAction v="true" />
- <isObjectAction v="true" />
- <iconId>VAADIN:CURLY_BRACKETS</iconId>
- <stateProcess>%aditoprj%/entity/EmployeeGroupRuleGroup_entity/entityfields/openadminview/stateProcess.js</stateProcess>
- </entityActionField>
<entityProvider>
<name>#PROVIDER</name>
</entityProvider>
diff --git a/entity/EmployeeGroupRuleGroup_entity/entityfields/openadminview/onActionProcess.js b/entity/EmployeeGroupRuleGroup_entity/entityfields/openadminview/onActionProcess.js
deleted file mode 100644
index 5f0a79a73c27ec828c71827934ac9b4071baaa81..0000000000000000000000000000000000000000
--- a/entity/EmployeeGroupRuleGroup_entity/entityfields/openadminview/onActionProcess.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import("system.vars");
-import("Context_lib");
-
-AdminViewUtils.open("EMPLOYEEGROUP_RULEGROUPID", []);
\ No newline at end of file
diff --git a/entity/EmployeeGroupRuleGroup_entity/entityfields/openadminview/stateProcess.js b/entity/EmployeeGroupRuleGroup_entity/entityfields/openadminview/stateProcess.js
deleted file mode 100644
index 38f2298db7304b4d44a15fbad7f720558c02da99..0000000000000000000000000000000000000000
--- a/entity/EmployeeGroupRuleGroup_entity/entityfields/openadminview/stateProcess.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import("Context_lib");
-import("system.result");
-
-result.string(AdminViewUtils.getActionState());
\ No newline at end of file
diff --git a/entity/EmployeeGroup_entity/EmployeeGroup_entity.aod b/entity/EmployeeGroup_entity/EmployeeGroup_entity.aod
index 6db50550f1cb547ab49ca0a46057e499cf122992..da7a223f92849ab3bb95a659ecd53f8f30845bd7 100644
--- a/entity/EmployeeGroup_entity/EmployeeGroup_entity.aod
+++ b/entity/EmployeeGroup_entity/EmployeeGroup_entity.aod
@@ -11,15 +11,6 @@
<titlePlural>Employee Groups</titlePlural>
<recordContainer>db</recordContainer>
<entityFields>
- <entityActionField>
- <name>openAdminView</name>
- <title>Open admin view</title>
- <onActionProcess>%aditoprj%/entity/EmployeeGroup_entity/entityfields/openadminview/onActionProcess.js</onActionProcess>
- <isMenuAction v="true" />
- <isObjectAction v="true" />
- <iconId>VAADIN:CURLY_BRACKETS</iconId>
- <stateProcess>%aditoprj%/entity/EmployeeGroup_entity/entityfields/openadminview/stateProcess.js</stateProcess>
- </entityActionField>
<entityProvider>
<name>#PROVIDER</name>
</entityProvider>
diff --git a/entity/EmployeeGroup_entity/entityfields/openadminview/onActionProcess.js b/entity/EmployeeGroup_entity/entityfields/openadminview/onActionProcess.js
deleted file mode 100644
index 373aa1c7585c962f583565869e18764afae7c74a..0000000000000000000000000000000000000000
--- a/entity/EmployeeGroup_entity/entityfields/openadminview/onActionProcess.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import("system.vars");
-import("Context_lib");
-
-AdminViewUtils.open("EMPLOYEEGROUPID", []);
\ No newline at end of file
diff --git a/entity/EmployeeGroup_entity/entityfields/openadminview/stateProcess.js b/entity/EmployeeGroup_entity/entityfields/openadminview/stateProcess.js
deleted file mode 100644
index 38f2298db7304b4d44a15fbad7f720558c02da99..0000000000000000000000000000000000000000
--- a/entity/EmployeeGroup_entity/entityfields/openadminview/stateProcess.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import("Context_lib");
-import("system.result");
-
-result.string(AdminViewUtils.getActionState());
\ No newline at end of file
diff --git a/entity/Forecast_entity/Forecast_entity.aod b/entity/Forecast_entity/Forecast_entity.aod
index a845f98af0a193a6c3d3e5ffc8b67de33b63b417..8d2b49c8a0d189a4e34a62dc62d6b112685946af 100644
--- a/entity/Forecast_entity/Forecast_entity.aod
+++ b/entity/Forecast_entity/Forecast_entity.aod
@@ -8,15 +8,6 @@
<titlePlural>Forecasts</titlePlural>
<recordContainer>db</recordContainer>
<entityFields>
- <entityActionField>
- <name>openAdminView</name>
- <title>Open admin view</title>
- <onActionProcess>%aditoprj%/entity/Forecast_entity/entityfields/openadminview/onActionProcess.js</onActionProcess>
- <isMenuAction v="true" />
- <isObjectAction v="true" />
- <iconId>VAADIN:CURLY_BRACKETS</iconId>
- <stateProcess>%aditoprj%/entity/Forecast_entity/entityfields/openadminview/stateProcess.js</stateProcess>
- </entityActionField>
<entityProvider>
<name>#PROVIDER</name>
</entityProvider>
diff --git a/entity/Forecast_entity/entityfields/openadminview/onActionProcess.js b/entity/Forecast_entity/entityfields/openadminview/onActionProcess.js
deleted file mode 100644
index ede0edc248ef994e5bdd821e80c9e9164808d486..0000000000000000000000000000000000000000
--- a/entity/Forecast_entity/entityfields/openadminview/onActionProcess.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import("system.vars");
-import("Context_lib");
-
-AdminViewUtils.open("FORECASTID", []);
\ No newline at end of file
diff --git a/entity/Forecast_entity/entityfields/openadminview/stateProcess.js b/entity/Forecast_entity/entityfields/openadminview/stateProcess.js
deleted file mode 100644
index 38f2298db7304b4d44a15fbad7f720558c02da99..0000000000000000000000000000000000000000
--- a/entity/Forecast_entity/entityfields/openadminview/stateProcess.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import("Context_lib");
-import("system.result");
-
-result.string(AdminViewUtils.getActionState());
\ No newline at end of file
diff --git a/entity/InboxFilterGroup_entity/InboxFilterGroup_entity.aod b/entity/InboxFilterGroup_entity/InboxFilterGroup_entity.aod
index 185136b037322a5c5c331dd8f3e3320cc1eec13c..e5c6a604f7c1fc270baf9f25ad5de3bd3df6b99f 100644
--- a/entity/InboxFilterGroup_entity/InboxFilterGroup_entity.aod
+++ b/entity/InboxFilterGroup_entity/InboxFilterGroup_entity.aod
@@ -9,15 +9,6 @@
<titlePlural>Inbox filter groups</titlePlural>
<recordContainer>db</recordContainer>
<entityFields>
- <entityActionField>
- <name>openAdminView</name>
- <title>Open admin view</title>
- <onActionProcess>%aditoprj%/entity/InboxFilterGroup_entity/entityfields/openadminview/onActionProcess.js</onActionProcess>
- <isMenuAction v="true" />
- <isObjectAction v="true" />
- <iconId>VAADIN:CURLY_BRACKETS</iconId>
- <stateProcess>%aditoprj%/entity/InboxFilterGroup_entity/entityfields/openadminview/stateProcess.js</stateProcess>
- </entityActionField>
<entityProvider>
<name>#PROVIDER</name>
</entityProvider>
diff --git a/entity/InboxFilterGroup_entity/entityfields/openadminview/onActionProcess.js b/entity/InboxFilterGroup_entity/entityfields/openadminview/onActionProcess.js
deleted file mode 100644
index 8aac896af8e8503ee1089d186777d2405916617f..0000000000000000000000000000000000000000
--- a/entity/InboxFilterGroup_entity/entityfields/openadminview/onActionProcess.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import("system.vars");
-import("Context_lib");
-
-AdminViewUtils.open("INBOXFILTERGROUPID", []);
\ No newline at end of file
diff --git a/entity/InboxFilterGroup_entity/entityfields/openadminview/stateProcess.js b/entity/InboxFilterGroup_entity/entityfields/openadminview/stateProcess.js
deleted file mode 100644
index 38f2298db7304b4d44a15fbad7f720558c02da99..0000000000000000000000000000000000000000
--- a/entity/InboxFilterGroup_entity/entityfields/openadminview/stateProcess.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import("Context_lib");
-import("system.result");
-
-result.string(AdminViewUtils.getActionState());
\ No newline at end of file
diff --git a/entity/KnowledgeManagement_entity/KnowledgeManagement_entity.aod b/entity/KnowledgeManagement_entity/KnowledgeManagement_entity.aod
index afd4fddddbd3fd1afb35fc15b80eb6dab30a695c..2bafd40619419a08e00d284c9b3a4457b45d16cf 100644
--- a/entity/KnowledgeManagement_entity/KnowledgeManagement_entity.aod
+++ b/entity/KnowledgeManagement_entity/KnowledgeManagement_entity.aod
@@ -190,6 +190,15 @@
</entityParameter>
</children>
</entityConsumer>
+ <entityActionField>
+ <name>openEntryAsMail</name>
+ <title>send as mail</title>
+ <onActionProcess>%aditoprj%/entity/KnowledgeManagement_entity/entityfields/openentryasmail/onActionProcess.js</onActionProcess>
+ <isMenuAction v="true" />
+ <selectionType>MULTI</selectionType>
+ <iconId>VAADIN:ENVELOPE</iconId>
+ <state>INVISIBLE</state>
+ </entityActionField>
<entityConsumer>
<name>LinksByKnowledgeId</name>
<refreshParent v="true" />
@@ -224,6 +233,13 @@
</entityParameter>
</children>
</entityConsumer>
+ <entityActionField>
+ <name>exportHTML_action</name>
+ <title>Export HTML</title>
+ <onActionProcess>%aditoprj%/entity/KnowledgeManagement_entity/entityfields/exporthtml_action/onActionProcess.js</onActionProcess>
+ <iconId>NEON:EXPORT</iconId>
+ <tooltip>Exports the knowledge entry as a html file</tooltip>
+ </entityActionField>
<entityProvider>
<name>#PROVIDER_AGGREGATES</name>
<useAggregates v="true" />
@@ -320,31 +336,6 @@
<name>ObjectType_param</name>
<expose v="true" />
</entityParameter>
- <entityActionField>
- <name>openEntryAsMail</name>
- <title>send as mail</title>
- <onActionProcess>%aditoprj%/entity/KnowledgeManagement_entity/entityfields/openentryasmail/onActionProcess.js</onActionProcess>
- <isMenuAction v="true" />
- <selectionType>MULTI</selectionType>
- <iconId>VAADIN:ENVELOPE</iconId>
- <state>INVISIBLE</state>
- </entityActionField>
- <entityActionField>
- <name>exportHTML_action</name>
- <title>Export HTML</title>
- <onActionProcess>%aditoprj%/entity/KnowledgeManagement_entity/entityfields/exporthtml_action/onActionProcess.js</onActionProcess>
- <iconId>NEON:EXPORT</iconId>
- <tooltip>Exports the knowledge entry as a html file</tooltip>
- </entityActionField>
- <entityActionField>
- <name>openAdminView</name>
- <title>Open admin view</title>
- <onActionProcess>%aditoprj%/entity/KnowledgeManagement_entity/entityfields/openadminview/onActionProcess.js</onActionProcess>
- <isMenuAction v="true" />
- <isObjectAction v="true" />
- <iconId>VAADIN:CURLY_BRACKETS</iconId>
- <stateProcess>%aditoprj%/entity/KnowledgeManagement_entity/entityfields/openadminview/stateProcess.js</stateProcess>
- </entityActionField>
</entityFields>
<recordContainers>
<dbRecordContainer>
diff --git a/entity/KnowledgeManagement_entity/entityfields/openadminview/onActionProcess.js b/entity/KnowledgeManagement_entity/entityfields/openadminview/onActionProcess.js
deleted file mode 100644
index 3de612555798ccb7028de12a868adbbcd3163218..0000000000000000000000000000000000000000
--- a/entity/KnowledgeManagement_entity/entityfields/openadminview/onActionProcess.js
+++ /dev/null
@@ -1,9 +0,0 @@
-import("system.vars");
-import("Context_lib");
-
-AdminViewUtils.open("KNOWLEDGEMANAGEMENTID", [
- ["DATE_NEW", vars.get("$field.DATE_NEW"), "DATE"],
- ["DATE_EDIT", vars.get("$field.DATE_EDIT"), "DATE"],
- ["USER_NEW", vars.get("$field.USER_NEW")],
- ["USER_EDIT", vars.get("$field.USER_EDIT")]
-]);
\ No newline at end of file
diff --git a/entity/KnowledgeManagement_entity/entityfields/openadminview/stateProcess.js b/entity/KnowledgeManagement_entity/entityfields/openadminview/stateProcess.js
deleted file mode 100644
index 38f2298db7304b4d44a15fbad7f720558c02da99..0000000000000000000000000000000000000000
--- a/entity/KnowledgeManagement_entity/entityfields/openadminview/stateProcess.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import("Context_lib");
-import("system.result");
-
-result.string(AdminViewUtils.getActionState());
\ No newline at end of file
diff --git a/entity/Leadimport_entity/Leadimport_entity.aod b/entity/Leadimport_entity/Leadimport_entity.aod
index 89a26a5efd1abc6c5549a3952ece324161c71bf9..17162d2042b47856465d4d30866fe9da58cf9cb1 100644
--- a/entity/Leadimport_entity/Leadimport_entity.aod
+++ b/entity/Leadimport_entity/Leadimport_entity.aod
@@ -19,6 +19,27 @@
<titlePlural>Lead Imports</titlePlural>
<recordContainer>db</recordContainer>
<entityFields>
+ <entityActionGroup>
+ <name>observeActionGroup</name>
+ <children>
+ <entityActionField>
+ <name>observe</name>
+ <title>Observe</title>
+ <onActionProcess>%aditoprj%/entity/Leadimport_entity/entityfields/observeactiongroup/children/observe/onActionProcess.js</onActionProcess>
+ <isObjectAction v="true" />
+ <iconId>VAADIN:EYE</iconId>
+ <stateProcess>%aditoprj%/entity/Leadimport_entity/entityfields/observeactiongroup/children/observe/stateProcess.js</stateProcess>
+ <titleProcess>%aditoprj%/entity/Leadimport_entity/entityfields/observeactiongroup/children/observe/titleProcess.js</titleProcess>
+ </entityActionField>
+ <entityActionField>
+ <name>cancelObservation</name>
+ <onActionProcess>%aditoprj%/entity/Leadimport_entity/entityfields/observeactiongroup/children/cancelobservation/onActionProcess.js</onActionProcess>
+ <iconId>VAADIN:EYE_SLASH</iconId>
+ <stateProcess>%aditoprj%/entity/Leadimport_entity/entityfields/observeactiongroup/children/cancelobservation/stateProcess.js</stateProcess>
+ <titleProcess>%aditoprj%/entity/Leadimport_entity/entityfields/observeactiongroup/children/cancelobservation/titleProcess.js</titleProcess>
+ </entityActionField>
+ </children>
+ </entityActionGroup>
<entityProvider>
<name>#PROVIDER</name>
</entityProvider>
@@ -64,6 +85,16 @@
<entityField>
<name>LEADIMPORTID</name>
</entityField>
+ <entityActionField>
+ <name>TransferData</name>
+ <title>Transfer data</title>
+ <onActionProcess>%aditoprj%/entity/Leadimport_entity/entityfields/transferdata/onActionProcess.js</onActionProcess>
+ <isMenuAction v="true" />
+ <isObjectAction v="false" />
+ <selectionType>UNBOUND</selectionType>
+ <iconId>VAADIN:INBOX</iconId>
+ <stateProcess>%aditoprj%/entity/Leadimport_entity/entityfields/transferdata/stateProcess.js</stateProcess>
+ </entityActionField>
<entityField>
<name>SENTENCESEPARATOR</name>
<title>Record separator</title>
@@ -222,6 +253,13 @@
<entityField>
<name>UID</name>
</entityField>
+ <entityActionField>
+ <name>UploadNewFile</name>
+ <title>Upload new file</title>
+ <onActionProcess>%aditoprj%/entity/Leadimport_entity/entityfields/uploadnewfile/onActionProcess.js</onActionProcess>
+ <iconId>VAADIN:UPLOAD_ALT</iconId>
+ <state>INVISIBLE</state>
+ </entityActionField>
<entityField>
<name>information</name>
<title>Warning</title>
@@ -233,6 +271,14 @@
<name>loadedData</name>
<state>AUTO</state>
</entityField>
+ <entityActionField>
+ <name>Load_Data</name>
+ <title>Load data</title>
+ <onActionProcess>%aditoprj%/entity/Leadimport_entity/entityfields/load_data/onActionProcess.js</onActionProcess>
+ <isMenuAction v="true" />
+ <iconId>VAADIN:CLOUD_DOWNLOAD</iconId>
+ <state>EDITABLE</state>
+ </entityActionField>
<entityConsumer>
<name>LeadTempC</name>
<dependency>
@@ -275,6 +321,14 @@
</entityParameter>
</children>
</entityConsumer>
+ <entityActionField>
+ <name>LeadimportReset</name>
+ <title>Lead Import Reset</title>
+ <onActionProcess>%aditoprj%/entity/Leadimport_entity/entityfields/leadimportreset/onActionProcess.js</onActionProcess>
+ <iconId>VAADIN:ARROW_BACKWARD</iconId>
+ <state>INVISIBLE</state>
+ <stateProcess>%aditoprj%/entity/Leadimport_entity/entityfields/leadimportreset/stateProcess.js</stateProcess>
+ </entityActionField>
<entityConsumer>
<name>LeadimportMappings</name>
<dependency>
@@ -297,60 +351,6 @@
<name>#PROVIDER_AGGREGATES</name>
<useAggregates v="true" />
</entityProvider>
- <entityActionGroup>
- <name>observeActionGroup</name>
- <children>
- <entityActionField>
- <name>observe</name>
- <title>Observe</title>
- <onActionProcess>%aditoprj%/entity/Leadimport_entity/entityfields/observeactiongroup/children/observe/onActionProcess.js</onActionProcess>
- <isObjectAction v="true" />
- <iconId>VAADIN:EYE</iconId>
- <stateProcess>%aditoprj%/entity/Leadimport_entity/entityfields/observeactiongroup/children/observe/stateProcess.js</stateProcess>
- <titleProcess>%aditoprj%/entity/Leadimport_entity/entityfields/observeactiongroup/children/observe/titleProcess.js</titleProcess>
- </entityActionField>
- <entityActionField>
- <name>cancelObservation</name>
- <onActionProcess>%aditoprj%/entity/Leadimport_entity/entityfields/observeactiongroup/children/cancelobservation/onActionProcess.js</onActionProcess>
- <iconId>VAADIN:EYE_SLASH</iconId>
- <stateProcess>%aditoprj%/entity/Leadimport_entity/entityfields/observeactiongroup/children/cancelobservation/stateProcess.js</stateProcess>
- <titleProcess>%aditoprj%/entity/Leadimport_entity/entityfields/observeactiongroup/children/cancelobservation/titleProcess.js</titleProcess>
- </entityActionField>
- </children>
- </entityActionGroup>
- <entityActionField>
- <name>TransferData</name>
- <title>Transfer data</title>
- <onActionProcess>%aditoprj%/entity/Leadimport_entity/entityfields/transferdata/onActionProcess.js</onActionProcess>
- <isMenuAction v="true" />
- <isObjectAction v="false" />
- <selectionType>UNBOUND</selectionType>
- <iconId>VAADIN:INBOX</iconId>
- <stateProcess>%aditoprj%/entity/Leadimport_entity/entityfields/transferdata/stateProcess.js</stateProcess>
- </entityActionField>
- <entityActionField>
- <name>UploadNewFile</name>
- <title>Upload new file</title>
- <onActionProcess>%aditoprj%/entity/Leadimport_entity/entityfields/uploadnewfile/onActionProcess.js</onActionProcess>
- <iconId>VAADIN:UPLOAD_ALT</iconId>
- <state>INVISIBLE</state>
- </entityActionField>
- <entityActionField>
- <name>Load_Data</name>
- <title>Load data</title>
- <onActionProcess>%aditoprj%/entity/Leadimport_entity/entityfields/load_data/onActionProcess.js</onActionProcess>
- <isMenuAction v="true" />
- <iconId>VAADIN:CLOUD_DOWNLOAD</iconId>
- <state>EDITABLE</state>
- </entityActionField>
- <entityActionField>
- <name>LeadimportReset</name>
- <title>Lead Import Reset</title>
- <onActionProcess>%aditoprj%/entity/Leadimport_entity/entityfields/leadimportreset/onActionProcess.js</onActionProcess>
- <iconId>VAADIN:ARROW_BACKWARD</iconId>
- <state>INVISIBLE</state>
- <stateProcess>%aditoprj%/entity/Leadimport_entity/entityfields/leadimportreset/stateProcess.js</stateProcess>
- </entityActionField>
<entityActionField>
<name>ReloadTransferdData</name>
<title>Search for new Entries</title>
@@ -358,15 +358,6 @@
<isObjectAction v="false" />
<iconId>VAADIN:REFRESH</iconId>
</entityActionField>
- <entityActionField>
- <name>openAdminView</name>
- <title>Open admin view</title>
- <onActionProcess>%aditoprj%/entity/Leadimport_entity/entityfields/openadminview/onActionProcess.js</onActionProcess>
- <isMenuAction v="true" />
- <isObjectAction v="true" />
- <iconId>VAADIN:CURLY_BRACKETS</iconId>
- <stateProcess>%aditoprj%/entity/Leadimport_entity/entityfields/openadminview/stateProcess.js</stateProcess>
- </entityActionField>
</entityFields>
<recordContainers>
<dbRecordContainer>
diff --git a/entity/Leadimport_entity/entityfields/openadminview/onActionProcess.js b/entity/Leadimport_entity/entityfields/openadminview/onActionProcess.js
deleted file mode 100644
index 448c71a6fd043c39c909358b28c966312c662844..0000000000000000000000000000000000000000
--- a/entity/Leadimport_entity/entityfields/openadminview/onActionProcess.js
+++ /dev/null
@@ -1,9 +0,0 @@
-import("system.vars");
-import("Context_lib");
-
-AdminViewUtils.open("LEADIMPORTID", [
- ["DATE_NEW", vars.get("$field.DATE_NEW"), "DATE"],
- ["DATE_EDIT", vars.get("$field.DATE_EDIT"), "DATE"],
- ["USER_NEW", vars.get("$field.USER_NEW")],
- ["USER_EDIT", vars.get("$field.USER_EDIT")]
-]);
\ No newline at end of file
diff --git a/entity/Leadimport_entity/entityfields/openadminview/stateProcess.js b/entity/Leadimport_entity/entityfields/openadminview/stateProcess.js
deleted file mode 100644
index 38f2298db7304b4d44a15fbad7f720558c02da99..0000000000000000000000000000000000000000
--- a/entity/Leadimport_entity/entityfields/openadminview/stateProcess.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import("Context_lib");
-import("system.result");
-
-result.string(AdminViewUtils.getActionState());
\ No newline at end of file
diff --git a/entity/Member_entity/Member_entity.aod b/entity/Member_entity/Member_entity.aod
index 704a47ff9ea48de0cf6f39f04b7b65c75e7eca81..f643a48c17d2e1816a4d216ddb1bd29b0914af43 100644
--- a/entity/Member_entity/Member_entity.aod
+++ b/entity/Member_entity/Member_entity.aod
@@ -442,7 +442,7 @@
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>ORGANISATION_CONTACT_ID.displayValue</name>
- <recordfield>ORGANISATION.NAME</recordfield>
+ <expression>%aditoprj%/entity/Member_entity/recordcontainers/db/recordfieldmappings/organisation_id.displayvalue/expression.js</expression>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>TARGET_ID.value</name>
diff --git a/entity/Notification_entity/initFilterProcess.js b/entity/Notification_entity/initFilterProcess.js
index 4562dad2095e6a0fc34422afa58b4a39757d7175..fbd4e058555c1ebb84133cccec7e2b28b30f7fdf 100644
--- a/entity/Notification_entity/initFilterProcess.js
+++ b/entity/Notification_entity/initFilterProcess.js
@@ -5,7 +5,7 @@ import("Keyword_lib");
import("KeywordRegistry_basic");
import("system.result");
-if ([neon.CONTEXT_PRESENTATIONMODE_FILTER, neon.CONTEXT_PRESENTATIONMODE_DASHBOARD].includes(vars.get("$sys.presentationmode")))
+if (vars.get("$sys.presentationmode") === neon.CONTEXT_PRESENTATIONMODE_FILTER)
{
var statusNew = $KeywordRegistry.notificationState$unseen();
var statusUnread = $KeywordRegistry.notificationState$seen();
diff --git a/entity/Offer_entity/Offer_entity.aod b/entity/Offer_entity/Offer_entity.aod
index ec69db13dbb3a49575b10abc1e40fa1f0618ec99..06cc973024a6288f02e099bde31e52e26bafe02c 100644
--- a/entity/Offer_entity/Offer_entity.aod
+++ b/entity/Offer_entity/Offer_entity.aod
@@ -18,6 +18,17 @@
<titlePlural>Offers</titlePlural>
<recordContainer>db</recordContainer>
<entityFields>
+ <entityActionField>
+ <name>export</name>
+ <title>Export</title>
+ <onActionProcess>%aditoprj%/entity/Offer_entity/entityfields/export/onActionProcess.js</onActionProcess>
+ <isMenuAction v="true" />
+ <isObjectAction v="false" />
+ <iconId>NEON:EXPORT</iconId>
+ <stateProcess>%aditoprj%/entity/Offer_entity/entityfields/export/stateProcess.js</stateProcess>
+ <tooltip>Export fields of this table</tooltip>
+ <tooltipProcess>%aditoprj%/entity/Offer_entity/entityfields/export/tooltipProcess.js</tooltipProcess>
+ </entityActionField>
<entityProvider>
<name>#PROVIDER</name>
</entityProvider>
@@ -1064,17 +1075,6 @@
<name>Approval_param</name>
<expose v="true" />
</entityParameter>
- <entityActionField>
- <name>export</name>
- <title>Export</title>
- <onActionProcess>%aditoprj%/entity/Offer_entity/entityfields/export/onActionProcess.js</onActionProcess>
- <isMenuAction v="true" />
- <isObjectAction v="false" />
- <iconId>NEON:EXPORT</iconId>
- <stateProcess>%aditoprj%/entity/Offer_entity/entityfields/export/stateProcess.js</stateProcess>
- <tooltip>Export fields of this table</tooltip>
- <tooltipProcess>%aditoprj%/entity/Offer_entity/entityfields/export/tooltipProcess.js</tooltipProcess>
- </entityActionField>
<entityActionGroup>
<name>observeActionGroup</name>
<children>
@@ -1175,12 +1175,6 @@
<stateProcess>%aditoprj%/entity/Offer_entity/entityfields/approveoffer/stateProcess.js</stateProcess>
<titleProcess>%aditoprj%/entity/Offer_entity/entityfields/approveoffer/titleProcess.js</titleProcess>
</entityActionField>
- <entityActionField>
- <name>newSupportTicket</name>
- <title>New support ticket</title>
- <onActionProcess>%aditoprj%/entity/Offer_entity/entityfields/newsupportticket/onActionProcess.js</onActionProcess>
- <iconId>VAADIN:TICKET</iconId>
- </entityActionField>
<entityActionField>
<name>openAdminView</name>
<title>Open admin view</title>
@@ -1188,6 +1182,12 @@
<iconId>VAADIN:CURLY_BRACKETS</iconId>
<stateProcess>%aditoprj%/entity/Offer_entity/entityfields/openadminview/stateProcess.js</stateProcess>
</entityActionField>
+ <entityActionField>
+ <name>newSupportTicket</name>
+ <title>New support ticket</title>
+ <onActionProcess>%aditoprj%/entity/Offer_entity/entityfields/newsupportticket/onActionProcess.js</onActionProcess>
+ <iconId>VAADIN:TICKET</iconId>
+ </entityActionField>
</entityFields>
<recordContainers>
<dbRecordContainer>
diff --git a/entity/Offeritem_entity/Offeritem_entity.aod b/entity/Offeritem_entity/Offeritem_entity.aod
index e5bf6cab9b0be9e336e55894323f78e6e3e89af8..87a0d3f6cae67df525e62259afd9f120e5d84ef5 100644
--- a/entity/Offeritem_entity/Offeritem_entity.aod
+++ b/entity/Offeritem_entity/Offeritem_entity.aod
@@ -13,15 +13,6 @@
<titlePlural>Offeritems</titlePlural>
<recordContainer>db</recordContainer>
<entityFields>
- <entityActionField>
- <name>openAdminView</name>
- <title>Open admin view</title>
- <onActionProcess>%aditoprj%/entity/Offeritem_entity/entityfields/openadminview/onActionProcess.js</onActionProcess>
- <isMenuAction v="true" />
- <isObjectAction v="true" />
- <iconId>VAADIN:CURLY_BRACKETS</iconId>
- <stateProcess>%aditoprj%/entity/Offeritem_entity/entityfields/openadminview/stateProcess.js</stateProcess>
- </entityActionField>
<entityProvider>
<name>#PROVIDER</name>
</entityProvider>
diff --git a/entity/Offeritem_entity/entityfields/openadminview/onActionProcess.js b/entity/Offeritem_entity/entityfields/openadminview/onActionProcess.js
deleted file mode 100644
index ab3b242df40e1491a718d9ce22bba886d60bb9d1..0000000000000000000000000000000000000000
--- a/entity/Offeritem_entity/entityfields/openadminview/onActionProcess.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import("system.vars");
-import("Context_lib");
-
-AdminViewUtils.open("OFFERITEMID", []);
\ No newline at end of file
diff --git a/entity/Offeritem_entity/entityfields/openadminview/stateProcess.js b/entity/Offeritem_entity/entityfields/openadminview/stateProcess.js
deleted file mode 100644
index 38f2298db7304b4d44a15fbad7f720558c02da99..0000000000000000000000000000000000000000
--- a/entity/Offeritem_entity/entityfields/openadminview/stateProcess.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import("Context_lib");
-import("system.result");
-
-result.string(AdminViewUtils.getActionState());
\ No newline at end of file
diff --git a/entity/Orderitem_entity/Orderitem_entity.aod b/entity/Orderitem_entity/Orderitem_entity.aod
index 01b182c6ed84266fd72cbdfa63ce769c16137181..b6f5ec9513c092d2287bed81eb534a94eca65062 100644
--- a/entity/Orderitem_entity/Orderitem_entity.aod
+++ b/entity/Orderitem_entity/Orderitem_entity.aod
@@ -244,34 +244,6 @@
<name>Discount_param</name>
<expose v="true" />
</entityParameter>
- <entityParameter>
- <name>IgnoreOnUpdateProcess_param</name>
- <expose v="true" />
- <documentation>%aditoprj%/entity/Orderitem_entity/entityfields/ignoreonupdateprocess_param/documentation.adoc</documentation>
- </entityParameter>
- <entityField>
- <name>itemInsertStatements</name>
- <documentation>%aditoprj%/entity/Orderitem_entity/entityfields/iteminsertstatements/documentation.adoc</documentation>
- </entityField>
- <entityField>
- <name>currency</name>
- <title>Currency</title>
- <state>READONLY</state>
- <valueProcess>%aditoprj%/entity/Orderitem_entity/entityfields/currency/valueProcess.js</valueProcess>
- </entityField>
- <entityField>
- <name>PICTURE</name>
- <contentType>IMAGE</contentType>
- </entityField>
- <entityActionField>
- <name>openAdminView</name>
- <title>Open admin view</title>
- <onActionProcess>%aditoprj%/entity/Orderitem_entity/entityfields/openadminview/onActionProcess.js</onActionProcess>
- <isMenuAction v="true" />
- <isObjectAction v="true" />
- <iconId>VAADIN:CURLY_BRACKETS</iconId>
- <stateProcess>%aditoprj%/entity/Orderitem_entity/entityfields/openadminview/stateProcess.js</stateProcess>
- </entityActionField>
<entityActionGroup>
<name>group</name>
<children>
@@ -291,6 +263,25 @@
</entityActionField>
</children>
</entityActionGroup>
+ <entityParameter>
+ <name>IgnoreOnUpdateProcess_param</name>
+ <expose v="true" />
+ <documentation>%aditoprj%/entity/Orderitem_entity/entityfields/ignoreonupdateprocess_param/documentation.adoc</documentation>
+ </entityParameter>
+ <entityField>
+ <name>itemInsertStatements</name>
+ <documentation>%aditoprj%/entity/Orderitem_entity/entityfields/iteminsertstatements/documentation.adoc</documentation>
+ </entityField>
+ <entityField>
+ <name>currency</name>
+ <title>Currency</title>
+ <state>READONLY</state>
+ <valueProcess>%aditoprj%/entity/Orderitem_entity/entityfields/currency/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>PICTURE</name>
+ <contentType>IMAGE</contentType>
+ </entityField>
</entityFields>
<recordContainers>
<dbRecordContainer>
diff --git a/entity/Orderitem_entity/entityfields/openadminview/onActionProcess.js b/entity/Orderitem_entity/entityfields/openadminview/onActionProcess.js
deleted file mode 100644
index c5d14a46253d0dcecf06d306f065c289cb2a40fa..0000000000000000000000000000000000000000
--- a/entity/Orderitem_entity/entityfields/openadminview/onActionProcess.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import("system.vars");
-import("Context_lib");
-
-AdminViewUtils.open("SALESORDERITEM", []);
\ No newline at end of file
diff --git a/entity/Orderitem_entity/entityfields/openadminview/stateProcess.js b/entity/Orderitem_entity/entityfields/openadminview/stateProcess.js
deleted file mode 100644
index 38f2298db7304b4d44a15fbad7f720558c02da99..0000000000000000000000000000000000000000
--- a/entity/Orderitem_entity/entityfields/openadminview/stateProcess.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import("Context_lib");
-import("system.result");
-
-result.string(AdminViewUtils.getActionState());
\ No newline at end of file
diff --git a/entity/Organisation_entity/Organisation_entity.aod b/entity/Organisation_entity/Organisation_entity.aod
index a4b0d8312c559b8f834f04c773cf27e76003ec7a..2aad89b6a15c54afff194a99f57c64328c5de320 100644
--- a/entity/Organisation_entity/Organisation_entity.aod
+++ b/entity/Organisation_entity/Organisation_entity.aod
@@ -17,6 +17,27 @@
<titlePlural>Companies</titlePlural>
<recordContainer>db</recordContainer>
<entityFields>
+ <entityActionGroup>
+ <name>observeActionGroup</name>
+ <children>
+ <entityActionField>
+ <name>observe</name>
+ <title>Observe</title>
+ <onActionProcess>%aditoprj%/entity/Organisation_entity/entityfields/observeactiongroup/children/observe/onActionProcess.js</onActionProcess>
+ <isObjectAction v="true" />
+ <iconId>VAADIN:EYE</iconId>
+ <stateProcess>%aditoprj%/entity/Organisation_entity/entityfields/observeactiongroup/children/observe/stateProcess.js</stateProcess>
+ <titleProcess>%aditoprj%/entity/Organisation_entity/entityfields/observeactiongroup/children/observe/titleProcess.js</titleProcess>
+ </entityActionField>
+ <entityActionField>
+ <name>cancelObservation</name>
+ <onActionProcess>%aditoprj%/entity/Organisation_entity/entityfields/observeactiongroup/children/cancelobservation/onActionProcess.js</onActionProcess>
+ <iconId>VAADIN:EYE_SLASH</iconId>
+ <stateProcess>%aditoprj%/entity/Organisation_entity/entityfields/observeactiongroup/children/cancelobservation/stateProcess.js</stateProcess>
+ <titleProcess>%aditoprj%/entity/Organisation_entity/entityfields/observeactiongroup/children/cancelobservation/titleProcess.js</titleProcess>
+ </entityActionField>
+ </children>
+ </entityActionGroup>
<entityField>
<name>CUSTOMERCODE</name>
<title>Customercode</title>
@@ -1052,212 +1073,6 @@
</entityParameter>
</children>
</entityConsumer>
- <entityConsumer>
- <name>DuplicatesOrganisation</name>
- <selectionMode>MULTI</selectionMode>
- <selectionModeProcess>%aditoprj%/entity/Organisation_entity/entityfields/duplicatesorganisation/selectionModeProcess.js</selectionModeProcess>
- <dependency>
- <name>dependency</name>
- <entityName>Duplicate_entity</entityName>
- <fieldName>Duplicates</fieldName>
- </dependency>
- <children>
- <entityParameter>
- <name>DuplicateObject_param</name>
- <valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/duplicatesorganisation/children/duplicateobject_param/valueProcess.js</valueProcess>
- </entityParameter>
- </children>
- </entityConsumer>
- <entityConsumer>
- <name>Plannings</name>
- <dependency>
- <name>dependency</name>
- <entityName>Planning_entity</entityName>
- <fieldName>Plannings</fieldName>
- </dependency>
- <children>
- <entityParameter>
- <name>ContactId_param</name>
- <valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/plannings/children/contactid_param/valueProcess.js</valueProcess>
- </entityParameter>
- </children>
- </entityConsumer>
- <entityConsumer>
- <name>Turnovers</name>
- <dependency>
- <name>dependency</name>
- <entityName>Turnover_entity</entityName>
- <fieldName>DynamicTurnover</fieldName>
- </dependency>
- <children>
- <entityParameter>
- <name>ContactIds_param</name>
- <valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/turnovers/children/contactids_param/valueProcess.js</valueProcess>
- </entityParameter>
- </children>
- </entityConsumer>
- <entityConsumer>
- <name>conversionrates</name>
- <dependency>
- <name>dependency</name>
- <entityName>SalesprojectConversionRate_entity</entityName>
- <fieldName>#PROVIDER</fieldName>
- </dependency>
- </entityConsumer>
- <entityConsumer>
- <name>ContactCommunicationSettings</name>
- <dependency>
- <name>dependency</name>
- <entityName>CommunicationSettings_entity</entityName>
- <fieldName>SettingsForContact</fieldName>
- </dependency>
- <children>
- <entityParameter>
- <name>ContactId_param</name>
- <valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/contactcommunicationsettings/children/contactid_param/valueProcess.js</valueProcess>
- </entityParameter>
- </children>
- </entityConsumer>
- <entityParameter>
- <name>SearchSyncCondition_param</name>
- <expose v="true" />
- </entityParameter>
- <entityConsumer>
- <name>Campaigns</name>
- <dependency>
- <name>dependency</name>
- <entityName>Campaign_entity</entityName>
- <fieldName>Campaigns</fieldName>
- </dependency>
- </entityConsumer>
- <entityConsumer>
- <name>Bulkmails</name>
- <dependency>
- <name>dependency</name>
- <entityName>BulkMail_entity</entityName>
- <fieldName>#PROVIDER</fieldName>
- </dependency>
- </entityConsumer>
- <entityConsumer>
- <name>CommunicationSettingStatusKeyword</name>
- <dependency>
- <name>dependency</name>
- <entityName>KeywordEntry_entity</entityName>
- <fieldName>SpecificContainerKeywords</fieldName>
- </dependency>
- <children>
- <entityParameter>
- <name>ContainerName_param</name>
- <valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/communicationsettingstatuskeyword/children/containername_param/valueProcess.js</valueProcess>
- </entityParameter>
- </children>
- </entityConsumer>
- <entityConsumer>
- <name>ChecklistEntryValues</name>
- <dependency>
- <name>dependency</name>
- <entityName>ChecklistEntryValue_entity</entityName>
- <fieldName>ChecklistEntryValues</fieldName>
- </dependency>
- <children>
- <entityParameter>
- <name>ObjectRowId_param</name>
- <valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/checklistentryvalues/children/objectrowid_param/valueProcess.js</valueProcess>
- </entityParameter>
- <entityParameter>
- <name>ObjectType_param</name>
- <valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/checklistentryvalues/children/objecttype_param/valueProcess.js</valueProcess>
- </entityParameter>
- <entityParameter>
- <name>ChecklistIds_param</name>
- <valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/checklistentryvalues/children/checklistids_param/valueProcess.js</valueProcess>
- </entityParameter>
- <entityParameter>
- <name>Presentationmode_param</name>
- <valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/checklistentryvalues/children/presentationmode_param/valueProcess.js</valueProcess>
- </entityParameter>
- </children>
- </entityConsumer>
- <entityParameter>
- <name>IgnoreOrderBy_param</name>
- <expose v="true" />
- </entityParameter>
- <entityProvider>
- <name>OrganisationForQuickEntry</name>
- <lookupIdfield>ORGANISATIONID</lookupIdfield>
- <documentation>%aditoprj%/entity/Organisation_entity/entityfields/organisationforquickentry/documentation.adoc</documentation>
- <children>
- <entityParameter>
- <name>WithPrivate_param</name>
- </entityParameter>
- <entityParameter>
- <name>AttributeId_param</name>
- <expose v="false" />
- </entityParameter>
- <entityParameter>
- <name>AttributeKeyId_param</name>
- <expose v="false" />
- </entityParameter>
- <entityParameter>
- <name>ExcludedContactIds_param</name>
- </entityParameter>
- <entityParameter>
- <name>ExcludeOrganisationsByPersonId</name>
- <expose v="false" />
- </entityParameter>
- <entityParameter>
- <name>MapViewAdditionalFeatures_param</name>
- <expose v="false" />
- </entityParameter>
- <entityParameter>
- <name>MapViewCenterLat_param</name>
- <expose v="false" />
- </entityParameter>
- <entityParameter>
- <name>MapViewCenterLon_param</name>
- <expose v="false" />
- </entityParameter>
- </children>
- </entityProvider>
- <entityConsumer>
- <name>AllTopics</name>
- <dependency>
- <name>dependency</name>
- <entityName>TopicTree_entity</entityName>
- <fieldName>#PROVIDER</fieldName>
- </dependency>
- <children>
- <entityParameter>
- <name>Expanded_param</name>
- <valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/alltopics/children/expanded_param/valueProcess.js</valueProcess>
- </entityParameter>
- </children>
- </entityConsumer>
- <entityParameter>
- <name>IsQuickEntry_param</name>
- <expose v="true" />
- </entityParameter>
- <entityActionGroup>
- <name>observeActionGroup</name>
- <children>
- <entityActionField>
- <name>observe</name>
- <title>Observe</title>
- <onActionProcess>%aditoprj%/entity/Organisation_entity/entityfields/observeactiongroup/children/observe/onActionProcess.js</onActionProcess>
- <isObjectAction v="true" />
- <iconId>VAADIN:EYE</iconId>
- <stateProcess>%aditoprj%/entity/Organisation_entity/entityfields/observeactiongroup/children/observe/stateProcess.js</stateProcess>
- <titleProcess>%aditoprj%/entity/Organisation_entity/entityfields/observeactiongroup/children/observe/titleProcess.js</titleProcess>
- </entityActionField>
- <entityActionField>
- <name>cancelObservation</name>
- <onActionProcess>%aditoprj%/entity/Organisation_entity/entityfields/observeactiongroup/children/cancelobservation/onActionProcess.js</onActionProcess>
- <iconId>VAADIN:EYE_SLASH</iconId>
- <stateProcess>%aditoprj%/entity/Organisation_entity/entityfields/observeactiongroup/children/cancelobservation/stateProcess.js</stateProcess>
- <titleProcess>%aditoprj%/entity/Organisation_entity/entityfields/observeactiongroup/children/cancelobservation/titleProcess.js</titleProcess>
- </entityActionField>
- </children>
- </entityActionGroup>
<entityActionField>
<name>openEditDefaultsView</name>
<documentation>%aditoprj%/entity/Organisation_entity/entityfields/openeditdefaultsview/documentation.adoc</documentation>
@@ -1460,12 +1275,6 @@
</entityActionField>
</children>
</entityActionGroup>
- <entityActionField>
- <name>openClassificationOverView</name>
- <title>Show Classification</title>
- <onActionProcess>%aditoprj%/entity/Organisation_entity/entityfields/openclassificationoverview/onActionProcess.js</onActionProcess>
- <iconId>VAADIN:LIST_OL</iconId>
- </entityActionField>
<entityActionField>
<name>openAdminView</name>
<title>Open admin view</title>
@@ -1473,6 +1282,197 @@
<iconId>VAADIN:CURLY_BRACKETS</iconId>
<stateProcess>%aditoprj%/entity/Organisation_entity/entityfields/openadminview/stateProcess.js</stateProcess>
</entityActionField>
+ <entityConsumer>
+ <name>DuplicatesOrganisation</name>
+ <selectionMode>MULTI</selectionMode>
+ <selectionModeProcess>%aditoprj%/entity/Organisation_entity/entityfields/duplicatesorganisation/selectionModeProcess.js</selectionModeProcess>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Duplicate_entity</entityName>
+ <fieldName>Duplicates</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>DuplicateObject_param</name>
+ <valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/duplicatesorganisation/children/duplicateobject_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ </children>
+ </entityConsumer>
+ <entityConsumer>
+ <name>Plannings</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Planning_entity</entityName>
+ <fieldName>Plannings</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>ContactId_param</name>
+ <valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/plannings/children/contactid_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ </children>
+ </entityConsumer>
+ <entityConsumer>
+ <name>Turnovers</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Turnover_entity</entityName>
+ <fieldName>DynamicTurnover</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>ContactIds_param</name>
+ <valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/turnovers/children/contactids_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ </children>
+ </entityConsumer>
+ <entityConsumer>
+ <name>conversionrates</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>SalesprojectConversionRate_entity</entityName>
+ <fieldName>#PROVIDER</fieldName>
+ </dependency>
+ </entityConsumer>
+ <entityConsumer>
+ <name>ContactCommunicationSettings</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>CommunicationSettings_entity</entityName>
+ <fieldName>SettingsForContact</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>ContactId_param</name>
+ <valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/contactcommunicationsettings/children/contactid_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ </children>
+ </entityConsumer>
+ <entityParameter>
+ <name>SearchSyncCondition_param</name>
+ <expose v="true" />
+ </entityParameter>
+ <entityConsumer>
+ <name>Campaigns</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Campaign_entity</entityName>
+ <fieldName>Campaigns</fieldName>
+ </dependency>
+ </entityConsumer>
+ <entityConsumer>
+ <name>Bulkmails</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>BulkMail_entity</entityName>
+ <fieldName>#PROVIDER</fieldName>
+ </dependency>
+ </entityConsumer>
+ <entityConsumer>
+ <name>CommunicationSettingStatusKeyword</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>KeywordEntry_entity</entityName>
+ <fieldName>SpecificContainerKeywords</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>ContainerName_param</name>
+ <valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/communicationsettingstatuskeyword/children/containername_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ </children>
+ </entityConsumer>
+ <entityActionField>
+ <name>openClassificationOverView</name>
+ <title>Show Classification</title>
+ <onActionProcess>%aditoprj%/entity/Organisation_entity/entityfields/openclassificationoverview/onActionProcess.js</onActionProcess>
+ <iconId>VAADIN:LIST_OL</iconId>
+ </entityActionField>
+ <entityConsumer>
+ <name>ChecklistEntryValues</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>ChecklistEntryValue_entity</entityName>
+ <fieldName>ChecklistEntryValues</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>ObjectRowId_param</name>
+ <valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/checklistentryvalues/children/objectrowid_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ <entityParameter>
+ <name>ObjectType_param</name>
+ <valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/checklistentryvalues/children/objecttype_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ <entityParameter>
+ <name>ChecklistIds_param</name>
+ <valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/checklistentryvalues/children/checklistids_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ <entityParameter>
+ <name>Presentationmode_param</name>
+ <valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/checklistentryvalues/children/presentationmode_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ </children>
+ </entityConsumer>
+ <entityParameter>
+ <name>IgnoreOrderBy_param</name>
+ <expose v="true" />
+ </entityParameter>
+ <entityProvider>
+ <name>OrganisationForQuickEntry</name>
+ <lookupIdfield>ORGANISATIONID</lookupIdfield>
+ <documentation>%aditoprj%/entity/Organisation_entity/entityfields/organisationforquickentry/documentation.adoc</documentation>
+ <children>
+ <entityParameter>
+ <name>WithPrivate_param</name>
+ </entityParameter>
+ <entityParameter>
+ <name>AttributeId_param</name>
+ <expose v="false" />
+ </entityParameter>
+ <entityParameter>
+ <name>AttributeKeyId_param</name>
+ <expose v="false" />
+ </entityParameter>
+ <entityParameter>
+ <name>ExcludedContactIds_param</name>
+ </entityParameter>
+ <entityParameter>
+ <name>ExcludeOrganisationsByPersonId</name>
+ <expose v="false" />
+ </entityParameter>
+ <entityParameter>
+ <name>MapViewAdditionalFeatures_param</name>
+ <expose v="false" />
+ </entityParameter>
+ <entityParameter>
+ <name>MapViewCenterLat_param</name>
+ <expose v="false" />
+ </entityParameter>
+ <entityParameter>
+ <name>MapViewCenterLon_param</name>
+ <expose v="false" />
+ </entityParameter>
+ </children>
+ </entityProvider>
+ <entityConsumer>
+ <name>AllTopics</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>TopicTree_entity</entityName>
+ <fieldName>#PROVIDER</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>Expanded_param</name>
+ <valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/alltopics/children/expanded_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ </children>
+ </entityConsumer>
+ <entityParameter>
+ <name>IsQuickEntry_param</name>
+ <expose v="true" />
+ </entityParameter>
</entityFields>
<recordContainers>
<dbRecordContainer>
diff --git a/entity/Organisation_entity/entityfields/keywordcontactstates/children/blacklistids_param/valueProcess.js b/entity/Organisation_entity/entityfields/keywordcontactstates/children/blacklistids_param/valueProcess.js
index b76327a14de3e183e7b0d4643deea1082abb86a7..a52cc0873588ad599c0efe525b8ec15716c7ec07 100644
--- a/entity/Organisation_entity/entityfields/keywordcontactstates/children/blacklistids_param/valueProcess.js
+++ b/entity/Organisation_entity/entityfields/keywordcontactstates/children/blacklistids_param/valueProcess.js
@@ -1,9 +1,4 @@
-import("system.vars");
-import("system.neon");
import("KeywordRegistry_basic");
import("system.result");
-if([neon.OPERATINGSTATE_NEW, neon.OPERATINGSTATE_EDIT].includes(vars.get("$sys.operatingstate")))
-{
- result.object([$KeywordRegistry.contactStatus$markToDelete()]);
-}
\ No newline at end of file
+result.object([$KeywordRegistry.contactStatus$markToDelete()]);
\ No newline at end of file
diff --git a/entity/Organisation_entity/initFilterProcess.js b/entity/Organisation_entity/initFilterProcess.js
index 307a49be33ddd26b3c087718e2cd2e60ccd33d08..0d63b18bcadfa767381a1635111687cc5cd9e53f 100644
--- a/entity/Organisation_entity/initFilterProcess.js
+++ b/entity/Organisation_entity/initFilterProcess.js
@@ -11,7 +11,7 @@ if(searchSyncCond)
{
filter = searchSyncCond;
}
-else if(!filter && [neon.CONTEXT_PRESENTATIONMODE_FILTER, neon.CONTEXT_PRESENTATIONMODE_DASHBOARD].includes(vars.get("$sys.presentationmode")))
+else if(!filter && vars.get("$sys.presentationmode") === neon.CONTEXT_PRESENTATIONMODE_FILTER)
{
var statusInactive = $KeywordRegistry.contactStatus$inactive();
filter = JSON.stringify({
diff --git a/entity/Organisation_entity/recordcontainers/index/query.js b/entity/Organisation_entity/recordcontainers/index/query.js
index 3101ad998876a730d77807a182e13846fc3b926c..d2b62c6dcf11ffbcd44e25d1a647ee5548a7d78f 100644
--- a/entity/Organisation_entity/recordcontainers/index/query.js
+++ b/entity/Organisation_entity/recordcontainers/index/query.js
@@ -27,7 +27,7 @@ var querySelect = newSelect([
sqlHelper.concatWithSeparator(["'" + translate.text("Phone") + ":'", "(" + CommUtil.getStandardSubSqlPhone() + ")"]),
sqlHelper.concatWithSeparator(["'" + translate.text("Email") + ":'", "(" + CommUtil.getStandardSubSqlMail() + ")"])
], " | "),
- sqlHelper.concatWithSeparator([sqlHelper.cast("standardAddress.LAT", SQLTYPES.VARCHAR, 16), sqlHelper.cast("standardAddress.LON", SQLTYPES.VARCHAR, 16)], ","),
+ sqlHelper.concatWithSeparator([sqlHelper.cast("REPLACE(standardAddress.LAT, ',', '.')", SQLTYPES.VARCHAR, 16), sqlHelper.cast("REPLACE(standardAddress.LON, ',', '.')", SQLTYPES.VARCHAR, 16)], ","),,
//additional indexed fields
"ORGANISATION.NAME",
sqlHelper.trim("ORGANISATION.ORGANISATIONID"),//trim to enable filter patterns like: >> -organisationid_value:0<<
diff --git a/entity/Person_entity/Person_entity.aod b/entity/Person_entity/Person_entity.aod
index a47b0870f914103180a0de1de9a8711c2b63b004..9a5d402ea757cf6d2aed330ebb35c9de397e42a1 100644
--- a/entity/Person_entity/Person_entity.aod
+++ b/entity/Person_entity/Person_entity.aod
@@ -23,6 +23,27 @@
<titlePlural>Contacts</titlePlural>
<recordContainer>db</recordContainer>
<entityFields>
+ <entityActionGroup>
+ <name>observeActionGroup</name>
+ <children>
+ <entityActionField>
+ <name>observe</name>
+ <title>Observe</title>
+ <onActionProcess>%aditoprj%/entity/Person_entity/entityfields/observeactiongroup/children/observe/onActionProcess.js</onActionProcess>
+ <isObjectAction v="true" />
+ <iconId>VAADIN:EYE</iconId>
+ <stateProcess>%aditoprj%/entity/Person_entity/entityfields/observeactiongroup/children/observe/stateProcess.js</stateProcess>
+ <titleProcess>%aditoprj%/entity/Person_entity/entityfields/observeactiongroup/children/observe/titleProcess.js</titleProcess>
+ </entityActionField>
+ <entityActionField>
+ <name>cancelObservation</name>
+ <onActionProcess>%aditoprj%/entity/Person_entity/entityfields/observeactiongroup/children/cancelobservation/onActionProcess.js</onActionProcess>
+ <iconId>VAADIN:EYE_SLASH</iconId>
+ <stateProcess>%aditoprj%/entity/Person_entity/entityfields/observeactiongroup/children/cancelobservation/stateProcess.js</stateProcess>
+ <titleProcess>%aditoprj%/entity/Person_entity/entityfields/observeactiongroup/children/cancelobservation/titleProcess.js</titleProcess>
+ </entityActionField>
+ </children>
+ </entityActionGroup>
<entityField>
<name>DATEOFBIRTH</name>
<title>Date of birth</title>
@@ -1025,179 +1046,6 @@
<inputFormat>dd.MM.</inputFormat>
<state>READONLY</state>
</entityField>
- <entityConsumer>
- <name>DSGVODeleteFlags</name>
- <stateProcess>%aditoprj%/entity/Person_entity/entityfields/dsgvodeleteflags/stateProcess.js</stateProcess>
- <dependency>
- <name>dependency</name>
- <entityName>DSGVODeleteFlag_entity</entityName>
- <fieldName>DSGVODeleteFlags</fieldName>
- </dependency>
- <children>
- <entityParameter>
- <name>ContactId_param</name>
- <valueProcess>%aditoprj%/entity/Person_entity/entityfields/dsgvodeleteflags/children/contactid_param/valueProcess.js</valueProcess>
- </entityParameter>
- </children>
- </entityConsumer>
- <entityConsumer>
- <name>Campaigns</name>
- <dependency>
- <name>dependency</name>
- <entityName>Campaign_entity</entityName>
- <fieldName>Campaigns</fieldName>
- </dependency>
- </entityConsumer>
- <entityParameter>
- <name>FilterPreSet_param</name>
- <expose v="true" />
- </entityParameter>
- <entityConsumer>
- <name>DuplicatesPerson</name>
- <selectionMode>MULTI</selectionMode>
- <selectionModeProcess>%aditoprj%/entity/Person_entity/entityfields/duplicatesperson/selectionModeProcess.js</selectionModeProcess>
- <dependency>
- <name>dependency</name>
- <entityName>Duplicate_entity</entityName>
- <fieldName>Duplicates</fieldName>
- </dependency>
- <children>
- <entityParameter>
- <name>DuplicateObject_param</name>
- <valueProcess>%aditoprj%/entity/Person_entity/entityfields/duplicatesperson/children/duplicateobject_param/valueProcess.js</valueProcess>
- </entityParameter>
- </children>
- </entityConsumer>
- <entityConsumer>
- <name>ContactCommunicationSettings</name>
- <refreshParent v="true" />
- <dependency>
- <name>dependency</name>
- <entityName>CommunicationSettings_entity</entityName>
- <fieldName>SettingsForContact</fieldName>
- </dependency>
- <children>
- <entityParameter>
- <name>ContactId_param</name>
- <valueProcess>%aditoprj%/entity/Person_entity/entityfields/contactcommunicationsettings/children/contactid_param/valueProcess.js</valueProcess>
- </entityParameter>
- </children>
- </entityConsumer>
- <entityConsumer>
- <name>InterestLinks</name>
- <dependency>
- <name>dependency</name>
- <entityName>InterestLink_entity</entityName>
- <fieldName>InterestsForContact</fieldName>
- </dependency>
- <children>
- <entityParameter>
- <name>ContactId_param</name>
- <valueProcess>%aditoprj%/entity/Person_entity/entityfields/interestlinks/children/contactid_param/valueProcess.js</valueProcess>
- </entityParameter>
- </children>
- </entityConsumer>
- <entityParameter>
- <name>SearchSyncCondition_param</name>
- <expose v="true" />
- </entityParameter>
- <entityConsumer>
- <name>Interests</name>
- <description>Used for the filterExtension "InterestLink_filter"</description>
- <dependency>
- <name>dependency</name>
- <entityName>Interest_entity</entityName>
- <fieldName>#PROVIDER</fieldName>
- </dependency>
- </entityConsumer>
- <entityConsumer>
- <name>Bulkmails</name>
- <description>Used for the filterExtension "BulkmailReceived_filter"</description>
- <dependency>
- <name>dependency</name>
- <entityName>BulkMail_entity</entityName>
- <fieldName>#PROVIDER</fieldName>
- </dependency>
- </entityConsumer>
- <entityConsumer>
- <name>CommunicationSettingStatusKeyword</name>
- <dependency>
- <name>dependency</name>
- <entityName>KeywordEntry_entity</entityName>
- <fieldName>SpecificContainerKeywords</fieldName>
- </dependency>
- <children>
- <entityParameter>
- <name>ContainerName_param</name>
- <valueProcess>%aditoprj%/entity/Person_entity/entityfields/communicationsettingstatuskeyword/children/containername_param/valueProcess.js</valueProcess>
- </entityParameter>
- </children>
- </entityConsumer>
- <entityConsumer>
- <name>Salesprojects</name>
- <dependency>
- <name>dependency</name>
- <entityName>Salesproject_entity</entityName>
- <fieldName>Salesprojects</fieldName>
- </dependency>
- </entityConsumer>
- <entityConsumer>
- <name>AllTopics</name>
- <dependency>
- <name>dependency</name>
- <entityName>TopicTree_entity</entityName>
- <fieldName>#PROVIDER</fieldName>
- </dependency>
- <children>
- <entityParameter>
- <name>Expanded_param</name>
- <valueProcess>%aditoprj%/entity/Person_entity/entityfields/alltopics/children/expanded_param/valueProcess.js</valueProcess>
- </entityParameter>
- </children>
- </entityConsumer>
- <entityConsumer>
- <name>Serviceticket</name>
- <dependency>
- <name>dependency</name>
- <entityName>SupportTicket_entity</entityName>
- <fieldName>SupportTickets</fieldName>
- </dependency>
- <children>
- <entityParameter>
- <name>ReturnEmpty_param</name>
- <valueProcess>%aditoprj%/entity/Person_entity/entityfields/serviceticket/children/returnempty_param/valueProcess.js</valueProcess>
- </entityParameter>
- <entityParameter>
- <name>TaskRequestorContactId_param</name>
- <valueProcess>%aditoprj%/entity/Person_entity/entityfields/serviceticket/children/taskrequestorcontactid_param/valueProcess.js</valueProcess>
- </entityParameter>
- </children>
- </entityConsumer>
- <entityField>
- <name>LETTERSALUTATION</name>
- <title>Lettersalutation</title>
- </entityField>
- <entityActionGroup>
- <name>observeActionGroup</name>
- <children>
- <entityActionField>
- <name>observe</name>
- <title>Observe</title>
- <onActionProcess>%aditoprj%/entity/Person_entity/entityfields/observeactiongroup/children/observe/onActionProcess.js</onActionProcess>
- <isObjectAction v="true" />
- <iconId>VAADIN:EYE</iconId>
- <stateProcess>%aditoprj%/entity/Person_entity/entityfields/observeactiongroup/children/observe/stateProcess.js</stateProcess>
- <titleProcess>%aditoprj%/entity/Person_entity/entityfields/observeactiongroup/children/observe/titleProcess.js</titleProcess>
- </entityActionField>
- <entityActionField>
- <name>cancelObservation</name>
- <onActionProcess>%aditoprj%/entity/Person_entity/entityfields/observeactiongroup/children/cancelobservation/onActionProcess.js</onActionProcess>
- <iconId>VAADIN:EYE_SLASH</iconId>
- <stateProcess>%aditoprj%/entity/Person_entity/entityfields/observeactiongroup/children/cancelobservation/stateProcess.js</stateProcess>
- <titleProcess>%aditoprj%/entity/Person_entity/entityfields/observeactiongroup/children/cancelobservation/titleProcess.js</titleProcess>
- </entityActionField>
- </children>
- </entityActionGroup>
<entityActionField>
<name>openEditDefaultsView</name>
<title>Edit defaults</title>
@@ -1375,12 +1223,6 @@
<iconId>NEON:TRASH</iconId>
<stateProcess>%aditoprj%/entity/Person_entity/entityfields/deletefunction/stateProcess.js</stateProcess>
</entityActionField>
- <entityActionField>
- <name>newSupportTicket</name>
- <title>New Service ticket</title>
- <onActionProcess>%aditoprj%/entity/Person_entity/entityfields/newsupportticket/onActionProcess.js</onActionProcess>
- <iconId>VAADIN:TICKET</iconId>
- </entityActionField>
<entityActionField>
<name>openAdminView</name>
<title>Open admin view</title>
@@ -1388,6 +1230,164 @@
<iconId>VAADIN:CURLY_BRACKETS</iconId>
<stateProcess>%aditoprj%/entity/Person_entity/entityfields/openadminview/stateProcess.js</stateProcess>
</entityActionField>
+ <entityConsumer>
+ <name>DSGVODeleteFlags</name>
+ <stateProcess>%aditoprj%/entity/Person_entity/entityfields/dsgvodeleteflags/stateProcess.js</stateProcess>
+ <dependency>
+ <name>dependency</name>
+ <entityName>DSGVODeleteFlag_entity</entityName>
+ <fieldName>DSGVODeleteFlags</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>ContactId_param</name>
+ <valueProcess>%aditoprj%/entity/Person_entity/entityfields/dsgvodeleteflags/children/contactid_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ </children>
+ </entityConsumer>
+ <entityConsumer>
+ <name>Campaigns</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Campaign_entity</entityName>
+ <fieldName>Campaigns</fieldName>
+ </dependency>
+ </entityConsumer>
+ <entityParameter>
+ <name>FilterPreSet_param</name>
+ <expose v="true" />
+ </entityParameter>
+ <entityConsumer>
+ <name>DuplicatesPerson</name>
+ <selectionMode>MULTI</selectionMode>
+ <selectionModeProcess>%aditoprj%/entity/Person_entity/entityfields/duplicatesperson/selectionModeProcess.js</selectionModeProcess>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Duplicate_entity</entityName>
+ <fieldName>Duplicates</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>DuplicateObject_param</name>
+ <valueProcess>%aditoprj%/entity/Person_entity/entityfields/duplicatesperson/children/duplicateobject_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ </children>
+ </entityConsumer>
+ <entityConsumer>
+ <name>ContactCommunicationSettings</name>
+ <refreshParent v="true" />
+ <dependency>
+ <name>dependency</name>
+ <entityName>CommunicationSettings_entity</entityName>
+ <fieldName>SettingsForContact</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>ContactId_param</name>
+ <valueProcess>%aditoprj%/entity/Person_entity/entityfields/contactcommunicationsettings/children/contactid_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ </children>
+ </entityConsumer>
+ <entityConsumer>
+ <name>InterestLinks</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>InterestLink_entity</entityName>
+ <fieldName>InterestsForContact</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>ContactId_param</name>
+ <valueProcess>%aditoprj%/entity/Person_entity/entityfields/interestlinks/children/contactid_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ </children>
+ </entityConsumer>
+ <entityParameter>
+ <name>SearchSyncCondition_param</name>
+ <expose v="true" />
+ </entityParameter>
+ <entityConsumer>
+ <name>Interests</name>
+ <description>Used for the filterExtension "InterestLink_filter"</description>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Interest_entity</entityName>
+ <fieldName>#PROVIDER</fieldName>
+ </dependency>
+ </entityConsumer>
+ <entityConsumer>
+ <name>Bulkmails</name>
+ <description>Used for the filterExtension "BulkmailReceived_filter"</description>
+ <dependency>
+ <name>dependency</name>
+ <entityName>BulkMail_entity</entityName>
+ <fieldName>#PROVIDER</fieldName>
+ </dependency>
+ </entityConsumer>
+ <entityConsumer>
+ <name>CommunicationSettingStatusKeyword</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>KeywordEntry_entity</entityName>
+ <fieldName>SpecificContainerKeywords</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>ContainerName_param</name>
+ <valueProcess>%aditoprj%/entity/Person_entity/entityfields/communicationsettingstatuskeyword/children/containername_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ </children>
+ </entityConsumer>
+ <entityConsumer>
+ <name>Salesprojects</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Salesproject_entity</entityName>
+ <fieldName>Salesprojects</fieldName>
+ </dependency>
+ </entityConsumer>
+ <entityConsumer>
+ <name>AllTopics</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>TopicTree_entity</entityName>
+ <fieldName>#PROVIDER</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>Expanded_param</name>
+ <valueProcess>%aditoprj%/entity/Person_entity/entityfields/alltopics/children/expanded_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ </children>
+ </entityConsumer>
+ <entityActionField>
+ <name>newSupportTicket</name>
+ <title>New Service ticket</title>
+ <onActionProcess>%aditoprj%/entity/Person_entity/entityfields/newsupportticket/onActionProcess.js</onActionProcess>
+ <iconId>VAADIN:TICKET</iconId>
+ </entityActionField>
+ <entityConsumer>
+ <name>Serviceticket</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>SupportTicket_entity</entityName>
+ <fieldName>SupportTickets</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>ReturnEmpty_param</name>
+ <valueProcess>%aditoprj%/entity/Person_entity/entityfields/serviceticket/children/returnempty_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ <entityParameter>
+ <name>TaskRequestorContactId_param</name>
+ <valueProcess>%aditoprj%/entity/Person_entity/entityfields/serviceticket/children/taskrequestorcontactid_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ </children>
+ </entityConsumer>
+ <entityField>
+ <name>LETTERSALUTATION</name>
+ <title>Lettersalutation</title>
+ </entityField>
</entityFields>
<recordContainers>
<dbRecordContainer>
diff --git a/entity/Person_entity/entityfields/keywordcontactstates/children/blacklistids_param/valueProcess.js b/entity/Person_entity/entityfields/keywordcontactstates/children/blacklistids_param/valueProcess.js
index db312733ad60f53d5f4a34e0d2140415566bb23c..a52cc0873588ad599c0efe525b8ec15716c7ec07 100644
--- a/entity/Person_entity/entityfields/keywordcontactstates/children/blacklistids_param/valueProcess.js
+++ b/entity/Person_entity/entityfields/keywordcontactstates/children/blacklistids_param/valueProcess.js
@@ -1,9 +1,4 @@
-import("system.vars");
-import("system.neon");
import("KeywordRegistry_basic");
import("system.result");
-if([neon.OPERATINGSTATE_NEW, neon.OPERATINGSTATE_EDIT].includes(vars.get("$sys.operatingstate")))
-{
- result.object([$KeywordRegistry.contactStatus$markToDelete()]);
-}
+result.object([$KeywordRegistry.contactStatus$markToDelete()]);
\ No newline at end of file
diff --git a/entity/Product_entity/Product_entity.aod b/entity/Product_entity/Product_entity.aod
index 829be6254e5c06c4c5d8be0571f55fb65c1aa6fb..39548637b30282bab8ccce72193eb56f79fd7ed0 100644
--- a/entity/Product_entity/Product_entity.aod
+++ b/entity/Product_entity/Product_entity.aod
@@ -17,6 +17,27 @@
<titlePlural>Products</titlePlural>
<recordContainer>db</recordContainer>
<entityFields>
+ <entityActionGroup>
+ <name>observeActionGroup</name>
+ <children>
+ <entityActionField>
+ <name>observe</name>
+ <title>Observe</title>
+ <onActionProcess>%aditoprj%/entity/Product_entity/entityfields/observeactiongroup/children/observe/onActionProcess.js</onActionProcess>
+ <isObjectAction v="true" />
+ <iconId>VAADIN:EYE</iconId>
+ <stateProcess>%aditoprj%/entity/Product_entity/entityfields/observeactiongroup/children/observe/stateProcess.js</stateProcess>
+ <titleProcess>%aditoprj%/entity/Product_entity/entityfields/observeactiongroup/children/observe/titleProcess.js</titleProcess>
+ </entityActionField>
+ <entityActionField>
+ <name>cancelObservation</name>
+ <onActionProcess>%aditoprj%/entity/Product_entity/entityfields/observeactiongroup/children/cancelobservation/onActionProcess.js</onActionProcess>
+ <iconId>VAADIN:EYE_SLASH</iconId>
+ <stateProcess>%aditoprj%/entity/Product_entity/entityfields/observeactiongroup/children/cancelobservation/stateProcess.js</stateProcess>
+ <titleProcess>%aditoprj%/entity/Product_entity/entityfields/observeactiongroup/children/cancelobservation/titleProcess.js</titleProcess>
+ </entityActionField>
+ </children>
+ </entityActionGroup>
<entityField>
<name>ADVERTISING</name>
<title>Advertising material</title>
@@ -268,6 +289,14 @@
</entityParameter>
</children>
</entityConsumer>
+ <entityActionField>
+ <name>newActivity</name>
+ <title>New activity</title>
+ <onActionProcess>%aditoprj%/entity/Product_entity/entityfields/newactivity/onActionProcess.js</onActionProcess>
+ <iconId>VAADIN:HOURGLASS_END</iconId>
+ <tooltip>New activity</tooltip>
+ <tooltipProcess>%aditoprj%/entity/Product_entity/entityfields/newactivity/tooltipProcess.js</tooltipProcess>
+ </entityActionField>
<entityConsumer>
<name>Attributes</name>
<stateProcess>%aditoprj%/entity/Product_entity/entityfields/attributes/stateProcess.js</stateProcess>
@@ -304,6 +333,12 @@
</entityParameter>
</children>
</entityProvider>
+ <entityActionField>
+ <name>newTask</name>
+ <title>New task</title>
+ <onActionProcess>%aditoprj%/entity/Product_entity/entityfields/newtask/onActionProcess.js</onActionProcess>
+ <iconId>VAADIN:TASKS</iconId>
+ </entityActionField>
<entityConsumer>
<name>Tasks</name>
<dependency>
@@ -397,6 +432,13 @@
</entityParameter>
</children>
</entityConsumer>
+ <entityActionField>
+ <name>openAdminView</name>
+ <title>Open admin view</title>
+ <onActionProcess>%aditoprj%/entity/Product_entity/entityfields/openadminview/onActionProcess.js</onActionProcess>
+ <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>
@@ -433,6 +475,23 @@
</entityParameter>
</children>
</entityConsumer>
+ <entityActionField>
+ <name>addToOrder</name>
+ <title>Add to order</title>
+ <onActionProcess>%aditoprj%/entity/Product_entity/entityfields/addtoorder/onActionProcess.js</onActionProcess>
+ <isObjectAction v="false" />
+ <iconId>VAADIN:FILE_TEXT_O</iconId>
+ <state>INVISIBLE</state>
+ <stateProcess>%aditoprj%/entity/Product_entity/entityfields/addtoorder/stateProcess.js</stateProcess>
+ </entityActionField>
+ <entityActionField>
+ <name>addToOffer</name>
+ <title>Add to offer</title>
+ <onActionProcess>%aditoprj%/entity/Product_entity/entityfields/addtooffer/onActionProcess.js</onActionProcess>
+ <iconId>VAADIN:CART</iconId>
+ <state>INVISIBLE</state>
+ <stateProcess>%aditoprj%/entity/Product_entity/entityfields/addtooffer/stateProcess.js</stateProcess>
+ </entityActionField>
<entityParameter>
<name>ShownInOfferMainView_param</name>
<expose v="true" />
@@ -491,65 +550,6 @@
<name>ADVERTISING_TILEVIEW</name>
<documentation>%aditoprj%/entity/Product_entity/entityfields/advertising_tileview/documentation.adoc</documentation>
</entityField>
- <entityActionGroup>
- <name>observeActionGroup</name>
- <children>
- <entityActionField>
- <name>observe</name>
- <title>Observe</title>
- <onActionProcess>%aditoprj%/entity/Product_entity/entityfields/observeactiongroup/children/observe/onActionProcess.js</onActionProcess>
- <isObjectAction v="true" />
- <iconId>VAADIN:EYE</iconId>
- <stateProcess>%aditoprj%/entity/Product_entity/entityfields/observeactiongroup/children/observe/stateProcess.js</stateProcess>
- <titleProcess>%aditoprj%/entity/Product_entity/entityfields/observeactiongroup/children/observe/titleProcess.js</titleProcess>
- </entityActionField>
- <entityActionField>
- <name>cancelObservation</name>
- <onActionProcess>%aditoprj%/entity/Product_entity/entityfields/observeactiongroup/children/cancelobservation/onActionProcess.js</onActionProcess>
- <iconId>VAADIN:EYE_SLASH</iconId>
- <stateProcess>%aditoprj%/entity/Product_entity/entityfields/observeactiongroup/children/cancelobservation/stateProcess.js</stateProcess>
- <titleProcess>%aditoprj%/entity/Product_entity/entityfields/observeactiongroup/children/cancelobservation/titleProcess.js</titleProcess>
- </entityActionField>
- </children>
- </entityActionGroup>
- <entityActionField>
- <name>newActivity</name>
- <title>New activity</title>
- <onActionProcess>%aditoprj%/entity/Product_entity/entityfields/newactivity/onActionProcess.js</onActionProcess>
- <iconId>VAADIN:HOURGLASS_END</iconId>
- <tooltip>New activity</tooltip>
- <tooltipProcess>%aditoprj%/entity/Product_entity/entityfields/newactivity/tooltipProcess.js</tooltipProcess>
- </entityActionField>
- <entityActionField>
- <name>newTask</name>
- <title>New task</title>
- <onActionProcess>%aditoprj%/entity/Product_entity/entityfields/newtask/onActionProcess.js</onActionProcess>
- <iconId>VAADIN:TASKS</iconId>
- </entityActionField>
- <entityActionField>
- <name>addToOrder</name>
- <title>Add to order</title>
- <onActionProcess>%aditoprj%/entity/Product_entity/entityfields/addtoorder/onActionProcess.js</onActionProcess>
- <isObjectAction v="false" />
- <iconId>VAADIN:FILE_TEXT_O</iconId>
- <state>INVISIBLE</state>
- <stateProcess>%aditoprj%/entity/Product_entity/entityfields/addtoorder/stateProcess.js</stateProcess>
- </entityActionField>
- <entityActionField>
- <name>addToOffer</name>
- <title>Add to offer</title>
- <onActionProcess>%aditoprj%/entity/Product_entity/entityfields/addtooffer/onActionProcess.js</onActionProcess>
- <iconId>VAADIN:CART</iconId>
- <state>INVISIBLE</state>
- <stateProcess>%aditoprj%/entity/Product_entity/entityfields/addtooffer/stateProcess.js</stateProcess>
- </entityActionField>
- <entityActionField>
- <name>openAdminView</name>
- <title>Open admin view</title>
- <onActionProcess>%aditoprj%/entity/Product_entity/entityfields/openadminview/onActionProcess.js</onActionProcess>
- <iconId>VAADIN:CURLY_BRACKETS</iconId>
- <stateProcess>%aditoprj%/entity/Product_entity/entityfields/openadminview/stateProcess.js</stateProcess>
- </entityActionField>
</entityFields>
<recordContainers>
<dbRecordContainer>
diff --git a/entity/Product_entity/entityfields/openadminview/onActionProcess.js b/entity/Product_entity/entityfields/openadminview/onActionProcess.js
index b1a19a1a3044a4c8273c71e0eacbd353d401910b..7506bf94163c4b2c8e915acc21932da4ee548889 100644
--- a/entity/Product_entity/entityfields/openadminview/onActionProcess.js
+++ b/entity/Product_entity/entityfields/openadminview/onActionProcess.js
@@ -5,6 +5,6 @@ AdminViewUtils.open("PRODUCTID", [
["CONTACT_ID", vars.get("$field.CONTACT_ID")],
["DATE_NEW", vars.get("$field.DATE_NEW"), "DATE"],
["DATE_EDIT", vars.get("$field.DATE_EDIT"), "DATE"],
- ["USER_NEW", vars.get("$field.USER_NEW")],
- ["USER_EDIT", vars.get("$field.USER_EDIT")]
+ ["USER_NEW", vars.get("$field.USER_NEW"), "DATE"],
+ ["USER_EDIT", vars.get("$field.USER_EDIT"), "DATE"]
]);
\ No newline at end of file
diff --git a/entity/Productprice_entity/Productprice_entity.aod b/entity/Productprice_entity/Productprice_entity.aod
index ac4a52efd1b2fb44ed9181a3913a87db3f81815d..177b09df41ec56f5d3bad7feca838a7ed1d6df17 100644
--- a/entity/Productprice_entity/Productprice_entity.aod
+++ b/entity/Productprice_entity/Productprice_entity.aod
@@ -13,15 +13,6 @@
<titlePlural>Prices</titlePlural>
<recordContainer>db</recordContainer>
<entityFields>
- <entityActionField>
- <name>openAdminView</name>
- <title>Open admin view</title>
- <onActionProcess>%aditoprj%/entity/Productprice_entity/entityfields/openadminview/onActionProcess.js</onActionProcess>
- <isMenuAction v="true" />
- <isObjectAction v="true" />
- <iconId>VAADIN:CURLY_BRACKETS</iconId>
- <stateProcess>%aditoprj%/entity/Productprice_entity/entityfields/openadminview/stateProcess.js</stateProcess>
- </entityActionField>
<entityField>
<name>BUYSELL</name>
<title>PP/SP</title>
diff --git a/entity/Productprice_entity/entityfields/openadminview/onActionProcess.js b/entity/Productprice_entity/entityfields/openadminview/onActionProcess.js
deleted file mode 100644
index c873db04873e3264f59b1576b1ebf4d5e740e11e..0000000000000000000000000000000000000000
--- a/entity/Productprice_entity/entityfields/openadminview/onActionProcess.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import("system.vars");
-import("Context_lib");
-
-AdminViewUtils.open("PRODUCTPRICEID", []);
\ No newline at end of file
diff --git a/entity/Productprice_entity/entityfields/openadminview/stateProcess.js b/entity/Productprice_entity/entityfields/openadminview/stateProcess.js
deleted file mode 100644
index 38f2298db7304b4d44a15fbad7f720558c02da99..0000000000000000000000000000000000000000
--- a/entity/Productprice_entity/entityfields/openadminview/stateProcess.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import("Context_lib");
-import("system.result");
-
-result.string(AdminViewUtils.getActionState());
\ No newline at end of file
diff --git a/entity/SalesprojectSource_entity/SalesprojectSource_entity.aod b/entity/SalesprojectSource_entity/SalesprojectSource_entity.aod
index efe41aff7ee634795c5ce284c073f2f8492fb47d..f7de40bbdd7617027f70244d03cfc385dada4db6 100644
--- a/entity/SalesprojectSource_entity/SalesprojectSource_entity.aod
+++ b/entity/SalesprojectSource_entity/SalesprojectSource_entity.aod
@@ -8,15 +8,6 @@
<titlePlural>Touchpoints</titlePlural>
<recordContainer>db</recordContainer>
<entityFields>
- <entityActionField>
- <name>openAdminView</name>
- <title>Open admin view</title>
- <onActionProcess>%aditoprj%/entity/SalesprojectSource_entity/entityfields/openadminview/onActionProcess.js</onActionProcess>
- <isMenuAction v="true" />
- <isObjectAction v="true" />
- <iconId>VAADIN:CURLY_BRACKETS</iconId>
- <stateProcess>%aditoprj%/entity/SalesprojectSource_entity/entityfields/openadminview/stateProcess.js</stateProcess>
- </entityActionField>
<entityProvider>
<name>#PROVIDER</name>
</entityProvider>
diff --git a/entity/SalesprojectSource_entity/entityfields/openadminview/onActionProcess.js b/entity/SalesprojectSource_entity/entityfields/openadminview/onActionProcess.js
deleted file mode 100644
index 4a89348d3540669c4ce582a7967329734a474e6c..0000000000000000000000000000000000000000
--- a/entity/SalesprojectSource_entity/entityfields/openadminview/onActionProcess.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import("system.vars");
-import("Context_lib");
-
-AdminViewUtils.open("SALESPROJECT_TOUCHPOINTID", []);
\ No newline at end of file
diff --git a/entity/SalesprojectSource_entity/entityfields/openadminview/stateProcess.js b/entity/SalesprojectSource_entity/entityfields/openadminview/stateProcess.js
deleted file mode 100644
index 38f2298db7304b4d44a15fbad7f720558c02da99..0000000000000000000000000000000000000000
--- a/entity/SalesprojectSource_entity/entityfields/openadminview/stateProcess.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import("Context_lib");
-import("system.result");
-
-result.string(AdminViewUtils.getActionState());
\ No newline at end of file
diff --git a/entity/Salesproject_entity/Salesproject_entity.aod b/entity/Salesproject_entity/Salesproject_entity.aod
index 2899fb100c565ab2f975f899cb4664a07e2a2f0a..b677647150bcdc189ed5509f1c0006a81ab6f04c 100644
--- a/entity/Salesproject_entity/Salesproject_entity.aod
+++ b/entity/Salesproject_entity/Salesproject_entity.aod
@@ -747,6 +747,81 @@
</entityParameter>
</children>
</entityProvider>
+ <entityActionGroup>
+ <name>observeActionGroup</name>
+ <children>
+ <entityActionField>
+ <name>observe</name>
+ <title>Observe</title>
+ <onActionProcess>%aditoprj%/entity/Salesproject_entity/entityfields/observeactiongroup/children/observe/onActionProcess.js</onActionProcess>
+ <isObjectAction v="true" />
+ <iconId>VAADIN:EYE</iconId>
+ <stateProcess>%aditoprj%/entity/Salesproject_entity/entityfields/observeactiongroup/children/observe/stateProcess.js</stateProcess>
+ <titleProcess>%aditoprj%/entity/Salesproject_entity/entityfields/observeactiongroup/children/observe/titleProcess.js</titleProcess>
+ </entityActionField>
+ <entityActionField>
+ <name>cancelObservation</name>
+ <onActionProcess>%aditoprj%/entity/Salesproject_entity/entityfields/observeactiongroup/children/cancelobservation/onActionProcess.js</onActionProcess>
+ <iconId>VAADIN:EYE_SLASH</iconId>
+ <stateProcess>%aditoprj%/entity/Salesproject_entity/entityfields/observeactiongroup/children/cancelobservation/stateProcess.js</stateProcess>
+ <titleProcess>%aditoprj%/entity/Salesproject_entity/entityfields/observeactiongroup/children/cancelobservation/titleProcess.js</titleProcess>
+ </entityActionField>
+ <entityActionField>
+ <name>export</name>
+ <title>Export</title>
+ <onActionProcess>%aditoprj%/entity/Salesproject_entity/entityfields/observeactiongroup/children/export/onActionProcess.js</onActionProcess>
+ <isMenuAction v="true" />
+ <isObjectAction v="false" />
+ <iconId>NEON:EXPORT</iconId>
+ <stateProcess>%aditoprj%/entity/Salesproject_entity/entityfields/observeactiongroup/children/export/stateProcess.js</stateProcess>
+ <tooltip>Export fields of this table</tooltip>
+ <tooltipProcess>%aditoprj%/entity/Salesproject_entity/entityfields/observeactiongroup/children/export/tooltipProcess.js</tooltipProcess>
+ </entityActionField>
+ </children>
+ </entityActionGroup>
+ <entityActionField>
+ <name>newOffer</name>
+ <documentation>%aditoprj%/entity/Salesproject_entity/entityfields/newoffer/documentation.adoc</documentation>
+ <title>New offer</title>
+ <description>Opens the Offer context in NEW-Mode and fills salesproject and contact.</description>
+ <onActionProcess>%aditoprj%/entity/Salesproject_entity/entityfields/newoffer/onActionProcess.js</onActionProcess>
+ <iconId>VAADIN:CART</iconId>
+ </entityActionField>
+ <entityActionField>
+ <name>newTimetracking</name>
+ <title>New time tracking</title>
+ <description>Opens the time tracking context in new-mode for the selected salesproject</description>
+ <onActionProcess>%aditoprj%/entity/Salesproject_entity/entityfields/newtimetracking/onActionProcess.js</onActionProcess>
+ <iconId>VAADIN:STOPWATCH</iconId>
+ </entityActionField>
+ <entityActionField>
+ <name>newActivity</name>
+ <title>New activity</title>
+ <onActionProcess>%aditoprj%/entity/Salesproject_entity/entityfields/newactivity/onActionProcess.js</onActionProcess>
+ <iconId>VAADIN:HOURGLASS_END</iconId>
+ <tooltip>New activity</tooltip>
+ <tooltipProcess>%aditoprj%/entity/Salesproject_entity/entityfields/newactivity/tooltipProcess.js</tooltipProcess>
+ </entityActionField>
+ <entityActionField>
+ <name>newTask</name>
+ <title>New task</title>
+ <onActionProcess>%aditoprj%/entity/Salesproject_entity/entityfields/newtask/onActionProcess.js</onActionProcess>
+ <iconId>VAADIN:TASKS</iconId>
+ </entityActionField>
+ <entityActionField>
+ <name>startWorkflow</name>
+ <title>Start workflow</title>
+ <onActionProcess>%aditoprj%/entity/Salesproject_entity/entityfields/startworkflow/onActionProcess.js</onActionProcess>
+ <iconId>VAADIN:PLAY</iconId>
+ <stateProcess>%aditoprj%/entity/Salesproject_entity/entityfields/startworkflow/stateProcess.js</stateProcess>
+ </entityActionField>
+ <entityActionField>
+ <name>openAdminView</name>
+ <title>Open admin view</title>
+ <onActionProcess>%aditoprj%/entity/Salesproject_entity/entityfields/openadminview/onActionProcess.js</onActionProcess>
+ <iconId>VAADIN:CURLY_BRACKETS</iconId>
+ <stateProcess>%aditoprj%/entity/Salesproject_entity/entityfields/openadminview/stateProcess.js</stateProcess>
+ </entityActionField>
<entityAggregateField>
<name>PROBABILITY_aggregate</name>
<parentField>PROBABILITY</parentField>
@@ -785,6 +860,12 @@
</entityParameter>
</children>
</entityConsumer>
+ <entityActionField>
+ <name>openClassificationOverView</name>
+ <title>Show Classification</title>
+ <onActionProcess>%aditoprj%/entity/Salesproject_entity/entityfields/openclassificationoverview/onActionProcess.js</onActionProcess>
+ <iconId>VAADIN:LIST_OL</iconId>
+ </entityActionField>
<entityParameter>
<name>IgnoreChecklists_param</name>
<expose v="true" />
@@ -827,87 +908,6 @@
<fieldName>Contacts</fieldName>
</dependency>
</entityConsumer>
- <entityActionGroup>
- <name>observeActionGroup</name>
- <children>
- <entityActionField>
- <name>observe</name>
- <title>Observe</title>
- <onActionProcess>%aditoprj%/entity/Salesproject_entity/entityfields/observeactiongroup/children/observe/onActionProcess.js</onActionProcess>
- <isObjectAction v="true" />
- <iconId>VAADIN:EYE</iconId>
- <stateProcess>%aditoprj%/entity/Salesproject_entity/entityfields/observeactiongroup/children/observe/stateProcess.js</stateProcess>
- <titleProcess>%aditoprj%/entity/Salesproject_entity/entityfields/observeactiongroup/children/observe/titleProcess.js</titleProcess>
- </entityActionField>
- <entityActionField>
- <name>cancelObservation</name>
- <onActionProcess>%aditoprj%/entity/Salesproject_entity/entityfields/observeactiongroup/children/cancelobservation/onActionProcess.js</onActionProcess>
- <iconId>VAADIN:EYE_SLASH</iconId>
- <stateProcess>%aditoprj%/entity/Salesproject_entity/entityfields/observeactiongroup/children/cancelobservation/stateProcess.js</stateProcess>
- <titleProcess>%aditoprj%/entity/Salesproject_entity/entityfields/observeactiongroup/children/cancelobservation/titleProcess.js</titleProcess>
- </entityActionField>
- <entityActionField>
- <name>export</name>
- <title>Export</title>
- <onActionProcess>%aditoprj%/entity/Salesproject_entity/entityfields/observeactiongroup/children/export/onActionProcess.js</onActionProcess>
- <isMenuAction v="true" />
- <isObjectAction v="false" />
- <iconId>NEON:EXPORT</iconId>
- <stateProcess>%aditoprj%/entity/Salesproject_entity/entityfields/observeactiongroup/children/export/stateProcess.js</stateProcess>
- <tooltip>Export fields of this table</tooltip>
- <tooltipProcess>%aditoprj%/entity/Salesproject_entity/entityfields/observeactiongroup/children/export/tooltipProcess.js</tooltipProcess>
- </entityActionField>
- </children>
- </entityActionGroup>
- <entityActionField>
- <name>newOffer</name>
- <documentation>%aditoprj%/entity/Salesproject_entity/entityfields/newoffer/documentation.adoc</documentation>
- <title>New offer</title>
- <description>Opens the Offer context in NEW-Mode and fills salesproject and contact.</description>
- <onActionProcess>%aditoprj%/entity/Salesproject_entity/entityfields/newoffer/onActionProcess.js</onActionProcess>
- <iconId>VAADIN:CART</iconId>
- </entityActionField>
- <entityActionField>
- <name>newTimetracking</name>
- <title>New time tracking</title>
- <description>Opens the time tracking context in new-mode for the selected salesproject</description>
- <onActionProcess>%aditoprj%/entity/Salesproject_entity/entityfields/newtimetracking/onActionProcess.js</onActionProcess>
- <iconId>VAADIN:STOPWATCH</iconId>
- </entityActionField>
- <entityActionField>
- <name>newActivity</name>
- <title>New activity</title>
- <onActionProcess>%aditoprj%/entity/Salesproject_entity/entityfields/newactivity/onActionProcess.js</onActionProcess>
- <iconId>VAADIN:HOURGLASS_END</iconId>
- <tooltip>New activity</tooltip>
- <tooltipProcess>%aditoprj%/entity/Salesproject_entity/entityfields/newactivity/tooltipProcess.js</tooltipProcess>
- </entityActionField>
- <entityActionField>
- <name>newTask</name>
- <title>New task</title>
- <onActionProcess>%aditoprj%/entity/Salesproject_entity/entityfields/newtask/onActionProcess.js</onActionProcess>
- <iconId>VAADIN:TASKS</iconId>
- </entityActionField>
- <entityActionField>
- <name>startWorkflow</name>
- <title>Start workflow</title>
- <onActionProcess>%aditoprj%/entity/Salesproject_entity/entityfields/startworkflow/onActionProcess.js</onActionProcess>
- <iconId>VAADIN:PLAY</iconId>
- <stateProcess>%aditoprj%/entity/Salesproject_entity/entityfields/startworkflow/stateProcess.js</stateProcess>
- </entityActionField>
- <entityActionField>
- <name>openClassificationOverView</name>
- <title>Show Classification</title>
- <onActionProcess>%aditoprj%/entity/Salesproject_entity/entityfields/openclassificationoverview/onActionProcess.js</onActionProcess>
- <iconId>VAADIN:LIST_OL</iconId>
- </entityActionField>
- <entityActionField>
- <name>openAdminView</name>
- <title>Open admin view</title>
- <onActionProcess>%aditoprj%/entity/Salesproject_entity/entityfields/openadminview/onActionProcess.js</onActionProcess>
- <iconId>VAADIN:CURLY_BRACKETS</iconId>
- <stateProcess>%aditoprj%/entity/Salesproject_entity/entityfields/openadminview/stateProcess.js</stateProcess>
- </entityActionField>
</entityFields>
<recordContainers>
<dbRecordContainer>
diff --git a/entity/Salesproject_entity/entityfields/openadminview/onActionProcess.js b/entity/Salesproject_entity/entityfields/openadminview/onActionProcess.js
index 304a766b5667494fcf3f51a72d7afd5e50f0be2a..246f5181a434a2f382ae05fadc22a3e57d4cf765 100644
--- a/entity/Salesproject_entity/entityfields/openadminview/onActionProcess.js
+++ b/entity/Salesproject_entity/entityfields/openadminview/onActionProcess.js
@@ -2,9 +2,5 @@ import("system.vars");
import("Context_lib");
AdminViewUtils.open("SALESPROJECTID", [
- ["CONTACT_ID", vars.get("$field.CONTACT_ID")],
- ["DATE_NEW", vars.get("$field.DATE_NEW"), "DATE"],
- ["DATE_EDIT", vars.get("$field.DATE_EDIT"), "DATE"],
- ["USER_NEW", vars.get("$field.USER_NEW")],
- ["USER_EDIT", vars.get("$field.USER_EDIT")]
- ]);
\ No newline at end of file
+ ["CONTACT_ID", vars.get("$field.CONTACT_ID")]
+]);
\ No newline at end of file
diff --git a/entity/Task_entity/initFilterProcess.js b/entity/Task_entity/initFilterProcess.js
index 1879073eba8c2958206dd275f693c5b10bbc387c..914bcc6d16366bb57e75220f1ea4ce3a1c04d5ea 100644
--- a/entity/Task_entity/initFilterProcess.js
+++ b/entity/Task_entity/initFilterProcess.js
@@ -9,7 +9,7 @@ import("system.neon");
import("system.vars");
-if ([neon.CONTEXT_PRESENTATIONMODE_FILTER, neon.CONTEXT_PRESENTATIONMODE_DASHBOARD].includes(vars.get("$sys.presentationmode"))
+if (vars.get("$sys.presentationmode") === neon.CONTEXT_PRESENTATIONMODE_FILTER
&& !vars.get("$param.RowId_param")
|| Utils.toBoolean(vars.get("$param.dashletFilter_param")))
{
diff --git a/entity/Timetracking_entity/Timetracking_entity.aod b/entity/Timetracking_entity/Timetracking_entity.aod
index c9603811b128ed9ff7ecbab378946bf54664d6ad..8422d4687aa6e2472177ba1ef03a40b9d3be69f7 100644
--- a/entity/Timetracking_entity/Timetracking_entity.aod
+++ b/entity/Timetracking_entity/Timetracking_entity.aod
@@ -7,15 +7,6 @@
<titlePlural>Timetracking entries</titlePlural>
<recordContainer>db</recordContainer>
<entityFields>
- <entityActionField>
- <name>openAdminView</name>
- <title>Open admin view</title>
- <onActionProcess>%aditoprj%/entity/Timetracking_entity/entityfields/openadminview/onActionProcess.js</onActionProcess>
- <isMenuAction v="true" />
- <isObjectAction v="true" />
- <iconId>VAADIN:CURLY_BRACKETS</iconId>
- <stateProcess>%aditoprj%/entity/Timetracking_entity/entityfields/openadminview/stateProcess.js</stateProcess>
- </entityActionField>
<entityProvider>
<name>#PROVIDER</name>
</entityProvider>
diff --git a/entity/Timetracking_entity/entityfields/openadminview/onActionProcess.js b/entity/Timetracking_entity/entityfields/openadminview/onActionProcess.js
deleted file mode 100644
index 1931d99268faa97d90e58783d7b10a9ab01b5c0b..0000000000000000000000000000000000000000
--- a/entity/Timetracking_entity/entityfields/openadminview/onActionProcess.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import("system.vars");
-import("Context_lib");
-
-AdminViewUtils.open("TIMETRACKINGID", []);
\ No newline at end of file
diff --git a/entity/Timetracking_entity/entityfields/openadminview/stateProcess.js b/entity/Timetracking_entity/entityfields/openadminview/stateProcess.js
deleted file mode 100644
index 38f2298db7304b4d44a15fbad7f720558c02da99..0000000000000000000000000000000000000000
--- a/entity/Timetracking_entity/entityfields/openadminview/stateProcess.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import("Context_lib");
-import("system.result");
-
-result.string(AdminViewUtils.getActionState());
\ No newline at end of file
diff --git a/entity/VisitRecommendation_entity/initFilterProcess.js b/entity/VisitRecommendation_entity/initFilterProcess.js
index d2cdd7826154af2abb92de92ed37205cf06aca04..581449dc6f85cac282a08d045b6c3e1f8509cd85 100644
--- a/entity/VisitRecommendation_entity/initFilterProcess.js
+++ b/entity/VisitRecommendation_entity/initFilterProcess.js
@@ -7,7 +7,8 @@ import("KeywordRegistry_basic");
import("system.result");
import("Employee_lib");
-if ([neon.CONTEXT_PRESENTATIONMODE_FILTER, neon.CONTEXT_PRESENTATIONMODE_DASHBOARD].includes(vars.get("$sys.presentationmode")))
+var res;
+if (vars.get("$sys.presentationmode") === neon.CONTEXT_PRESENTATIONMODE_FILTER)
{
var sourceKey = $KeywordRegistry.visitRecommendationPrioSource$manual()
filter = {
@@ -45,5 +46,8 @@ if ([neon.CONTEXT_PRESENTATIONMODE_FILTER, neon.CONTEXT_PRESENTATIONMODE_DASHBOA
}, filter]
};
}
- result.string(JSON.stringify(filter));
-}
\ No newline at end of file
+ res = JSON.stringify(filter);
+}
+
+if (res)
+ result.string(res);
\ No newline at end of file
diff --git a/entity/Weblink_entity/Weblink_entity.aod b/entity/Weblink_entity/Weblink_entity.aod
index 4ef1da7f5a8c8758443bbd4ab5a5d52edb5c63df..3de5e57011653877b476d970c9aeafd830eb4b1e 100644
--- a/entity/Weblink_entity/Weblink_entity.aod
+++ b/entity/Weblink_entity/Weblink_entity.aod
@@ -11,15 +11,6 @@
<titlePlural>Weblinks</titlePlural>
<recordContainer>db</recordContainer>
<entityFields>
- <entityActionField>
- <name>openAdminView</name>
- <title>Open admin view</title>
- <onActionProcess>%aditoprj%/entity/Weblink_entity/entityfields/openadminview/onActionProcess.js</onActionProcess>
- <isMenuAction v="true" />
- <isObjectAction v="true" />
- <iconId>VAADIN:CURLY_BRACKETS</iconId>
- <stateProcess>%aditoprj%/entity/Weblink_entity/entityfields/openadminview/stateProcess.js</stateProcess>
- </entityActionField>
<entityProvider>
<name>#PROVIDER</name>
</entityProvider>
diff --git a/entity/Weblink_entity/entityfields/openadminview/onActionProcess.js b/entity/Weblink_entity/entityfields/openadminview/onActionProcess.js
deleted file mode 100644
index 89543fe00f48a017ea125bc5e22509fab989dc9d..0000000000000000000000000000000000000000
--- a/entity/Weblink_entity/entityfields/openadminview/onActionProcess.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import("system.vars");
-import("Context_lib");
-
-AdminViewUtils.open("WEBLINKID", []);
\ No newline at end of file
diff --git a/entity/Weblink_entity/entityfields/openadminview/stateProcess.js b/entity/Weblink_entity/entityfields/openadminview/stateProcess.js
deleted file mode 100644
index 38f2298db7304b4d44a15fbad7f720558c02da99..0000000000000000000000000000000000000000
--- a/entity/Weblink_entity/entityfields/openadminview/stateProcess.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import("Context_lib");
-import("system.result");
-
-result.string(AdminViewUtils.getActionState());
\ No newline at end of file
diff --git a/entity/WorkflowInstance_entity/initFilterProcess.js b/entity/WorkflowInstance_entity/initFilterProcess.js
index c4fb3e45f471ae3b966938eab7cbbcd2d7da63b3..d4649f5520545d0b269fda11729c9e90d8b6e697 100644
--- a/entity/WorkflowInstance_entity/initFilterProcess.js
+++ b/entity/WorkflowInstance_entity/initFilterProcess.js
@@ -3,7 +3,7 @@ import("system.vars");
import("system.result");
import("system.translate");
-if ([neon.CONTEXT_PRESENTATIONMODE_FILTER, neon.CONTEXT_PRESENTATIONMODE_DASHBOARD].includes(vars.get("$sys.presentationmode")))
+if (vars.get("$sys.presentationmode") === neon.CONTEXT_PRESENTATIONMODE_FILTER)
{
var filterOnlyUnfinished = {
type : "group",
diff --git a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
index c5fc03f23af316e0913a3e5cd9ced8d6d5de42e9..7b6aee941f0b18cc3d840c7eed167824e967ab9b 100644
--- a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
+++ b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
@@ -11132,15 +11132,6 @@
<entry>
<key>dd/MM/yyyy HH:mm</key>
</entry>
- <entry>
- <key>Only .odt, .docx and .docm files are supported for letters.</key>
- </entry>
- <entry>
- <key>Create subordinate relationship</key>
- </entry>
- <entry>
- <key>Datasets are exported</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 647a9346eaf398e415a8c0cd941af77663c4b9b6..4bfa615b72f7c003d1e1a4eea5b8e75a1e6aafa6 100644
--- a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
+++ b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
@@ -5367,7 +5367,7 @@
</entry>
<entry>
<key>Relation type</key>
- <value>Beziehungsart</value>
+ <value>Beziehungstyp</value>
</entry>
<entry>
<key>Context 1</key>
@@ -5395,7 +5395,7 @@
</entry>
<entry>
<key>Enable relation type 2</key>
- <value>Beziehungsart 2 aktiv</value>
+ <value>Beziehungstyp 2 aktiv</value>
</entry>
<entry>
<key>Salesproject Analyses</key>
@@ -5711,7 +5711,7 @@
</entry>
<entry>
<key>Relation Type</key>
- <value>Beziehungsart</value>
+ <value>Beziehungstyp</value>
</entry>
<entry>
<key>Item sort</key>
@@ -6942,7 +6942,7 @@
</entry>
<entry>
<key>Relation types</key>
- <value>Beziehungsarten</value>
+ <value>Beziehungstypen</value>
</entry>
<entry>
<key>Wine</key>
@@ -10099,11 +10099,11 @@ Bitte Datumseingabe prüfen</value>
</entry>
<entry>
<key>Relation Type 1</key>
- <value>Beziehungsart 1</value>
+ <value>Beziehungstyp 1</value>
</entry>
<entry>
<key>Relation Type 2</key>
- <value>Beziehungsart 2</value>
+ <value>Beziehungstyp 2</value>
</entry>
<entry>
<key>Min. stock</key>
diff --git a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
index 14e635c81e2990d5a4c8427801e7c5e2c5185cef..99650096f79bb15197e3e728143e69bb1060b560 100644
--- a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
+++ b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
@@ -11228,15 +11228,6 @@
<entry>
<key>dd/MM/yyyy HH:mm</key>
</entry>
- <entry>
- <key>Only .odt, .docx and .docm files are supported for letters.</key>
- </entry>
- <entry>
- <key>Create subordinate relationship</key>
- </entry>
- <entry>
- <key>Datasets are exported</key>
- </entry>
</keyValueMap>
<font name="Dialog" style="0" size="11" />
</language>
diff --git a/neonView/ActivityAnalyses_view/ActivityAnalyses_view.aod b/neonView/ActivityAnalyses_view/ActivityAnalyses_view.aod
index 7ca06416fb5b9bd5c248bda1836ac16c26f8c0fa..fd67ceed29eb81b3dcee171af5119d624b3ff615 100644
--- a/neonView/ActivityAnalyses_view/ActivityAnalyses_view.aod
+++ b/neonView/ActivityAnalyses_view/ActivityAnalyses_view.aod
@@ -34,9 +34,6 @@
<chartType>COLUMN</chartType>
<yAxisLabel>Count</yAxisLabel>
<entityField>#ENTITY</entityField>
- <defaultGroupFields>
- <element>CATEGORY</element>
- </defaultGroupFields>
<columns>
<neonDynamicMultiDataChartColumn>
<name>5d99020c-0bf4-4815-9a67-9e378fa66b66</name>
diff --git a/neonView/AdvertisingItemFilter_view/AdvertisingItemFilter_view.aod b/neonView/AdvertisingItemFilter_view/AdvertisingItemFilter_view.aod
index 82ec636d8e3261ab4c869ba303b5bfa72ebd77ce..7c05fd6bd41f9f1d9d43067281eb1862f3217714 100644
--- a/neonView/AdvertisingItemFilter_view/AdvertisingItemFilter_view.aod
+++ b/neonView/AdvertisingItemFilter_view/AdvertisingItemFilter_view.aod
@@ -11,10 +11,6 @@
<tableViewTemplate>
<name>table</name>
<columns>
- <neonTableColumn>
- <name>b20cd7e8-804c-4348-9771-bdd76ea1d3a5</name>
- <entityField>PICTURE</entityField>
- </neonTableColumn>
<neonTableColumn>
<name>a7894166-f880-477a-afd5-58fd982cdb5f</name>
<entityField>ITEMPOSITION</entityField>
diff --git a/neonView/AdvertisingItemPreview_view/AdvertisingItemPreview_view.aod b/neonView/AdvertisingItemPreview_view/AdvertisingItemPreview_view.aod
index 081f01350682854e82f9dec9707e8cb953dfb0e7..fdca083a04cd48044e3318e2d4c871210cb5524c 100644
--- a/neonView/AdvertisingItemPreview_view/AdvertisingItemPreview_view.aod
+++ b/neonView/AdvertisingItemPreview_view/AdvertisingItemPreview_view.aod
@@ -8,20 +8,22 @@
</headerFooterLayout>
</layout>
<children>
- <cardViewTemplate>
- <name>Card</name>
- <iconField>PICTURE</iconField>
- <titleField>PRODUCT_ID</titleField>
- <subtitleField>ITEMPOSITION</subtitleField>
- </cardViewTemplate>
<genericViewTemplate>
<name>Generic</name>
<showDrawer v="true" />
<fields>
+ <entityFieldLink>
+ <name>d89630d6-d28e-4506-b31b-56a03cbcf4f2</name>
+ <entityField>ITEMPOSITION</entityField>
+ </entityFieldLink>
<entityFieldLink>
<name>6f40b9eb-aa08-4026-bca0-eda59b612d97</name>
<entityField>contactId</entityField>
</entityFieldLink>
+ <entityFieldLink>
+ <name>697c7664-460d-4a08-b91f-3a83f23fbd24</name>
+ <entityField>PRODUCT_ID</entityField>
+ </entityFieldLink>
<entityFieldLink>
<name>e7e4464b-3e07-4562-ba09-a87bc2fe26ad</name>
<entityField>QUANTITY</entityField>
diff --git a/neonView/AdvertisingItemSmallFilter_view/AdvertisingItemSmallFilter_view.aod b/neonView/AdvertisingItemSmallFilter_view/AdvertisingItemSmallFilter_view.aod
index 569ec217147f46972686a309f3012d4a758c1fc6..392578f715fb82a3e8f2b7ae0c1dc8e8c876a13b 100644
--- a/neonView/AdvertisingItemSmallFilter_view/AdvertisingItemSmallFilter_view.aod
+++ b/neonView/AdvertisingItemSmallFilter_view/AdvertisingItemSmallFilter_view.aod
@@ -12,10 +12,6 @@
<tableViewTemplate>
<name>Table</name>
<columns>
- <neonTableColumn>
- <name>35dd4269-207c-4a10-aaec-b9d20dcfb6cd</name>
- <entityField>PICTURE</entityField>
- </neonTableColumn>
<neonTableColumn>
<name>4f14ad89-679c-43c5-bf2d-9a7050a84b4c</name>
<entityField>PRODUCT_ID</entityField>
diff --git a/neonView/ProductPreview_view/ProductPreview_view.aod b/neonView/ProductPreview_view/ProductPreview_view.aod
index 6bda8f376d2b344b69884a617f758d3fb2e3ebef..687114627beba86d1f6095264fdc8806152aa1cf 100644
--- a/neonView/ProductPreview_view/ProductPreview_view.aod
+++ b/neonView/ProductPreview_view/ProductPreview_view.aod
@@ -11,7 +11,7 @@
<children>
<cardViewTemplate>
<name>Header</name>
- <iconField>#IMAGE</iconField>
+ <iconField>PICTURE</iconField>
<titleField>PRODUCTCODE</titleField>
<descriptionField>PRODUCTNAME</descriptionField>
<favoriteAction1>newActivity</favoriteAction1>
diff --git a/neonView/SalesprojectSourcePreview_view/SalesprojectSourcePreview_view.aod b/neonView/SalesprojectSourcePreview_view/SalesprojectSourcePreview_view.aod
index 7ec45a3f4a9bc0aca77738b06a818030bd5fb833..cc2f0edd78ffd871b30a352885b01d6d1d63e264 100644
--- a/neonView/SalesprojectSourcePreview_view/SalesprojectSourcePreview_view.aod
+++ b/neonView/SalesprojectSourcePreview_view/SalesprojectSourcePreview_view.aod
@@ -11,7 +11,6 @@
<children>
<cardViewTemplate>
<name>Header</name>
- <iconField>ICON</iconField>
<titleField>TOUCHPOINT</titleField>
<descriptionField>ENTRYDATE</descriptionField>
<entityField>#ENTITY</entityField>
diff --git a/process/Contact_lib/process.js b/process/Contact_lib/process.js
index b42c720124eda1b3351ee8176dfb310c4e734cfa..ef75d00d32dd94fd8827b744714cd84fa65e7ba7 100644
--- a/process/Contact_lib/process.js
+++ b/process/Contact_lib/process.js
@@ -744,7 +744,7 @@ ContactUtils.getCommFilter = function(pOperator, pRawvalue, pFilterOperatorName,
resultSqlCond = resultSqlCond + " '%" + pRawvalue + "')";
break;
case "ISNULL":
- resultSqlCond = "CONTACTID not in (" + commpart + ")";
+ resultSqlCond = "CONTACTID not in " + commpart + ")";
break;
case "ISNOTNULL":
resultSqlCond = resultSqlCond + ")";