From 7446b731430c728c866851b4221fc348d61cc462 Mon Sep 17 00:00:00 2001
From: "f.maier" <f.maier@adito.de>
Date: Thu, 21 Oct 2021 16:25:16 +0200
Subject: [PATCH] [Projekt: xRM-ContactManagement][TicketNr.: 1086600][Action
"Open admin view" fehlt oder steht nicht ganz unten]
---
...ueprint_ create Open Admin View Action.xml | 33 ++
.../AdvertisingItem_entity.aod | 17 +
.../openadminview/onActionProcess.js | 4 +
.../openadminview/stateProcess.js | 4 +
.../picture.value/expression.js | 9 +
.../CampaignStep_entity.aod | 75 ++--
.../openadminview/onActionProcess.js | 9 +
.../openadminview/stateProcess.js | 4 +
.../CommunicationSettings_entity.aod | 9 +
.../openadminview/onActionProcess.js | 9 +
.../openadminview/stateProcess.js | 4 +
.../Competition_entity/Competition_entity.aod | 9 +
.../openadminview/onActionProcess.js | 4 +
.../openadminview/stateProcess.js | 4 +
.../DescriptionTranslation_entity.aod | 9 +
.../openadminview/onActionProcess.js | 4 +
.../openadminview/stateProcess.js | 4 +
.../EmployeeGroupRuleGroup_entity.aod | 9 +
.../openadminview/onActionProcess.js | 4 +
.../openadminview/stateProcess.js | 4 +
.../EmployeeGroup_entity.aod | 9 +
.../openadminview/onActionProcess.js | 4 +
.../openadminview/stateProcess.js | 4 +
entity/Forecast_entity/Forecast_entity.aod | 9 +
.../openadminview/onActionProcess.js | 4 +
.../openadminview/stateProcess.js | 4 +
.../InboxFilterGroup_entity.aod | 9 +
.../openadminview/onActionProcess.js | 4 +
.../openadminview/stateProcess.js | 4 +
.../KnowledgeManagement_entity.aod | 41 +-
.../openadminview/onActionProcess.js | 9 +
.../openadminview/stateProcess.js | 4 +
.../Leadimport_entity/Leadimport_entity.aod | 117 ++---
.../openadminview/onActionProcess.js | 9 +
.../openadminview/stateProcess.js | 4 +
entity/Member_entity/Member_entity.aod | 2 +-
entity/Offer_entity/Offer_entity.aod | 34 +-
entity/Offeritem_entity/Offeritem_entity.aod | 9 +
.../openadminview/onActionProcess.js | 4 +
.../openadminview/stateProcess.js | 4 +
entity/Orderitem_entity/Orderitem_entity.aod | 47 +-
.../openadminview/onActionProcess.js | 4 +
.../openadminview/stateProcess.js | 4 +
.../Organisation_entity.aod | 424 +++++++++---------
entity/Person_entity/Person_entity.aod | 358 +++++++--------
entity/Product_entity/Product_entity.aod | 118 ++---
.../openadminview/onActionProcess.js | 4 +-
.../Productprice_entity.aod | 9 +
.../openadminview/onActionProcess.js | 4 +
.../openadminview/stateProcess.js | 4 +
.../SalesprojectSource_entity.aod | 9 +
.../openadminview/onActionProcess.js | 4 +
.../openadminview/stateProcess.js | 4 +
.../Salesproject_entity.aod | 162 +++----
.../openadminview/onActionProcess.js | 8 +-
.../Timetracking_entity.aod | 9 +
.../openadminview/onActionProcess.js | 4 +
.../openadminview/stateProcess.js | 4 +
entity/Weblink_entity/Weblink_entity.aod | 9 +
.../openadminview/onActionProcess.js | 4 +
.../openadminview/stateProcess.js | 4 +
.../AdvertisingItemFilter_view.aod | 4 +
.../AdvertisingItemPreview_view.aod | 14 +-
.../AdvertisingItemSmallFilter_view.aod | 4 +
.../ProductPreview_view.aod | 2 +-
.../SalesprojectSourcePreview_view.aod | 1 +
66 files changed, 1054 insertions(+), 684 deletions(-)
create mode 100644 .aditoprj/blueprints/Blueprint_ create Open Admin View Action.xml
create mode 100644 entity/AdvertisingItem_entity/entityfields/openadminview/onActionProcess.js
create mode 100644 entity/AdvertisingItem_entity/entityfields/openadminview/stateProcess.js
create mode 100644 entity/AdvertisingItem_entity/recordcontainers/db/recordfieldmappings/picture.value/expression.js
create mode 100644 entity/CampaignStep_entity/entityfields/openadminview/onActionProcess.js
create mode 100644 entity/CampaignStep_entity/entityfields/openadminview/stateProcess.js
create mode 100644 entity/CommunicationSettings_entity/entityfields/openadminview/onActionProcess.js
create mode 100644 entity/CommunicationSettings_entity/entityfields/openadminview/stateProcess.js
create mode 100644 entity/Competition_entity/entityfields/openadminview/onActionProcess.js
create mode 100644 entity/Competition_entity/entityfields/openadminview/stateProcess.js
create mode 100644 entity/DescriptionTranslation_entity/entityfields/openadminview/onActionProcess.js
create mode 100644 entity/DescriptionTranslation_entity/entityfields/openadminview/stateProcess.js
create mode 100644 entity/EmployeeGroupRuleGroup_entity/entityfields/openadminview/onActionProcess.js
create mode 100644 entity/EmployeeGroupRuleGroup_entity/entityfields/openadminview/stateProcess.js
create mode 100644 entity/EmployeeGroup_entity/entityfields/openadminview/onActionProcess.js
create mode 100644 entity/EmployeeGroup_entity/entityfields/openadminview/stateProcess.js
create mode 100644 entity/Forecast_entity/entityfields/openadminview/onActionProcess.js
create mode 100644 entity/Forecast_entity/entityfields/openadminview/stateProcess.js
create mode 100644 entity/InboxFilterGroup_entity/entityfields/openadminview/onActionProcess.js
create mode 100644 entity/InboxFilterGroup_entity/entityfields/openadminview/stateProcess.js
create mode 100644 entity/KnowledgeManagement_entity/entityfields/openadminview/onActionProcess.js
create mode 100644 entity/KnowledgeManagement_entity/entityfields/openadminview/stateProcess.js
create mode 100644 entity/Leadimport_entity/entityfields/openadminview/onActionProcess.js
create mode 100644 entity/Leadimport_entity/entityfields/openadminview/stateProcess.js
create mode 100644 entity/Offeritem_entity/entityfields/openadminview/onActionProcess.js
create mode 100644 entity/Offeritem_entity/entityfields/openadminview/stateProcess.js
create mode 100644 entity/Orderitem_entity/entityfields/openadminview/onActionProcess.js
create mode 100644 entity/Orderitem_entity/entityfields/openadminview/stateProcess.js
create mode 100644 entity/Productprice_entity/entityfields/openadminview/onActionProcess.js
create mode 100644 entity/Productprice_entity/entityfields/openadminview/stateProcess.js
create mode 100644 entity/SalesprojectSource_entity/entityfields/openadminview/onActionProcess.js
create mode 100644 entity/SalesprojectSource_entity/entityfields/openadminview/stateProcess.js
create mode 100644 entity/Timetracking_entity/entityfields/openadminview/onActionProcess.js
create mode 100644 entity/Timetracking_entity/entityfields/openadminview/stateProcess.js
create mode 100644 entity/Weblink_entity/entityfields/openadminview/onActionProcess.js
create mode 100644 entity/Weblink_entity/entityfields/openadminview/stateProcess.js
diff --git a/.aditoprj/blueprints/Blueprint_ create Open Admin View Action.xml b/.aditoprj/blueprints/Blueprint_ create Open Admin View Action.xml
new file mode 100644
index 0000000000..3c54223f12
--- /dev/null
+++ b/.aditoprj/blueprints/Blueprint_ create Open Admin View Action.xml
@@ -0,0 +1,33 @@
+<?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 aa1f2ac812..2d98540b29 100644
--- a/entity/AdvertisingItem_entity/AdvertisingItem_entity.aod
+++ b/entity/AdvertisingItem_entity/AdvertisingItem_entity.aod
@@ -8,6 +8,15 @@
<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>
@@ -227,6 +236,10 @@
<name>OnlyDigital_param</name>
<expose v="true" />
</entityParameter>
+ <entityField>
+ <name>PICTURE</name>
+ <contentType>IMAGE</contentType>
+ </entityField>
</entityFields>
<recordContainers>
<dbRecordContainer>
@@ -320,6 +333,10 @@
<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
new file mode 100644
index 0000000000..40a7d88213
--- /dev/null
+++ b/entity/AdvertisingItem_entity/entityfields/openadminview/onActionProcess.js
@@ -0,0 +1,4 @@
+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
new file mode 100644
index 0000000000..38f2298db7
--- /dev/null
+++ b/entity/AdvertisingItem_entity/entityfields/openadminview/stateProcess.js
@@ -0,0 +1,4 @@
+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
new file mode 100644
index 0000000000..cc3052f7f7
--- /dev/null
+++ b/entity/AdvertisingItem_entity/recordcontainers/db/recordfieldmappings/picture.value/expression.js
@@ -0,0 +1,9 @@
+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/CampaignStep_entity/CampaignStep_entity.aod b/entity/CampaignStep_entity/CampaignStep_entity.aod
index a38be8ee20..66369d8d6f 100644
--- a/entity/CampaignStep_entity/CampaignStep_entity.aod
+++ b/entity/CampaignStep_entity/CampaignStep_entity.aod
@@ -272,20 +272,6 @@
</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>
@@ -340,12 +326,6 @@
<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" />
@@ -372,6 +352,39 @@
</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>
@@ -413,19 +426,15 @@
</entityActionField>
</children>
</entityActionGroup>
- <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>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>
</entityFields>
<recordContainers>
<dbRecordContainer>
diff --git a/entity/CampaignStep_entity/entityfields/openadminview/onActionProcess.js b/entity/CampaignStep_entity/entityfields/openadminview/onActionProcess.js
new file mode 100644
index 0000000000..58a9e2c742
--- /dev/null
+++ b/entity/CampaignStep_entity/entityfields/openadminview/onActionProcess.js
@@ -0,0 +1,9 @@
+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
new file mode 100644
index 0000000000..38f2298db7
--- /dev/null
+++ b/entity/CampaignStep_entity/entityfields/openadminview/stateProcess.js
@@ -0,0 +1,4 @@
+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 ee03291546..1e0c4a6ae6 100644
--- a/entity/CommunicationSettings_entity/CommunicationSettings_entity.aod
+++ b/entity/CommunicationSettings_entity/CommunicationSettings_entity.aod
@@ -10,6 +10,15 @@
<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
new file mode 100644
index 0000000000..a0c4826f36
--- /dev/null
+++ b/entity/CommunicationSettings_entity/entityfields/openadminview/onActionProcess.js
@@ -0,0 +1,9 @@
+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
new file mode 100644
index 0000000000..38f2298db7
--- /dev/null
+++ b/entity/CommunicationSettings_entity/entityfields/openadminview/stateProcess.js
@@ -0,0 +1,4 @@
+import("Context_lib");
+import("system.result");
+
+result.string(AdminViewUtils.getActionState());
\ No newline at end of file
diff --git a/entity/Competition_entity/Competition_entity.aod b/entity/Competition_entity/Competition_entity.aod
index b43f51cac2..ffda6e7ac7 100644
--- a/entity/Competition_entity/Competition_entity.aod
+++ b/entity/Competition_entity/Competition_entity.aod
@@ -7,6 +7,15 @@
<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
new file mode 100644
index 0000000000..aeba20d43a
--- /dev/null
+++ b/entity/Competition_entity/entityfields/openadminview/onActionProcess.js
@@ -0,0 +1,4 @@
+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
new file mode 100644
index 0000000000..38f2298db7
--- /dev/null
+++ b/entity/Competition_entity/entityfields/openadminview/stateProcess.js
@@ -0,0 +1,4 @@
+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 de4a3074d3..70e4dd249f 100644
--- a/entity/DescriptionTranslation_entity/DescriptionTranslation_entity.aod
+++ b/entity/DescriptionTranslation_entity/DescriptionTranslation_entity.aod
@@ -7,6 +7,15 @@
<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
new file mode 100644
index 0000000000..dddbe75128
--- /dev/null
+++ b/entity/DescriptionTranslation_entity/entityfields/openadminview/onActionProcess.js
@@ -0,0 +1,4 @@
+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
new file mode 100644
index 0000000000..38f2298db7
--- /dev/null
+++ b/entity/DescriptionTranslation_entity/entityfields/openadminview/stateProcess.js
@@ -0,0 +1,4 @@
+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 2d96b5aaf8..7ca780a9c5 100644
--- a/entity/EmployeeGroupRuleGroup_entity/EmployeeGroupRuleGroup_entity.aod
+++ b/entity/EmployeeGroupRuleGroup_entity/EmployeeGroupRuleGroup_entity.aod
@@ -9,6 +9,15 @@
<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
new file mode 100644
index 0000000000..5f0a79a73c
--- /dev/null
+++ b/entity/EmployeeGroupRuleGroup_entity/entityfields/openadminview/onActionProcess.js
@@ -0,0 +1,4 @@
+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
new file mode 100644
index 0000000000..38f2298db7
--- /dev/null
+++ b/entity/EmployeeGroupRuleGroup_entity/entityfields/openadminview/stateProcess.js
@@ -0,0 +1,4 @@
+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 da7a223f92..6db50550f1 100644
--- a/entity/EmployeeGroup_entity/EmployeeGroup_entity.aod
+++ b/entity/EmployeeGroup_entity/EmployeeGroup_entity.aod
@@ -11,6 +11,15 @@
<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
new file mode 100644
index 0000000000..373aa1c758
--- /dev/null
+++ b/entity/EmployeeGroup_entity/entityfields/openadminview/onActionProcess.js
@@ -0,0 +1,4 @@
+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
new file mode 100644
index 0000000000..38f2298db7
--- /dev/null
+++ b/entity/EmployeeGroup_entity/entityfields/openadminview/stateProcess.js
@@ -0,0 +1,4 @@
+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 8d2b49c8a0..a845f98af0 100644
--- a/entity/Forecast_entity/Forecast_entity.aod
+++ b/entity/Forecast_entity/Forecast_entity.aod
@@ -8,6 +8,15 @@
<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
new file mode 100644
index 0000000000..ede0edc248
--- /dev/null
+++ b/entity/Forecast_entity/entityfields/openadminview/onActionProcess.js
@@ -0,0 +1,4 @@
+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
new file mode 100644
index 0000000000..38f2298db7
--- /dev/null
+++ b/entity/Forecast_entity/entityfields/openadminview/stateProcess.js
@@ -0,0 +1,4 @@
+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 e5c6a604f7..185136b037 100644
--- a/entity/InboxFilterGroup_entity/InboxFilterGroup_entity.aod
+++ b/entity/InboxFilterGroup_entity/InboxFilterGroup_entity.aod
@@ -9,6 +9,15 @@
<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
new file mode 100644
index 0000000000..8aac896af8
--- /dev/null
+++ b/entity/InboxFilterGroup_entity/entityfields/openadminview/onActionProcess.js
@@ -0,0 +1,4 @@
+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
new file mode 100644
index 0000000000..38f2298db7
--- /dev/null
+++ b/entity/InboxFilterGroup_entity/entityfields/openadminview/stateProcess.js
@@ -0,0 +1,4 @@
+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 2bafd40619..afd4fddddb 100644
--- a/entity/KnowledgeManagement_entity/KnowledgeManagement_entity.aod
+++ b/entity/KnowledgeManagement_entity/KnowledgeManagement_entity.aod
@@ -190,15 +190,6 @@
</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" />
@@ -233,13 +224,6 @@
</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" />
@@ -336,6 +320,31 @@
<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
new file mode 100644
index 0000000000..3de6125557
--- /dev/null
+++ b/entity/KnowledgeManagement_entity/entityfields/openadminview/onActionProcess.js
@@ -0,0 +1,9 @@
+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
new file mode 100644
index 0000000000..38f2298db7
--- /dev/null
+++ b/entity/KnowledgeManagement_entity/entityfields/openadminview/stateProcess.js
@@ -0,0 +1,4 @@
+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 17162d2042..89a26a5efd 100644
--- a/entity/Leadimport_entity/Leadimport_entity.aod
+++ b/entity/Leadimport_entity/Leadimport_entity.aod
@@ -19,27 +19,6 @@
<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>
@@ -85,16 +64,6 @@
<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>
@@ -253,13 +222,6 @@
<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>
@@ -271,14 +233,6 @@
<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>
@@ -321,14 +275,6 @@
</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>
@@ -351,6 +297,60 @@
<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,6 +358,15 @@
<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
new file mode 100644
index 0000000000..448c71a6fd
--- /dev/null
+++ b/entity/Leadimport_entity/entityfields/openadminview/onActionProcess.js
@@ -0,0 +1,9 @@
+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
new file mode 100644
index 0000000000..38f2298db7
--- /dev/null
+++ b/entity/Leadimport_entity/entityfields/openadminview/stateProcess.js
@@ -0,0 +1,4 @@
+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 f643a48c17..704a47ff9e 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>
- <expression>%aditoprj%/entity/Member_entity/recordcontainers/db/recordfieldmappings/organisation_id.displayvalue/expression.js</expression>
+ <recordfield>ORGANISATION.NAME</recordfield>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>TARGET_ID.value</name>
diff --git a/entity/Offer_entity/Offer_entity.aod b/entity/Offer_entity/Offer_entity.aod
index 06cc973024..ec69db13db 100644
--- a/entity/Offer_entity/Offer_entity.aod
+++ b/entity/Offer_entity/Offer_entity.aod
@@ -18,17 +18,6 @@
<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>
@@ -1075,6 +1064,17 @@
<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,6 +1175,12 @@
<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>
@@ -1182,12 +1188,6 @@
<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 87a0d3f6ca..e5bf6cab9b 100644
--- a/entity/Offeritem_entity/Offeritem_entity.aod
+++ b/entity/Offeritem_entity/Offeritem_entity.aod
@@ -13,6 +13,15 @@
<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
new file mode 100644
index 0000000000..ab3b242df4
--- /dev/null
+++ b/entity/Offeritem_entity/entityfields/openadminview/onActionProcess.js
@@ -0,0 +1,4 @@
+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
new file mode 100644
index 0000000000..38f2298db7
--- /dev/null
+++ b/entity/Offeritem_entity/entityfields/openadminview/stateProcess.js
@@ -0,0 +1,4 @@
+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 b6f5ec9513..01b182c6ed 100644
--- a/entity/Orderitem_entity/Orderitem_entity.aod
+++ b/entity/Orderitem_entity/Orderitem_entity.aod
@@ -244,25 +244,6 @@
<name>Discount_param</name>
<expose v="true" />
</entityParameter>
- <entityActionGroup>
- <name>group</name>
- <children>
- <entityActionField>
- <name>moveUp</name>
- <onActionProcess>%aditoprj%/entity/Orderitem_entity/entityfields/group/children/moveup/onActionProcess.js</onActionProcess>
- <iconId>VAADIN:ARROW_UP</iconId>
- <state>DISABLED</state>
- <stateProcess>%aditoprj%/entity/Orderitem_entity/entityfields/group/children/moveup/stateProcess.js</stateProcess>
- </entityActionField>
- <entityActionField>
- <name>moveDown</name>
- <onActionProcess>%aditoprj%/entity/Orderitem_entity/entityfields/group/children/movedown/onActionProcess.js</onActionProcess>
- <iconId>VAADIN:ARROW_DOWN</iconId>
- <state>DISABLED</state>
- <stateProcess>%aditoprj%/entity/Orderitem_entity/entityfields/group/children/movedown/stateProcess.js</stateProcess>
- </entityActionField>
- </children>
- </entityActionGroup>
<entityParameter>
<name>IgnoreOnUpdateProcess_param</name>
<expose v="true" />
@@ -282,6 +263,34 @@
<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>
+ <entityActionField>
+ <name>moveUp</name>
+ <onActionProcess>%aditoprj%/entity/Orderitem_entity/entityfields/group/children/moveup/onActionProcess.js</onActionProcess>
+ <iconId>VAADIN:ARROW_UP</iconId>
+ <state>DISABLED</state>
+ <stateProcess>%aditoprj%/entity/Orderitem_entity/entityfields/group/children/moveup/stateProcess.js</stateProcess>
+ </entityActionField>
+ <entityActionField>
+ <name>moveDown</name>
+ <onActionProcess>%aditoprj%/entity/Orderitem_entity/entityfields/group/children/movedown/onActionProcess.js</onActionProcess>
+ <iconId>VAADIN:ARROW_DOWN</iconId>
+ <state>DISABLED</state>
+ <stateProcess>%aditoprj%/entity/Orderitem_entity/entityfields/group/children/movedown/stateProcess.js</stateProcess>
+ </entityActionField>
+ </children>
+ </entityActionGroup>
</entityFields>
<recordContainers>
<dbRecordContainer>
diff --git a/entity/Orderitem_entity/entityfields/openadminview/onActionProcess.js b/entity/Orderitem_entity/entityfields/openadminview/onActionProcess.js
new file mode 100644
index 0000000000..c5d14a4625
--- /dev/null
+++ b/entity/Orderitem_entity/entityfields/openadminview/onActionProcess.js
@@ -0,0 +1,4 @@
+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
new file mode 100644
index 0000000000..38f2298db7
--- /dev/null
+++ b/entity/Orderitem_entity/entityfields/openadminview/stateProcess.js
@@ -0,0 +1,4 @@
+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 d6d327120e..28c9d627a0 100644
--- a/entity/Organisation_entity/Organisation_entity.aod
+++ b/entity/Organisation_entity/Organisation_entity.aod
@@ -17,27 +17,6 @@
<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>
@@ -1073,6 +1052,212 @@
</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>
@@ -1276,6 +1461,12 @@
</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>
@@ -1283,197 +1474,6 @@
<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/Person_entity/Person_entity.aod b/entity/Person_entity/Person_entity.aod
index 0e71f6701c..74b6490d99 100644
--- a/entity/Person_entity/Person_entity.aod
+++ b/entity/Person_entity/Person_entity.aod
@@ -23,27 +23,6 @@
<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>
@@ -1046,6 +1025,179 @@
<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>
@@ -1224,6 +1376,12 @@
<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>
@@ -1231,164 +1389,6 @@
<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/Product_entity/Product_entity.aod b/entity/Product_entity/Product_entity.aod
index 39548637b3..829be6254e 100644
--- a/entity/Product_entity/Product_entity.aod
+++ b/entity/Product_entity/Product_entity.aod
@@ -17,27 +17,6 @@
<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>
@@ -289,14 +268,6 @@
</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>
@@ -333,12 +304,6 @@
</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>
@@ -432,13 +397,6 @@
</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>
@@ -475,23 +433,6 @@
</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" />
@@ -550,6 +491,65 @@
<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 7506bf9416..b1a19a1a30 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"), "DATE"],
- ["USER_EDIT", vars.get("$field.USER_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/Productprice_entity/Productprice_entity.aod b/entity/Productprice_entity/Productprice_entity.aod
index 177b09df41..ac4a52efd1 100644
--- a/entity/Productprice_entity/Productprice_entity.aod
+++ b/entity/Productprice_entity/Productprice_entity.aod
@@ -13,6 +13,15 @@
<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
new file mode 100644
index 0000000000..c873db0487
--- /dev/null
+++ b/entity/Productprice_entity/entityfields/openadminview/onActionProcess.js
@@ -0,0 +1,4 @@
+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
new file mode 100644
index 0000000000..38f2298db7
--- /dev/null
+++ b/entity/Productprice_entity/entityfields/openadminview/stateProcess.js
@@ -0,0 +1,4 @@
+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 f7de40bbdd..efe41aff7e 100644
--- a/entity/SalesprojectSource_entity/SalesprojectSource_entity.aod
+++ b/entity/SalesprojectSource_entity/SalesprojectSource_entity.aod
@@ -8,6 +8,15 @@
<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
new file mode 100644
index 0000000000..4a89348d35
--- /dev/null
+++ b/entity/SalesprojectSource_entity/entityfields/openadminview/onActionProcess.js
@@ -0,0 +1,4 @@
+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
new file mode 100644
index 0000000000..38f2298db7
--- /dev/null
+++ b/entity/SalesprojectSource_entity/entityfields/openadminview/stateProcess.js
@@ -0,0 +1,4 @@
+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 b677647150..2899fb100c 100644
--- a/entity/Salesproject_entity/Salesproject_entity.aod
+++ b/entity/Salesproject_entity/Salesproject_entity.aod
@@ -747,81 +747,6 @@
</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>
@@ -860,12 +785,6 @@
</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" />
@@ -908,6 +827,87 @@
<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 246f5181a4..304a766b56 100644
--- a/entity/Salesproject_entity/entityfields/openadminview/onActionProcess.js
+++ b/entity/Salesproject_entity/entityfields/openadminview/onActionProcess.js
@@ -2,5 +2,9 @@ import("system.vars");
import("Context_lib");
AdminViewUtils.open("SALESPROJECTID", [
- ["CONTACT_ID", vars.get("$field.CONTACT_ID")]
-]);
\ No newline at end of file
+ ["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
diff --git a/entity/Timetracking_entity/Timetracking_entity.aod b/entity/Timetracking_entity/Timetracking_entity.aod
index 8422d4687a..c9603811b1 100644
--- a/entity/Timetracking_entity/Timetracking_entity.aod
+++ b/entity/Timetracking_entity/Timetracking_entity.aod
@@ -7,6 +7,15 @@
<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
new file mode 100644
index 0000000000..1931d99268
--- /dev/null
+++ b/entity/Timetracking_entity/entityfields/openadminview/onActionProcess.js
@@ -0,0 +1,4 @@
+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
new file mode 100644
index 0000000000..38f2298db7
--- /dev/null
+++ b/entity/Timetracking_entity/entityfields/openadminview/stateProcess.js
@@ -0,0 +1,4 @@
+import("Context_lib");
+import("system.result");
+
+result.string(AdminViewUtils.getActionState());
\ No newline at end of file
diff --git a/entity/Weblink_entity/Weblink_entity.aod b/entity/Weblink_entity/Weblink_entity.aod
index 3de5e57011..4ef1da7f5a 100644
--- a/entity/Weblink_entity/Weblink_entity.aod
+++ b/entity/Weblink_entity/Weblink_entity.aod
@@ -11,6 +11,15 @@
<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
new file mode 100644
index 0000000000..89543fe00f
--- /dev/null
+++ b/entity/Weblink_entity/entityfields/openadminview/onActionProcess.js
@@ -0,0 +1,4 @@
+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
new file mode 100644
index 0000000000..38f2298db7
--- /dev/null
+++ b/entity/Weblink_entity/entityfields/openadminview/stateProcess.js
@@ -0,0 +1,4 @@
+import("Context_lib");
+import("system.result");
+
+result.string(AdminViewUtils.getActionState());
\ No newline at end of file
diff --git a/neonView/AdvertisingItemFilter_view/AdvertisingItemFilter_view.aod b/neonView/AdvertisingItemFilter_view/AdvertisingItemFilter_view.aod
index 7c05fd6bd4..82ec636d8e 100644
--- a/neonView/AdvertisingItemFilter_view/AdvertisingItemFilter_view.aod
+++ b/neonView/AdvertisingItemFilter_view/AdvertisingItemFilter_view.aod
@@ -11,6 +11,10 @@
<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 fdca083a04..081f013506 100644
--- a/neonView/AdvertisingItemPreview_view/AdvertisingItemPreview_view.aod
+++ b/neonView/AdvertisingItemPreview_view/AdvertisingItemPreview_view.aod
@@ -8,22 +8,20 @@
</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 392578f715..569ec21714 100644
--- a/neonView/AdvertisingItemSmallFilter_view/AdvertisingItemSmallFilter_view.aod
+++ b/neonView/AdvertisingItemSmallFilter_view/AdvertisingItemSmallFilter_view.aod
@@ -12,6 +12,10 @@
<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 687114627b..6bda8f376d 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>PICTURE</iconField>
+ <iconField>#IMAGE</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 cc2f0edd78..7ec45a3f4a 100644
--- a/neonView/SalesprojectSourcePreview_view/SalesprojectSourcePreview_view.aod
+++ b/neonView/SalesprojectSourcePreview_view/SalesprojectSourcePreview_view.aod
@@ -11,6 +11,7 @@
<children>
<cardViewTemplate>
<name>Header</name>
+ <iconField>ICON</iconField>
<titleField>TOUCHPOINT</titleField>
<descriptionField>ENTRYDATE</descriptionField>
<entityField>#ENTITY</entityField>
--
GitLab