diff --git a/.aditoprj/project.version b/.aditoprj/project.version
index 7c31c19a75999c69a878cd440f2c0ecd93d16f5b..7575f2bdceeea11d07df2726a45be64b21ca4149 100644
--- a/.aditoprj/project.version
+++ b/.aditoprj/project.version
@@ -1,4 +1,4 @@
#This file is generated by ADITO designer. Do NOT delete or modify!
-#Wed Feb 06 07:12:44 CET 2019
+#Mon Feb 04 13:21:44 CET 2019
version=5.1.8
diff --git a/aliasDefinition/Data_alias/Data_alias.aod b/aliasDefinition/Data_alias/Data_alias.aod
index 98e773860af1ec014b8ecf9bbcab91ff7691021f..5f3eba59f8df97f32531209db9ad4f853e94d018 100644
--- a/aliasDefinition/Data_alias/Data_alias.aod
+++ b/aliasDefinition/Data_alias/Data_alias.aod
@@ -5939,7 +5939,7 @@
<descriptionColumn>DESCCOLUMN</descriptionColumn>
<query>%aditoprj%/aliasDefinition/Data_alias/indexsearchgroups/org/query.js</query>
<subQueries>%aditoprj%/aliasDefinition/Data_alias/indexsearchgroups/org/subQueries.js</subQueries>
- <resultContextNeon>Org_context</resultContextNeon>
+ <resultContextNeon>Organisation_context</resultContextNeon>
<affectedTables>
<element>ADDRESS</element>
<element>COMM</element>
@@ -5957,7 +5957,7 @@
<descriptionColumn>DESCCOLUMN</descriptionColumn>
<query>%aditoprj%/aliasDefinition/Data_alias/indexsearchgroups/pers/query.js</query>
<subQueries>%aditoprj%/aliasDefinition/Data_alias/indexsearchgroups/pers/subQueries.js</subQueries>
- <resultContextNeon>Pers_context</resultContextNeon>
+ <resultContextNeon>Contact_context</resultContextNeon>
<affectedTables>
<element>ADDRESS</element>
<element>COMM</element>
diff --git a/application/_____SYSTEM_APPLICATION_NEON/_____SYSTEM_APPLICATION_NEON.aod b/application/_____SYSTEM_APPLICATION_NEON/_____SYSTEM_APPLICATION_NEON.aod
index 520211cda6a8a5d8a41811d4909bce0bfdea0f2b..a6d7ef279293bbd90ea240b4fc5358f59e057f8a 100644
--- a/application/_____SYSTEM_APPLICATION_NEON/_____SYSTEM_APPLICATION_NEON.aod
+++ b/application/_____SYSTEM_APPLICATION_NEON/_____SYSTEM_APPLICATION_NEON.aod
@@ -6,8 +6,8 @@
<node name="CONTACTS" kind="123" title="Contactmanagement">
<icon>VAADIN:STAR</icon>
<node name="Group1" kind="123" title="">
- <node name="Pers_context" kind="10077" />
- <node name="Org_context" kind="10077" />
+ <node name="Contact_context" kind="10077" />
+ <node name="Organisation_context" kind="10077" />
<node name="Activity_context" kind="10077" />
<node name="Task_context" kind="10077" />
<node name="INTERNAL_ADMINISTRATOR" kind="159" />
@@ -30,6 +30,7 @@
<icon>VAADIN:CONTROLLER</icon>
<node name="Group3" kind="123" title="">
<node name="Attribute_context" kind="10077" />
+ <node name="Keyword_context" kind="10077" />
<node name="INTERNAL_ADMINISTRATOR" kind="159" />
</node>
</node>
diff --git a/entity/ActivityLink_entity/ActivityLink_entity.aod b/entity/ActivityLink_entity/ActivityLink_entity.aod
index 280145ea2ff4c718bf074865a013f6ecb00c25bf..ab6387e257882a62cb5bbf18ba4d042b921690ba 100644
--- a/entity/ActivityLink_entity/ActivityLink_entity.aod
+++ b/entity/ActivityLink_entity/ActivityLink_entity.aod
@@ -58,7 +58,7 @@
<entityDependency>
<name>73dec28e-1c16-4b09-a665-8db44201d317</name>
<entityName>Activity_entity</entityName>
- <fieldName>ActivityLink_dfo</fieldName>
+ <fieldName>Links</fieldName>
<isConsumer v="false" />
</entityDependency>
</dependencies>
diff --git a/entity/Activity_entity/Activity_entity.aod b/entity/Activity_entity/Activity_entity.aod
index efd90edcb4a8e7676a015b64e53f9a5207a7c9ea..e44e8acaa649948888f8106e72e43b924f913039 100644
--- a/entity/Activity_entity/Activity_entity.aod
+++ b/entity/Activity_entity/Activity_entity.aod
@@ -46,19 +46,6 @@
<mandatory v="true" />
<groupable v="false" />
</entityField>
- <entityProvider>
- <name>OrgActivity_dfi</name>
- <fieldType>DEPENDENCY_IN</fieldType>
- <recordContainer>db</recordContainer>
- <dependencies>
- <entityDependency>
- <name>82a86ae6-5814-40f9-9fa2-5c8d754c9bc7</name>
- <entityName>Org_entity</entityName>
- <fieldName>OrgActivity_dfo</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
- </entityProvider>
<entityParameter>
<name>RowId_param</name>
<expose v="true" />
@@ -66,19 +53,6 @@
<mandatory v="false" />
<description>PARAMETER</description>
</entityParameter>
- <entityProvider>
- <name>PersActivity_dfi</name>
- <fieldType>DEPENDENCY_IN</fieldType>
- <recordContainer>db</recordContainer>
- <dependencies>
- <entityDependency>
- <name>8931861c-bc1b-4545-a472-2020e2ca72e2</name>
- <entityName>Pers_entity</entityName>
- <fieldName>PersActivity_dfo</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
- </entityProvider>
<entityField>
<name>USER_NEW</name>
<searchable v="false" />
@@ -98,40 +72,15 @@
<contentType>IMAGE</contentType>
<valueProcess>%aditoprj%/entity/Activity_entity/entityfields/direction_icon/valueProcess.js</valueProcess>
</entityField>
- <entityProvider>
- <name>ContractActivity_dfi</name>
- <fieldType>DEPENDENCY_IN</fieldType>
- <recordContainer>db</recordContainer>
- <dependencies>
- <entityDependency>
- <name>f47157d9-0cb6-4bcf-a485-08675bd957ee</name>
- <entityName>Contract_entity</entityName>
- <fieldName>ContractActivity_dfo</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
- </entityProvider>
<entityProvider>
<name>#PROVIDER</name>
+ <recordContainer>db</recordContainer>
</entityProvider>
<entityField>
<name>ICON</name>
<contentType>IMAGE</contentType>
<valueProcess>%aditoprj%/entity/Activity_entity/entityfields/icon/valueProcess.js</valueProcess>
</entityField>
- <entityProvider>
- <name>SalesprojectActivity_dfi</name>
- <fieldType>DEPENDENCY_IN</fieldType>
- <recordContainer>db</recordContainer>
- <dependencies>
- <entityDependency>
- <name>261bcfe4-1317-4933-9e85-d25848268b47</name>
- <entityName>Salesproject_entity</entityName>
- <fieldName>SalesprojectActivity_dfo</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
- </entityProvider>
<entityParameter>
<name>OnlyInnate_param</name>
<title>Nur Eigene anzeigen</title>
@@ -156,7 +105,7 @@
<documentation>%aditoprj%/entity/Activity_entity/entityfields/objectid_param/documentation.adoc</documentation>
</entityParameter>
<entityConsumer>
- <name>ActivityDocument_dfo</name>
+ <name>AllDocuments</name>
<title>Documents</title>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
@@ -167,20 +116,20 @@
<children>
<entityParameter>
<name>AssignmentName_param</name>
- <code>%aditoprj%/entity/Activity_entity/entityfields/activitydocument_dfo/children/assignmentname_param/code.js</code>
+ <code>%aditoprj%/entity/Activity_entity/entityfields/alldocuments/children/assignmentname_param/code.js</code>
</entityParameter>
<entityParameter>
<name>AssignmentRowId_param</name>
- <code>%aditoprj%/entity/Activity_entity/entityfields/activitydocument_dfo/children/assignmentrowid_param/code.js</code>
+ <code>%aditoprj%/entity/Activity_entity/entityfields/alldocuments/children/assignmentrowid_param/code.js</code>
</entityParameter>
<entityParameter>
<name>AssignmentTable_param</name>
- <code>%aditoprj%/entity/Activity_entity/entityfields/activitydocument_dfo/children/assignmenttable_param/code.js</code>
+ <code>%aditoprj%/entity/Activity_entity/entityfields/alldocuments/children/assignmenttable_param/code.js</code>
</entityParameter>
</children>
</entityConsumer>
<entityConsumer>
- <name>ActivityMainDocument_dfo</name>
+ <name>MainDocuments</name>
<title>Maindocuments</title>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
@@ -191,19 +140,19 @@
<children>
<entityParameter>
<name>Keyword_param</name>
- <code>%aditoprj%/entity/Activity_entity/entityfields/activitymaindocument_dfo/children/keyword_param/code.js</code>
+ <code>%aditoprj%/entity/Activity_entity/entityfields/maindocuments/children/keyword_param/code.js</code>
</entityParameter>
<entityParameter>
<name>AssignmentTable_param</name>
- <code>%aditoprj%/entity/Activity_entity/entityfields/activitymaindocument_dfo/children/assignmenttable_param/code.js</code>
+ <code>%aditoprj%/entity/Activity_entity/entityfields/maindocuments/children/assignmenttable_param/code.js</code>
</entityParameter>
<entityParameter>
<name>AssignmentRowId_param</name>
- <code>%aditoprj%/entity/Activity_entity/entityfields/activitymaindocument_dfo/children/assignmentrowid_param/code.js</code>
+ <code>%aditoprj%/entity/Activity_entity/entityfields/maindocuments/children/assignmentrowid_param/code.js</code>
</entityParameter>
<entityParameter>
<name>AssignmentName_param</name>
- <code>%aditoprj%/entity/Activity_entity/entityfields/activitymaindocument_dfo/children/assignmentname_param/code.js</code>
+ <code>%aditoprj%/entity/Activity_entity/entityfields/maindocuments/children/assignmentname_param/code.js</code>
</entityParameter>
</children>
</entityConsumer>
@@ -225,7 +174,7 @@
<description>PARAMETER</description>
</entityParameter>
<entityConsumer>
- <name>ActivityObjectRelation_dfo</name>
+ <name>ObjectRelations</name>
<title>Relations</title>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
@@ -236,16 +185,16 @@
<children>
<entityParameter>
<name>Object1Rowid_param</name>
- <code>%aditoprj%/entity/Activity_entity/entityfields/activityobjectrelation_dfo/children/object1rowid_param/code.js</code>
+ <code>%aditoprj%/entity/Activity_entity/entityfields/objectrelations/children/object1rowid_param/code.js</code>
</entityParameter>
<entityParameter>
<name>Object1Type_param</name>
- <code>%aditoprj%/entity/Activity_entity/entityfields/activityobjectrelation_dfo/children/object1type_param/code.js</code>
+ <code>%aditoprj%/entity/Activity_entity/entityfields/objectrelations/children/object1type_param/code.js</code>
</entityParameter>
</children>
</entityConsumer>
<entityConsumer>
- <name>ActivityLink_dfo</name>
+ <name>Links</name>
<title>Beziehungen</title>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
@@ -256,11 +205,11 @@
<children>
<entityParameter>
<name>ObjectRowid_param</name>
- <code>%aditoprj%/entity/Activity_entity/entityfields/activitylink_dfo/children/objectrowid_param/code.js</code>
+ <code>%aditoprj%/entity/Activity_entity/entityfields/links/children/objectrowid_param/code.js</code>
</entityParameter>
<entityParameter>
<name>ObjectType_param</name>
- <code>%aditoprj%/entity/Activity_entity/entityfields/activitylink_dfo/children/objecttype_param/code.js</code>
+ <code>%aditoprj%/entity/Activity_entity/entityfields/links/children/objecttype_param/code.js</code>
</entityParameter>
</children>
</entityConsumer>
@@ -279,6 +228,49 @@
</entityParameter>
</children>
</entityConsumer>
+ <entityProvider>
+ <name>LinkedObjects</name>
+ <fieldType>DEPENDENCY_IN</fieldType>
+ <documentation>%aditoprj%/entity/Activity_entity/entityfields/linkedobjects/documentation.adoc</documentation>
+ <recordContainer>db</recordContainer>
+ <dependencies>
+ <entityDependency>
+ <name>8ececf30-a3bc-4cd2-ad04-fb9f3cb9332d</name>
+ <entityName>Salesproject_entity</entityName>
+ <fieldName>Activities</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>549af7f6-3828-4c15-8357-72f0c6fc4f0c</name>
+ <entityName>Contract_entity</entityName>
+ <fieldName>ContractActivity_dfo</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>49a91b21-f24e-45c6-9b2c-5bb15d808d43</name>
+ <entityName>Organisation_entity</entityName>
+ <fieldName>Activities</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>6461d7f4-182f-4e5c-9453-49c145e15476</name>
+ <entityName>Contact_entity</entityName>
+ <fieldName>Activities</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ </dependencies>
+ <children>
+ <entityParameter>
+ <name>ActivityId_param</name>
+ <expose v="false" />
+ </entityParameter>
+ <entityParameter>
+ <name>OnlyInnate_param</name>
+ <expose v="false" />
+ <documentation>%aditoprj%/entity/Activity_entity/entityfields/linkedobjects/children/onlyinnate_param/documentation.adoc</documentation>
+ </entityParameter>
+ </children>
+ </entityProvider>
</entityFields>
<recordContainers>
<dbRecordContainer>
diff --git a/entity/Activity_entity/entityfields/activitydocument_dfo/children/assignmentname_param/code.js b/entity/Activity_entity/entityfields/alldocuments/children/assignmentname_param/code.js
similarity index 100%
rename from entity/Activity_entity/entityfields/activitydocument_dfo/children/assignmentname_param/code.js
rename to entity/Activity_entity/entityfields/alldocuments/children/assignmentname_param/code.js
diff --git a/entity/Activity_entity/entityfields/activitydocument_dfo/children/assignmentrowid_param/code.js b/entity/Activity_entity/entityfields/alldocuments/children/assignmentrowid_param/code.js
similarity index 100%
rename from entity/Activity_entity/entityfields/activitydocument_dfo/children/assignmentrowid_param/code.js
rename to entity/Activity_entity/entityfields/alldocuments/children/assignmentrowid_param/code.js
diff --git a/entity/Activity_entity/entityfields/activitydocument_dfo/children/assignmenttable_param/code.js b/entity/Activity_entity/entityfields/alldocuments/children/assignmenttable_param/code.js
similarity index 100%
rename from entity/Activity_entity/entityfields/activitydocument_dfo/children/assignmenttable_param/code.js
rename to entity/Activity_entity/entityfields/alldocuments/children/assignmenttable_param/code.js
diff --git a/entity/Activity_entity/entityfields/linkedobjects/children/onlyinnate_param/documentation.adoc b/entity/Activity_entity/entityfields/linkedobjects/children/onlyinnate_param/documentation.adoc
new file mode 100644
index 0000000000000000000000000000000000000000..abd18febe748f73d214ba89835a2abf043029c79
--- /dev/null
+++ b/entity/Activity_entity/entityfields/linkedobjects/children/onlyinnate_param/documentation.adoc
@@ -0,0 +1 @@
+The `OnlyInnate_param` specifies a filter where only own records (records you created) are displayed.
\ No newline at end of file
diff --git a/entity/Activity_entity/entityfields/linkedobjects/documentation.adoc b/entity/Activity_entity/entityfields/linkedobjects/documentation.adoc
new file mode 100644
index 0000000000000000000000000000000000000000..028aca9658879ec0a70be660d43f3b4c1aa5c3be
--- /dev/null
+++ b/entity/Activity_entity/entityfields/linkedobjects/documentation.adoc
@@ -0,0 +1,2 @@
+Provides records via ActivityLinks.
+Every Activity can have 0..n link-records. This provider can be used to retrieve Activity Records from another object that is linkable.(e.g. get all Activites of a specific contactperson)
\ No newline at end of file
diff --git a/entity/Activity_entity/entityfields/activitylink_dfo/children/objectrowid_param/code.js b/entity/Activity_entity/entityfields/links/children/objectrowid_param/code.js
similarity index 100%
rename from entity/Activity_entity/entityfields/activitylink_dfo/children/objectrowid_param/code.js
rename to entity/Activity_entity/entityfields/links/children/objectrowid_param/code.js
diff --git a/entity/Activity_entity/entityfields/activitylink_dfo/children/objecttype_param/code.js b/entity/Activity_entity/entityfields/links/children/objecttype_param/code.js
similarity index 100%
rename from entity/Activity_entity/entityfields/activitylink_dfo/children/objecttype_param/code.js
rename to entity/Activity_entity/entityfields/links/children/objecttype_param/code.js
diff --git a/entity/Activity_entity/entityfields/activitymaindocument_dfo/children/assignmentname_param/code.js b/entity/Activity_entity/entityfields/maindocuments/children/assignmentname_param/code.js
similarity index 100%
rename from entity/Activity_entity/entityfields/activitymaindocument_dfo/children/assignmentname_param/code.js
rename to entity/Activity_entity/entityfields/maindocuments/children/assignmentname_param/code.js
diff --git a/entity/Activity_entity/entityfields/activitymaindocument_dfo/children/assignmentrowid_param/code.js b/entity/Activity_entity/entityfields/maindocuments/children/assignmentrowid_param/code.js
similarity index 100%
rename from entity/Activity_entity/entityfields/activitymaindocument_dfo/children/assignmentrowid_param/code.js
rename to entity/Activity_entity/entityfields/maindocuments/children/assignmentrowid_param/code.js
diff --git a/entity/Activity_entity/entityfields/activitymaindocument_dfo/children/assignmenttable_param/code.js b/entity/Activity_entity/entityfields/maindocuments/children/assignmenttable_param/code.js
similarity index 100%
rename from entity/Activity_entity/entityfields/activitymaindocument_dfo/children/assignmenttable_param/code.js
rename to entity/Activity_entity/entityfields/maindocuments/children/assignmenttable_param/code.js
diff --git a/entity/Activity_entity/entityfields/activitymaindocument_dfo/children/keyword_param/code.js b/entity/Activity_entity/entityfields/maindocuments/children/keyword_param/code.js
similarity index 100%
rename from entity/Activity_entity/entityfields/activitymaindocument_dfo/children/keyword_param/code.js
rename to entity/Activity_entity/entityfields/maindocuments/children/keyword_param/code.js
diff --git a/entity/Activity_entity/entityfields/activityobjectrelation_dfo/children/object1rowid_param/code.js b/entity/Activity_entity/entityfields/objectrelations/children/object1rowid_param/code.js
similarity index 100%
rename from entity/Activity_entity/entityfields/activityobjectrelation_dfo/children/object1rowid_param/code.js
rename to entity/Activity_entity/entityfields/objectrelations/children/object1rowid_param/code.js
diff --git a/entity/Activity_entity/entityfields/activityobjectrelation_dfo/children/object1type_param/code.js b/entity/Activity_entity/entityfields/objectrelations/children/object1type_param/code.js
similarity index 100%
rename from entity/Activity_entity/entityfields/activityobjectrelation_dfo/children/object1type_param/code.js
rename to entity/Activity_entity/entityfields/objectrelations/children/object1type_param/code.js
diff --git a/entity/Address_entity/Address_entity.aod b/entity/Address_entity/Address_entity.aod
index 5fa111d9d5e845ec1111aec925dca6e293a567c2..4b476ec1fb5a59d700f46fe683ea1eb879a2aa1a 100644
--- a/entity/Address_entity/Address_entity.aod
+++ b/entity/Address_entity/Address_entity.aod
@@ -40,7 +40,7 @@
<entityField>
<name>COUNTRY</name>
<title>Country</title>
- <consumer>Countries_dfo</consumer>
+ <consumer>Countries</consumer>
<mandatory v="true" />
<displayValueProcess>%aditoprj%/entity/Address_entity/entityfields/country/displayValueProcess.js</displayValueProcess>
</entityField>
@@ -91,8 +91,8 @@
<dependencies>
<entityDependency>
<name>b484b43c-16f6-4875-9787-f0813dd200cb</name>
- <entityName>Org_entity</entityName>
- <fieldName>OrgAddress_dfo</fieldName>
+ <entityName>Organisation_entity</entityName>
+ <fieldName>Addresses</fieldName>
<isConsumer v="false" />
</entityDependency>
</dependencies>
@@ -109,8 +109,8 @@
<dependencies>
<entityDependency>
<name>efdb2f19-ab41-4f49-941a-843610e2b31b</name>
- <entityName>Pers_entity</entityName>
- <fieldName>PersAddress_dfo</fieldName>
+ <entityName>Contact_entity</entityName>
+ <fieldName>PersAddresses</fieldName>
<isConsumer v="false" />
</entityDependency>
</dependencies>
@@ -119,7 +119,7 @@
<name>#PROVIDER</name>
</entityProvider>
<entityConsumer>
- <name>Countries_dfo</name>
+ <name>Countries</name>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
<name>dependency</name>
@@ -135,8 +135,8 @@
<dependencies>
<entityDependency>
<name>388f6ad3-b817-4dc0-a5d5-a41eec485357</name>
- <entityName>Pers_entity</entityName>
- <fieldName>PersOrgsAddresses_dfo</fieldName>
+ <entityName>Contact_entity</entityName>
+ <fieldName>OrgAddresses</fieldName>
<isConsumer v="false" />
</entityDependency>
</dependencies>
@@ -151,6 +151,7 @@
<name>DefaultAddressId_param</name>
<expose v="true" />
<triggerRecalculation v="false" />
+ <mandatory v="false" />
<documentation>%aditoprj%/entity/Address_entity/entityfields/defaultaddressid_param/documentation.adoc</documentation>
<description>provide a ADDRESSID-value of the standard address (of a RELATION)</description>
</entityParameter>
diff --git a/entity/Address_entity/entityfields/defaultaddressid_param/documentation.adoc b/entity/Address_entity/entityfields/defaultaddressid_param/documentation.adoc
index d54b66e0afdacbc26f4fcf8de43ac3fef0892275..b39ad624e74fdee023f15e568e634d7edf1b2f82 100644
--- a/entity/Address_entity/entityfields/defaultaddressid_param/documentation.adoc
+++ b/entity/Address_entity/entityfields/defaultaddressid_param/documentation.adoc
@@ -1,3 +1,4 @@
`ADDRESSID`-value that specifies which ADDRESSID` is the standard addess of a record. [.small]#See: `IS_STANDARD` field#
-There is no validation if the provided value is actually the value of an standard address or a valid `ADDRESSID` at all.
\ No newline at end of file
+There is no validation if the provided value is actually the value of an standard address or a valid `ADDRESSID` at all.
+This param enables a fast determination of the standard-address-flag.
\ No newline at end of file
diff --git a/entity/AttributeRelation_entity/AttributeRelation_entity.aod b/entity/AttributeRelation_entity/AttributeRelation_entity.aod
index fa91146136f1fa16015a17877c156816cad8d676..e16646151f6462f7568f02b64baae4573e96ada5 100644
--- a/entity/AttributeRelation_entity/AttributeRelation_entity.aod
+++ b/entity/AttributeRelation_entity/AttributeRelation_entity.aod
@@ -59,8 +59,8 @@
<dependencies>
<entityDependency>
<name>2226c7fc-45d4-45e8-a5d3-a5e13dff4b59</name>
- <entityName>Org_entity</entityName>
- <fieldName>OrgAttr_dfo</fieldName>
+ <entityName>Organisation_entity</entityName>
+ <fieldName>Attributes</fieldName>
<isConsumer v="false" />
</entityDependency>
</dependencies>
diff --git a/entity/AttributeUsage_entity/entityfields/object_type/possibleItemsProcess.js b/entity/AttributeUsage_entity/entityfields/object_type/possibleItemsProcess.js
index c23cd2f0baa7b9b7abc8fe69acd6b5e692fcda73..ad26576d8fcb56cd2457297eaf71b6468ddd264f 100644
--- a/entity/AttributeUsage_entity/entityfields/object_type/possibleItemsProcess.js
+++ b/entity/AttributeUsage_entity/entityfields/object_type/possibleItemsProcess.js
@@ -1,4 +1,4 @@
-import("system.result");
-
-//TODO: when available, use a function to get the possible contexts
-result.object([["Org_context", "Org"]]);
\ No newline at end of file
+import("system.result");
+
+//TODO: when available, use a function to get the possible contexts
+result.object([["Organisation_context", "Org"]]);
\ No newline at end of file
diff --git a/entity/Comm_entity/Comm_entity.aod b/entity/Communication_entity/Communication_entity.aod
similarity index 75%
rename from entity/Comm_entity/Comm_entity.aod
rename to entity/Communication_entity/Communication_entity.aod
index eb4f4d5a961bdfe924ef599dd2333ab4f1a0e96d..4e6fae8e2edf49132d581de5d675d61082b67f66 100644
--- a/entity/Comm_entity/Comm_entity.aod
+++ b/entity/Communication_entity/Communication_entity.aod
@@ -1,21 +1,21 @@
<?xml version="1.0" encoding="UTF-8"?>
<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.2.0">
- <name>Comm_entity</name>
+ <name>Communication_entity</name>
<title>Communication</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
- <titleProcess>%aditoprj%/entity/Comm_entity/titleProcess.js</titleProcess>
+ <titleProcess>%aditoprj%/entity/Communication_entity/titleProcess.js</titleProcess>
<recordContainer>db</recordContainer>
<entityFields>
<entityField>
<name>ADDR</name>
<title>${COMM_ADDRESS}</title>
- <contentTypeProcess>%aditoprj%/entity/Comm_entity/entityfields/addr/contentTypeProcess.js</contentTypeProcess>
+ <contentTypeProcess>%aditoprj%/entity/Communication_entity/entityfields/addr/contentTypeProcess.js</contentTypeProcess>
<mandatory v="true" />
- <onValidation>%aditoprj%/entity/Comm_entity/entityfields/addr/onValidation.js</onValidation>
+ <onValidation>%aditoprj%/entity/Communication_entity/entityfields/addr/onValidation.js</onValidation>
</entityField>
<entityField>
<name>COMMID</name>
- <valueProcess>%aditoprj%/entity/Comm_entity/entityfields/commid/valueProcess.js</valueProcess>
+ <valueProcess>%aditoprj%/entity/Communication_entity/entityfields/commid/valueProcess.js</valueProcess>
</entityField>
<entityField>
<name>DATE_EDIT</name>
@@ -23,21 +23,21 @@
<entityField>
<name>DATE_NEW</name>
<state>READONLY</state>
- <valueProcess>%aditoprj%/entity/Comm_entity/entityfields/date_new/valueProcess.js</valueProcess>
+ <valueProcess>%aditoprj%/entity/Communication_entity/entityfields/date_new/valueProcess.js</valueProcess>
</entityField>
<entityField>
<name>MEDIUM_ID</name>
<title>Medium</title>
<mandatory v="true" />
- <possibleItemsProcess>%aditoprj%/entity/Comm_entity/entityfields/medium_id/possibleItemsProcess.js</possibleItemsProcess>
+ <possibleItemsProcess>%aditoprj%/entity/Communication_entity/entityfields/medium_id/possibleItemsProcess.js</possibleItemsProcess>
</entityField>
<entityField>
<name>RELATION_ID</name>
- <valueProcess>%aditoprj%/entity/Comm_entity/entityfields/relation_id/valueProcess.js</valueProcess>
+ <valueProcess>%aditoprj%/entity/Communication_entity/entityfields/relation_id/valueProcess.js</valueProcess>
</entityField>
<entityField>
<name>STANDARD</name>
- <valueProcess>%aditoprj%/entity/Comm_entity/entityfields/standard/valueProcess.js</valueProcess>
+ <valueProcess>%aditoprj%/entity/Communication_entity/entityfields/standard/valueProcess.js</valueProcess>
</entityField>
<entityField>
<name>USER_EDIT</name>
@@ -45,7 +45,7 @@
<entityField>
<name>USER_NEW</name>
<state>READONLY</state>
- <valueProcess>%aditoprj%/entity/Comm_entity/entityfields/user_new/valueProcess.js</valueProcess>
+ <valueProcess>%aditoprj%/entity/Communication_entity/entityfields/user_new/valueProcess.js</valueProcess>
</entityField>
<entityParameter>
<name>RelId_param</name>
@@ -56,7 +56,7 @@ Usually this is used for filtering COMM-entires by a specified contact or creati
<entityField>
<name>IS_STANDARD</name>
<contentType>BOOLEAN</contentType>
- <valueProcess>%aditoprj%/entity/Comm_entity/entityfields/is_standard/valueProcess.js</valueProcess>
+ <valueProcess>%aditoprj%/entity/Communication_entity/entityfields/is_standard/valueProcess.js</valueProcess>
</entityField>
<entityProvider>
<name>#PROVIDER</name>
@@ -64,7 +64,7 @@ Usually this is used for filtering COMM-entires by a specified contact or creati
</entityProvider>
<entityParameter>
<name>RelationsMainCountry_param</name>
- <code>%aditoprj%/entity/Comm_entity/entityfields/relationsmaincountry_param/code.js</code>
+ <code>%aditoprj%/entity/Communication_entity/entityfields/relationsmaincountry_param/code.js</code>
<mandatory v="false" />
<description>PARAMETER</description>
</entityParameter>
@@ -75,8 +75,8 @@ Usually this is used for filtering COMM-entires by a specified contact or creati
<dependencies>
<entityDependency>
<name>070b2457-3766-4c8a-b43f-a2bf7c9ef638</name>
- <entityName>Org_entity</entityName>
- <fieldName>OrgComm_dfo</fieldName>
+ <entityName>Organisation_entity</entityName>
+ <fieldName>Communications</fieldName>
<isConsumer v="false" />
</entityDependency>
</dependencies>
@@ -88,8 +88,8 @@ Usually this is used for filtering COMM-entires by a specified contact or creati
<dependencies>
<entityDependency>
<name>e54350c7-b9a6-4f7a-ac35-506922f3964b</name>
- <entityName>Pers_entity</entityName>
- <fieldName>PersComm_dfo</fieldName>
+ <entityName>Contact_entity</entityName>
+ <fieldName>Communications</fieldName>
<isConsumer v="false" />
</entityDependency>
</dependencies>
@@ -101,8 +101,8 @@ Usually this is used for filtering COMM-entires by a specified contact or creati
<dependencies>
<entityDependency>
<name>7382242a-aa18-4a31-ab77-69a79f2b97b8</name>
- <entityName>Org_entity</entityName>
- <fieldName>OrgCommPhone_dfo</fieldName>
+ <entityName>Organisation_entity</entityName>
+ <fieldName>PhoneCommunications</fieldName>
<isConsumer v="false" />
</entityDependency>
</dependencies>
@@ -114,8 +114,8 @@ Usually this is used for filtering COMM-entires by a specified contact or creati
<dependencies>
<entityDependency>
<name>ecfbf518-fe92-4661-8ebe-e2d3c8d259e1</name>
- <entityName>Org_entity</entityName>
- <fieldName>OrgCommEmail_dfo</fieldName>
+ <entityName>Organisation_entity</entityName>
+ <fieldName>EmailCommunications</fieldName>
<isConsumer v="false" />
</entityDependency>
</dependencies>
@@ -123,11 +123,12 @@ Usually this is used for filtering COMM-entires by a specified contact or creati
<entityProvider>
<name>PersCommPhone_dfi</name>
<fieldType>DEPENDENCY_IN</fieldType>
+ <recordContainer>db</recordContainer>
<dependencies>
<entityDependency>
<name>2d615521-e9b9-463f-8e09-b5749b5484ff</name>
- <entityName>Pers_entity</entityName>
- <fieldName>PersCommPhone_dfo</fieldName>
+ <entityName>Contact_entity</entityName>
+ <fieldName>PhoneCommunications</fieldName>
<isConsumer v="false" />
</entityDependency>
</dependencies>
@@ -135,11 +136,12 @@ Usually this is used for filtering COMM-entires by a specified contact or creati
<entityProvider>
<name>PersCommEmail_dfi</name>
<fieldType>DEPENDENCY_IN</fieldType>
+ <recordContainer>db</recordContainer>
<dependencies>
<entityDependency>
<name>b1cc8f6a-e3c1-4d52-9fae-cf254ced5211</name>
- <entityName>Pers_entity</entityName>
- <fieldName>PersCommEmail_dfo</fieldName>
+ <entityName>Contact_entity</entityName>
+ <fieldName>EmailCommunications</fieldName>
<isConsumer v="false" />
</entityDependency>
</dependencies>
@@ -152,7 +154,7 @@ Usually this is used for filtering COMM-entires by a specified contact or creati
</entityParameter>
<entityParameter>
<name>CommMediumIds_param</name>
- <code>%aditoprj%/entity/Comm_entity/entityfields/commmediumids_param/code.js</code>
+ <code>%aditoprj%/entity/Communication_entity/entityfields/commmediumids_param/code.js</code>
<triggerRecalculation v="true" />
<mandatory v="false" />
<description>PARAMETER</description>
@@ -188,8 +190,8 @@ Usually this is used for filtering COMM-entires by a specified contact or creati
<dbRecordContainer>
<name>db</name>
<alias>Data_alias</alias>
- <conditionProcess>%aditoprj%/entity/Comm_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
- <orderClauseProcess>%aditoprj%/entity/Comm_entity/recordcontainers/db/orderClauseProcess.js</orderClauseProcess>
+ <conditionProcess>%aditoprj%/entity/Communication_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
+ <orderClauseProcess>%aditoprj%/entity/Communication_entity/recordcontainers/db/orderClauseProcess.js</orderClauseProcess>
<linkInformation>
<linkInformation>
<name>e3567770-187a-4366-bb87-fb22ff7ff257</name>
diff --git a/entity/Comm_entity/entityfields/addr/contentTypeProcess.js b/entity/Communication_entity/entityfields/addr/contentTypeProcess.js
similarity index 100%
rename from entity/Comm_entity/entityfields/addr/contentTypeProcess.js
rename to entity/Communication_entity/entityfields/addr/contentTypeProcess.js
diff --git a/entity/Comm_entity/entityfields/addr/onValidation.js b/entity/Communication_entity/entityfields/addr/onValidation.js
similarity index 100%
rename from entity/Comm_entity/entityfields/addr/onValidation.js
rename to entity/Communication_entity/entityfields/addr/onValidation.js
diff --git a/entity/Comm_entity/entityfields/commid/valueProcess.js b/entity/Communication_entity/entityfields/commid/valueProcess.js
similarity index 100%
rename from entity/Comm_entity/entityfields/commid/valueProcess.js
rename to entity/Communication_entity/entityfields/commid/valueProcess.js
diff --git a/entity/Comm_entity/entityfields/commmediumids_param/code.js b/entity/Communication_entity/entityfields/commmediumids_param/code.js
similarity index 100%
rename from entity/Comm_entity/entityfields/commmediumids_param/code.js
rename to entity/Communication_entity/entityfields/commmediumids_param/code.js
diff --git a/entity/Comm_entity/entityfields/date_new/valueProcess.js b/entity/Communication_entity/entityfields/date_new/valueProcess.js
similarity index 100%
rename from entity/Comm_entity/entityfields/date_new/valueProcess.js
rename to entity/Communication_entity/entityfields/date_new/valueProcess.js
diff --git a/entity/Comm_entity/entityfields/is_standard/valueProcess.js b/entity/Communication_entity/entityfields/is_standard/valueProcess.js
similarity index 100%
rename from entity/Comm_entity/entityfields/is_standard/valueProcess.js
rename to entity/Communication_entity/entityfields/is_standard/valueProcess.js
diff --git a/entity/Comm_entity/entityfields/medium_id/possibleItemsProcess.js b/entity/Communication_entity/entityfields/medium_id/possibleItemsProcess.js
similarity index 96%
rename from entity/Comm_entity/entityfields/medium_id/possibleItemsProcess.js
rename to entity/Communication_entity/entityfields/medium_id/possibleItemsProcess.js
index 4cdb3f37796e4fc2c44194d74a1ed5dadf8e06c2..7274de0d4f40bd1d411fe83c4c1afbf8b845f27e 100644
--- a/entity/Comm_entity/entityfields/medium_id/possibleItemsProcess.js
+++ b/entity/Communication_entity/entityfields/medium_id/possibleItemsProcess.js
@@ -1,7 +1,7 @@
-import("system.text");
-import("system.vars");
-import("system.result");
-import("Keyword_lib");
-
-var items = KeywordUtils.getStandardArray("COMM.MEDIUM");
-result.object(items);
+import("system.text");
+import("system.vars");
+import("system.result");
+import("Keyword_lib");
+
+var items = KeywordUtils.getStandardArray("COMM.MEDIUM");
+result.object(items);
diff --git a/entity/Comm_entity/entityfields/medium_id/valueMappingProcess.js b/entity/Communication_entity/entityfields/medium_id/valueMappingProcess.js
similarity index 100%
rename from entity/Comm_entity/entityfields/medium_id/valueMappingProcess.js
rename to entity/Communication_entity/entityfields/medium_id/valueMappingProcess.js
diff --git a/entity/Comm_entity/entityfields/relation_id/valueProcess.js b/entity/Communication_entity/entityfields/relation_id/valueProcess.js
similarity index 100%
rename from entity/Comm_entity/entityfields/relation_id/valueProcess.js
rename to entity/Communication_entity/entityfields/relation_id/valueProcess.js
diff --git a/entity/Comm_entity/entityfields/relationsmaincountry_param/code.js b/entity/Communication_entity/entityfields/relationsmaincountry_param/code.js
similarity index 100%
rename from entity/Comm_entity/entityfields/relationsmaincountry_param/code.js
rename to entity/Communication_entity/entityfields/relationsmaincountry_param/code.js
diff --git a/entity/Comm_entity/entityfields/standard/valueProcess.js b/entity/Communication_entity/entityfields/standard/valueProcess.js
similarity index 100%
rename from entity/Comm_entity/entityfields/standard/valueProcess.js
rename to entity/Communication_entity/entityfields/standard/valueProcess.js
diff --git a/entity/Comm_entity/entityfields/user_new/valueProcess.js b/entity/Communication_entity/entityfields/user_new/valueProcess.js
similarity index 100%
rename from entity/Comm_entity/entityfields/user_new/valueProcess.js
rename to entity/Communication_entity/entityfields/user_new/valueProcess.js
diff --git a/entity/Comm_entity/recordcontainers/db/conditionProcess.js b/entity/Communication_entity/recordcontainers/db/conditionProcess.js
similarity index 100%
rename from entity/Comm_entity/recordcontainers/db/conditionProcess.js
rename to entity/Communication_entity/recordcontainers/db/conditionProcess.js
diff --git a/entity/Comm_entity/recordcontainers/db/orderClauseProcess.js b/entity/Communication_entity/recordcontainers/db/orderClauseProcess.js
similarity index 100%
rename from entity/Comm_entity/recordcontainers/db/orderClauseProcess.js
rename to entity/Communication_entity/recordcontainers/db/orderClauseProcess.js
diff --git a/entity/Comm_entity/titleProcess.js b/entity/Communication_entity/titleProcess.js
similarity index 100%
rename from entity/Comm_entity/titleProcess.js
rename to entity/Communication_entity/titleProcess.js
diff --git a/entity/Pers_entity/Pers_entity.aod b/entity/Contact_entity/Contact_entity.aod
similarity index 69%
rename from entity/Pers_entity/Pers_entity.aod
rename to entity/Contact_entity/Contact_entity.aod
index 62c20bf9f535bedc33b1190a051c2135545ee9f4..18c526fa20690dcd35a1d76c4a432bc1d62feea7 100644
--- a/entity/Pers_entity/Pers_entity.aod
+++ b/entity/Contact_entity/Contact_entity.aod
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.2.0">
- <name>Pers_entity</name>
+ <name>Contact_entity</name>
<title>Contact</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
<iconId>VAADIN:USERS</iconId>
- <imageProcess>%aditoprj%/entity/Pers_entity/imageProcess.js</imageProcess>
- <titleProcess>%aditoprj%/entity/Pers_entity/titleProcess.js</titleProcess>
+ <imageProcess>%aditoprj%/entity/Contact_entity/imageProcess.js</imageProcess>
+ <titleProcess>%aditoprj%/entity/Contact_entity/titleProcess.js</titleProcess>
<recordContainer>db</recordContainer>
<entityFields>
<entityField>
@@ -19,7 +19,7 @@
<contentType>DATE</contentType>
<outputFormat>yyyy-MM-dd&apos;T&apos;HH:mm:ssZ</outputFormat>
<searchable v="false" />
- <valueProcess>%aditoprj%/entity/Pers_entity/entityfields/pers_date_edit/valueProcess.js</valueProcess>
+ <valueProcess>%aditoprj%/entity/Contact_entity/entityfields/pers_date_edit/valueProcess.js</valueProcess>
</entityField>
<entityField>
<name>PERS_DATE_NEW</name>
@@ -27,7 +27,7 @@
<outputFormat>yyyy-MM-dd&apos;T&apos;HH:mm:ssZ</outputFormat>
<searchable v="false" />
<state>READONLY</state>
- <valueProcess>%aditoprj%/entity/Pers_entity/entityfields/pers_date_new/valueProcess.js</valueProcess>
+ <valueProcess>%aditoprj%/entity/Contact_entity/entityfields/pers_date_new/valueProcess.js</valueProcess>
</entityField>
<entityField>
<name>FIRSTNAME</name>
@@ -36,13 +36,13 @@
<entityField>
<name>GENDER</name>
<title>Gender</title>
- <possibleItemsProcess>%aditoprj%/entity/Pers_entity/entityfields/gender/possibleItemsProcess.js</possibleItemsProcess>
+ <possibleItemsProcess>%aditoprj%/entity/Contact_entity/entityfields/gender/possibleItemsProcess.js</possibleItemsProcess>
</entityField>
<entityField>
<name>LASTNAME</name>
<title>Lastname</title>
<mandatory v="true" />
- <valueProcess>%aditoprj%/entity/Pers_entity/entityfields/lastname/valueProcess.js</valueProcess>
+ <valueProcess>%aditoprj%/entity/Contact_entity/entityfields/lastname/valueProcess.js</valueProcess>
</entityField>
<entityField>
<name>MIDDLENAME</name>
@@ -51,7 +51,7 @@
<entityField>
<name>PERSID</name>
<searchable v="false" />
- <valueProcess>%aditoprj%/entity/Pers_entity/entityfields/persid/valueProcess.js</valueProcess>
+ <valueProcess>%aditoprj%/entity/Contact_entity/entityfields/persid/valueProcess.js</valueProcess>
</entityField>
<entityField>
<name>SALUTATION</name>
@@ -68,18 +68,18 @@
<entityField>
<name>PERS_USER_EDIT</name>
<searchable v="false" />
- <valueProcess>%aditoprj%/entity/Pers_entity/entityfields/pers_user_edit/valueProcess.js</valueProcess>
+ <valueProcess>%aditoprj%/entity/Contact_entity/entityfields/pers_user_edit/valueProcess.js</valueProcess>
</entityField>
<entityField>
<name>PERS_USER_NEW</name>
<searchable v="false" />
<state>READONLY</state>
- <valueProcess>%aditoprj%/entity/Pers_entity/entityfields/pers_user_new/valueProcess.js</valueProcess>
+ <valueProcess>%aditoprj%/entity/Contact_entity/entityfields/pers_user_new/valueProcess.js</valueProcess>
</entityField>
<entityField>
<name>PREVIEWTITLE</name>
<title></title>
- <valueProcess>%aditoprj%/entity/Pers_entity/entityfields/previewtitle/valueProcess.js</valueProcess>
+ <valueProcess>%aditoprj%/entity/Contact_entity/entityfields/previewtitle/valueProcess.js</valueProcess>
</entityField>
<entityParameter>
<name>OrgId_param</name>
@@ -91,15 +91,15 @@
<entityField>
<name>IMAGE</name>
<contentType>IMAGE</contentType>
- <valueProcess>%aditoprj%/entity/Pers_entity/entityfields/image/valueProcess.js</valueProcess>
- <onValueChange>%aditoprj%/entity/Pers_entity/entityfields/image/onValueChange.js</onValueChange>
+ <valueProcess>%aditoprj%/entity/Contact_entity/entityfields/image/valueProcess.js</valueProcess>
+ <onValueChange>%aditoprj%/entity/Contact_entity/entityfields/image/onValueChange.js</onValueChange>
<onValueChangeTypes>
<element>MASK</element>
</onValueChangeTypes>
</entityField>
<entityFieldGroup>
<name>NAME_fieldGroup</name>
- <valueProcess>%aditoprj%/entity/Pers_entity/entityfields/name_fieldgroup/valueProcess.js</valueProcess>
+ <valueProcess>%aditoprj%/entity/Contact_entity/entityfields/name_fieldgroup/valueProcess.js</valueProcess>
<description>FIELDGROUP</description>
<fields>
<element>FIRSTNAME</element>
@@ -107,22 +107,22 @@
</fields>
</entityFieldGroup>
<entityConsumer>
- <name>PersActivity_dfo</name>
+ <name>Activities</name>
<title>Activities</title>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
<name>dependency</name>
<entityName>Activity_entity</entityName>
- <fieldName>PersActivity_dfi</fieldName>
+ <fieldName>LinkedObjects</fieldName>
</dependency>
<children>
<entityParameter>
<name>RowId_param</name>
- <code>%aditoprj%/entity/Pers_entity/entityfields/persactivity_dfo/children/rowid_param/code.js</code>
+ <code>%aditoprj%/entity/Contact_entity/entityfields/activities/children/rowid_param/code.js</code>
</entityParameter>
<entityParameter>
<name>ObjectId_param</name>
- <code>%aditoprj%/entity/Pers_entity/entityfields/persactivity_dfo/children/objectid_param/code.js</code>
+ <code>%aditoprj%/entity/Contact_entity/entityfields/activities/children/objectid_param/code.js</code>
</entityParameter>
</children>
</entityConsumer>
@@ -131,60 +131,60 @@
<searchable v="false" />
</entityField>
<entityProvider>
- <name>PersOrg_dfi</name>
+ <name>OrganisationRelated</name>
<fieldType>DEPENDENCY_IN</fieldType>
<recordContainer>db</recordContainer>
<dependencies>
<entityDependency>
<name>41952879-c2f0-411f-8ca1-36c38914a629</name>
- <entityName>Org_entity</entityName>
- <fieldName>PersOrg_dfo</fieldName>
+ <entityName>Organisation_entity</entityName>
+ <fieldName>Contacts</fieldName>
<isConsumer v="false" />
</entityDependency>
</dependencies>
</entityProvider>
<entityField>
<name>PERS_ID</name>
- <documentation>%aditoprj%/entity/Pers_entity/entityfields/pers_id/documentation.adoc</documentation>
+ <documentation>%aditoprj%/entity/Contact_entity/entityfields/pers_id/documentation.adoc</documentation>
<searchable v="false" />
- <valueProcess>%aditoprj%/entity/Pers_entity/entityfields/pers_id/valueProcess.js</valueProcess>
+ <valueProcess>%aditoprj%/entity/Contact_entity/entityfields/pers_id/valueProcess.js</valueProcess>
</entityField>
<entityField>
<name>ORG_ID</name>
<title>Firma</title>
- <consumer>PersOrg_dfo</consumer>
- <linkedContextProcess>%aditoprj%/entity/Pers_entity/entityfields/org_id/linkedContextProcess.js</linkedContextProcess>
+ <consumer>Organisations</consumer>
+ <linkedContextProcess>%aditoprj%/entity/Contact_entity/entityfields/org_id/linkedContextProcess.js</linkedContextProcess>
<mandatory v="false" />
<searchable v="false" />
- <valueProcess>%aditoprj%/entity/Pers_entity/entityfields/org_id/valueProcess.js</valueProcess>
- <onValueChange>%aditoprj%/entity/Pers_entity/entityfields/org_id/onValueChange.js</onValueChange>
+ <valueProcess>%aditoprj%/entity/Contact_entity/entityfields/org_id/valueProcess.js</valueProcess>
+ <onValueChange>%aditoprj%/entity/Contact_entity/entityfields/org_id/onValueChange.js</onValueChange>
</entityField>
<entityField>
<name>REL_USER_NEW</name>
<searchable v="false" />
<state>READONLY</state>
- <valueProcess>%aditoprj%/entity/Pers_entity/entityfields/rel_user_new/valueProcess.js</valueProcess>
+ <valueProcess>%aditoprj%/entity/Contact_entity/entityfields/rel_user_new/valueProcess.js</valueProcess>
</entityField>
<entityField>
<name>REL_USER_EDIT</name>
<searchable v="false" />
- <valueProcess>%aditoprj%/entity/Pers_entity/entityfields/rel_user_edit/valueProcess.js</valueProcess>
+ <valueProcess>%aditoprj%/entity/Contact_entity/entityfields/rel_user_edit/valueProcess.js</valueProcess>
</entityField>
<entityField>
<name>REL_DATE_NEW</name>
<contentType>DATE</contentType>
<searchable v="false" />
<state>READONLY</state>
- <valueProcess>%aditoprj%/entity/Pers_entity/entityfields/rel_date_new/valueProcess.js</valueProcess>
+ <valueProcess>%aditoprj%/entity/Contact_entity/entityfields/rel_date_new/valueProcess.js</valueProcess>
</entityField>
<entityField>
<name>REL_DATE_EDIT</name>
<contentType>DATE</contentType>
<searchable v="false" />
- <valueProcess>%aditoprj%/entity/Pers_entity/entityfields/rel_date_edit/valueProcess.js</valueProcess>
+ <valueProcess>%aditoprj%/entity/Contact_entity/entityfields/rel_date_edit/valueProcess.js</valueProcess>
</entityField>
<entityConsumer>
- <name>PersAddress_dfo</name>
+ <name>PersAddresses</name>
<title>Addresses</title>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
@@ -195,50 +195,50 @@
<children>
<entityParameter>
<name>RelId_param</name>
- <code>%aditoprj%/entity/Pers_entity/entityfields/persaddress_dfo/children/relid_param/code.js</code>
+ <code>%aditoprj%/entity/Contact_entity/entityfields/persaddresses/children/relid_param/code.js</code>
<triggerRecalculation v="true" />
</entityParameter>
<entityParameter>
<name>DefaultAddressId_param</name>
- <code>%aditoprj%/entity/Pers_entity/entityfields/persaddress_dfo/children/defaultaddressid_param/code.js</code>
+ <code>%aditoprj%/entity/Contact_entity/entityfields/persaddresses/children/defaultaddressid_param/code.js</code>
<triggerRecalculation v="true" />
</entityParameter>
<entityParameter>
<name>RelationType_param</name>
- <code>%aditoprj%/entity/Pers_entity/entityfields/persaddress_dfo/children/relationtype_param/code.js</code>
+ <code>%aditoprj%/entity/Contact_entity/entityfields/persaddresses/children/relationtype_param/code.js</code>
<triggerRecalculation v="true" />
</entityParameter>
</children>
</entityConsumer>
<entityConsumer>
- <name>PersComm_dfo</name>
+ <name>Communications</name>
<title>Communication</title>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
<name>dependency</name>
- <entityName>Comm_entity</entityName>
+ <entityName>Communication_entity</entityName>
<fieldName>PersComm_dfi</fieldName>
</dependency>
<children>
<entityParameter>
<name>RelId_param</name>
- <code>%aditoprj%/entity/Pers_entity/entityfields/perscomm_dfo/children/relid_param/code.js</code>
+ <code>%aditoprj%/entity/Contact_entity/entityfields/communications/children/relid_param/code.js</code>
<triggerRecalculation v="true" />
</entityParameter>
</children>
</entityConsumer>
<entityConsumer>
- <name>PersOrg_dfo</name>
+ <name>Organisations</name>
<fieldType>DEPENDENCY_OUT</fieldType>
<selectionMode>SINGLE</selectionMode>
<dependency>
<name>dependency</name>
- <entityName>Org_entity</entityName>
- <fieldName>Org_dfi</fieldName>
+ <entityName>Organisation_entity</entityName>
+ <fieldName>#PROVIDER</fieldName>
</dependency>
</entityConsumer>
<entityConsumer>
- <name>PersContract_dfo</name>
+ <name>Contracts</name>
<title>Contracts</title>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
@@ -249,17 +249,17 @@
<children>
<entityParameter>
<name>RelId_param</name>
- <code>%aditoprj%/entity/Pers_entity/entityfields/perscontract_dfo/children/relid_param/code.js</code>
+ <code>%aditoprj%/entity/Contact_entity/entityfields/contracts/children/relid_param/code.js</code>
<triggerRecalculation v="true" />
</entityParameter>
</children>
</entityConsumer>
<entityConsumer>
- <name>PersPricelist_dfo</name>
+ <name>Pricelists</name>
<title>Conditions</title>
<fieldType>DEPENDENCY_OUT</fieldType>
<state>AUTO</state>
- <stateProcess>%aditoprj%/entity/Pers_entity/entityfields/perspricelist_dfo/stateProcess.js</stateProcess>
+ <stateProcess>%aditoprj%/entity/Contact_entity/entityfields/pricelists/stateProcess.js</stateProcess>
<dependency>
<name>dependency</name>
<entityName>Productprice_entity</entityName>
@@ -268,12 +268,12 @@
<children>
<entityParameter>
<name>RelID_param</name>
- <code>%aditoprj%/entity/Pers_entity/entityfields/perspricelist_dfo/children/relid_param/code.js</code>
+ <code>%aditoprj%/entity/Contact_entity/entityfields/pricelists/children/relid_param/code.js</code>
</entityParameter>
</children>
</entityConsumer>
<entityConsumer>
- <name>PersGender_dfo</name>
+ <name>Genders</name>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
<name>dependency</name>
@@ -299,7 +299,13 @@
<entityDependency>
<name>b72f99e9-0c8d-4b54-863b-b47eafbb0189</name>
<entityName>SalesprojectMember_entity</entityName>
- <fieldName>PersLookup_dfo</fieldName>
+ <fieldName>Contacts</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>4eaa8874-e6c8-4a0e-9a69-b5fc33d2a780</name>
+ <entityName>Timetracking_entity</entityName>
+ <fieldName>Contacts</fieldName>
<isConsumer v="false" />
</entityDependency>
</dependencies>
@@ -308,10 +314,10 @@
<name>LANGUAGE</name>
<title>Language</title>
<mandatory v="true" />
- <possibleItemsProcess>%aditoprj%/entity/Pers_entity/entityfields/language/possibleItemsProcess.js</possibleItemsProcess>
+ <possibleItemsProcess>%aditoprj%/entity/Contact_entity/entityfields/language/possibleItemsProcess.js</possibleItemsProcess>
</entityField>
<entityConsumer>
- <name>PersDocument_dfo</name>
+ <name>Documents</name>
<title>Documents</title>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
@@ -322,30 +328,18 @@
<children>
<entityParameter>
<name>AssignmentName_param</name>
- <code>%aditoprj%/entity/Pers_entity/entityfields/persdocument_dfo/children/assignmentname_param/code.js</code>
+ <code>%aditoprj%/entity/Contact_entity/entityfields/documents/children/assignmentname_param/code.js</code>
</entityParameter>
<entityParameter>
<name>AssignmentRowId_param</name>
- <code>%aditoprj%/entity/Pers_entity/entityfields/persdocument_dfo/children/assignmentrowid_param/code.js</code>
+ <code>%aditoprj%/entity/Contact_entity/entityfields/documents/children/assignmentrowid_param/code.js</code>
</entityParameter>
<entityParameter>
<name>AssignmentTable_param</name>
- <code>%aditoprj%/entity/Pers_entity/entityfields/persdocument_dfo/children/assignmenttable_param/code.js</code>
+ <code>%aditoprj%/entity/Contact_entity/entityfields/documents/children/assignmenttable_param/code.js</code>
</entityParameter>
</children>
</entityConsumer>
- <entityProvider>
- <name>PersSalesprojectMember_dfi</name>
- <fieldType>DEPENDENCY_IN</fieldType>
- <dependencies>
- <entityDependency>
- <name>9f55eb02-bb8d-4472-9332-3b99049f7d1b</name>
- <entityName>SalesprojectMember_entity</entityName>
- <fieldName>PersSalesprojectMember_dfo</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
- </entityProvider>
<entityParameter>
<name>RelationId_param</name>
<expose v="true" />
@@ -355,7 +349,7 @@
</entityParameter>
<entityFieldGroup>
<name>FULL_NAME_fieldGroup</name>
- <valueProcess>%aditoprj%/entity/Pers_entity/entityfields/full_name_fieldgroup/valueProcess.js</valueProcess>
+ <valueProcess>%aditoprj%/entity/Contact_entity/entityfields/full_name_fieldgroup/valueProcess.js</valueProcess>
<title>Name</title>
<description>FIELDGROUP</description>
<fields>
@@ -368,7 +362,7 @@
</fields>
</entityFieldGroup>
<entityProvider>
- <name>RelationPers_dfi</name>
+ <name>byUid</name>
<fieldType>DEPENDENCY_IN</fieldType>
<recordContainer>db</recordContainer>
<dependencies>
@@ -378,10 +372,26 @@
<fieldName>RelationPers_dfo</fieldName>
<isConsumer v="false" />
</entityDependency>
+ <entityDependency>
+ <name>12c5350a-3159-449b-a94e-d57658b4c124</name>
+ <entityName>SalesprojectMember_entity</entityName>
+ <fieldName>CurrentContact</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
</dependencies>
+ <children>
+ <entityParameter>
+ <name>OrgId_param</name>
+ <expose v="false" />
+ </entityParameter>
+ <entityParameter>
+ <name>RelationId_param</name>
+ <mandatory v="true" />
+ </entityParameter>
+ </children>
</entityProvider>
<entityConsumer>
- <name>PersOrgsAddresses_dfo</name>
+ <name>OrgAddresses</name>
<title>Company Addresses</title>
<fieldType>DEPENDENCY_OUT</fieldType>
<state>READONLY</state>
@@ -393,12 +403,12 @@
<children>
<entityParameter>
<name>RelId_param</name>
- <code>%aditoprj%/entity/Pers_entity/entityfields/persorgsaddresses_dfo/children/relid_param/code.js</code>
+ <code>%aditoprj%/entity/Contact_entity/entityfields/orgaddresses/children/relid_param/code.js</code>
<triggerRecalculation v="true" />
</entityParameter>
<entityParameter>
<name>RelationType_param</name>
- <code>%aditoprj%/entity/Pers_entity/entityfields/persorgsaddresses_dfo/children/relationtype_param/code.js</code>
+ <code>%aditoprj%/entity/Contact_entity/entityfields/orgaddresses/children/relationtype_param/code.js</code>
<triggerRecalculation v="true" />
</entityParameter>
</children>
@@ -409,100 +419,87 @@
<description>TODO: Beziehung zu der Relation 1024846 (z.B. per Ampelsystem)</description>
<contentType>NUMBER</contentType>
<mandatory v="false" />
- <valueProcess>%aditoprj%/entity/Pers_entity/entityfields/rel_relationship/valueProcess.js</valueProcess>
+ <valueProcess>%aditoprj%/entity/Contact_entity/entityfields/rel_relationship/valueProcess.js</valueProcess>
</entityField>
<entityActionField>
<name>openEditDefaultsView_action</name>
<fieldType>ACTION</fieldType>
<title>Edit defaults</title>
- <onActionProcess>%aditoprj%/entity/Pers_entity/entityfields/openeditdefaultsview_action/onActionProcess.js</onActionProcess>
+ <onActionProcess>%aditoprj%/entity/Contact_entity/entityfields/openeditdefaultsview_action/onActionProcess.js</onActionProcess>
<iconId>VAADIN:WRENCH</iconId>
</entityActionField>
<entityActionField>
<name>newOffer</name>
<fieldType>ACTION</fieldType>
<title>New offer</title>
- <onActionProcess>%aditoprj%/entity/Pers_entity/entityfields/newoffer/onActionProcess.js</onActionProcess>
+ <onActionProcess>%aditoprj%/entity/Contact_entity/entityfields/newoffer/onActionProcess.js</onActionProcess>
<iconId>VAADIN:CART</iconId>
</entityActionField>
- <entityProvider>
- <name>TimetrackingPers_dfi</name>
- <fieldType>DEPENDENCY_IN</fieldType>
- <recordContainer>db</recordContainer>
- <dependencies>
- <entityDependency>
- <name>d30713a5-ab92-400e-8127-dde9598027b0</name>
- <entityName>Timetracking_entity</entityName>
- <fieldName>TimetrackingPers_dfo</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
- </entityProvider>
<entityField>
<name>STANDARD_EMAIL_COMM</name>
<title>E-Mail</title>
- <consumer>PersCommEmail_dfo</consumer>
- <onValueChange>%aditoprj%/entity/Pers_entity/entityfields/standard_email_comm/onValueChange.js</onValueChange>
+ <consumer>EmailCommunications</consumer>
+ <onValueChange>%aditoprj%/entity/Contact_entity/entityfields/standard_email_comm/onValueChange.js</onValueChange>
</entityField>
<entityField>
<name>STANDARD_PHONE_COMM</name>
<title>Phone</title>
- <consumer>PersCommPhone_dfo</consumer>
- <onValueChange>%aditoprj%/entity/Pers_entity/entityfields/standard_phone_comm/onValueChange.js</onValueChange>
+ <consumer>PhoneCommunications</consumer>
+ <onValueChange>%aditoprj%/entity/Contact_entity/entityfields/standard_phone_comm/onValueChange.js</onValueChange>
</entityField>
<entityConsumer>
- <name>PersCommPhone_dfo</name>
+ <name>PhoneCommunications</name>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
<name>dependency</name>
- <entityName>Comm_entity</entityName>
+ <entityName>Communication_entity</entityName>
<fieldName>PersCommPhone_dfi</fieldName>
</dependency>
<children>
<entityParameter>
<name>RelId_param</name>
- <code>%aditoprj%/entity/Pers_entity/entityfields/perscommphone_dfo/children/relid_param/code.js</code>
+ <code>%aditoprj%/entity/Contact_entity/entityfields/phonecommunications/children/relid_param/code.js</code>
</entityParameter>
<entityParameter>
<name>CommCategory_param</name>
- <code>%aditoprj%/entity/Pers_entity/entityfields/perscommphone_dfo/children/commcategory_param/code.js</code>
+ <code>%aditoprj%/entity/Contact_entity/entityfields/phonecommunications/children/commcategory_param/code.js</code>
</entityParameter>
</children>
</entityConsumer>
<entityConsumer>
- <name>PersCommEmail_dfo</name>
+ <name>EmailCommunications</name>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
<name>dependency</name>
- <entityName>Comm_entity</entityName>
+ <entityName>Communication_entity</entityName>
<fieldName>PersCommEmail_dfi</fieldName>
</dependency>
<children>
<entityParameter>
<name>RelId_param</name>
- <code>%aditoprj%/entity/Pers_entity/entityfields/perscommemail_dfo/children/relid_param/code.js</code>
+ <code>%aditoprj%/entity/Contact_entity/entityfields/emailcommunications/children/relid_param/code.js</code>
</entityParameter>
<entityParameter>
<name>CommCategory_param</name>
- <code>%aditoprj%/entity/Pers_entity/entityfields/perscommemail_dfo/children/commcategory_param/code.js</code>
+ <code>%aditoprj%/entity/Contact_entity/entityfields/emailcommunications/children/commcategory_param/code.js</code>
</entityParameter>
</children>
</entityConsumer>
<entityField>
<name>ADDRESS_ID</name>
<title>standard address</title>
- <consumer>PersAddress_dfo</consumer>
- <displayValueProcess>%aditoprj%/entity/Pers_entity/entityfields/address_id/displayValueProcess.js</displayValueProcess>
+ <consumer>PersAddresses</consumer>
+ <displayValueProcess>%aditoprj%/entity/Contact_entity/entityfields/address_id/displayValueProcess.js</displayValueProcess>
</entityField>
<entityActionField>
<name>newActivity</name>
<fieldType>ACTION</fieldType>
<title>New activity</title>
- <onActionProcess>%aditoprj%/entity/Pers_entity/entityfields/newactivity/onActionProcess.js</onActionProcess>
+ <onActionProcess>%aditoprj%/entity/Contact_entity/entityfields/newactivity/onActionProcess.js</onActionProcess>
<iconId>NEON:HISTORY</iconId>
</entityActionField>
<entityConsumer>
- <name>ObjectRelation_dfo</name>
+ <name>ObjectRelations</name>
<title>Relations</title>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
@@ -514,11 +511,11 @@
<entityParameter>
<name>AnyObjectRowid_param</name>
<title></title>
- <code>%aditoprj%/entity/Pers_entity/entityfields/objectrelation_dfo/children/anyobjectrowid_param/code.js</code>
+ <code>%aditoprj%/entity/Contact_entity/entityfields/objectrelations/children/anyobjectrowid_param/code.js</code>
</entityParameter>
<entityParameter>
<name>AnyObjectType_param</name>
- <code>%aditoprj%/entity/Pers_entity/entityfields/objectrelation_dfo/children/anyobjecttype_param/code.js</code>
+ <code>%aditoprj%/entity/Contact_entity/entityfields/objectrelations/children/anyobjecttype_param/code.js</code>
</entityParameter>
</children>
</entityConsumer>
@@ -527,9 +524,9 @@
<dbRecordContainer>
<name>db</name>
<alias>Data_alias</alias>
- <fromClauseProcess>%aditoprj%/entity/Pers_entity/recordcontainers/db/fromClauseProcess.js</fromClauseProcess>
- <conditionProcess>%aditoprj%/entity/Pers_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
- <onDBUpdate>%aditoprj%/entity/Pers_entity/recordcontainers/db/onDBUpdate.js</onDBUpdate>
+ <fromClauseProcess>%aditoprj%/entity/Contact_entity/recordcontainers/db/fromClauseProcess.js</fromClauseProcess>
+ <conditionProcess>%aditoprj%/entity/Contact_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
+ <onDBUpdate>%aditoprj%/entity/Contact_entity/recordcontainers/db/onDBUpdate.js</onDBUpdate>
<linkInformation>
<linkInformation>
<name>cb2de42b-de48-4543-91d6-8d00af5c5736</name>
@@ -645,12 +642,12 @@
<dbRecordFieldMapping>
<name>STANDARD_EMAIL_COMM.displayValue</name>
<recordfield></recordfield>
- <expression>%aditoprj%/entity/Pers_entity/recordcontainers/db/recordfieldmappings/standard_email_comm.displayvalue/expression.js</expression>
+ <expression>%aditoprj%/entity/Contact_entity/recordcontainers/db/recordfieldmappings/standard_email_comm.displayvalue/expression.js</expression>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>STANDARD_PHONE_COMM.displayValue</name>
<recordfield></recordfield>
- <expression>%aditoprj%/entity/Pers_entity/recordcontainers/db/recordfieldmappings/standard_phone_comm.displayvalue/expression.js</expression>
+ <expression>%aditoprj%/entity/Contact_entity/recordcontainers/db/recordfieldmappings/standard_phone_comm.displayvalue/expression.js</expression>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>ADDRESS_ID.value</name>
diff --git a/entity/Pers_entity/conditionProcess.js b/entity/Contact_entity/conditionProcess.js
similarity index 100%
rename from entity/Pers_entity/conditionProcess.js
rename to entity/Contact_entity/conditionProcess.js
diff --git a/entity/Org_entity/entityfields/orgactivity_dfo/children/objectid_param/code.js b/entity/Contact_entity/entityfields/activities/children/objectid_param/code.js
similarity index 100%
rename from entity/Org_entity/entityfields/orgactivity_dfo/children/objectid_param/code.js
rename to entity/Contact_entity/entityfields/activities/children/objectid_param/code.js
diff --git a/entity/Pers_entity/entityfields/persactivity_dfo/children/rowid_param/code.js b/entity/Contact_entity/entityfields/activities/children/rowid_param/code.js
similarity index 100%
rename from entity/Pers_entity/entityfields/persactivity_dfo/children/rowid_param/code.js
rename to entity/Contact_entity/entityfields/activities/children/rowid_param/code.js
diff --git a/entity/Org_entity/entityfields/address_id/displayValueProcess.js b/entity/Contact_entity/entityfields/address_id/displayValueProcess.js
similarity index 100%
rename from entity/Org_entity/entityfields/address_id/displayValueProcess.js
rename to entity/Contact_entity/entityfields/address_id/displayValueProcess.js
diff --git a/entity/Org_entity/entityfields/orgactivity_dfo/children/rowid_param/code.js b/entity/Contact_entity/entityfields/communications/children/relid_param/code.js
similarity index 100%
rename from entity/Org_entity/entityfields/orgactivity_dfo/children/rowid_param/code.js
rename to entity/Contact_entity/entityfields/communications/children/relid_param/code.js
diff --git a/entity/Org_entity/entityfields/orgaddress_dfo/children/relid_param/code.js b/entity/Contact_entity/entityfields/contracts/children/relid_param/code.js
similarity index 100%
rename from entity/Org_entity/entityfields/orgaddress_dfo/children/relid_param/code.js
rename to entity/Contact_entity/entityfields/contracts/children/relid_param/code.js
diff --git a/entity/Org_entity/entityfields/orgdocument_dfo/children/assignmentname_param/code.js b/entity/Contact_entity/entityfields/documents/children/assignmentname_param/code.js
similarity index 100%
rename from entity/Org_entity/entityfields/orgdocument_dfo/children/assignmentname_param/code.js
rename to entity/Contact_entity/entityfields/documents/children/assignmentname_param/code.js
diff --git a/entity/Org_entity/entityfields/orgcomm_dfo/children/relid_param/code.js b/entity/Contact_entity/entityfields/documents/children/assignmentrowid_param/code.js
similarity index 100%
rename from entity/Org_entity/entityfields/orgcomm_dfo/children/relid_param/code.js
rename to entity/Contact_entity/entityfields/documents/children/assignmentrowid_param/code.js
diff --git a/entity/Org_entity/entityfields/orgdocument_dfo/children/assignmenttable_param/code.js b/entity/Contact_entity/entityfields/documents/children/assignmenttable_param/code.js
similarity index 100%
rename from entity/Org_entity/entityfields/orgdocument_dfo/children/assignmenttable_param/code.js
rename to entity/Contact_entity/entityfields/documents/children/assignmenttable_param/code.js
diff --git a/entity/Pers_entity/entityfields/perscommemail_dfo/children/commcategory_param/code.js b/entity/Contact_entity/entityfields/emailcommunications/children/commcategory_param/code.js
similarity index 100%
rename from entity/Pers_entity/entityfields/perscommemail_dfo/children/commcategory_param/code.js
rename to entity/Contact_entity/entityfields/emailcommunications/children/commcategory_param/code.js
diff --git a/entity/Org_entity/entityfields/orgcommemail_dfo/children/relid_param/code.js b/entity/Contact_entity/entityfields/emailcommunications/children/relid_param/code.js
similarity index 100%
rename from entity/Org_entity/entityfields/orgcommemail_dfo/children/relid_param/code.js
rename to entity/Contact_entity/entityfields/emailcommunications/children/relid_param/code.js
diff --git a/entity/Pers_entity/entityfields/full_name_fieldgroup/valueProcess.js b/entity/Contact_entity/entityfields/full_name_fieldgroup/valueProcess.js
similarity index 100%
rename from entity/Pers_entity/entityfields/full_name_fieldgroup/valueProcess.js
rename to entity/Contact_entity/entityfields/full_name_fieldgroup/valueProcess.js
diff --git a/entity/Pers_entity/entityfields/gender/possibleItemsProcess.js b/entity/Contact_entity/entityfields/gender/possibleItemsProcess.js
similarity index 100%
rename from entity/Pers_entity/entityfields/gender/possibleItemsProcess.js
rename to entity/Contact_entity/entityfields/gender/possibleItemsProcess.js
diff --git a/entity/Org_entity/entityfields/image/onValueChange.js b/entity/Contact_entity/entityfields/image/onValueChange.js
similarity index 100%
rename from entity/Org_entity/entityfields/image/onValueChange.js
rename to entity/Contact_entity/entityfields/image/onValueChange.js
diff --git a/entity/Pers_entity/entityfields/image/valueProcess.js b/entity/Contact_entity/entityfields/image/valueProcess.js
similarity index 100%
rename from entity/Pers_entity/entityfields/image/valueProcess.js
rename to entity/Contact_entity/entityfields/image/valueProcess.js
diff --git a/entity/Org_entity/entityfields/language/possibleItemsProcess.js b/entity/Contact_entity/entityfields/language/possibleItemsProcess.js
similarity index 100%
rename from entity/Org_entity/entityfields/language/possibleItemsProcess.js
rename to entity/Contact_entity/entityfields/language/possibleItemsProcess.js
diff --git a/entity/Pers_entity/entityfields/name_fieldgroup/valueProcess.js b/entity/Contact_entity/entityfields/name_fieldgroup/valueProcess.js
similarity index 100%
rename from entity/Pers_entity/entityfields/name_fieldgroup/valueProcess.js
rename to entity/Contact_entity/entityfields/name_fieldgroup/valueProcess.js
diff --git a/entity/Org_entity/entityfields/newactivity/onActionProcess.js b/entity/Contact_entity/entityfields/newactivity/onActionProcess.js
similarity index 100%
rename from entity/Org_entity/entityfields/newactivity/onActionProcess.js
rename to entity/Contact_entity/entityfields/newactivity/onActionProcess.js
diff --git a/entity/Org_entity/entityfields/newoffer/onActionProcess.js b/entity/Contact_entity/entityfields/newoffer/onActionProcess.js
similarity index 100%
rename from entity/Org_entity/entityfields/newoffer/onActionProcess.js
rename to entity/Contact_entity/entityfields/newoffer/onActionProcess.js
diff --git a/entity/Pers_entity/entityfields/objectrelation_dfo/children/anyobjectrowid_param/code.js b/entity/Contact_entity/entityfields/objectrelations/children/anyobjectrowid_param/code.js
similarity index 100%
rename from entity/Pers_entity/entityfields/objectrelation_dfo/children/anyobjectrowid_param/code.js
rename to entity/Contact_entity/entityfields/objectrelations/children/anyobjectrowid_param/code.js
diff --git a/entity/Org_entity/entityfields/objectrelation_dfo/children/anyobjecttype_param/code.js b/entity/Contact_entity/entityfields/objectrelations/children/anyobjecttype_param/code.js
similarity index 100%
rename from entity/Org_entity/entityfields/objectrelation_dfo/children/anyobjecttype_param/code.js
rename to entity/Contact_entity/entityfields/objectrelations/children/anyobjecttype_param/code.js
diff --git a/entity/Contact_entity/entityfields/openeditdefaultsview/onActionProcess.js b/entity/Contact_entity/entityfields/openeditdefaultsview/onActionProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..66caa626fa898493304f86086061d38edce7a07a
--- /dev/null
+++ b/entity/Contact_entity/entityfields/openeditdefaultsview/onActionProcess.js
@@ -0,0 +1,3 @@
+import("system.vars");
+import("system.neon");
+neon.openContext("Contact_context", "ContactEditDefaults_view", [vars.get("$field.RELATIONID")], neon.OPERATINGSTATE_EDIT, null);
\ No newline at end of file
diff --git a/entity/Contact_entity/entityfields/openeditdefaultsview_action/onActionProcess.js b/entity/Contact_entity/entityfields/openeditdefaultsview_action/onActionProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..7586ff1cc154f2022c7fa6ae2a128e11a6d39a69
--- /dev/null
+++ b/entity/Contact_entity/entityfields/openeditdefaultsview_action/onActionProcess.js
@@ -0,0 +1,3 @@
+import("system.vars");
+import("system.neon");
+neon.openContext("Contact_context", "ContactEditDefaults_view", [vars.get("$sys.uid")], neon.OPERATINGSTATE_EDIT, null);
diff --git a/entity/Pers_entity/entityfields/org_id/linkedContextProcess.js b/entity/Contact_entity/entityfields/org_id/linkedContextProcess.js
similarity index 68%
rename from entity/Pers_entity/entityfields/org_id/linkedContextProcess.js
rename to entity/Contact_entity/entityfields/org_id/linkedContextProcess.js
index 5ac9b06e2cecd0de1d1cfb0f0728df2e6d97eeb4..be0af109ad4f0469b47bb955ff61f932ca768f6d 100644
--- a/entity/Pers_entity/entityfields/org_id/linkedContextProcess.js
+++ b/entity/Contact_entity/entityfields/org_id/linkedContextProcess.js
@@ -2,4 +2,4 @@ import("system.vars");
import("system.result");
if(vars.getString("$field.ORG_ID") != 0)
- result.string("Org_context");
\ No newline at end of file
+ result.string("Organisation_context");
\ No newline at end of file
diff --git a/entity/Pers_entity/entityfields/org_id/onValueChange.js b/entity/Contact_entity/entityfields/org_id/onValueChange.js
similarity index 100%
rename from entity/Pers_entity/entityfields/org_id/onValueChange.js
rename to entity/Contact_entity/entityfields/org_id/onValueChange.js
diff --git a/entity/Pers_entity/entityfields/org_id/valueProcess.js b/entity/Contact_entity/entityfields/org_id/valueProcess.js
similarity index 100%
rename from entity/Pers_entity/entityfields/org_id/valueProcess.js
rename to entity/Contact_entity/entityfields/org_id/valueProcess.js
diff --git a/entity/Org_entity/entityfields/orgaddress_dfo/children/relationtype_param/code.js b/entity/Contact_entity/entityfields/orgaddresses/children/relationtype_param/code.js
similarity index 100%
rename from entity/Org_entity/entityfields/orgaddress_dfo/children/relationtype_param/code.js
rename to entity/Contact_entity/entityfields/orgaddresses/children/relationtype_param/code.js
diff --git a/entity/Pers_entity/entityfields/persorgsaddresses_dfo/children/relid_param/code.js b/entity/Contact_entity/entityfields/orgaddresses/children/relid_param/code.js
similarity index 100%
rename from entity/Pers_entity/entityfields/persorgsaddresses_dfo/children/relid_param/code.js
rename to entity/Contact_entity/entityfields/orgaddresses/children/relid_param/code.js
diff --git a/entity/Org_entity/entityfields/org_date_edit/valueProcess.js b/entity/Contact_entity/entityfields/pers_date_edit/valueProcess.js
similarity index 100%
rename from entity/Org_entity/entityfields/org_date_edit/valueProcess.js
rename to entity/Contact_entity/entityfields/pers_date_edit/valueProcess.js
diff --git a/entity/Org_entity/entityfields/rel_date_new/valueProcess.js b/entity/Contact_entity/entityfields/pers_date_new/valueProcess.js
similarity index 100%
rename from entity/Org_entity/entityfields/rel_date_new/valueProcess.js
rename to entity/Contact_entity/entityfields/pers_date_new/valueProcess.js
diff --git a/entity/Pers_entity/entityfields/pers_id/documentation.adoc b/entity/Contact_entity/entityfields/pers_id/documentation.adoc
similarity index 100%
rename from entity/Pers_entity/entityfields/pers_id/documentation.adoc
rename to entity/Contact_entity/entityfields/pers_id/documentation.adoc
diff --git a/entity/Pers_entity/entityfields/pers_id/valueProcess.js b/entity/Contact_entity/entityfields/pers_id/valueProcess.js
similarity index 100%
rename from entity/Pers_entity/entityfields/pers_id/valueProcess.js
rename to entity/Contact_entity/entityfields/pers_id/valueProcess.js
diff --git a/entity/Org_entity/entityfields/org_user_edit/valueProcess.js b/entity/Contact_entity/entityfields/pers_user_edit/valueProcess.js
similarity index 100%
rename from entity/Org_entity/entityfields/org_user_edit/valueProcess.js
rename to entity/Contact_entity/entityfields/pers_user_edit/valueProcess.js
diff --git a/entity/Org_entity/entityfields/org_user_new/valueProcess.js b/entity/Contact_entity/entityfields/pers_user_new/valueProcess.js
similarity index 100%
rename from entity/Org_entity/entityfields/org_user_new/valueProcess.js
rename to entity/Contact_entity/entityfields/pers_user_new/valueProcess.js
diff --git a/entity/Org_entity/entityfields/orgaddress_dfo/children/defaultaddressid_param/code.js b/entity/Contact_entity/entityfields/persaddresses/children/defaultaddressid_param/code.js
similarity index 100%
rename from entity/Org_entity/entityfields/orgaddress_dfo/children/defaultaddressid_param/code.js
rename to entity/Contact_entity/entityfields/persaddresses/children/defaultaddressid_param/code.js
diff --git a/entity/Pers_entity/entityfields/persaddress_dfo/children/relationtype_param/code.js b/entity/Contact_entity/entityfields/persaddresses/children/relationtype_param/code.js
similarity index 100%
rename from entity/Pers_entity/entityfields/persaddress_dfo/children/relationtype_param/code.js
rename to entity/Contact_entity/entityfields/persaddresses/children/relationtype_param/code.js
diff --git a/entity/Pers_entity/entityfields/persaddress_dfo/children/relid_param/code.js b/entity/Contact_entity/entityfields/persaddresses/children/relid_param/code.js
similarity index 100%
rename from entity/Pers_entity/entityfields/persaddress_dfo/children/relid_param/code.js
rename to entity/Contact_entity/entityfields/persaddresses/children/relid_param/code.js
diff --git a/entity/Pers_entity/entityfields/persid/valueProcess.js b/entity/Contact_entity/entityfields/persid/valueProcess.js
similarity index 100%
rename from entity/Pers_entity/entityfields/persid/valueProcess.js
rename to entity/Contact_entity/entityfields/persid/valueProcess.js
diff --git a/entity/Org_entity/entityfields/orgcommphone_dfo/children/commcategory_param/code.js b/entity/Contact_entity/entityfields/phonecommunications/children/commcategory_param/code.js
similarity index 100%
rename from entity/Org_entity/entityfields/orgcommphone_dfo/children/commcategory_param/code.js
rename to entity/Contact_entity/entityfields/phonecommunications/children/commcategory_param/code.js
diff --git a/entity/Org_entity/entityfields/orgcommphone_dfo/children/relid_param/code.js b/entity/Contact_entity/entityfields/phonecommunications/children/relid_param/code.js
similarity index 100%
rename from entity/Org_entity/entityfields/orgcommphone_dfo/children/relid_param/code.js
rename to entity/Contact_entity/entityfields/phonecommunications/children/relid_param/code.js
diff --git a/entity/Org_entity/entityfields/orgcontract_dfo/children/relid_param/code.js b/entity/Contact_entity/entityfields/pricelists/children/relid_param/code.js
similarity index 100%
rename from entity/Org_entity/entityfields/orgcontract_dfo/children/relid_param/code.js
rename to entity/Contact_entity/entityfields/pricelists/children/relid_param/code.js
diff --git a/entity/Pers_entity/entityfields/perspricelist_dfo/stateProcess.js b/entity/Contact_entity/entityfields/pricelists/stateProcess.js
similarity index 100%
rename from entity/Pers_entity/entityfields/perspricelist_dfo/stateProcess.js
rename to entity/Contact_entity/entityfields/pricelists/stateProcess.js
diff --git a/entity/Org_entity/entityfields/rel_date_edit/valueProcess.js b/entity/Contact_entity/entityfields/rel_date_edit/valueProcess.js
similarity index 100%
rename from entity/Org_entity/entityfields/rel_date_edit/valueProcess.js
rename to entity/Contact_entity/entityfields/rel_date_edit/valueProcess.js
diff --git a/entity/Pers_entity/entityfields/pers_date_new/valueProcess.js b/entity/Contact_entity/entityfields/rel_date_new/valueProcess.js
similarity index 100%
rename from entity/Pers_entity/entityfields/pers_date_new/valueProcess.js
rename to entity/Contact_entity/entityfields/rel_date_new/valueProcess.js
diff --git a/entity/Pers_entity/entityfields/rel_relationship/valueProcess.js b/entity/Contact_entity/entityfields/rel_relationship/valueProcess.js
similarity index 100%
rename from entity/Pers_entity/entityfields/rel_relationship/valueProcess.js
rename to entity/Contact_entity/entityfields/rel_relationship/valueProcess.js
diff --git a/entity/Org_entity/entityfields/rel_user_edit/valueProcess.js b/entity/Contact_entity/entityfields/rel_user_edit/valueProcess.js
similarity index 100%
rename from entity/Org_entity/entityfields/rel_user_edit/valueProcess.js
rename to entity/Contact_entity/entityfields/rel_user_edit/valueProcess.js
diff --git a/entity/Org_entity/entityfields/rel_user_new/valueProcess.js b/entity/Contact_entity/entityfields/rel_user_new/valueProcess.js
similarity index 100%
rename from entity/Org_entity/entityfields/rel_user_new/valueProcess.js
rename to entity/Contact_entity/entityfields/rel_user_new/valueProcess.js
diff --git a/entity/Org_entity/entityfields/standard_email_comm/onValueChange.js b/entity/Contact_entity/entityfields/standard_email_comm/onValueChange.js
similarity index 100%
rename from entity/Org_entity/entityfields/standard_email_comm/onValueChange.js
rename to entity/Contact_entity/entityfields/standard_email_comm/onValueChange.js
diff --git a/entity/Org_entity/entityfields/standard_phone_comm/onValueChange.js b/entity/Contact_entity/entityfields/standard_phone_comm/onValueChange.js
similarity index 100%
rename from entity/Org_entity/entityfields/standard_phone_comm/onValueChange.js
rename to entity/Contact_entity/entityfields/standard_phone_comm/onValueChange.js
diff --git a/entity/Pers_entity/fromClauseProcess.js b/entity/Contact_entity/fromClauseProcess.js
similarity index 100%
rename from entity/Pers_entity/fromClauseProcess.js
rename to entity/Contact_entity/fromClauseProcess.js
diff --git a/entity/Pers_entity/imageProcess.js b/entity/Contact_entity/imageProcess.js
similarity index 100%
rename from entity/Pers_entity/imageProcess.js
rename to entity/Contact_entity/imageProcess.js
diff --git a/entity/Pers_entity/recordcontainers/db/conditionProcess.js b/entity/Contact_entity/recordcontainers/db/conditionProcess.js
similarity index 100%
rename from entity/Pers_entity/recordcontainers/db/conditionProcess.js
rename to entity/Contact_entity/recordcontainers/db/conditionProcess.js
diff --git a/entity/Pers_entity/recordcontainers/db/fromClauseProcess.js b/entity/Contact_entity/recordcontainers/db/fromClauseProcess.js
similarity index 100%
rename from entity/Pers_entity/recordcontainers/db/fromClauseProcess.js
rename to entity/Contact_entity/recordcontainers/db/fromClauseProcess.js
diff --git a/entity/Pers_entity/recordcontainers/db/onDBUpdate.js b/entity/Contact_entity/recordcontainers/db/onDBUpdate.js
similarity index 100%
rename from entity/Pers_entity/recordcontainers/db/onDBUpdate.js
rename to entity/Contact_entity/recordcontainers/db/onDBUpdate.js
diff --git a/entity/Org_entity/recordcontainers/db/recordfieldmappings/standard_email_comm.displayvalue/expression.js b/entity/Contact_entity/recordcontainers/db/recordfieldmappings/standard_email_comm.displayvalue/expression.js
similarity index 100%
rename from entity/Org_entity/recordcontainers/db/recordfieldmappings/standard_email_comm.displayvalue/expression.js
rename to entity/Contact_entity/recordcontainers/db/recordfieldmappings/standard_email_comm.displayvalue/expression.js
diff --git a/entity/Org_entity/recordcontainers/db/recordfieldmappings/standard_phone_comm.displayvalue/expression.js b/entity/Contact_entity/recordcontainers/db/recordfieldmappings/standard_phone_comm.displayvalue/expression.js
similarity index 100%
rename from entity/Org_entity/recordcontainers/db/recordfieldmappings/standard_phone_comm.displayvalue/expression.js
rename to entity/Contact_entity/recordcontainers/db/recordfieldmappings/standard_phone_comm.displayvalue/expression.js
diff --git a/entity/Pers_entity/titleProcess.js b/entity/Contact_entity/titleProcess.js
similarity index 100%
rename from entity/Pers_entity/titleProcess.js
rename to entity/Contact_entity/titleProcess.js
diff --git a/entity/Contract_entity/Contract_entity.aod b/entity/Contract_entity/Contract_entity.aod
index b11aede6e011b8371ab54603971f9d4db06d9db2..cd29aec6091405d0af99673e0c03313725ecd186 100644
--- a/entity/Contract_entity/Contract_entity.aod
+++ b/entity/Contract_entity/Contract_entity.aod
@@ -107,8 +107,8 @@
<dependencies>
<entityDependency>
<name>2146b082-6377-4b34-be6b-3dad18885614</name>
- <entityName>Pers_entity</entityName>
- <fieldName>PersContract_dfo</fieldName>
+ <entityName>Contact_entity</entityName>
+ <fieldName>Contracts</fieldName>
<isConsumer v="false" />
</entityDependency>
</dependencies>
@@ -120,8 +120,8 @@
<dependencies>
<entityDependency>
<name>6d7c7166-84b4-4da2-9a48-cc1e390ac987</name>
- <entityName>Org_entity</entityName>
- <fieldName>OrgContract_dfo</fieldName>
+ <entityName>Organisation_entity</entityName>
+ <fieldName>Contracts</fieldName>
<isConsumer v="false" />
</entityDependency>
</dependencies>
@@ -153,7 +153,7 @@
<dependency>
<name>dependency</name>
<entityName>Activity_entity</entityName>
- <fieldName>ContractActivity_dfi</fieldName>
+ <fieldName>LinkedObjects</fieldName>
</dependency>
<children>
<entityParameter>
diff --git a/entity/Countries_Entity/Countries_Entity.aod b/entity/Countries_Entity/Countries_Entity.aod
index 4937ff8b9832a16ab7f294b9775d0a51d751dfdf..f54c0dd2089c60f3ddc5a34f2acffed6a876d056 100644
--- a/entity/Countries_Entity/Countries_Entity.aod
+++ b/entity/Countries_Entity/Countries_Entity.aod
@@ -19,13 +19,13 @@
<entityDependency>
<name>83e8a2e6-aa80-4b35-a0ad-8dad483ed428</name>
<entityName>Address_entity</entityName>
- <fieldName>Countries_dfo</fieldName>
+ <fieldName>Countries</fieldName>
<isConsumer v="false" />
</entityDependency>
<entityDependency>
<name>8e8d1ace-3cbb-4ed7-b029-f486805605ef</name>
- <entityName>Org_entity</entityName>
- <fieldName>Countries_dfo</fieldName>
+ <entityName>Organisation_entity</entityName>
+ <fieldName>Countries</fieldName>
<isConsumer v="false" />
</entityDependency>
</dependencies>
diff --git a/entity/Document_entity/Document_entity.aod b/entity/Document_entity/Document_entity.aod
index 7980353d8c88161a51aeff0b089509a6c6c2c2dc..8667d73aa2291f3d1b922ffdba004c65e2db68ad 100644
--- a/entity/Document_entity/Document_entity.aod
+++ b/entity/Document_entity/Document_entity.aod
@@ -55,8 +55,8 @@
<dependencies>
<entityDependency>
<name>a6870a73-171b-4060-960c-8cc53ea558ae</name>
- <entityName>Org_entity</entityName>
- <fieldName>OrgDocument_dfo</fieldName>
+ <entityName>Organisation_entity</entityName>
+ <fieldName>Documents</fieldName>
<isConsumer v="false" />
</entityDependency>
</dependencies>
@@ -101,8 +101,8 @@
<dependencies>
<entityDependency>
<name>b312a3cc-2689-4bf6-8a83-85f0c21ae61e</name>
- <entityName>Pers_entity</entityName>
- <fieldName>PersDocument_dfo</fieldName>
+ <entityName>Contact_entity</entityName>
+ <fieldName>Documents</fieldName>
<isConsumer v="false" />
</entityDependency>
</dependencies>
@@ -249,7 +249,7 @@
<entityDependency>
<name>d57c0122-3227-4f98-b6a5-2ae45a0c5571</name>
<entityName>Activity_entity</entityName>
- <fieldName>ActivityDocument_dfo</fieldName>
+ <fieldName>AllDocuments</fieldName>
<isConsumer v="false" />
</entityDependency>
</dependencies>
@@ -262,7 +262,7 @@
<entityDependency>
<name>056d9a73-c9cd-44f2-828b-e9742b66fa37</name>
<entityName>Activity_entity</entityName>
- <fieldName>ActivityMainDocument_dfo</fieldName>
+ <fieldName>MainDocuments</fieldName>
<isConsumer v="false" />
</entityDependency>
</dependencies>
diff --git a/entity/Gender_keyword/Gender_keyword.aod b/entity/Gender_keyword/Gender_keyword.aod
index 2b677c0471864aab947b16f6a08dbee77e50869b..34a7da4696eb5ed6de1b3cc7aec637c2bcccf977 100644
--- a/entity/Gender_keyword/Gender_keyword.aod
+++ b/entity/Gender_keyword/Gender_keyword.aod
@@ -18,8 +18,8 @@
<dependencies>
<entityDependency>
<name>3feb4002-8a56-4be8-adc7-5a81c3cb72c5</name>
- <entityName>Pers_entity</entityName>
- <fieldName>PersGender_dfo</fieldName>
+ <entityName>Contact_entity</entityName>
+ <fieldName>Genders</fieldName>
<isConsumer v="false" />
</entityDependency>
</dependencies>
diff --git a/entity/History_entity/recordcontainers/db/orderClauseProcess.js b/entity/History_entity/recordcontainers/db/orderClauseProcess.js
deleted file mode 100644
index 2a0b3788355a2dd1557205b7ca99042eceb039be..0000000000000000000000000000000000000000
--- a/entity/History_entity/recordcontainers/db/orderClauseProcess.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import("system.result");
-import("system.db");
-
-result.object({"HISTORY.ENTRYDATE": db.DESCENDING});
\ No newline at end of file
diff --git a/entity/Keyword_entity/Keyword_entity.aod b/entity/Keyword_entity/Keyword_entity.aod
index 9ae33945c55b67856ea507a93dc755fcad931018..4d093b1cd29c03f61d62e3edfaf16ad8e3bd265b 100644
--- a/entity/Keyword_entity/Keyword_entity.aod
+++ b/entity/Keyword_entity/Keyword_entity.aod
@@ -4,7 +4,9 @@
<title>Keyword</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/Keyword_entity/documentation.adoc</documentation>
+ <onValidation>%aditoprj%/entity/Keyword_entity/onValidation.js</onValidation>
<iconId>VAADIN:KEY</iconId>
+ <iconIdProcess>%aditoprj%/entity/Keyword_entity/iconIdProcess.js</iconIdProcess>
<titleProcess>%aditoprj%/entity/Keyword_entity/titleProcess.js</titleProcess>
<recordContainer>db</recordContainer>
<entityFields>
@@ -15,7 +17,10 @@
</entityProvider>
<entityField>
<name>CONTAINER</name>
+ <documentation>%aditoprj%/entity/Keyword_entity/entityfields/container/documentation.adoc</documentation>
<title>Container</title>
+ <mandatory v="true" />
+ <possibleItemsProcess>%aditoprj%/entity/Keyword_entity/entityfields/container/possibleItemsProcess.js</possibleItemsProcess>
<groupable v="true" />
</entityField>
<entityField>
@@ -41,26 +46,34 @@
<entityField>
<name>KEYID</name>
<title>Key</title>
+ <state>READONLY</state>
+ <valueProcess>%aditoprj%/entity/Keyword_entity/entityfields/keyid/valueProcess.js</valueProcess>
</entityField>
<entityField>
<name>TITLE</name>
<title>Title (original language)</title>
+ <mandatory v="true" />
</entityField>
<entityField>
<name>SORTING</name>
+ <documentation>%aditoprj%/entity/Keyword_entity/entityfields/sorting/documentation.adoc</documentation>
<title>Sorting</title>
+ <state>READONLY</state>
</entityField>
<entityField>
<name>ISACTIVE</name>
<title>Active</title>
<contentType>BOOLEAN</contentType>
<possibleItemsProcess>%aditoprj%/entity/Keyword_entity/entityfields/isactive/possibleItemsProcess.js</possibleItemsProcess>
+ <valueProcess>%aditoprj%/entity/Keyword_entity/entityfields/isactive/valueProcess.js</valueProcess>
</entityField>
<entityField>
<name>ISESSENTIAL</name>
+ <documentation>%aditoprj%/entity/Keyword_entity/entityfields/isessential/documentation.adoc</documentation>
<title>Essential</title>
<contentType>BOOLEAN</contentType>
<possibleItemsProcess>%aditoprj%/entity/Keyword_entity/entityfields/isessential/possibleItemsProcess.js</possibleItemsProcess>
+ <state>READONLY</state>
</entityField>
<entityParameter>
<name>containerName_param</name>
@@ -75,7 +88,7 @@
<dependencies>
<entityDependency>
<name>bb48a3ee-f340-4fd4-8c80-ef73b765ab58</name>
- <entityName>Org_entity</entityName>
+ <entityName>Organisation_entity</entityName>
<fieldName>RelationStates</fieldName>
<isConsumer v="false" />
</entityDependency>
@@ -86,17 +99,33 @@
<isConsumer v="false" />
</entityDependency>
</dependencies>
+ <children>
+ <entityParameter>
+ <name>onlyActives</name>
+ <code>%aditoprj%/entity/Keyword_entity/entityfields/generic_dfi/children/onlyactives/code.js</code>
+ <expose v="true" />
+ </entityParameter>
+ </children>
</entityProvider>
<entityField>
<name>TITLE_TRANSLATED</name>
<valueProcess>%aditoprj%/entity/Keyword_entity/entityfields/title_translated/valueProcess.js</valueProcess>
</entityField>
+ <entityParameter>
+ <name>onlyActives</name>
+ <code>%aditoprj%/entity/Keyword_entity/entityfields/onlyactives/code.js</code>
+ <expose v="true" />
+ <triggerRecalculation v="true" />
+ <description>PARAMETER</description>
+ </entityParameter>
</entityFields>
<recordContainers>
<dbRecordContainer>
<name>db</name>
<alias>Data_alias</alias>
<conditionProcess>%aditoprj%/entity/Keyword_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
+ <orderClauseProcess>%aditoprj%/entity/Keyword_entity/recordcontainers/db/orderClauseProcess.js</orderClauseProcess>
+ <onDBUpdate>%aditoprj%/entity/Keyword_entity/recordcontainers/db/onDBUpdate.js</onDBUpdate>
<linkInformation>
<linkInformation>
<name>52acbfe0-57f4-4614-83af-9882e168f431</name>
diff --git a/entity/Keyword_entity/documentation.adoc b/entity/Keyword_entity/documentation.adoc
index bd1db753b161e22c51377479812d1132ecb9c2bc..85315315fa2f284f66f942747594cef62fb842b6 100644
--- a/entity/Keyword_entity/documentation.adoc
+++ b/entity/Keyword_entity/documentation.adoc
@@ -12,7 +12,7 @@ Glossary
[glossary]
Keyword Container::
- A keyword container is the element that keeps several entries of Keywords together. That could be for example something like "Contact-Status".
+ A keyword container is the element that keeps several entries of Keywords together. That could be for example something like "Contact-Status". Keep in mind that this done virtually and not in the actual way of storage.
Keyword Entry::
A keyword entry is a specific child-element of a keyword container. For the upper example "Contact-Status" this could be "Active", "Inactive", etc.
diff --git a/entity/Keyword_entity/entityfields/container/documentation.adoc b/entity/Keyword_entity/entityfields/container/documentation.adoc
new file mode 100644
index 0000000000000000000000000000000000000000..b46aaac93ed420d5150d4d5202dc302a4898ca70
--- /dev/null
+++ b/entity/Keyword_entity/entityfields/container/documentation.adoc
@@ -0,0 +1 @@
+ `CONTAINER` is the a name and used for grouping keyword-entries. This is was a keyword-container essentially is.
\ No newline at end of file
diff --git a/entity/Keyword_entity/entityfields/container/possibleItemsProcess.js b/entity/Keyword_entity/entityfields/container/possibleItemsProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..6d8037350d9404a9d3fda57b4f842a83a9f00e6e
--- /dev/null
+++ b/entity/Keyword_entity/entityfields/container/possibleItemsProcess.js
@@ -0,0 +1,6 @@
+import("system.result");
+import("system.db");
+
+//TODO: move into UEM
+//first column is ID, second view value - which is the same because there is no ID for keyword-containers
+result.object(db.table("select distinct AB_KEYWORD_ENTRY.CONTAINER, AB_KEYWORD_ENTRY.CONTAINER from AB_KEYWORD_ENTRY order by 1 asc"));
\ No newline at end of file
diff --git a/entity/Keyword_entity/entityfields/generic_dfi/children/onlyactives/code.js b/entity/Keyword_entity/entityfields/generic_dfi/children/onlyactives/code.js
new file mode 100644
index 0000000000000000000000000000000000000000..0e7522714af4e73d87e977bb3e83b350461053b6
--- /dev/null
+++ b/entity/Keyword_entity/entityfields/generic_dfi/children/onlyactives/code.js
@@ -0,0 +1,2 @@
+import("system.result");
+result.string("true");//TODO: provider-code is not executed correct (did not receive the value from here)
\ No newline at end of file
diff --git a/entity/Keyword_entity/entityfields/isactive/valueProcess.js b/entity/Keyword_entity/entityfields/isactive/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..95f59e0c071d0c4ed575acf0ae642c6cfd37a2f5
--- /dev/null
+++ b/entity/Keyword_entity/entityfields/isactive/valueProcess.js
@@ -0,0 +1,7 @@
+import("system.util");
+import("system.result");
+import("system.neon");
+import("system.vars");
+
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
+ result.string("1");
\ No newline at end of file
diff --git a/entity/Keyword_entity/entityfields/isessential/documentation.adoc b/entity/Keyword_entity/entityfields/isessential/documentation.adoc
new file mode 100644
index 0000000000000000000000000000000000000000..a8ed78817f03465060f46e92b9b34162242dc34f
--- /dev/null
+++ b/entity/Keyword_entity/entityfields/isessential/documentation.adoc
@@ -0,0 +1,7 @@
+Specifies if a keyword-entry is essential. An essential keyword-entry is protected an must not be deleted because the `KEYID` is used within JDito-Code and there is functionality behind that keyword-entry.
+
+
+[NOTE]
+====
+Therefore this field cannot be set (it's *READONLY*) - a `true`-value makes only sense if the developer decides to use it which is why he has to care that the field is marked as essential.
+====
diff --git a/entity/Keyword_entity/entityfields/keyid/valueProcess.js b/entity/Keyword_entity/entityfields/keyid/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..4af99287f59a86e98d9b4c552c010fe13c106cc7
--- /dev/null
+++ b/entity/Keyword_entity/entityfields/keyid/valueProcess.js
@@ -0,0 +1,7 @@
+import("system.util");
+import("system.result");
+import("system.neon");
+import("system.vars");
+
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
+ result.string(util.getNewUUID());
\ No newline at end of file
diff --git a/entity/Keyword_entity/entityfields/onlyactives/code.js b/entity/Keyword_entity/entityfields/onlyactives/code.js
new file mode 100644
index 0000000000000000000000000000000000000000..3504e7637476a34d3ab50f5767f8a7b5dba25387
--- /dev/null
+++ b/entity/Keyword_entity/entityfields/onlyactives/code.js
@@ -0,0 +1,2 @@
+import("system.result");
+result.string("false");
\ No newline at end of file
diff --git a/entity/Keyword_entity/entityfields/sorting/documentation.adoc b/entity/Keyword_entity/entityfields/sorting/documentation.adoc
new file mode 100644
index 0000000000000000000000000000000000000000..d999d0a3d2509691a8f9c2d9830044cbd690218a
--- /dev/null
+++ b/entity/Keyword_entity/entityfields/sorting/documentation.adoc
@@ -0,0 +1,6 @@
+Used for sorting keyword-entries within a keyword-container.
+
+[NOTE]
+====
+Currently this cannot be set (it's *READONLY*) - the value is generated automatically. Reserved for future use.
+====
diff --git a/entity/Keyword_entity/iconIdProcess.js b/entity/Keyword_entity/iconIdProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..ef0457e780554daacf633e3381aff300f84e713c
--- /dev/null
+++ b/entity/Keyword_entity/iconIdProcess.js
@@ -0,0 +1,7 @@
+import("system.vars");
+import("system.result");
+
+var container = vars.get("$field.CONTAINER");
+
+if (container)
+ result.string("TEXT:" + container);
\ No newline at end of file
diff --git a/entity/Keyword_entity/onValidation.js b/entity/Keyword_entity/onValidation.js
new file mode 100644
index 0000000000000000000000000000000000000000..ae813d018848dcb847a752c1eedb985090518c16
--- /dev/null
+++ b/entity/Keyword_entity/onValidation.js
@@ -0,0 +1,21 @@
+import("system.db");
+import("system.vars");
+import("system.text");
+import("system.neon");
+import("Sql_lib");
+
+//TODO: this should no happen in onValidation; waiting for #1032668
+if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
+{
+ var keyContainer = vars.get("$field.CONTAINER");
+ if (keyContainer)
+ {
+ var cond = SqlCondition.begin().andPrepare("AB_KEYWORD_ENTRY.CONTAINER", keyContainer);
+ var maskingHelper = new SqlMaskingUtils();
+ var newCodeNumber = db.cell(cond.buildSql("select " + maskingHelper.max("AB_KEYWORD_ENTRY.SORTING") + " from AB_KEYWORD_ENTRY", "1 = 2"));
+ newCodeNumber = Number(newCodeNumber);//if no number exists till no, start value will be 1 (due to: ++0)
+ if (isNaN(newCodeNumber))
+ throw new TypeError();//TODO:add Message
+ neon.setFieldValue("$field.SORTING", ++newCodeNumber);
+ }
+}
\ No newline at end of file
diff --git a/entity/Keyword_entity/recordcontainers/db/conditionProcess.js b/entity/Keyword_entity/recordcontainers/db/conditionProcess.js
index b581f2d83f5fee8ecd01da407517d76b64a86dd2..7b0650f1d331e6ff462876ffdb803d67d58c9408 100644
--- a/entity/Keyword_entity/recordcontainers/db/conditionProcess.js
+++ b/entity/Keyword_entity/recordcontainers/db/conditionProcess.js
@@ -1,10 +1,14 @@
+import("system.vars");
import("system.db");
import("system.result");
import("Sql_lib");
var cond = SqlCondition.begin().andPrepareVars("AB_KEYWORD_ENTRY.CONTAINER", "$param.containerName_param");
-if (!cond.isSet())
- throw new Error("keyword containerName has to be set");//at the moment throw an error since there is no list of "all keywords"
-var condStr = db.translateCondition(cond.build());
+if (vars.get("$param.onlyActives") == "true")
+{
+ cond.andPrepare("AB_KEYWORD_ENTRY.ISACTIVE", "1");
+}
+
+var condStr = db.translateCondition(cond.build("1 = 1"));
result.string(condStr);
\ No newline at end of file
diff --git a/entity/Keyword_entity/recordcontainers/db/onDBUpdate.js b/entity/Keyword_entity/recordcontainers/db/onDBUpdate.js
new file mode 100644
index 0000000000000000000000000000000000000000..a1e6133b613a59c988a2abaf9c87f81d9139b08b
--- /dev/null
+++ b/entity/Keyword_entity/recordcontainers/db/onDBUpdate.js
@@ -0,0 +1,29 @@
+import("system.logging");
+import("system.db");
+import("system.vars");
+import("system.text");
+import("system.neon");
+import("Sql_lib");
+
+var changedFields = vars.get("$local.changed");
+//whenever the container is changed data that depends on the keyword-container has be "fixed" to keep consistency
+//this could be information like Keyword-attributes or the sorting-position
+//maybe it'd be better to lock KeywordContainer as read-only after creation
+if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT && changedFields.indexOf("AB_KEYWORD_ENTRY.CONTAINER") > -1)
+{
+ var keyContainer = vars.get("$field.CONTAINER");
+ if (keyContainer)
+ {
+ var cond = SqlCondition.begin().andPrepare("AB_KEYWORD_ENTRY.CONTAINER", keyContainer);
+ var maskingHelper = new SqlMaskingUtils();
+ var newCodeNumber = db.cell(cond.buildSql("select " + maskingHelper.max("AB_KEYWORD_ENTRY.SORTING") + " from AB_KEYWORD_ENTRY", "1 = 2"));
+ newCodeNumber = Number(newCodeNumber);//if no number exists till no, start value will be 1 (due to: ++0)
+ if (isNaN(newCodeNumber))
+ throw new TypeError();//TODO:add Message
+
+ var cols = ["SORTING"];
+ var vals = [++newCodeNumber];
+ cond.clear().andPrepare("AB_KEYWORD_ENTRY.AB_KEYWORD_ENTRYID", vars.get("$sys.uid"));
+ db.updateData("AB_KEYWORD_ENTRY", cols, null, vals, cond.build("1 = 2"));
+ }
+}
\ No newline at end of file
diff --git a/entity/Keyword_entity/recordcontainers/db/orderClauseProcess.js b/entity/Keyword_entity/recordcontainers/db/orderClauseProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..b8dafebb3d124fac43eb1bf6d64037083dfae319
--- /dev/null
+++ b/entity/Keyword_entity/recordcontainers/db/orderClauseProcess.js
@@ -0,0 +1,7 @@
+import("system.db");
+import("system.result");
+
+result.object({
+ "AB_KEYWORD_ENTRY.CONTAINER": db.ASCENDING
+ ,"AB_KEYWORD_ENTRY.SORTING": db.ASCENDING
+});
\ No newline at end of file
diff --git a/entity/ObjectRelation_entity/ObjectRelation_entity.aod b/entity/ObjectRelation_entity/ObjectRelation_entity.aod
index 5946a919521c26ab4302d90fc9068f4a58ef3a41..ce309b86912583f4db5cccd2e67f30bcc6a5e8f9 100644
--- a/entity/ObjectRelation_entity/ObjectRelation_entity.aod
+++ b/entity/ObjectRelation_entity/ObjectRelation_entity.aod
@@ -66,16 +66,11 @@
<entityDependency>
<name>8eb3187c-07cb-4b51-8b7e-d63e83959bdb</name>
<entityName>Activity_entity</entityName>
- <fieldName>ActivityObjectRelation_dfo</fieldName>
+ <fieldName>ObjectRelations</fieldName>
<isConsumer v="false" />
</entityDependency>
</dependencies>
<children>
- <entityParameter>
- <name>ObjectRelatonId_param</name>
- <expose v="false" />
- <mandatory v="false" />
- </entityParameter>
<entityParameter>
<name>AnyObjectRowid_param</name>
<expose v="false" />
@@ -205,14 +200,14 @@
<dependencies>
<entityDependency>
<name>744259f7-3b08-4147-8376-3311b7a35712</name>
- <entityName>Pers_entity</entityName>
- <fieldName>ObjectRelation_dfo</fieldName>
+ <entityName>Contact_entity</entityName>
+ <fieldName>ObjectRelations</fieldName>
<isConsumer v="false" />
</entityDependency>
<entityDependency>
<name>38acc24a-716c-4c58-9e6f-9d3ccca0ab43</name>
- <entityName>Org_entity</entityName>
- <fieldName>ObjectRelation_dfo</fieldName>
+ <entityName>Organisation_entity</entityName>
+ <fieldName>ObjectRelations</fieldName>
<isConsumer v="false" />
</entityDependency>
</dependencies>
@@ -243,10 +238,11 @@
</entityParameter>
</children>
</entityProvider>
+ <entityProvider>
<name>test_dfi</name>
<fieldType>DEPENDENCY_IN</fieldType>
<recordContainer>db</recordContainer>
- </entityIncomingField>
+ </entityProvider>
</entityFields>
<recordContainers>
<dbRecordContainer>
diff --git a/entity/Org_entity/entityfields/openeditdefaultsview/onActionProcess.js b/entity/Org_entity/entityfields/openeditdefaultsview/onActionProcess.js
deleted file mode 100644
index f7d67f293ebf1e23e6aac9ede5864b663f5323aa..0000000000000000000000000000000000000000
--- a/entity/Org_entity/entityfields/openeditdefaultsview/onActionProcess.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import("system.vars");
-import("system.neon");
-neon.openContext("Org_context", "OrgEditDefaults_view", [vars.get("$field.ORGID")], neon.OPERATINGSTATE_EDIT, null);
diff --git a/entity/Org_entity/Org_entity.aod b/entity/Organisation_entity/Organisation_entity.aod
similarity index 66%
rename from entity/Org_entity/Org_entity.aod
rename to entity/Organisation_entity/Organisation_entity.aod
index db7c66ff4e89294c5b71a54aa3d982bab3c24ed3..5d8a3f3cce83ec96f534d3253c8062ee156ae130 100644
--- a/entity/Org_entity/Org_entity.aod
+++ b/entity/Organisation_entity/Organisation_entity.aod
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.2.0">
- <name>Org_entity</name>
+ <name>Organisation_entity</name>
<title>Company</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
- <documentation>%aditoprj%/entity/Org_entity/documentation.adoc</documentation>
+ <documentation>%aditoprj%/entity/Organisation_entity/documentation.adoc</documentation>
<iconId>VAADIN:BUILDING</iconId>
- <imageProcess>%aditoprj%/entity/Org_entity/imageProcess.js</imageProcess>
- <titleProcess>%aditoprj%/entity/Org_entity/titleProcess.js</titleProcess>
+ <imageProcess>%aditoprj%/entity/Organisation_entity/imageProcess.js</imageProcess>
+ <titleProcess>%aditoprj%/entity/Organisation_entity/titleProcess.js</titleProcess>
<recordContainer>db</recordContainer>
<entityFields>
<entityField>
@@ -19,14 +19,14 @@
<contentType>DATE</contentType>
<outputFormat>yyyy-MM-dd&apos;T&apos;HH:mm:ssZ</outputFormat>
<searchable v="false" />
- <valueProcess>%aditoprj%/entity/Org_entity/entityfields/org_date_edit/valueProcess.js</valueProcess>
+ <valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/org_date_edit/valueProcess.js</valueProcess>
</entityField>
<entityField>
<name>ORG_DATE_NEW</name>
<contentType>DATE</contentType>
<outputFormat>yyyy-MM-dd&apos;T&apos;HH:mm:ssZ</outputFormat>
<searchable v="false" />
- <valueProcess>%aditoprj%/entity/Org_entity/entityfields/org_date_new/valueProcess.js</valueProcess>
+ <valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/org_date_new/valueProcess.js</valueProcess>
<onValueChangeTypes>
<element>MASK</element>
<element>PROCESS</element>
@@ -45,49 +45,49 @@
<entityField>
<name>ORGID</name>
<searchable v="false" />
- <valueProcess>%aditoprj%/entity/Org_entity/entityfields/orgid/valueProcess.js</valueProcess>
+ <valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/orgid/valueProcess.js</valueProcess>
</entityField>
<entityField>
<name>ORG_USER_EDIT</name>
<searchable v="false" />
- <valueProcess>%aditoprj%/entity/Org_entity/entityfields/org_user_edit/valueProcess.js</valueProcess>
+ <valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/org_user_edit/valueProcess.js</valueProcess>
</entityField>
<entityField>
<name>ORG_USER_NEW</name>
<searchable v="false" />
- <valueProcess>%aditoprj%/entity/Org_entity/entityfields/org_user_new/valueProcess.js</valueProcess>
+ <valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/org_user_new/valueProcess.js</valueProcess>
</entityField>
<entityField>
<name>REL_DATE_EDIT</name>
<contentType>DATE</contentType>
<outputFormat>yyyy-MM-dd&apos;T&apos;HH:mm:ssZ</outputFormat>
<searchable v="false" />
- <valueProcess>%aditoprj%/entity/Org_entity/entityfields/rel_date_edit/valueProcess.js</valueProcess>
+ <valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/rel_date_edit/valueProcess.js</valueProcess>
</entityField>
<entityField>
<name>REL_DATE_NEW</name>
<contentType>DATE</contentType>
<outputFormat>yyyy-MM-dd&apos;T&apos;HH:mm:ssZ</outputFormat>
<searchable v="false" />
- <valueProcess>%aditoprj%/entity/Org_entity/entityfields/rel_date_new/valueProcess.js</valueProcess>
+ <valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/rel_date_new/valueProcess.js</valueProcess>
</entityField>
<entityField>
<name>LANGUAGE</name>
<title>Language</title>
- <consumer>Countries_dfo</consumer>
- <possibleItemsProcess>%aditoprj%/entity/Org_entity/entityfields/language/possibleItemsProcess.js</possibleItemsProcess>
+ <consumer>Countries</consumer>
+ <possibleItemsProcess>%aditoprj%/entity/Organisation_entity/entityfields/language/possibleItemsProcess.js</possibleItemsProcess>
<selectionMode>SINGLE</selectionMode>
- <displayValueProcess>%aditoprj%/entity/Org_entity/entityfields/language/displayValueProcess.js</displayValueProcess>
+ <displayValueProcess>%aditoprj%/entity/Organisation_entity/entityfields/language/displayValueProcess.js</displayValueProcess>
</entityField>
<entityField>
<name>ORG_ID</name>
<searchable v="false" />
- <valueProcess>%aditoprj%/entity/Org_entity/entityfields/org_id/valueProcess.js</valueProcess>
+ <valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/org_id/valueProcess.js</valueProcess>
</entityField>
<entityField>
<name>RELATIONID</name>
<searchable v="false" />
- <valueProcess>%aditoprj%/entity/Org_entity/entityfields/relationid/valueProcess.js</valueProcess>
+ <valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/relationid/valueProcess.js</valueProcess>
</entityField>
<entityField>
<name>STATUS</name>
@@ -99,53 +99,53 @@
<entityField>
<name>REL_USER_EDIT</name>
<searchable v="false" />
- <valueProcess>%aditoprj%/entity/Org_entity/entityfields/rel_user_edit/valueProcess.js</valueProcess>
+ <valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/rel_user_edit/valueProcess.js</valueProcess>
</entityField>
<entityField>
<name>REL_USER_NEW</name>
<searchable v="false" />
- <valueProcess>%aditoprj%/entity/Org_entity/entityfields/rel_user_new/valueProcess.js</valueProcess>
+ <valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/rel_user_new/valueProcess.js</valueProcess>
</entityField>
<entityField>
<name>TYPE</name>
<title>Type</title>
- <possibleItemsProcess>%aditoprj%/entity/Org_entity/entityfields/type/possibleItemsProcess.js</possibleItemsProcess>
+ <possibleItemsProcess>%aditoprj%/entity/Organisation_entity/entityfields/type/possibleItemsProcess.js</possibleItemsProcess>
<searchable v="false" />
</entityField>
<entityConsumer>
- <name>OrgActivity_dfo</name>
+ <name>Activities</name>
<title>Activities</title>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
<name>dependency</name>
<entityName>Activity_entity</entityName>
- <fieldName>OrgActivity_dfi</fieldName>
+ <fieldName>LinkedObjects</fieldName>
</dependency>
<children>
<entityParameter>
<name>RowId_param</name>
- <code>%aditoprj%/entity/Org_entity/entityfields/orgactivity_dfo/children/rowid_param/code.js</code>
+ <code>%aditoprj%/entity/Organisation_entity/entityfields/activities/children/rowid_param/code.js</code>
<triggerRecalculation v="true" />
</entityParameter>
<entityParameter>
<name>ObjectId_param</name>
- <code>%aditoprj%/entity/Org_entity/entityfields/orgactivity_dfo/children/objectid_param/code.js</code>
+ <code>%aditoprj%/entity/Organisation_entity/entityfields/activities/children/objectid_param/code.js</code>
</entityParameter>
</children>
</entityConsumer>
<entityConsumer>
- <name>PersOrg_dfo</name>
+ <name>Contacts</name>
<title>Contacts</title>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
<name>dependency</name>
- <entityName>Pers_entity</entityName>
- <fieldName>PersOrg_dfi</fieldName>
+ <entityName>Contact_entity</entityName>
+ <fieldName>OrganisationRelated</fieldName>
</dependency>
<children>
<entityParameter>
<name>OrgId_param</name>
- <code>%aditoprj%/entity/Org_entity/entityfields/persorg_dfo/children/orgid_param/code.js</code>
+ <code>%aditoprj%/entity/Organisation_entity/entityfields/contacts/children/orgid_param/code.js</code>
<triggerRecalculation v="true" />
</entityParameter>
</children>
@@ -153,37 +153,25 @@
<entityField>
<name>IMAGE</name>
<contentType>IMAGE</contentType>
- <valueProcess>%aditoprj%/entity/Org_entity/entityfields/image/valueProcess.js</valueProcess>
- <onValueChange>%aditoprj%/entity/Org_entity/entityfields/image/onValueChange.js</onValueChange>
+ <valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/image/valueProcess.js</valueProcess>
+ <onValueChange>%aditoprj%/entity/Organisation_entity/entityfields/image/onValueChange.js</onValueChange>
<onValueChangeTypes>
<element>MASK</element>
</onValueChangeTypes>
</entityField>
<entityFieldGroup>
<name>CUSTOMERCODE_DISPLAY_fieldGroup</name>
- <valueProcess>%aditoprj%/entity/Org_entity/entityfields/customercode_display_fieldgroup/valueProcess.js</valueProcess>
+ <valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/customercode_display_fieldgroup/valueProcess.js</valueProcess>
<description>FIELDGROUP</description>
<fields>
<element>CUSTOMERCODE</element>
</fields>
</entityFieldGroup>
<entityProvider>
- <name>Org_dfi</name>
+ <name>byUid</name>
<fieldType>DEPENDENCY_IN</fieldType>
<recordContainer>db</recordContainer>
<dependencies>
- <entityDependency>
- <name>11f8e13a-d801-4bd6-829c-d334c49e9a4c</name>
- <entityName>Pers_entity</entityName>
- <fieldName>PersOrg_dfo</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>a6e1d9a2-9079-4415-b56f-865df5170d5e</name>
- <entityName>Salesproject_entity</entityName>
- <fieldName>SalesprojectOrg_dfo</fieldName>
- <isConsumer v="false" />
- </entityDependency>
<entityDependency>
<name>e56d51be-aaf7-4ddc-8bed-7a4a3c42b4dd</name>
<entityName>Relation_entity</entityName>
@@ -191,15 +179,21 @@
<isConsumer v="false" />
</entityDependency>
<entityDependency>
- <name>8bc24adb-78f1-49bb-a41d-79fb29175b27</name>
- <entityName>Product_entity</entityName>
- <fieldName>ProductOrg_dfo</fieldName>
+ <name>120c8bfb-1b03-408d-97e7-88e3b7249c53</name>
+ <entityName>SalesprojectCompetition_entity</entityName>
+ <fieldName>SalesprojectCompetitionOrg_dfo</fieldName>
<isConsumer v="false" />
</entityDependency>
</dependencies>
+ <children>
+ <entityParameter>
+ <name>relationId_param</name>
+ <mandatory v="true" />
+ </entityParameter>
+ </children>
</entityProvider>
<entityConsumer>
- <name>OrgAddress_dfo</name>
+ <name>Addresses</name>
<title>Addresses</title>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
@@ -210,17 +204,17 @@
<children>
<entityParameter>
<name>RelId_param</name>
- <code>%aditoprj%/entity/Org_entity/entityfields/orgaddress_dfo/children/relid_param/code.js</code>
+ <code>%aditoprj%/entity/Organisation_entity/entityfields/addresses/children/relid_param/code.js</code>
<triggerRecalculation v="true" />
</entityParameter>
<entityParameter>
<name>DefaultAddressId_param</name>
- <code>%aditoprj%/entity/Org_entity/entityfields/orgaddress_dfo/children/defaultaddressid_param/code.js</code>
+ <code>%aditoprj%/entity/Organisation_entity/entityfields/addresses/children/defaultaddressid_param/code.js</code>
<triggerRecalculation v="true" />
</entityParameter>
<entityParameter>
<name>RelationType_param</name>
- <code>%aditoprj%/entity/Org_entity/entityfields/orgaddress_dfo/children/relationtype_param/code.js</code>
+ <code>%aditoprj%/entity/Organisation_entity/entityfields/addresses/children/relationtype_param/code.js</code>
<triggerRecalculation v="true" />
</entityParameter>
</children>
@@ -228,30 +222,30 @@
<entityField>
<name>ADDRESS_ID</name>
<title>standard address</title>
- <consumer>OrgAddress_dfo</consumer>
+ <consumer>Addresses</consumer>
<searchable v="false" />
<state>AUTO</state>
- <displayValueProcess>%aditoprj%/entity/Org_entity/entityfields/address_id/displayValueProcess.js</displayValueProcess>
+ <displayValueProcess>%aditoprj%/entity/Organisation_entity/entityfields/address_id/displayValueProcess.js</displayValueProcess>
</entityField>
<entityConsumer>
- <name>OrgComm_dfo</name>
+ <name>Communications</name>
<title>Communication</title>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
<name>dependency</name>
- <entityName>Comm_entity</entityName>
+ <entityName>Communication_entity</entityName>
<fieldName>OrgComm_dfi</fieldName>
</dependency>
<children>
<entityParameter>
<name>RelId_param</name>
- <code>%aditoprj%/entity/Org_entity/entityfields/orgcomm_dfo/children/relid_param/code.js</code>
+ <code>%aditoprj%/entity/Organisation_entity/entityfields/communications/children/relid_param/code.js</code>
<triggerRecalculation v="true" />
</entityParameter>
</children>
</entityConsumer>
<entityConsumer>
- <name>OrgContract_dfo</name>
+ <name>Contracts</name>
<title>Contracts</title>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
@@ -262,13 +256,13 @@
<children>
<entityParameter>
<name>RelId_param</name>
- <code>%aditoprj%/entity/Org_entity/entityfields/orgcontract_dfo/children/relid_param/code.js</code>
+ <code>%aditoprj%/entity/Organisation_entity/entityfields/contracts/children/relid_param/code.js</code>
<triggerRecalculation v="true" />
</entityParameter>
</children>
</entityConsumer>
<entityConsumer>
- <name>OrgProduct_dfo</name>
+ <name>Products</name>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
<name>dependency</name>
@@ -278,12 +272,12 @@
<children>
<entityParameter>
<name>relationId_param</name>
- <code>%aditoprj%/entity/Org_entity/entityfields/orgproduct_dfo/children/relationid_param/code.js</code>
+ <code>%aditoprj%/entity/Organisation_entity/entityfields/products/children/relationid_param/code.js</code>
</entityParameter>
</children>
</entityConsumer>
<entityConsumer>
- <name>OrgProductprice_dfo</name>
+ <name>Productprices</name>
<title>Conditions</title>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
@@ -294,15 +288,41 @@
<children>
<entityParameter>
<name>RelID_param</name>
- <code>%aditoprj%/entity/Org_entity/entityfields/orgproductprice_dfo/children/relid_param/code.js</code>
+ <code>%aditoprj%/entity/Organisation_entity/entityfields/productprices/children/relid_param/code.js</code>
</entityParameter>
</children>
</entityConsumer>
<entityProvider>
<name>#PROVIDER</name>
+ <dependencies>
+ <entityDependency>
+ <name>72825dbe-c602-4c17-9aa8-546c4b61f2f9</name>
+ <entityName>Contact_entity</entityName>
+ <fieldName>Organisations</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>f78c0ca6-7939-4a0e-903e-0fbbbf512e76</name>
+ <entityName>Product_entity</entityName>
+ <fieldName>Organisations</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>1fa399a8-8c0c-470f-94a8-6c748293d93d</name>
+ <entityName>SalesprojectCompetition_entity</entityName>
+ <fieldName>CompetitionOrg_lookup_dfo</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>c84fdb27-45a1-4dec-b013-af43751f6a7b</name>
+ <entityName>Salesproject_entity</entityName>
+ <fieldName>Organisations</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ </dependencies>
</entityProvider>
<entityConsumer>
- <name>OrgDocument_dfo</name>
+ <name>Documents</name>
<title>Documents</title>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
@@ -313,23 +333,18 @@
<children>
<entityParameter>
<name>AssignmentName_param</name>
- <code>%aditoprj%/entity/Org_entity/entityfields/orgdocument_dfo/children/assignmentname_param/code.js</code>
+ <code>%aditoprj%/entity/Organisation_entity/entityfields/documents/children/assignmentname_param/code.js</code>
</entityParameter>
<entityParameter>
<name>AssignmentRowId_param</name>
- <code>%aditoprj%/entity/Org_entity/entityfields/orgdocument_dfo/children/assignmentrowid_param/code.js</code>
+ <code>%aditoprj%/entity/Organisation_entity/entityfields/documents/children/assignmentrowid_param/code.js</code>
</entityParameter>
<entityParameter>
<name>AssignmentTable_param</name>
- <code>%aditoprj%/entity/Org_entity/entityfields/orgdocument_dfo/children/assignmenttable_param/code.js</code>
+ <code>%aditoprj%/entity/Organisation_entity/entityfields/documents/children/assignmenttable_param/code.js</code>
</entityParameter>
</children>
</entityConsumer>
- <entityProvider>
- <name>RelationOrg_dfi</name>
- <fieldType>DEPENDENCY_IN</fieldType>
- <recordContainer>db</recordContainer>
- </entityProvider>
<entityParameter>
<name>relationId_param</name>
<expose v="true" />
@@ -340,61 +355,42 @@
<entityActionField>
<name>openEditDefaultsView</name>
<fieldType>ACTION</fieldType>
- <documentation>%aditoprj%/entity/Org_entity/entityfields/openeditdefaultsview/documentation.adoc</documentation>
+ <documentation>%aditoprj%/entity/Organisation_entity/entityfields/openeditdefaultsview/documentation.adoc</documentation>
<title>Edit defaults</title>
- <onActionProcess>%aditoprj%/entity/Org_entity/entityfields/openeditdefaultsview/onActionProcess.js</onActionProcess>
+ <onActionProcess>%aditoprj%/entity/Organisation_entity/entityfields/openeditdefaultsview/onActionProcess.js</onActionProcess>
<iconId>NEON:WRENCH</iconId>
</entityActionField>
<entityActionField>
<name>newOffer</name>
<fieldType>ACTION</fieldType>
- <documentation>%aditoprj%/entity/Org_entity/entityfields/newoffer/documentation.adoc</documentation>
+ <documentation>%aditoprj%/entity/Organisation_entity/entityfields/newoffer/documentation.adoc</documentation>
<title>New offer</title>
- <onActionProcess>%aditoprj%/entity/Org_entity/entityfields/newoffer/onActionProcess.js</onActionProcess>
+ <onActionProcess>%aditoprj%/entity/Organisation_entity/entityfields/newoffer/onActionProcess.js</onActionProcess>
<iconId>VAADIN:CART</iconId>
</entityActionField>
- <entityProvider>
- <name>SalesprojectCompetitionOrg_dfi</name>
- <fieldType>DEPENDENCY_IN</fieldType>
- <recordContainer>db</recordContainer>
- <dependencies>
- <entityDependency>
- <name>f6e7b80e-64a9-4d4b-bbe7-dbb40bb35135</name>
- <entityName>SalesprojectCompetition_entity</entityName>
- <fieldName>SalesprojectCompetitionOrg_dfo</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>14301a6c-7144-4d1b-800e-e4ca733769bb</name>
- <entityName>SalesprojectCompetition_entity</entityName>
- <fieldName>CompetitionOrg_lookup_dfo</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
- </entityProvider>
<entityField>
<name>PRICE_POLITICS</name>
<title>Price politics</title>
- <possibleItemsProcess>%aditoprj%/entity/Org_entity/entityfields/price_politics/possibleItemsProcess.js</possibleItemsProcess>
+ <possibleItemsProcess>%aditoprj%/entity/Organisation_entity/entityfields/price_politics/possibleItemsProcess.js</possibleItemsProcess>
<searchable v="false" />
</entityField>
<entityField>
<name>STRENGTH</name>
<title>Strength</title>
- <possibleItemsProcess>%aditoprj%/entity/Org_entity/entityfields/strength/possibleItemsProcess.js</possibleItemsProcess>
+ <possibleItemsProcess>%aditoprj%/entity/Organisation_entity/entityfields/strength/possibleItemsProcess.js</possibleItemsProcess>
<searchable v="false" />
</entityField>
<entityField>
<name>WEAKNESS</name>
<title>Weakness</title>
- <possibleItemsProcess>%aditoprj%/entity/Org_entity/entityfields/weakness/possibleItemsProcess.js</possibleItemsProcess>
+ <possibleItemsProcess>%aditoprj%/entity/Organisation_entity/entityfields/weakness/possibleItemsProcess.js</possibleItemsProcess>
<searchable v="false" />
</entityField>
<entityField>
<name>STANDARD_EMAIL_COMM</name>
<title>standard email</title>
- <consumer>OrgCommEmail_dfo</consumer>
- <onValueChange>%aditoprj%/entity/Org_entity/entityfields/standard_email_comm/onValueChange.js</onValueChange>
+ <consumer>EmailCommunications</consumer>
+ <onValueChange>%aditoprj%/entity/Organisation_entity/entityfields/standard_email_comm/onValueChange.js</onValueChange>
<onValueChangeTypes>
<element>MASK</element>
<element>PROCESS</element>
@@ -404,44 +400,44 @@
<entityField>
<name>STANDARD_PHONE_COMM</name>
<title>standard phone</title>
- <consumer>OrgCommPhone_dfo</consumer>
- <onValueChange>%aditoprj%/entity/Org_entity/entityfields/standard_phone_comm/onValueChange.js</onValueChange>
+ <consumer>PhoneCommunications</consumer>
+ <onValueChange>%aditoprj%/entity/Organisation_entity/entityfields/standard_phone_comm/onValueChange.js</onValueChange>
</entityField>
<entityConsumer>
- <name>OrgCommPhone_dfo</name>
+ <name>PhoneCommunications</name>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
<name>dependency</name>
- <entityName>Comm_entity</entityName>
+ <entityName>Communication_entity</entityName>
<fieldName>OrgCommPhone_dfi</fieldName>
</dependency>
<children>
<entityParameter>
<name>RelId_param</name>
- <code>%aditoprj%/entity/Org_entity/entityfields/orgcommphone_dfo/children/relid_param/code.js</code>
+ <code>%aditoprj%/entity/Organisation_entity/entityfields/phonecommunications/children/relid_param/code.js</code>
</entityParameter>
<entityParameter>
<name>CommCategory_param</name>
- <code>%aditoprj%/entity/Org_entity/entityfields/orgcommphone_dfo/children/commcategory_param/code.js</code>
+ <code>%aditoprj%/entity/Organisation_entity/entityfields/phonecommunications/children/commcategory_param/code.js</code>
</entityParameter>
</children>
</entityConsumer>
<entityConsumer>
- <name>OrgCommEmail_dfo</name>
+ <name>EmailCommunications</name>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
<name>dependency</name>
- <entityName>Comm_entity</entityName>
+ <entityName>Communication_entity</entityName>
<fieldName>OrgCommEmail_dfi</fieldName>
</dependency>
<children>
<entityParameter>
<name>RelId_param</name>
- <code>%aditoprj%/entity/Org_entity/entityfields/orgcommemail_dfo/children/relid_param/code.js</code>
+ <code>%aditoprj%/entity/Organisation_entity/entityfields/emailcommunications/children/relid_param/code.js</code>
</entityParameter>
<entityParameter>
<name>CommCategory_param</name>
- <code>%aditoprj%/entity/Org_entity/entityfields/orgcommemail_dfo/children/commcategory_param/code.js</code>
+ <code>%aditoprj%/entity/Organisation_entity/entityfields/emailcommunications/children/commcategory_param/code.js</code>
</entityParameter>
</children>
</entityConsumer>
@@ -449,18 +445,18 @@
<name>newActivity</name>
<fieldType>ACTION</fieldType>
<title>New activity</title>
- <onActionProcess>%aditoprj%/entity/Org_entity/entityfields/newactivity/onActionProcess.js</onActionProcess>
+ <onActionProcess>%aditoprj%/entity/Organisation_entity/entityfields/newactivity/onActionProcess.js</onActionProcess>
<iconId>NEON:HISTORY</iconId>
</entityActionField>
<entityActionField>
<name>orgReport</name>
<fieldType>ACTION</fieldType>
<title>Customer Base Sheet</title>
- <onActionProcess>%aditoprj%/entity/Org_entity/entityfields/orgreport/onActionProcess.js</onActionProcess>
+ <onActionProcess>%aditoprj%/entity/Organisation_entity/entityfields/orgreport/onActionProcess.js</onActionProcess>
<iconId>VAADIN:FILE_TEXT_O</iconId>
</entityActionField>
<entityConsumer>
- <name>Countries_dfo</name>
+ <name>Countries</name>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
<name>dependency</name>
@@ -469,7 +465,7 @@
</dependency>
</entityConsumer>
<entityConsumer>
- <name>OrgAttr_dfo</name>
+ <name>Attributes</name>
<title>Attributes</title>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
@@ -480,18 +476,18 @@
<children>
<entityParameter>
<name>objectRowId_param</name>
- <code>%aditoprj%/entity/Org_entity/entityfields/orgattr_dfo/children/objectrowid_param/code.js</code>
+ <code>%aditoprj%/entity/Organisation_entity/entityfields/attributes/children/objectrowid_param/code.js</code>
<triggerRecalculation v="true" />
</entityParameter>
<entityParameter>
<name>objectType_param</name>
- <code>%aditoprj%/entity/Org_entity/entityfields/orgattr_dfo/children/objecttype_param/code.js</code>
+ <code>%aditoprj%/entity/Organisation_entity/entityfields/attributes/children/objecttype_param/code.js</code>
<triggerRecalculation v="true" />
</entityParameter>
</children>
</entityConsumer>
<entityConsumer>
- <name>ObjectRelation_dfo</name>
+ <name>ObjectRelations</name>
<title>Relations</title>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
@@ -502,11 +498,11 @@
<children>
<entityParameter>
<name>AnyObjectRowid_param</name>
- <code>%aditoprj%/entity/Org_entity/entityfields/objectrelation_dfo/children/anyobjectrowid_param/code.js</code>
+ <code>%aditoprj%/entity/Organisation_entity/entityfields/objectrelations/children/anyobjectrowid_param/code.js</code>
</entityParameter>
<entityParameter>
<name>AnyObjectType_param</name>
- <code>%aditoprj%/entity/Org_entity/entityfields/objectrelation_dfo/children/anyobjecttype_param/code.js</code>
+ <code>%aditoprj%/entity/Organisation_entity/entityfields/objectrelations/children/anyobjecttype_param/code.js</code>
</entityParameter>
</children>
</entityConsumer>
@@ -521,7 +517,7 @@
<children>
<entityParameter>
<name>containerName_param</name>
- <code>%aditoprj%/entity/Org_entity/entityfields/relationstates/children/containername_param/code.js</code>
+ <code>%aditoprj%/entity/Organisation_entity/entityfields/relationstates/children/containername_param/code.js</code>
</entityParameter>
</children>
</entityConsumer>
@@ -530,9 +526,9 @@
<dbRecordContainer>
<name>db</name>
<alias>Data_alias</alias>
- <fromClauseProcess>%aditoprj%/entity/Org_entity/recordcontainers/db/fromClauseProcess.js</fromClauseProcess>
- <conditionProcess>%aditoprj%/entity/Org_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
- <onDBUpdate>%aditoprj%/entity/Org_entity/recordcontainers/db/onDBUpdate.js</onDBUpdate>
+ <fromClauseProcess>%aditoprj%/entity/Organisation_entity/recordcontainers/db/fromClauseProcess.js</fromClauseProcess>
+ <conditionProcess>%aditoprj%/entity/Organisation_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
+ <onDBUpdate>%aditoprj%/entity/Organisation_entity/recordcontainers/db/onDBUpdate.js</onDBUpdate>
<linkInformation>
<linkInformation>
<name>ff0fa64f-4d73-49b3-bc02-02018392e838</name>
@@ -637,16 +633,16 @@
<dbRecordFieldMapping>
<name>STANDARD_EMAIL_COMM.displayValue</name>
<recordfield></recordfield>
- <expression>%aditoprj%/entity/Org_entity/recordcontainers/db/recordfieldmappings/standard_email_comm.displayvalue/expression.js</expression>
+ <expression>%aditoprj%/entity/Organisation_entity/recordcontainers/db/recordfieldmappings/standard_email_comm.displayvalue/expression.js</expression>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>STANDARD_PHONE_COMM.displayValue</name>
<recordfield></recordfield>
- <expression>%aditoprj%/entity/Org_entity/recordcontainers/db/recordfieldmappings/standard_phone_comm.displayvalue/expression.js</expression>
+ <expression>%aditoprj%/entity/Organisation_entity/recordcontainers/db/recordfieldmappings/standard_phone_comm.displayvalue/expression.js</expression>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>STATUS.displayValue</name>
- <expression>%aditoprj%/entity/Org_entity/recordcontainers/db/recordfieldmappings/status.displayvalue/expression.js</expression>
+ <expression>%aditoprj%/entity/Organisation_entity/recordcontainers/db/recordfieldmappings/status.displayvalue/expression.js</expression>
</dbRecordFieldMapping>
</recordFieldMappings>
</dbRecordContainer>
diff --git a/entity/Org_entity/documentation.adoc b/entity/Organisation_entity/documentation.adoc
similarity index 100%
rename from entity/Org_entity/documentation.adoc
rename to entity/Organisation_entity/documentation.adoc
diff --git a/entity/Pers_entity/entityfields/persactivity_dfo/children/objectid_param/code.js b/entity/Organisation_entity/entityfields/activities/children/objectid_param/code.js
similarity index 100%
rename from entity/Pers_entity/entityfields/persactivity_dfo/children/objectid_param/code.js
rename to entity/Organisation_entity/entityfields/activities/children/objectid_param/code.js
diff --git a/entity/Org_entity/entityfields/orgdocument_dfo/children/assignmentrowid_param/code.js b/entity/Organisation_entity/entityfields/activities/children/rowid_param/code.js
similarity index 100%
rename from entity/Org_entity/entityfields/orgdocument_dfo/children/assignmentrowid_param/code.js
rename to entity/Organisation_entity/entityfields/activities/children/rowid_param/code.js
diff --git a/entity/Pers_entity/entityfields/address_id/displayValueProcess.js b/entity/Organisation_entity/entityfields/address_id/displayValueProcess.js
similarity index 100%
rename from entity/Pers_entity/entityfields/address_id/displayValueProcess.js
rename to entity/Organisation_entity/entityfields/address_id/displayValueProcess.js
diff --git a/entity/Pers_entity/entityfields/persaddress_dfo/children/defaultaddressid_param/code.js b/entity/Organisation_entity/entityfields/addresses/children/defaultaddressid_param/code.js
similarity index 100%
rename from entity/Pers_entity/entityfields/persaddress_dfo/children/defaultaddressid_param/code.js
rename to entity/Organisation_entity/entityfields/addresses/children/defaultaddressid_param/code.js
diff --git a/entity/Pers_entity/entityfields/persorgsaddresses_dfo/children/relationtype_param/code.js b/entity/Organisation_entity/entityfields/addresses/children/relationtype_param/code.js
similarity index 100%
rename from entity/Pers_entity/entityfields/persorgsaddresses_dfo/children/relationtype_param/code.js
rename to entity/Organisation_entity/entityfields/addresses/children/relationtype_param/code.js
diff --git a/entity/Org_entity/entityfields/orgproduct_dfo/children/relationid_param/code.js b/entity/Organisation_entity/entityfields/addresses/children/relid_param/code.js
similarity index 100%
rename from entity/Org_entity/entityfields/orgproduct_dfo/children/relationid_param/code.js
rename to entity/Organisation_entity/entityfields/addresses/children/relid_param/code.js
diff --git a/entity/Org_entity/entityfields/orgattr_dfo/children/objectrowid_param/code.js b/entity/Organisation_entity/entityfields/attributes/children/objectrowid_param/code.js
similarity index 96%
rename from entity/Org_entity/entityfields/orgattr_dfo/children/objectrowid_param/code.js
rename to entity/Organisation_entity/entityfields/attributes/children/objectrowid_param/code.js
index 0e435a3d15ece690e8f94844a8ac57ad2f3c2b08..ec6a2a1a2f7a4a9cee9fff74dce98525063ba3ee 100644
--- a/entity/Org_entity/entityfields/orgattr_dfo/children/objectrowid_param/code.js
+++ b/entity/Organisation_entity/entityfields/attributes/children/objectrowid_param/code.js
@@ -1,4 +1,4 @@
-import("system.vars");
-import("system.result");
-
+import("system.vars");
+import("system.result");
+
result.string(vars.get("$field.ORGID"));
\ No newline at end of file
diff --git a/entity/Salesproject_entity/entityfields/salesprojectactivity_dfo/children/objectid_param/code.js b/entity/Organisation_entity/entityfields/attributes/children/objecttype_param/code.js
similarity index 100%
rename from entity/Salesproject_entity/entityfields/salesprojectactivity_dfo/children/objectid_param/code.js
rename to entity/Organisation_entity/entityfields/attributes/children/objecttype_param/code.js
diff --git a/entity/Org_entity/entityfields/orgproductprice_dfo/children/relid_param/code.js b/entity/Organisation_entity/entityfields/communications/children/relid_param/code.js
similarity index 100%
rename from entity/Org_entity/entityfields/orgproductprice_dfo/children/relid_param/code.js
rename to entity/Organisation_entity/entityfields/communications/children/relid_param/code.js
diff --git a/entity/Org_entity/entityfields/persorg_dfo/children/orgid_param/code.js b/entity/Organisation_entity/entityfields/contacts/children/orgid_param/code.js
similarity index 100%
rename from entity/Org_entity/entityfields/persorg_dfo/children/orgid_param/code.js
rename to entity/Organisation_entity/entityfields/contacts/children/orgid_param/code.js
diff --git a/entity/Pers_entity/entityfields/perscomm_dfo/children/relid_param/code.js b/entity/Organisation_entity/entityfields/contracts/children/relid_param/code.js
similarity index 100%
rename from entity/Pers_entity/entityfields/perscomm_dfo/children/relid_param/code.js
rename to entity/Organisation_entity/entityfields/contracts/children/relid_param/code.js
diff --git a/entity/Org_entity/entityfields/customercode_display_fieldgroup/valueProcess.js b/entity/Organisation_entity/entityfields/customercode_display_fieldgroup/valueProcess.js
similarity index 100%
rename from entity/Org_entity/entityfields/customercode_display_fieldgroup/valueProcess.js
rename to entity/Organisation_entity/entityfields/customercode_display_fieldgroup/valueProcess.js
diff --git a/entity/Pers_entity/entityfields/persdocument_dfo/children/assignmentname_param/code.js b/entity/Organisation_entity/entityfields/documents/children/assignmentname_param/code.js
similarity index 100%
rename from entity/Pers_entity/entityfields/persdocument_dfo/children/assignmentname_param/code.js
rename to entity/Organisation_entity/entityfields/documents/children/assignmentname_param/code.js
diff --git a/entity/Pers_entity/entityfields/perscommemail_dfo/children/relid_param/code.js b/entity/Organisation_entity/entityfields/documents/children/assignmentrowid_param/code.js
similarity index 100%
rename from entity/Pers_entity/entityfields/perscommemail_dfo/children/relid_param/code.js
rename to entity/Organisation_entity/entityfields/documents/children/assignmentrowid_param/code.js
diff --git a/entity/Pers_entity/entityfields/persdocument_dfo/children/assignmenttable_param/code.js b/entity/Organisation_entity/entityfields/documents/children/assignmenttable_param/code.js
similarity index 100%
rename from entity/Pers_entity/entityfields/persdocument_dfo/children/assignmenttable_param/code.js
rename to entity/Organisation_entity/entityfields/documents/children/assignmenttable_param/code.js
diff --git a/entity/Org_entity/entityfields/orgcommemail_dfo/children/commcategory_param/code.js b/entity/Organisation_entity/entityfields/emailcommunications/children/commcategory_param/code.js
similarity index 100%
rename from entity/Org_entity/entityfields/orgcommemail_dfo/children/commcategory_param/code.js
rename to entity/Organisation_entity/entityfields/emailcommunications/children/commcategory_param/code.js
diff --git a/entity/Pers_entity/entityfields/perscommphone_dfo/children/relid_param/code.js b/entity/Organisation_entity/entityfields/emailcommunications/children/relid_param/code.js
similarity index 100%
rename from entity/Pers_entity/entityfields/perscommphone_dfo/children/relid_param/code.js
rename to entity/Organisation_entity/entityfields/emailcommunications/children/relid_param/code.js
diff --git a/entity/Pers_entity/entityfields/image/onValueChange.js b/entity/Organisation_entity/entityfields/image/onValueChange.js
similarity index 100%
rename from entity/Pers_entity/entityfields/image/onValueChange.js
rename to entity/Organisation_entity/entityfields/image/onValueChange.js
diff --git a/entity/Org_entity/entityfields/image/valueProcess.js b/entity/Organisation_entity/entityfields/image/valueProcess.js
similarity index 100%
rename from entity/Org_entity/entityfields/image/valueProcess.js
rename to entity/Organisation_entity/entityfields/image/valueProcess.js
diff --git a/entity/Org_entity/entityfields/keywordrelationstatus_dfo/children/containername_param/code.js b/entity/Organisation_entity/entityfields/keywordrelationstatus_dfo/children/containername_param/code.js
similarity index 100%
rename from entity/Org_entity/entityfields/keywordrelationstatus_dfo/children/containername_param/code.js
rename to entity/Organisation_entity/entityfields/keywordrelationstatus_dfo/children/containername_param/code.js
diff --git a/entity/Org_entity/entityfields/language/displayValueProcess.js b/entity/Organisation_entity/entityfields/language/displayValueProcess.js
similarity index 100%
rename from entity/Org_entity/entityfields/language/displayValueProcess.js
rename to entity/Organisation_entity/entityfields/language/displayValueProcess.js
diff --git a/entity/Pers_entity/entityfields/language/possibleItemsProcess.js b/entity/Organisation_entity/entityfields/language/possibleItemsProcess.js
similarity index 100%
rename from entity/Pers_entity/entityfields/language/possibleItemsProcess.js
rename to entity/Organisation_entity/entityfields/language/possibleItemsProcess.js
diff --git a/entity/Pers_entity/entityfields/newactivity/onActionProcess.js b/entity/Organisation_entity/entityfields/newactivity/onActionProcess.js
similarity index 100%
rename from entity/Pers_entity/entityfields/newactivity/onActionProcess.js
rename to entity/Organisation_entity/entityfields/newactivity/onActionProcess.js
diff --git a/entity/Org_entity/entityfields/newoffer/documentation.adoc b/entity/Organisation_entity/entityfields/newoffer/documentation.adoc
similarity index 100%
rename from entity/Org_entity/entityfields/newoffer/documentation.adoc
rename to entity/Organisation_entity/entityfields/newoffer/documentation.adoc
diff --git a/entity/Pers_entity/entityfields/newoffer/onActionProcess.js b/entity/Organisation_entity/entityfields/newoffer/onActionProcess.js
similarity index 100%
rename from entity/Pers_entity/entityfields/newoffer/onActionProcess.js
rename to entity/Organisation_entity/entityfields/newoffer/onActionProcess.js
diff --git a/entity/Org_entity/entityfields/objectrelation_dfo/children/anyobjectrowid_param/code.js b/entity/Organisation_entity/entityfields/objectrelations/children/anyobjectrowid_param/code.js
similarity index 100%
rename from entity/Org_entity/entityfields/objectrelation_dfo/children/anyobjectrowid_param/code.js
rename to entity/Organisation_entity/entityfields/objectrelations/children/anyobjectrowid_param/code.js
diff --git a/entity/Pers_entity/entityfields/objectrelation_dfo/children/anyobjecttype_param/code.js b/entity/Organisation_entity/entityfields/objectrelations/children/anyobjecttype_param/code.js
similarity index 100%
rename from entity/Pers_entity/entityfields/objectrelation_dfo/children/anyobjecttype_param/code.js
rename to entity/Organisation_entity/entityfields/objectrelations/children/anyobjecttype_param/code.js
diff --git a/entity/Org_entity/entityfields/openeditdefaultsview/documentation.adoc b/entity/Organisation_entity/entityfields/openeditdefaultsview/documentation.adoc
similarity index 100%
rename from entity/Org_entity/entityfields/openeditdefaultsview/documentation.adoc
rename to entity/Organisation_entity/entityfields/openeditdefaultsview/documentation.adoc
diff --git a/entity/Organisation_entity/entityfields/openeditdefaultsview/onActionProcess.js b/entity/Organisation_entity/entityfields/openeditdefaultsview/onActionProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..a3f26978c2e00394bba10f1418402b776eb447ee
--- /dev/null
+++ b/entity/Organisation_entity/entityfields/openeditdefaultsview/onActionProcess.js
@@ -0,0 +1,3 @@
+import("system.vars");
+import("system.neon");
+neon.openContext("Organisation_context", "OrganisationEditDefaults_view", [vars.get("$field.ORGID")], neon.OPERATINGSTATE_EDIT, null);
diff --git a/entity/Pers_entity/entityfields/pers_date_edit/valueProcess.js b/entity/Organisation_entity/entityfields/org_date_edit/valueProcess.js
similarity index 100%
rename from entity/Pers_entity/entityfields/pers_date_edit/valueProcess.js
rename to entity/Organisation_entity/entityfields/org_date_edit/valueProcess.js
diff --git a/entity/Org_entity/entityfields/org_date_new/valueProcess.js b/entity/Organisation_entity/entityfields/org_date_new/valueProcess.js
similarity index 100%
rename from entity/Org_entity/entityfields/org_date_new/valueProcess.js
rename to entity/Organisation_entity/entityfields/org_date_new/valueProcess.js
diff --git a/entity/Org_entity/entityfields/org_id/valueProcess.js b/entity/Organisation_entity/entityfields/org_id/valueProcess.js
similarity index 100%
rename from entity/Org_entity/entityfields/org_id/valueProcess.js
rename to entity/Organisation_entity/entityfields/org_id/valueProcess.js
diff --git a/entity/Pers_entity/entityfields/pers_user_edit/valueProcess.js b/entity/Organisation_entity/entityfields/org_user_edit/valueProcess.js
similarity index 100%
rename from entity/Pers_entity/entityfields/pers_user_edit/valueProcess.js
rename to entity/Organisation_entity/entityfields/org_user_edit/valueProcess.js
diff --git a/entity/Pers_entity/entityfields/pers_user_new/valueProcess.js b/entity/Organisation_entity/entityfields/org_user_new/valueProcess.js
similarity index 100%
rename from entity/Pers_entity/entityfields/pers_user_new/valueProcess.js
rename to entity/Organisation_entity/entityfields/org_user_new/valueProcess.js
diff --git a/entity/Org_entity/entityfields/orgid/valueProcess.js b/entity/Organisation_entity/entityfields/orgid/valueProcess.js
similarity index 100%
rename from entity/Org_entity/entityfields/orgid/valueProcess.js
rename to entity/Organisation_entity/entityfields/orgid/valueProcess.js
diff --git a/entity/Pers_entity/entityfields/perscontract_dfo/children/relid_param/code.js b/entity/Organisation_entity/entityfields/orgproduct_dfo/children/relationid_param/code.js
similarity index 100%
rename from entity/Pers_entity/entityfields/perscontract_dfo/children/relid_param/code.js
rename to entity/Organisation_entity/entityfields/orgproduct_dfo/children/relationid_param/code.js
diff --git a/entity/Org_entity/entityfields/orgreport/onActionProcess.js b/entity/Organisation_entity/entityfields/orgreport/onActionProcess.js
similarity index 96%
rename from entity/Org_entity/entityfields/orgreport/onActionProcess.js
rename to entity/Organisation_entity/entityfields/orgreport/onActionProcess.js
index 63d6aafc0495c1f6e8d2e4dfa2ac0d8c79501af3..860948a6b4a063f2d7971d57261bb8b2455c0599 100644
--- a/entity/Org_entity/entityfields/orgreport/onActionProcess.js
+++ b/entity/Organisation_entity/entityfields/orgreport/onActionProcess.js
@@ -1,4 +1,4 @@
-import("system.vars");
-import("Org_lib");
-
+import("system.vars");
+import("Org_lib");
+
OrgUtils.openOrgReport(vars.get("$field.ORGID"));
\ No newline at end of file
diff --git a/entity/Pers_entity/entityfields/perscommphone_dfo/children/commcategory_param/code.js b/entity/Organisation_entity/entityfields/phonecommunications/children/commcategory_param/code.js
similarity index 100%
rename from entity/Pers_entity/entityfields/perscommphone_dfo/children/commcategory_param/code.js
rename to entity/Organisation_entity/entityfields/phonecommunications/children/commcategory_param/code.js
diff --git a/entity/Pers_entity/entityfields/persdocument_dfo/children/assignmentrowid_param/code.js b/entity/Organisation_entity/entityfields/phonecommunications/children/relid_param/code.js
similarity index 100%
rename from entity/Pers_entity/entityfields/persdocument_dfo/children/assignmentrowid_param/code.js
rename to entity/Organisation_entity/entityfields/phonecommunications/children/relid_param/code.js
diff --git a/entity/Org_entity/entityfields/price_politics/possibleItemsProcess.js b/entity/Organisation_entity/entityfields/price_politics/possibleItemsProcess.js
similarity index 100%
rename from entity/Org_entity/entityfields/price_politics/possibleItemsProcess.js
rename to entity/Organisation_entity/entityfields/price_politics/possibleItemsProcess.js
diff --git a/entity/Pers_entity/entityfields/perspricelist_dfo/children/relid_param/code.js b/entity/Organisation_entity/entityfields/productprices/children/relid_param/code.js
similarity index 100%
rename from entity/Pers_entity/entityfields/perspricelist_dfo/children/relid_param/code.js
rename to entity/Organisation_entity/entityfields/productprices/children/relid_param/code.js
diff --git a/entity/Organisation_entity/entityfields/products/children/relationid_param/code.js b/entity/Organisation_entity/entityfields/products/children/relationid_param/code.js
new file mode 100644
index 0000000000000000000000000000000000000000..aa257b8b78ed72ce888626a9fa22a890e3c9bf17
--- /dev/null
+++ b/entity/Organisation_entity/entityfields/products/children/relationid_param/code.js
@@ -0,0 +1,4 @@
+import("system.result");
+import("system.vars");
+
+result.string(vars.get("$field.RELATIONID"));
\ No newline at end of file
diff --git a/entity/Pers_entity/entityfields/rel_date_edit/valueProcess.js b/entity/Organisation_entity/entityfields/rel_date_edit/valueProcess.js
similarity index 100%
rename from entity/Pers_entity/entityfields/rel_date_edit/valueProcess.js
rename to entity/Organisation_entity/entityfields/rel_date_edit/valueProcess.js
diff --git a/entity/Pers_entity/entityfields/rel_date_new/valueProcess.js b/entity/Organisation_entity/entityfields/rel_date_new/valueProcess.js
similarity index 100%
rename from entity/Pers_entity/entityfields/rel_date_new/valueProcess.js
rename to entity/Organisation_entity/entityfields/rel_date_new/valueProcess.js
diff --git a/entity/Pers_entity/entityfields/rel_user_edit/valueProcess.js b/entity/Organisation_entity/entityfields/rel_user_edit/valueProcess.js
similarity index 100%
rename from entity/Pers_entity/entityfields/rel_user_edit/valueProcess.js
rename to entity/Organisation_entity/entityfields/rel_user_edit/valueProcess.js
diff --git a/entity/Pers_entity/entityfields/rel_user_new/valueProcess.js b/entity/Organisation_entity/entityfields/rel_user_new/valueProcess.js
similarity index 100%
rename from entity/Pers_entity/entityfields/rel_user_new/valueProcess.js
rename to entity/Organisation_entity/entityfields/rel_user_new/valueProcess.js
diff --git a/entity/Org_entity/entityfields/relationid/valueProcess.js b/entity/Organisation_entity/entityfields/relationid/valueProcess.js
similarity index 100%
rename from entity/Org_entity/entityfields/relationid/valueProcess.js
rename to entity/Organisation_entity/entityfields/relationid/valueProcess.js
diff --git a/entity/Org_entity/entityfields/relationstates/children/containername_param/code.js b/entity/Organisation_entity/entityfields/relationstates/children/containername_param/code.js
similarity index 100%
rename from entity/Org_entity/entityfields/relationstates/children/containername_param/code.js
rename to entity/Organisation_entity/entityfields/relationstates/children/containername_param/code.js
diff --git a/entity/Pers_entity/entityfields/standard_email_comm/onValueChange.js b/entity/Organisation_entity/entityfields/standard_email_comm/onValueChange.js
similarity index 100%
rename from entity/Pers_entity/entityfields/standard_email_comm/onValueChange.js
rename to entity/Organisation_entity/entityfields/standard_email_comm/onValueChange.js
diff --git a/entity/Pers_entity/entityfields/standard_phone_comm/onValueChange.js b/entity/Organisation_entity/entityfields/standard_phone_comm/onValueChange.js
similarity index 100%
rename from entity/Pers_entity/entityfields/standard_phone_comm/onValueChange.js
rename to entity/Organisation_entity/entityfields/standard_phone_comm/onValueChange.js
diff --git a/entity/Org_entity/entityfields/strength/possibleItemsProcess.js b/entity/Organisation_entity/entityfields/strength/possibleItemsProcess.js
similarity index 100%
rename from entity/Org_entity/entityfields/strength/possibleItemsProcess.js
rename to entity/Organisation_entity/entityfields/strength/possibleItemsProcess.js
diff --git a/entity/Org_entity/entityfields/type/possibleItemsProcess.js b/entity/Organisation_entity/entityfields/type/possibleItemsProcess.js
similarity index 100%
rename from entity/Org_entity/entityfields/type/possibleItemsProcess.js
rename to entity/Organisation_entity/entityfields/type/possibleItemsProcess.js
diff --git a/entity/Org_entity/entityfields/weakness/possibleItemsProcess.js b/entity/Organisation_entity/entityfields/weakness/possibleItemsProcess.js
similarity index 100%
rename from entity/Org_entity/entityfields/weakness/possibleItemsProcess.js
rename to entity/Organisation_entity/entityfields/weakness/possibleItemsProcess.js
diff --git a/entity/Org_entity/fromClauseProcess.js b/entity/Organisation_entity/fromClauseProcess.js
similarity index 100%
rename from entity/Org_entity/fromClauseProcess.js
rename to entity/Organisation_entity/fromClauseProcess.js
diff --git a/entity/Org_entity/imageProcess.js b/entity/Organisation_entity/imageProcess.js
similarity index 100%
rename from entity/Org_entity/imageProcess.js
rename to entity/Organisation_entity/imageProcess.js
diff --git a/entity/Org_entity/recordcontainers/db/conditionProcess.js b/entity/Organisation_entity/recordcontainers/db/conditionProcess.js
similarity index 100%
rename from entity/Org_entity/recordcontainers/db/conditionProcess.js
rename to entity/Organisation_entity/recordcontainers/db/conditionProcess.js
diff --git a/entity/Org_entity/recordcontainers/db/fromClauseProcess.js b/entity/Organisation_entity/recordcontainers/db/fromClauseProcess.js
similarity index 100%
rename from entity/Org_entity/recordcontainers/db/fromClauseProcess.js
rename to entity/Organisation_entity/recordcontainers/db/fromClauseProcess.js
diff --git a/entity/Org_entity/recordcontainers/db/onDBUpdate.js b/entity/Organisation_entity/recordcontainers/db/onDBUpdate.js
similarity index 100%
rename from entity/Org_entity/recordcontainers/db/onDBUpdate.js
rename to entity/Organisation_entity/recordcontainers/db/onDBUpdate.js
diff --git a/entity/Pers_entity/recordcontainers/db/recordfieldmappings/standard_email_comm.displayvalue/expression.js b/entity/Organisation_entity/recordcontainers/db/recordfieldmappings/standard_email_comm.displayvalue/expression.js
similarity index 100%
rename from entity/Pers_entity/recordcontainers/db/recordfieldmappings/standard_email_comm.displayvalue/expression.js
rename to entity/Organisation_entity/recordcontainers/db/recordfieldmappings/standard_email_comm.displayvalue/expression.js
diff --git a/entity/Pers_entity/recordcontainers/db/recordfieldmappings/standard_phone_comm.displayvalue/expression.js b/entity/Organisation_entity/recordcontainers/db/recordfieldmappings/standard_phone_comm.displayvalue/expression.js
similarity index 100%
rename from entity/Pers_entity/recordcontainers/db/recordfieldmappings/standard_phone_comm.displayvalue/expression.js
rename to entity/Organisation_entity/recordcontainers/db/recordfieldmappings/standard_phone_comm.displayvalue/expression.js
diff --git a/entity/Org_entity/recordcontainers/db/recordfieldmappings/status.displayvalue/expression.js b/entity/Organisation_entity/recordcontainers/db/recordfieldmappings/status.displayvalue/expression.js
similarity index 100%
rename from entity/Org_entity/recordcontainers/db/recordfieldmappings/status.displayvalue/expression.js
rename to entity/Organisation_entity/recordcontainers/db/recordfieldmappings/status.displayvalue/expression.js
diff --git a/entity/Org_entity/titleProcess.js b/entity/Organisation_entity/titleProcess.js
similarity index 100%
rename from entity/Org_entity/titleProcess.js
rename to entity/Organisation_entity/titleProcess.js
diff --git a/entity/Pers_entity/entityfields/openeditdefaultsview/onActionProcess.js b/entity/Pers_entity/entityfields/openeditdefaultsview/onActionProcess.js
deleted file mode 100644
index 637f5c51eb6e418eb58ab19f10307808ddfb7d45..0000000000000000000000000000000000000000
--- a/entity/Pers_entity/entityfields/openeditdefaultsview/onActionProcess.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import("system.vars");
-import("system.neon");
-neon.openContext("Pers_context", "PersEditDefaults_view", [vars.get("$field.RELATIONID")], neon.OPERATINGSTATE_EDIT, null);
\ No newline at end of file
diff --git a/entity/Pers_entity/entityfields/openeditdefaultsview_action/onActionProcess.js b/entity/Pers_entity/entityfields/openeditdefaultsview_action/onActionProcess.js
deleted file mode 100644
index 5b79095577e1ed73ed5e5b97eb4e6eef74cefcbf..0000000000000000000000000000000000000000
--- a/entity/Pers_entity/entityfields/openeditdefaultsview_action/onActionProcess.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import("system.vars");
-import("system.neon");
-neon.openContext("Pers_context", "PersEditDefaults_view", [vars.get("$sys.uid")], neon.OPERATINGSTATE_EDIT, null);
diff --git a/entity/Product_entity/Product_entity.aod b/entity/Product_entity/Product_entity.aod
index 6b6760d4946ddb9a95ecd0caf8ebb64f9d8caa9c..c06ba8b9bd03cddaf4755ef0586abf61b3640729 100644
--- a/entity/Product_entity/Product_entity.aod
+++ b/entity/Product_entity/Product_entity.aod
@@ -100,12 +100,12 @@
<valueProcess>%aditoprj%/entity/Product_entity/entityfields/currentsalespriceid/valueProcess.js</valueProcess>
</entityField>
<entityConsumer>
- <name>ProductOrg_dfo</name>
+ <name>Organisations</name>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
<name>dependency</name>
- <entityName>Org_entity</entityName>
- <fieldName>Org_dfi</fieldName>
+ <entityName>Organisation_entity</entityName>
+ <fieldName>#PROVIDER</fieldName>
</dependency>
</entityConsumer>
<entityProvider>
@@ -115,8 +115,8 @@
<dependencies>
<entityDependency>
<name>49cbec11-7d2e-4898-b63f-2e36aac9181e</name>
- <entityName>Org_entity</entityName>
- <fieldName>OrgProduct_dfo</fieldName>
+ <entityName>Organisation_entity</entityName>
+ <fieldName>Products</fieldName>
<isConsumer v="false" />
</entityDependency>
</dependencies>
diff --git a/entity/Product_entity/entityfields/relation_id/linkedContextProcess.js b/entity/Product_entity/entityfields/relation_id/linkedContextProcess.js
index 48528c5c24f559c391ad1f050e610943145da865..84a906c21962b4ff8d00fbd90fe9131ec6afecdb 100644
--- a/entity/Product_entity/entityfields/relation_id/linkedContextProcess.js
+++ b/entity/Product_entity/entityfields/relation_id/linkedContextProcess.js
@@ -3,4 +3,4 @@ import("system.result");
import("Relation_lib");
if(vars.get("$field.RELATION_ID"))
- result.string("Org_context");
\ No newline at end of file
+ result.string("Organisation_context");
\ No newline at end of file
diff --git a/entity/Productprice_entity/Productprice_entity.aod b/entity/Productprice_entity/Productprice_entity.aod
index d3ea74ab86b0b3373f45b65f6497549d16262d08..536a6a6474c6daa3c795106c71557aa66ecac2c7 100644
--- a/entity/Productprice_entity/Productprice_entity.aod
+++ b/entity/Productprice_entity/Productprice_entity.aod
@@ -141,8 +141,8 @@
<dependencies>
<entityDependency>
<name>93263731-7e48-4933-bdea-500a58a53357</name>
- <entityName>Org_entity</entityName>
- <fieldName>OrgProductprice_dfo</fieldName>
+ <entityName>Organisation_entity</entityName>
+ <fieldName>Productprices</fieldName>
<isConsumer v="false" />
</entityDependency>
</dependencies>
@@ -161,8 +161,8 @@
<dependencies>
<entityDependency>
<name>268bacb4-334d-42ba-9685-11e4854f0d85</name>
- <entityName>Pers_entity</entityName>
- <fieldName>PersPricelist_dfo</fieldName>
+ <entityName>Contact_entity</entityName>
+ <fieldName>Pricelists</fieldName>
<isConsumer v="false" />
</entityDependency>
</dependencies>
diff --git a/entity/Relation_entity/Relation_entity.aod b/entity/Relation_entity/Relation_entity.aod
index 8b0453243c932e4b02755a8a637cbd1528cb4b11..7b2d0e23de7b323872ff1e5edcf9ce05b8875a60 100644
--- a/entity/Relation_entity/Relation_entity.aod
+++ b/entity/Relation_entity/Relation_entity.aod
@@ -65,8 +65,8 @@ See RelationUtils.getRelationTypeByPersOrg for possible values</description>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
<name>dependency</name>
- <entityName>Pers_entity</entityName>
- <fieldName>RelationPers_dfi</fieldName>
+ <entityName>Contact_entity</entityName>
+ <fieldName>byUid</fieldName>
</dependency>
<children>
<entityParameter>
@@ -80,8 +80,8 @@ See RelationUtils.getRelationTypeByPersOrg for possible values</description>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
<name>dependency</name>
- <entityName>Org_entity</entityName>
- <fieldName>Org_dfi</fieldName>
+ <entityName>Organisation_entity</entityName>
+ <fieldName>byUid</fieldName>
</dependency>
<children>
<entityParameter>
@@ -151,7 +151,7 @@ See RelationUtils.getRelationTypeByPersOrg for possible values</description>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
<name>dependency</name>
- <entityName>Comm_entity</entityName>
+ <entityName>Communication_entity</entityName>
<fieldName>RelationCommEmail_dfi</fieldName>
</dependency>
<children>
@@ -170,7 +170,7 @@ See RelationUtils.getRelationTypeByPersOrg for possible values</description>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
<name>dependency</name>
- <entityName>Comm_entity</entityName>
+ <entityName>Communication_entity</entityName>
<fieldName>RelationCommPhone_dfi</fieldName>
</dependency>
<children>
diff --git a/entity/SalesprojectCompetition_entity/SalesprojectCompetition_entity.aod b/entity/SalesprojectCompetition_entity/SalesprojectCompetition_entity.aod
index 122ae4d6b54c124e07360731ae47a48ec9e2f223..a1fcb6d95e1094444b838d5393f212e7a92279da 100644
--- a/entity/SalesprojectCompetition_entity/SalesprojectCompetition_entity.aod
+++ b/entity/SalesprojectCompetition_entity/SalesprojectCompetition_entity.aod
@@ -78,7 +78,7 @@
<name>RELATION_ID</name>
<title>Organisation</title>
<consumer>CompetitionOrg_lookup_dfo</consumer>
- <linkedContext>Org_context</linkedContext>
+ <linkedContext>Organisation_context</linkedContext>
</entityField>
<entityField>
<name>ORG_NAME</name>
@@ -97,8 +97,8 @@
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
<name>dependency</name>
- <entityName>Org_entity</entityName>
- <fieldName>SalesprojectCompetitionOrg_dfi</fieldName>
+ <entityName>Organisation_entity</entityName>
+ <fieldName>byUid</fieldName>
</dependency>
<children>
<entityParameter>
@@ -129,8 +129,8 @@
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
<name>dependency</name>
- <entityName>Org_entity</entityName>
- <fieldName>SalesprojectCompetitionOrg_dfi</fieldName>
+ <entityName>Organisation_entity</entityName>
+ <fieldName>#PROVIDER</fieldName>
</dependency>
</entityConsumer>
</entityFields>
diff --git a/entity/SalesprojectMember_entity/SalesprojectMember_entity.aod b/entity/SalesprojectMember_entity/SalesprojectMember_entity.aod
index 691694d272fede02aa470224c6ed65d3706c4d8d..7b4b09176b4c36615593a3fd9678b9c19ef7a174 100644
--- a/entity/SalesprojectMember_entity/SalesprojectMember_entity.aod
+++ b/entity/SalesprojectMember_entity/SalesprojectMember_entity.aod
@@ -23,7 +23,7 @@
<name>RELATION_ID</name>
<title>Person</title>
<consumer>PersLookup_dfo</consumer>
- <linkedContext>Pers_context</linkedContext>
+ <linkedContext>Contact_context</linkedContext>
</entityField>
<entityField>
<name>SALESPROJECT_ID</name>
@@ -100,17 +100,17 @@
<state>READONLY</state>
</entityField>
<entityConsumer>
- <name>SalesprojectMemberPers_dfo</name>
+ <name>CurrentContact</name>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
<name>dependency</name>
- <entityName>Pers_entity</entityName>
- <fieldName>PersSalesprojectMember_dfi</fieldName>
+ <entityName>Contact_entity</entityName>
+ <fieldName>byUid</fieldName>
</dependency>
<children>
<entityParameter>
<name>RelationId_param</name>
- <code>%aditoprj%/entity/SalesprojectMember_entity/entityfields/salesprojectmemberpers_dfo/children/relationid_param/code.js</code>
+ <code>%aditoprj%/entity/SalesprojectMember_entity/entityfields/currentcontact/children/relationid_param/code.js</code>
</entityParameter>
</children>
</entityConsumer>
@@ -118,7 +118,7 @@
<name>PERS_FULL_NAME</name>
<title>Name</title>
<consumer>PersSalesprojectMember_dfo</consumer>
- <linkedContext>Pers_context</linkedContext>
+ <linkedContext>Contact_context</linkedContext>
<state>READONLY</state>
<valueProcess>%aditoprj%/entity/SalesprojectMember_entity/entityfields/pers_full_name/valueProcess.js</valueProcess>
</entityField>
@@ -142,11 +142,11 @@ TODO: intuitive möglichkeit, auf dend Stand aus Relation zurückzusetzen... akt
<contentType>NUMBER</contentType>
</entityField>
<entityConsumer>
- <name>PersLookup_dfo</name>
+ <name>Contacts</name>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
<name>dependency</name>
- <entityName>Pers_entity</entityName>
+ <entityName>Contact_entity</entityName>
<fieldName>#PROVIDER</fieldName>
</dependency>
</entityConsumer>
diff --git a/entity/SalesprojectMember_entity/entityfields/salesprojectmemberpers_dfo/children/relationid_param/code.js b/entity/SalesprojectMember_entity/entityfields/currentcontact/children/relationid_param/code.js
similarity index 100%
rename from entity/SalesprojectMember_entity/entityfields/salesprojectmemberpers_dfo/children/relationid_param/code.js
rename to entity/SalesprojectMember_entity/entityfields/currentcontact/children/relationid_param/code.js
diff --git a/entity/Salesproject_entity/Salesproject_entity.aod b/entity/Salesproject_entity/Salesproject_entity.aod
index b34c991583db4430a0928db07e99f1582b41502d..d5db2d716173ebd939ff77ced7ce5ce662814623 100644
--- a/entity/Salesproject_entity/Salesproject_entity.aod
+++ b/entity/Salesproject_entity/Salesproject_entity.aod
@@ -80,8 +80,8 @@
<entityField>
<name>RELATION_ID</name>
<title>Company</title>
- <consumer>SalesprojectOrg_dfo</consumer>
- <linkedContext>Org_context</linkedContext>
+ <consumer>Organisations</consumer>
+ <linkedContext>Organisation_context</linkedContext>
<mandatory v="true" />
</entityField>
<entityField>
@@ -119,12 +119,12 @@
<contentTypeProcess>%aditoprj%/entity/Salesproject_entity/entityfields/volume/contentTypeProcess.js</contentTypeProcess>
</entityField>
<entityConsumer>
- <name>SalesprojectOrg_dfo</name>
+ <name>Organisations</name>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
<name>dependency</name>
- <entityName>Org_entity</entityName>
- <fieldName>Org_dfi</fieldName>
+ <entityName>Organisation_entity</entityName>
+ <fieldName>#PROVIDER</fieldName>
</dependency>
</entityConsumer>
<entityField>
@@ -218,23 +218,23 @@
</children>
</entityConsumer>
<entityConsumer>
- <name>SalesprojectActivity_dfo</name>
+ <name>Activities</name>
<title>Activity</title>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
<name>dependency</name>
<entityName>Activity_entity</entityName>
- <fieldName>SalesprojectActivity_dfi</fieldName>
+ <fieldName>LinkedObjects</fieldName>
</dependency>
<children>
<entityParameter>
<name>RowId_param</name>
- <code>%aditoprj%/entity/Salesproject_entity/entityfields/salesprojectactivity_dfo/children/rowid_param/code.js</code>
+ <code>%aditoprj%/entity/Salesproject_entity/entityfields/activities/children/rowid_param/code.js</code>
<triggerRecalculation v="true" />
</entityParameter>
<entityParameter>
<name>ObjectId_param</name>
- <code>%aditoprj%/entity/Salesproject_entity/entityfields/salesprojectactivity_dfo/children/objectid_param/code.js</code>
+ <code>%aditoprj%/entity/Salesproject_entity/entityfields/activities/children/objectid_param/code.js</code>
</entityParameter>
</children>
</entityConsumer>
diff --git a/entity/Org_entity/entityfields/orgattr_dfo/children/objecttype_param/code.js b/entity/Salesproject_entity/entityfields/activities/children/objectid_param/code.js
similarity index 97%
rename from entity/Org_entity/entityfields/orgattr_dfo/children/objecttype_param/code.js
rename to entity/Salesproject_entity/entityfields/activities/children/objectid_param/code.js
index 5996e99db232db8df50f155732110608e5abff4e..008915f61deac19ccdd40fff81701de63eb3b6a2 100644
--- a/entity/Org_entity/entityfields/orgattr_dfo/children/objecttype_param/code.js
+++ b/entity/Salesproject_entity/entityfields/activities/children/objectid_param/code.js
@@ -1,4 +1,4 @@
-import("system.result");
-import("Context_lib");
-
+import("system.result");
+import("Context_lib");
+
result.string(ContextUtils.getCurrentContextId());
\ No newline at end of file
diff --git a/entity/Salesproject_entity/entityfields/salesprojectactivity_dfo/children/rowid_param/code.js b/entity/Salesproject_entity/entityfields/activities/children/rowid_param/code.js
similarity index 100%
rename from entity/Salesproject_entity/entityfields/salesprojectactivity_dfo/children/rowid_param/code.js
rename to entity/Salesproject_entity/entityfields/activities/children/rowid_param/code.js
diff --git a/entity/Task_entity/Task_entity.aod b/entity/Task_entity/Task_entity.aod
index a591ba0bbeebc09d3177a25469447d5e0c3162a9..99697c470aa3ae758c72c8d25ed93b7b6b7a9b9d 100644
--- a/entity/Task_entity/Task_entity.aod
+++ b/entity/Task_entity/Task_entity.aod
@@ -47,14 +47,14 @@
<name>REQUESTOR_RELATION_ID</name>
<title>{$TASK_REQUESTOR}</title>
<consumer>PersRequestor_dfo</consumer>
- <linkedContext>Pers_context</linkedContext>
+ <linkedContext>Contact_context</linkedContext>
<mandatory v="true" />
</entityField>
<entityField>
<name>EDITOR_RELATION_ID</name>
<title>{$TASK_EDITOR}</title>
<consumer>PersEditor_dfo</consumer>
- <linkedContext>Pers_context</linkedContext>
+ <linkedContext>Contact_context</linkedContext>
</entityField>
<entityField>
<name>START_DATE</name>
@@ -129,7 +129,7 @@
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
<name>dependency</name>
- <entityName>Pers_entity</entityName>
+ <entityName>Contact_entity</entityName>
<fieldName>#PROVIDER</fieldName>
</dependency>
</entityConsumer>
@@ -138,7 +138,7 @@
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
<name>dependency</name>
- <entityName>Pers_entity</entityName>
+ <entityName>Contact_entity</entityName>
<fieldName>#PROVIDER</fieldName>
</dependency>
</entityConsumer>
diff --git a/entity/Task_entity/onValidation.js b/entity/Task_entity/onValidation.js
index 9d163bb6d1dd266ac8be3fa38724bf65c8a58199..f0f501340bdc8a972b7ce9c32b2848a828ff198c 100644
--- a/entity/Task_entity/onValidation.js
+++ b/entity/Task_entity/onValidation.js
@@ -4,6 +4,7 @@ import("system.text");
import("system.neon");
import("Sql_lib");
+//TODO: this should no happen in onValidation; waiting for #1032668
if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
{
var maskingHelper = new SqlMaskingUtils();
diff --git a/entity/Timetracking_entity/Timetracking_entity.aod b/entity/Timetracking_entity/Timetracking_entity.aod
index 0df3ea1c7dd2b9a29049524901e6473a69b12f07..55fe3c6efc6598d3057abc1d9b96e178ab178c0d 100644
--- a/entity/Timetracking_entity/Timetracking_entity.aod
+++ b/entity/Timetracking_entity/Timetracking_entity.aod
@@ -42,7 +42,7 @@
<name>RELATION_ID</name>
<title>Creator</title>
<consumer>TimetrackingPers_dfo</consumer>
- <linkedContext>Pers_context</linkedContext>
+ <linkedContext>Contact_context</linkedContext>
<mandatory v="true" />
</entityField>
<entityField>
@@ -88,12 +88,12 @@
</dependencies>
</entityProvider>
<entityConsumer>
- <name>TimetrackingPers_dfo</name>
+ <name>Contacts</name>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
<name>dependency</name>
- <entityName>Pers_entity</entityName>
- <fieldName>TimetrackingPers_dfi</fieldName>
+ <entityName>Contact_entity</entityName>
+ <fieldName>#PROVIDER</fieldName>
</dependency>
</entityConsumer>
</entityFields>
diff --git a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
index a34ffa053914407b79b33cb9978930747b2d4dc4..ab1d0a6e88c3dcffb5830c165e60dbebbb9f9e41 100644
--- a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
+++ b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
@@ -783,9 +783,6 @@
<entry>
<key>Dateigröße</key>
</entry>
- <entry>
- <key>Member</key>
- </entry>
<entry>
<key>A reason is only possible if a date is given.</key>
</entry>
@@ -1005,9 +1002,6 @@
<entry>
<key>Social</key>
</entry>
- <entry>
- <key>Dataset</key>
- </entry>
<entry>
<key>Facebook Feed</key>
</entry>
@@ -1371,9 +1365,6 @@
<entry>
<key>absagen</key>
</entry>
- <entry>
- <key>asdfasdf</key>
- </entry>
<entry>
<key>type</key>
</entry>
@@ -1488,9 +1479,6 @@
<entry>
<key>${FORECAST_ENGLISH}</key>
</entry>
- <entry>
- <key>${NUMBER}</key>
- </entry>
<entry>
<key>Usage</key>
</entry>
@@ -1503,6 +1491,48 @@
<entry>
<key>${ADDRESS_STATE}</key>
</entry>
+ <entry>
+ <key>Title (original language)</key>
+ </entry>
+ <entry>
+ <key>Parent Attribute</key>
+ </entry>
+ <entry>
+ <key>Attribute Relation</key>
+ </entry>
+ <entry>
+ <key>Essential</key>
+ </entry>
+ <entry>
+ <key>Attribute Usage</key>
+ </entry>
+ <entry>
+ <key>Beziehung</key>
+ </entry>
+ <entry>
+ <key>Key</key>
+ </entry>
+ <entry>
+ <key>Attribute</key>
+ </entry>
+ <entry>
+ <key>Context</key>
+ </entry>
+ <entry>
+ <key>Container</key>
+ </entry>
+ <entry>
+ <key>Beziehungen</key>
+ </entry>
+ <entry>
+ <key>Administration</key>
+ </entry>
+ <entry>
+ <key>Keyword</key>
+ </entry>
+ <entry>
+ <key>Sorting</key>
+ </entry>
</keyValueMap>
<font name="Dialog" style="0" size="11" />
<sqlModels>
@@ -1510,7 +1540,7 @@
<name>Data_alias</name>
<alias>Data_alias</alias>
<statements>
- <element></element>
+ <element>select AB_KEYWORD_ENTRY.TITLE from AB_KEYWORD_ENTRY</element>
</statements>
</languageSql>
</sqlModels>
diff --git a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
index 7a997ae430781dc8960f1bf131730b42e38d1192..69a1c029028b47d3e5f234f71de5e407da8a9018 100644
--- a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
+++ b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
@@ -122,10 +122,6 @@
<key>Online-Meeting</key>
<value>Online-Meeting</value>
</entry>
- <entry>
- <key>${NUMBER}</key>
- <value>Zahl</value>
- </entry>
<entry>
<key>Choose address</key>
<value>Adresse auswählen</value>
@@ -1160,10 +1156,6 @@
<key>Forecast</key>
<value>Forecast</value>
</entry>
- <entry>
- <key>Member</key>
- <value>Teammitglied</value>
- </entry>
<entry>
<key>A reason is only possible if a date is given.</key>
<value>Begründung nur bei Ausgeschiedenen Mitbewerbern erlaubt.</value>
@@ -1552,10 +1544,6 @@
<entry>
<key>Social</key>
</entry>
- <entry>
- <key>Dataset</key>
- <value>Datensatz</value>
- </entry>
<entry>
<key>Facebook Feed</key>
</entry>
@@ -1778,6 +1766,7 @@
</entry>
<entry>
<key>title</key>
+ <value>Titel</value>
</entry>
<entry>
<key>von</key>
@@ -1812,9 +1801,6 @@
<entry>
<key>absagen</key>
</entry>
- <entry>
- <key>asdfasdf</key>
- </entry>
<entry>
<key>type</key>
<value>Typ</value>
@@ -1910,6 +1896,51 @@
<key>${FORECAST_ENGLISH}</key>
<value>Forecast</value>
</entry>
+ <entry>
+ <key>Title (original language)</key>
+ <value>Titel (ursprüngliche Sprache)</value>
+ </entry>
+ <entry>
+ <key>Parent Attribute</key>
+ </entry>
+ <entry>
+ <key>Attribute Relation</key>
+ </entry>
+ <entry>
+ <key>Essential</key>
+ <value>Essenziell</value>
+ </entry>
+ <entry>
+ <key>Attribute Usage</key>
+ </entry>
+ <entry>
+ <key>Beziehung</key>
+ </entry>
+ <entry>
+ <key>Key</key>
+ </entry>
+ <entry>
+ <key>Attribute</key>
+ </entry>
+ <entry>
+ <key>Context</key>
+ </entry>
+ <entry>
+ <key>Container</key>
+ </entry>
+ <entry>
+ <key>Beziehungen</key>
+ </entry>
+ <entry>
+ <key>Administration</key>
+ </entry>
+ <entry>
+ <key>Keyword</key>
+ </entry>
+ <entry>
+ <key>Sorting</key>
+ <value>Sortierung</value>
+ </entry>
</keyValueMap>
<font name="Dialog" style="0" size="11" />
</language>
diff --git a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
index ac6c84f0a0363fcb721a0f4afb2943753a502921..1c112c9978d82f432c69225a78f378a8105971af 100644
--- a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
+++ b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
@@ -797,9 +797,6 @@
<entry>
<key>Dateigröße</key>
</entry>
- <entry>
- <key>Member</key>
- </entry>
<entry>
<key>A reason is only possible if a date is given.</key>
</entry>
@@ -1022,9 +1019,6 @@
<entry>
<key>Social</key>
</entry>
- <entry>
- <key>Dataset</key>
- </entry>
<entry>
<key>Facebook Feed</key>
</entry>
@@ -1394,9 +1388,6 @@
<entry>
<key>absagen</key>
</entry>
- <entry>
- <key>asdfasdf</key>
- </entry>
<entry>
<key>type</key>
</entry>
@@ -1518,10 +1509,6 @@
<key>${FORECAST_ENGLISH}</key>
<value>Forecast</value>
</entry>
- <entry>
- <key>${NUMBER}</key>
- <value>Number</value>
- </entry>
<entry>
<key>Usage</key>
</entry>
@@ -1534,6 +1521,48 @@
<entry>
<key>${ADDRESS_STATE}</key>
</entry>
+ <entry>
+ <key>Title (original language)</key>
+ </entry>
+ <entry>
+ <key>Parent Attribute</key>
+ </entry>
+ <entry>
+ <key>Attribute Relation</key>
+ </entry>
+ <entry>
+ <key>Essential</key>
+ </entry>
+ <entry>
+ <key>Attribute Usage</key>
+ </entry>
+ <entry>
+ <key>Beziehung</key>
+ </entry>
+ <entry>
+ <key>Key</key>
+ </entry>
+ <entry>
+ <key>Attribute</key>
+ </entry>
+ <entry>
+ <key>Context</key>
+ </entry>
+ <entry>
+ <key>Container</key>
+ </entry>
+ <entry>
+ <key>Beziehungen</key>
+ </entry>
+ <entry>
+ <key>Administration</key>
+ </entry>
+ <entry>
+ <key>Keyword</key>
+ </entry>
+ <entry>
+ <key>Sorting</key>
+ </entry>
</keyValueMap>
<font name="Dialog" style="0" size="11" />
</language>
diff --git a/neonContext/Comm_context/Comm_context.aod b/neonContext/Communication_context/Communication_context.aod
similarity index 76%
rename from neonContext/Comm_context/Comm_context.aod
rename to neonContext/Communication_context/Communication_context.aod
index a01a8bcd22dc41ce032962b32339e23d42c1637f..f9d7881449bbae7783f345cf2b5abf61fe2982ac 100644
--- a/neonContext/Comm_context/Comm_context.aod
+++ b/neonContext/Communication_context/Communication_context.aod
@@ -1,25 +1,25 @@
<?xml version="1.0" encoding="UTF-8"?>
<neonContext xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.0.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonContext/1.0.0">
- <name>Comm_context</name>
+ <name>Communication_context</name>
<title>Communication</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
- <entity>Comm_entity</entity>
+ <entity>Communication_entity</entity>
<references>
<neonViewReference>
<name>a6ea1a77-09d3-4c36-90dc-3bcb4a22842a</name>
- <view>CommMultiEdit_view</view>
+ <view>CommunicationMultiEdit_view</view>
</neonViewReference>
<neonViewReference>
<name>af0e1f4b-a859-4302-b8d8-05568b9a4655</name>
- <view>CommList_view</view>
+ <view>CommunicationList_view</view>
</neonViewReference>
<neonViewReference>
<name>9bccd737-1feb-48e3-9b77-9b6b4720a4f8</name>
- <view>CommEdit_view</view>
+ <view>CommunicationEdit_view</view>
</neonViewReference>
<neonViewReference>
<name>ba995694-e88f-4f50-b4e7-5018b034747f</name>
- <view>CommFilter_view</view>
+ <view>CommunicationFilter_view</view>
</neonViewReference>
</references>
</neonContext>
diff --git a/neonContext/Pers_context/Pers_context.aod b/neonContext/Contact_context/Contact_context.aod
similarity index 67%
rename from neonContext/Pers_context/Pers_context.aod
rename to neonContext/Contact_context/Contact_context.aod
index 5370b20fc5db33b32c489b0f1d26da72be43a87a..1e746b831d5115c6c11531543e579a85e5f3ced0 100644
--- a/neonContext/Pers_context/Pers_context.aod
+++ b/neonContext/Contact_context/Contact_context.aod
@@ -1,46 +1,46 @@
<?xml version="1.0" encoding="UTF-8"?>
<neonContext xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.0.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonContext/1.0.0">
- <name>Pers_context</name>
+ <name>Contact_context</name>
<title>Contact</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
- <mainview>PersMain_view</mainview>
- <filterview>PersFilter_view</filterview>
- <editview>PersEdit_view</editview>
- <preview>PersPreview_view</preview>
- <lookupview>PersLookup_view</lookupview>
- <entity>Pers_entity</entity>
+ <mainview>ContactMain_view</mainview>
+ <filterview>ContactFilter_view</filterview>
+ <editview>ContactEdit_view</editview>
+ <preview>ContactPreview_view</preview>
+ <lookupview>ContactLookup_view</lookupview>
+ <entity>Contact_entity</entity>
<references>
<neonViewReference>
<name>901b3b2b-0f39-4d21-89fc-7d3cc7f6f5bc</name>
- <view>PersMain_view</view>
+ <view>ContactMain_view</view>
</neonViewReference>
<neonViewReference>
<name>44ddbcaa-f5ae-4cf7-a12c-36e0c4fe854d</name>
- <view>PersFilter_view</view>
+ <view>ContactFilter_view</view>
</neonViewReference>
<neonViewReference>
<name>aa2fef1f-796c-4d00-b37c-0d91e55957a0</name>
- <view>PersPreview_view</view>
+ <view>ContactPreview_view</view>
</neonViewReference>
<neonViewReference>
<name>ab08dc45-8021-4b9c-8f95-5a515441973f</name>
- <view>PersEdit_view</view>
+ <view>ContactEdit_view</view>
</neonViewReference>
<neonViewReference>
<name>059b25be-ba0e-43c9-983a-6a6115b3a24c</name>
- <view>PersDetail_view</view>
+ <view>ContactDetail_view</view>
</neonViewReference>
<neonViewReference>
<name>4192e40d-23f0-45ff-8f2c-3a0694a59582</name>
- <view>PersEditDefaults_view</view>
+ <view>ContactEditDefaults_view</view>
</neonViewReference>
<neonViewReference>
<name>c597732e-0291-42a1-8edf-20ff701aac5d</name>
- <view>PersLookup_view</view>
+ <view>ContactLookup_view</view>
</neonViewReference>
<neonViewReference>
<name>d2fe8cd9-e3fc-4f4e-bd61-f762e3315798</name>
- <view>PersSimpleList_view</view>
+ <view>ContactSimpleList_view</view>
</neonViewReference>
</references>
</neonContext>
diff --git a/neonContext/Keyword_context/Keyword_context.aod b/neonContext/Keyword_context/Keyword_context.aod
index f9ee88b7b1670b3d632a2f541cb3457fcb956a2d..916d515832119a1eee55ff2eb24806cbd75187e7 100644
--- a/neonContext/Keyword_context/Keyword_context.aod
+++ b/neonContext/Keyword_context/Keyword_context.aod
@@ -5,11 +5,21 @@
<description>&lt;null value&gt;</description>
<majorModelMode>DISTRIBUTED</majorModelMode>
<filterview>KeywordFilter_view</filterview>
+ <editview>KeywordEdit_view</editview>
+ <preview>KeywordPreview_view</preview>
<entity>Keyword_entity</entity>
<references>
<neonViewReference>
<name>75271eb0-8ddf-4b02-a943-01f589df1b20</name>
<view>KeywordFilter_view</view>
</neonViewReference>
+ <neonViewReference>
+ <name>e73f8fa3-3538-4af5-8116-84358b3254fa</name>
+ <view>KeywordEdit_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>9bb352b9-5a8c-41ac-9c42-7f4f7f4827f3</name>
+ <view>KeywordPreview_view</view>
+ </neonViewReference>
</references>
</neonContext>
diff --git a/neonContext/Org_context/Org_context.aod b/neonContext/Organisation_context/Organisation_context.aod
similarity index 64%
rename from neonContext/Org_context/Org_context.aod
rename to neonContext/Organisation_context/Organisation_context.aod
index 05b35f9a7c3839c9bc38d3d6f1cab55b82db15a2..815baacaa3969dbca9cf62635b7d87761e460f0c 100644
--- a/neonContext/Org_context/Org_context.aod
+++ b/neonContext/Organisation_context/Organisation_context.aod
@@ -1,43 +1,43 @@
<?xml version="1.0" encoding="UTF-8"?>
<neonContext xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.0.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonContext/1.0.0">
- <name>Org_context</name>
+ <name>Organisation_context</name>
<title>Company</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
<icon>VAADIN:BUILDING</icon>
- <mainview>OrgMain_view</mainview>
- <filterview>OrgFilter_view</filterview>
- <editview>OrgEdit_view</editview>
- <preview>OrgPreview_view</preview>
- <lookupview>OrgLookup_view</lookupview>
- <entity>Org_entity</entity>
+ <mainview>OrganisationMain_view</mainview>
+ <filterview>OrganisationFilter_view</filterview>
+ <editview>OrganisationEdit_view</editview>
+ <preview>OrganisationPreview_view</preview>
+ <lookupview>OrganisationLookup_view</lookupview>
+ <entity>Organisation_entity</entity>
<references>
<neonViewReference>
<name>c71a570c-2408-474d-961a-7409d0999fde</name>
- <view>OrgFilter_view</view>
+ <view>OrganisationFilter_view</view>
</neonViewReference>
<neonViewReference>
<name>167b9623-4050-480a-811c-9824549d3834</name>
- <view>OrgPreview_view</view>
+ <view>OrganisationPreview_view</view>
</neonViewReference>
<neonViewReference>
<name>42b328d7-e3f2-4bab-bca8-6899d89df78d</name>
- <view>OrgMain_view</view>
+ <view>OrganisationMain_view</view>
</neonViewReference>
<neonViewReference>
<name>68c233a5-ac5a-4aa7-b795-cd5aeb7af2e6</name>
- <view>OrgEdit_view</view>
+ <view>OrganisationEdit_view</view>
</neonViewReference>
<neonViewReference>
<name>bb592f88-fa9f-4ecc-98cc-51a7903dc970</name>
- <view>OrgAttr_view</view>
+ <view>OrganisationAttr_view</view>
</neonViewReference>
<neonViewReference>
<name>b1634a51-b3f3-47b7-aea0-b9e8fba851da</name>
- <view>OrgEditDefaults_view</view>
+ <view>OrganisationEditDefaults_view</view>
</neonViewReference>
<neonViewReference>
<name>27c1cd03-506a-4e1e-a080-79b9dca6eefd</name>
- <view>OrgLookup_view</view>
+ <view>OrganisationLookup_view</view>
</neonViewReference>
</references>
</neonContext>
diff --git a/neonDashboard/MeinDashboard/MeinDashboard.aod b/neonDashboard/MeinDashboard/MeinDashboard.aod
index 7eecfd470a77e7536f3f93155d4b9aa7fa15a89c..ae914b0bf01f41e4bb079a727dd558d640c2e42f 100644
--- a/neonDashboard/MeinDashboard/MeinDashboard.aod
+++ b/neonDashboard/MeinDashboard/MeinDashboard.aod
@@ -8,7 +8,7 @@
<defaultDashlets>
<neonDashlet>
<name>Dashlet2</name>
- <viewName>PersFilter_view</viewName>
+ <viewName>ContactFilter_view</viewName>
<configName>AllContactsDashlet</configName>
<uiConfiguration>
<name>uiConfiguration</name>
diff --git a/neonDashboard/Vertriebsdashboard/Vertriebsdashboard.aod b/neonDashboard/Vertriebsdashboard/Vertriebsdashboard.aod
index 8fa4aa14803f08c71977b372723020f2bab99289..863bff4ad59e1225b8e0557eace0fe4e1d05078a 100644
--- a/neonDashboard/Vertriebsdashboard/Vertriebsdashboard.aod
+++ b/neonDashboard/Vertriebsdashboard/Vertriebsdashboard.aod
@@ -48,7 +48,7 @@
</neonDashlet>
<neonDashlet>
<name>Dashlet4</name>
- <viewName>OrgFilter_view</viewName>
+ <viewName>OrganisationFilter_view</viewName>
<configName>AllOrgsDashlet</configName>
<uiConfiguration>
<name>uiConfiguration</name>
diff --git a/neonView/ActivityMain_view/ActivityMain_view.aod b/neonView/ActivityMain_view/ActivityMain_view.aod
index 0eebb1a184ac48208842bcb0955e2e101744d28f..d997d0fdf650fd034ddff7f502709edb3e7d5b44 100644
--- a/neonView/ActivityMain_view/ActivityMain_view.aod
+++ b/neonView/ActivityMain_view/ActivityMain_view.aod
@@ -21,12 +21,12 @@
</neonViewReference>
<neonViewReference>
<name>7bab8dbf-b69e-412d-a604-3a6999658e10</name>
- <entityField>ActivityDocument_dfo</entityField>
+ <entityField>AllDocuments</entityField>
<view>DocumentFilter_view</view>
</neonViewReference>
<neonViewReference>
<name>6066d539-d392-4688-931a-409c10fa1fbe</name>
- <entityField>ActivityLink_dfo</entityField>
+ <entityField>Links</entityField>
<view>ActivityLinkFilter_view</view>
</neonViewReference>
</children>
diff --git a/neonView/ActivityPreview_view/ActivityPreview_view.aod b/neonView/ActivityPreview_view/ActivityPreview_view.aod
index eaa45e929fc6184e171a216cc0ad63b6ed15cace..305b2238fe3da9600e215a63384e90fa0d550fea 100644
--- a/neonView/ActivityPreview_view/ActivityPreview_view.aod
+++ b/neonView/ActivityPreview_view/ActivityPreview_view.aod
@@ -36,7 +36,7 @@
</genericViewTemplate>
<neonViewReference>
<name>43167618-e4dc-429b-a264-3ea95bd647f9</name>
- <entityField>ActivityMainDocument_dfo</entityField>
+ <entityField>MainDocuments</entityField>
<view>DocumentList_view</view>
</neonViewReference>
</children>
diff --git a/neonView/ActivityTimeline_view/ActivityTimeline_view.aod b/neonView/ActivityTimeline_view/ActivityTimeline_view.aod
index 7272d341a2c28a266949451dd8f6b3b589a50ea1..1ae938948772d216ef8400867da46773c7290300 100644
--- a/neonView/ActivityTimeline_view/ActivityTimeline_view.aod
+++ b/neonView/ActivityTimeline_view/ActivityTimeline_view.aod
@@ -15,7 +15,6 @@
<descriptionField>INFO</descriptionField>
<iconIdField>DIRECTION_ICON</iconIdField>
<entityField>#ENTITY</entityField>
- <title>asdfasdf</title>
</timelineViewTemplate>
</children>
</neonView>
diff --git a/neonView/CommEdit_view/CommEdit_view.aod b/neonView/CommunicationEdit_view/CommunicationEdit_view.aod
similarity index 95%
rename from neonView/CommEdit_view/CommEdit_view.aod
rename to neonView/CommunicationEdit_view/CommunicationEdit_view.aod
index 5e13b2efc46c5475938608a0ef82771248ed6175..d1994e867c426810fd742c594a61418cdd201eb2 100644
--- a/neonView/CommEdit_view/CommEdit_view.aod
+++ b/neonView/CommunicationEdit_view/CommunicationEdit_view.aod
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.0.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.0.1">
- <name>CommEdit_view</name>
+ <name>CommunicationEdit_view</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<layout>
<boxLayout>
diff --git a/neonView/CommFilter_view/CommFilter_view.aod b/neonView/CommunicationFilter_view/CommunicationFilter_view.aod
similarity index 95%
rename from neonView/CommFilter_view/CommFilter_view.aod
rename to neonView/CommunicationFilter_view/CommunicationFilter_view.aod
index a3081da643f565a0cba32029f6849f501656db8c..75f9f952b9f74905af4ea436511fd6016ca62eff 100644
--- a/neonView/CommFilter_view/CommFilter_view.aod
+++ b/neonView/CommunicationFilter_view/CommunicationFilter_view.aod
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.0.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.0.1">
- <name>CommFilter_view</name>
+ <name>CommunicationFilter_view</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<filterable v="true" />
<layout>
diff --git a/neonView/CommList_view/CommList_view.aod b/neonView/CommunicationList_view/CommunicationList_view.aod
similarity index 96%
rename from neonView/CommList_view/CommList_view.aod
rename to neonView/CommunicationList_view/CommunicationList_view.aod
index 6e1fecc3c153c093254d93772c8098981996088b..83862dcc001a0f46a4abe8cc2c6b89641f311196 100644
--- a/neonView/CommList_view/CommList_view.aod
+++ b/neonView/CommunicationList_view/CommunicationList_view.aod
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.0.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.0.1">
- <name>CommList_view</name>
+ <name>CommunicationList_view</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<layout>
<noneLayout>
diff --git a/neonView/CommMultiEdit_view/CommMultiEdit_view.aod b/neonView/CommunicationMultiEdit_view/CommunicationMultiEdit_view.aod
similarity index 95%
rename from neonView/CommMultiEdit_view/CommMultiEdit_view.aod
rename to neonView/CommunicationMultiEdit_view/CommunicationMultiEdit_view.aod
index e294d4882c50fb59f7dca3760835c62dec06d093..b75bc136ec2b14511621975f5997b66ded946ce2 100644
--- a/neonView/CommMultiEdit_view/CommMultiEdit_view.aod
+++ b/neonView/CommunicationMultiEdit_view/CommunicationMultiEdit_view.aod
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.0.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.0.1">
- <name>CommMultiEdit_view</name>
+ <name>CommunicationMultiEdit_view</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<layout>
<noneLayout>
diff --git a/neonView/PersDetail_view/PersDetail_view.aod b/neonView/ContactDetail_view/ContactDetail_view.aod
similarity index 97%
rename from neonView/PersDetail_view/PersDetail_view.aod
rename to neonView/ContactDetail_view/ContactDetail_view.aod
index 6df023889fd76a20230cefd40717978c23779419..bb8db1a557147c259372a6f899fb707ebf0b894c 100644
--- a/neonView/PersDetail_view/PersDetail_view.aod
+++ b/neonView/ContactDetail_view/ContactDetail_view.aod
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.0.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.0.1">
- <name>PersDetail_view</name>
+ <name>ContactDetail_view</name>
<title>Details</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
<layout>
diff --git a/neonView/PersEditDefaults_view/PersEditDefaults_view.aod b/neonView/ContactEditDefaults_view/ContactEditDefaults_view.aod
similarity index 96%
rename from neonView/PersEditDefaults_view/PersEditDefaults_view.aod
rename to neonView/ContactEditDefaults_view/ContactEditDefaults_view.aod
index d396ada14027249d8daac14dae2482facc0bb6e9..298af207bf1ed3994e4e86baefb1792acc014265 100644
--- a/neonView/PersEditDefaults_view/PersEditDefaults_view.aod
+++ b/neonView/ContactEditDefaults_view/ContactEditDefaults_view.aod
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.0.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.0.1">
- <name>PersEditDefaults_view</name>
+ <name>ContactEditDefaults_view</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<layout>
<boxLayout>
diff --git a/neonView/PersEdit_view/PersEdit_view.aod b/neonView/ContactEdit_view/ContactEdit_view.aod
similarity index 92%
rename from neonView/PersEdit_view/PersEdit_view.aod
rename to neonView/ContactEdit_view/ContactEdit_view.aod
index 2617caa091fc1fd4be731d258812cff84857fed1..0f46dd6a24d3c587e68dc32e20c9c048c6a17f35 100644
--- a/neonView/PersEdit_view/PersEdit_view.aod
+++ b/neonView/ContactEdit_view/ContactEdit_view.aod
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.0.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.0.1">
- <name>PersEdit_view</name>
+ <name>ContactEdit_view</name>
<title>Contact</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
<icon>VAADIN:USERS</icon>
@@ -57,18 +57,18 @@
</genericViewTemplate>
<neonViewReference>
<name>78dcb8dc-61c3-4cf9-a37b-28dbeeb27001</name>
- <entityField>PersAddress_dfo</entityField>
+ <entityField>PersAddresses</entityField>
<view>AdressMultiEdit_view</view>
</neonViewReference>
<neonViewReference>
<name>5bfb64da-09d6-417d-a4b8-f5a2ffc1747e</name>
- <entityField>PersOrgsAddresses_dfo</entityField>
+ <entityField>OrgAddresses</entityField>
<view>AdressMultiEdit_view</view>
</neonViewReference>
<neonViewReference>
<name>fc64789f-b4c6-401e-86e3-f484451c7689</name>
- <entityField>PersComm_dfo</entityField>
- <view>CommMultiEdit_view</view>
+ <entityField>Communications</entityField>
+ <view>CommunicationMultiEdit_view</view>
</neonViewReference>
</children>
</neonView>
diff --git a/neonView/PersFilter_view/PersFilter_view.aod b/neonView/ContactFilter_view/ContactFilter_view.aod
similarity index 96%
rename from neonView/PersFilter_view/PersFilter_view.aod
rename to neonView/ContactFilter_view/ContactFilter_view.aod
index 78fa4cbc7adcf0e89a332893530287649fe29a97..e81e229092c35d066aad2643dcafc3e5b27672a5 100644
--- a/neonView/PersFilter_view/PersFilter_view.aod
+++ b/neonView/ContactFilter_view/ContactFilter_view.aod
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.0.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.0.1">
- <name>PersFilter_view</name>
+ <name>ContactFilter_view</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<filterable v="true" />
<dashletConfigurations>
@@ -8,7 +8,7 @@
<name>AllContactsDashlet</name>
<title>Contacts</title>
<description>Show all contacts</description>
- <fragment>Pers_context/filter</fragment>
+ <fragment>Contact_context/filter</fragment>
<singleton v="true" />
<requiresConfiguration v="false" />
<icon>vaadin:users</icon>
diff --git a/neonView/PersLookup_view/PersLookup_view.aod b/neonView/ContactLookup_view/ContactLookup_view.aod
similarity index 97%
rename from neonView/PersLookup_view/PersLookup_view.aod
rename to neonView/ContactLookup_view/ContactLookup_view.aod
index 1c7fdd8c23d5e690b31a6b42974b9dd3ffddbf42..2c6fb73133bca90d896eae70fac6a4955cada2ba 100644
--- a/neonView/PersLookup_view/PersLookup_view.aod
+++ b/neonView/ContactLookup_view/ContactLookup_view.aod
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.0.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.0.1">
- <name>PersLookup_view</name>
+ <name>ContactLookup_view</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<layout>
<boxLayout>
diff --git a/neonView/PersMain_view/PersMain_view.aod b/neonView/ContactMain_view/ContactMain_view.aod
similarity index 82%
rename from neonView/PersMain_view/PersMain_view.aod
rename to neonView/ContactMain_view/ContactMain_view.aod
index 30375651ab16c741532d0beb3b3c8c7e39e1c20c..ecebeb9bb8368704330bffe02560653a1f65a66b 100644
--- a/neonView/PersMain_view/PersMain_view.aod
+++ b/neonView/ContactMain_view/ContactMain_view.aod
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.0.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.0.1">
- <name>PersMain_view</name>
+ <name>ContactMain_view</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<layout>
<masterSlaveLayout>
@@ -12,26 +12,26 @@
<neonViewReference>
<name>12865531-5e68-4760-a846-8af7b97f9561</name>
<entityField>#ENTITY</entityField>
- <view>PersPreview_view</view>
+ <view>ContactPreview_view</view>
</neonViewReference>
<neonViewReference>
<name>d674b32c-0493-47ea-a51f-dff5d13d237d</name>
- <entityField>PersActivity_dfo</entityField>
+ <entityField>Activities</entityField>
<view>ActivityFilter_view</view>
</neonViewReference>
<neonViewReference>
<name>4b50b784-484f-4cdf-a705-4c356da763fa</name>
- <entityField>PersDocument_dfo</entityField>
+ <entityField>Documents</entityField>
<view>DocumentFilter_view</view>
</neonViewReference>
<neonViewReference>
<name>ec344a07-7b82-4c54-b06b-30ac5b8599f9</name>
- <entityField>PersContract_dfo</entityField>
+ <entityField>Contracts</entityField>
<view>ContractFilter_view</view>
</neonViewReference>
<neonViewReference>
<name>726f10a6-dad6-4325-a73e-2d6caf0340db</name>
- <entityField>ObjectRelation_dfo</entityField>
+ <entityField>ObjectRelations</entityField>
<view>ObjectRelationFilter_view</view>
</neonViewReference>
</children>
diff --git a/neonView/PersPreview_view/PersPreview_view.aod b/neonView/ContactPreview_view/ContactPreview_view.aod
similarity index 90%
rename from neonView/PersPreview_view/PersPreview_view.aod
rename to neonView/ContactPreview_view/ContactPreview_view.aod
index 8ab6116c914c30df0733d30b6b516e57ef1615f2..214873787105c3e259fb06689319860ac9e7043e 100644
--- a/neonView/PersPreview_view/PersPreview_view.aod
+++ b/neonView/ContactPreview_view/ContactPreview_view.aod
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.0.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.0.1">
- <name>PersPreview_view</name>
+ <name>ContactPreview_view</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<layout>
<boxLayout>
@@ -17,17 +17,17 @@
</cardViewTemplate>
<neonViewReference>
<name>5a1b7683-2fec-4763-9b45-e4c7a18d70fd</name>
- <entityField>PersComm_dfo</entityField>
- <view>CommList_view</view>
+ <entityField>Communications</entityField>
+ <view>CommunicationList_view</view>
</neonViewReference>
<neonViewReference>
<name>4c4b1e66-fdc2-469c-a553-244b6dbffbe0</name>
- <entityField>PersAddress_dfo</entityField>
+ <entityField>PersAddresses</entityField>
<view>AddressList_view</view>
</neonViewReference>
<neonViewReference>
<name>38bd1cc7-8b75-4755-8bb2-0177f02bbef5</name>
- <entityField>PersOrgsAddresses_dfo</entityField>
+ <entityField>OrgAddresses</entityField>
<view>AddressList_view</view>
</neonViewReference>
<genericViewTemplate>
diff --git a/neonView/PersSimpleList_view/PersSimpleList_view.aod b/neonView/ContactSimpleList_view/ContactSimpleList_view.aod
similarity index 97%
rename from neonView/PersSimpleList_view/PersSimpleList_view.aod
rename to neonView/ContactSimpleList_view/ContactSimpleList_view.aod
index f803c70d70a04a1602304a8be2641446ff07e81b..8e3e5e2fe97473b74d8a15194c3fd87c20b1f745 100644
--- a/neonView/PersSimpleList_view/PersSimpleList_view.aod
+++ b/neonView/ContactSimpleList_view/ContactSimpleList_view.aod
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.0.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.0.1">
- <name>PersSimpleList_view</name>
+ <name>ContactSimpleList_view</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<children>
<tableViewTemplate>
diff --git a/neonView/KeywordEdit_view/KeywordEdit_view.aod b/neonView/KeywordEdit_view/KeywordEdit_view.aod
new file mode 100644
index 0000000000000000000000000000000000000000..3275db9f41f66eda6375dc1c90da459abbcfe8f0
--- /dev/null
+++ b/neonView/KeywordEdit_view/KeywordEdit_view.aod
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.0.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.0.1">
+ <name>KeywordEdit_view</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <layout>
+ <boxLayout>
+ <name>layout</name>
+ </boxLayout>
+ </layout>
+ <children>
+ <genericViewTemplate>
+ <name>mainData</name>
+ <editMode v="true" />
+ <entityField>#ENTITY</entityField>
+ <fields>
+ <entityFieldLink>
+ <name>236c9d71-a619-47b5-b5a0-8d4e5bc45903</name>
+ <entityField>CONTAINER</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>f7f66b08-521c-46bf-b6e9-3c3f130648bc</name>
+ <entityField>TITLE</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>3fb4b999-853a-407e-b928-8f5e633c1dc5</name>
+ <entityField>ISACTIVE</entityField>
+ </entityFieldLink>
+ </fields>
+ </genericViewTemplate>
+ </children>
+</neonView>
diff --git a/neonView/KeywordFilter_view/KeywordFilter_view.aod b/neonView/KeywordFilter_view/KeywordFilter_view.aod
index 2d416b5a5fbc02eb22199dd35906dac66b0fa38d..c69a8a6af1adb1ba60271b77064ec3fbc12b87b5 100644
--- a/neonView/KeywordFilter_view/KeywordFilter_view.aod
+++ b/neonView/KeywordFilter_view/KeywordFilter_view.aod
@@ -2,17 +2,22 @@
<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.0.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.0.1">
<name>KeywordFilter_view</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
+ <filterable v="true" />
<layout>
- <boxLayout>
+ <groupLayout>
<name>layout</name>
- </boxLayout>
+ </groupLayout>
</layout>
<children>
<tableViewTemplate>
- <name>mainTable</name>
+ <name>table</name>
<entityField>#ENTITY</entityField>
<title></title>
<columns>
+ <neonTableColumn>
+ <name>0e85b64c-6ce8-4221-8544-b8b5152a1292</name>
+ <entityField>#ICON</entityField>
+ </neonTableColumn>
<neonTableColumn>
<name>4dc50d75-d856-4fca-bd4d-d79eb3c8769f</name>
<entityField>KEYID</entityField>
@@ -31,5 +36,11 @@
</neonTableColumn>
</columns>
</tableViewTemplate>
+ <treetableViewTemplate>
+ <name>treeTable</name>
+ <titleField>TITLE</titleField>
+ <descriptionField>KEYID</descriptionField>
+ <entityField>#ENTITY</entityField>
+ </treetableViewTemplate>
</children>
</neonView>
diff --git a/neonView/KeywordPreview_view/KeywordPreview_view.aod b/neonView/KeywordPreview_view/KeywordPreview_view.aod
new file mode 100644
index 0000000000000000000000000000000000000000..0dc50a66f5d5af36af64cb1bee37f598c8b2832d
--- /dev/null
+++ b/neonView/KeywordPreview_view/KeywordPreview_view.aod
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.0.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.0.1">
+ <name>KeywordPreview_view</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <layout>
+ <boxLayout>
+ <name>layout</name>
+ </boxLayout>
+ </layout>
+ <children>
+ <cardViewTemplate>
+ <name>card</name>
+ <titleField>TITLE</titleField>
+ <subtitleField>CONTAINER</subtitleField>
+ <descriptionField>KEYID</descriptionField>
+ <entityField>#ENTITY</entityField>
+ </cardViewTemplate>
+ <genericViewTemplate>
+ <name>data</name>
+ <showDrawer v="true" />
+ <entityField>#ENTITY</entityField>
+ <title></title>
+ <fields>
+ <entityFieldLink>
+ <name>8455ebce-3bc2-4b0c-8e80-ec3795202d0e</name>
+ <entityField>ISACTIVE</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>4b0bb3a6-5457-4eee-b0d8-6ec4b23c0aa7</name>
+ <entityField>ISESSENTIAL</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>30d80ba1-235e-4b4a-9e9c-2b63f70f87b5</name>
+ <entityField>SORTING</entityField>
+ </entityFieldLink>
+ </fields>
+ </genericViewTemplate>
+ </children>
+</neonView>
diff --git a/neonView/OrgEditDefaults_view/OrgEditDefaults_view.aod b/neonView/OrgEditDefaults_view/OrgEditDefaults_view.aod
index 7f6b83dfae3752be628409ca3edbd1a75c9703af..3c9b5d8bd26150f0a78b9e0a574dd89b1c4fc9b6 100644
--- a/neonView/OrgEditDefaults_view/OrgEditDefaults_view.aod
+++ b/neonView/OrgEditDefaults_view/OrgEditDefaults_view.aod
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.0.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.0.1">
- <name>OrgEditDefaults_view</name>
+ <name>OrganisationEditDefaults_view</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<layout>
<boxLayout>
diff --git a/neonView/OrgAttr_view/OrgAttr_view.aod b/neonView/OrganisationAttr_view/OrganisationAttr_view.aod
similarity index 97%
rename from neonView/OrgAttr_view/OrgAttr_view.aod
rename to neonView/OrganisationAttr_view/OrganisationAttr_view.aod
index 59140ae9a137033bd6cd6bd406b2da726456b9e7..776e229c1ed02a1c41f2600c4f1928dbb5974117 100644
--- a/neonView/OrgAttr_view/OrgAttr_view.aod
+++ b/neonView/OrganisationAttr_view/OrganisationAttr_view.aod
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.0.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.0.1">
- <name>OrgAttr_view</name>
+ <name>OrganisationAttr_view</name>
<description>TODO: View verknüpfung von generics momentan nicht möglich! Desshalb habe ich die Felder nochmal direkt verknüpft, damit es zumindest nutzbar ist.
TODO: diese Felder werden später als Attribute implementiert</description>
<majorModelMode>DISTRIBUTED</majorModelMode>
diff --git a/neonView/OrgEdit_view/OrgEdit_view.aod b/neonView/OrganisationEdit_view/OrganisationEdit_view.aod
similarity index 90%
rename from neonView/OrgEdit_view/OrgEdit_view.aod
rename to neonView/OrganisationEdit_view/OrganisationEdit_view.aod
index 3503cc145ffb92d69ca89adcaa7148fff6a550b3..17620ed36a47ad83bb2b7d473fbb798a5e528fe8 100644
--- a/neonView/OrgEdit_view/OrgEdit_view.aod
+++ b/neonView/OrganisationEdit_view/OrganisationEdit_view.aod
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.0.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.0.1">
- <name>OrgEdit_view</name>
+ <name>OrganisationEdit_view</name>
<title>Company</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
<icon>VAADIN:BUILDING</icon>
@@ -44,17 +44,17 @@
</genericViewTemplate>
<neonViewReference>
<name>148e3a6c-d30b-470c-84e5-273293348611</name>
- <entityField>OrgAddress_dfo</entityField>
+ <entityField>Addresses</entityField>
<view>AdressMultiEdit_view</view>
</neonViewReference>
<neonViewReference>
<name>6355808f-ee94-4caf-95b1-3848e81c75b7</name>
- <entityField>OrgComm_dfo</entityField>
- <view>CommMultiEdit_view</view>
+ <entityField>Communications</entityField>
+ <view>CommunicationMultiEdit_view</view>
</neonViewReference>
<neonViewReference>
<name>2e648487-73d1-41ce-a562-5ce6bce3b599</name>
- <entityField>OrgAttr_dfo</entityField>
+ <entityField>Attributes</entityField>
<view>AttributeRelationMultiEdit_view</view>
</neonViewReference>
</children>
diff --git a/neonView/OrgFilter_view/OrgFilter_view.aod b/neonView/OrganisationFilter_view/OrganisationFilter_view.aod
similarity index 96%
rename from neonView/OrgFilter_view/OrgFilter_view.aod
rename to neonView/OrganisationFilter_view/OrganisationFilter_view.aod
index 191e99712c072eb07d962039325d2ef7f48b3755..48585cf693c73e3042ff53533a68a6d281b42c0c 100644
--- a/neonView/OrgFilter_view/OrgFilter_view.aod
+++ b/neonView/OrganisationFilter_view/OrganisationFilter_view.aod
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.0.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.0.1">
- <name>OrgFilter_view</name>
+ <name>OrganisationFilter_view</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<filterable v="true" />
<dashletConfigurations>
@@ -8,7 +8,7 @@
<name>AllOrgsDashlet</name>
<title>Companies</title>
<description>Show all companies</description>
- <fragment>Org_context/filter</fragment>
+ <fragment>Organisation_context/filter</fragment>
<singleton v="true" />
<requiresConfiguration v="false" />
<icon>vaadin:building</icon>
diff --git a/neonView/OrgLookup_view/OrgLookup_view.aod b/neonView/OrganisationLookup_view/OrganisationLookup_view.aod
similarity index 96%
rename from neonView/OrgLookup_view/OrgLookup_view.aod
rename to neonView/OrganisationLookup_view/OrganisationLookup_view.aod
index 21c58f40bfea3c3128ddfb0e4330311b30cc3719..25d9c994afae8db47705a9944986959b0750047e 100644
--- a/neonView/OrgLookup_view/OrgLookup_view.aod
+++ b/neonView/OrganisationLookup_view/OrganisationLookup_view.aod
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.0.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.0.1">
- <name>OrgLookup_view</name>
+ <name>OrganisationLookup_view</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<layout>
<boxLayout>
diff --git a/neonView/OrgMain_view/OrgMain_view.aod b/neonView/OrganisationMain_view/OrganisationMain_view.aod
similarity index 78%
rename from neonView/OrgMain_view/OrgMain_view.aod
rename to neonView/OrganisationMain_view/OrganisationMain_view.aod
index 6b93cb0c7b3babbc072f2d8d76d612a1581358f1..24928bc18e0f64f509f812298c21cf95478633f7 100644
--- a/neonView/OrgMain_view/OrgMain_view.aod
+++ b/neonView/OrganisationMain_view/OrganisationMain_view.aod
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.0.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.0.1">
- <name>OrgMain_view</name>
+ <name>OrganisationMain_view</name>
<title>Attribute</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
<layout>
@@ -13,41 +13,41 @@
<neonViewReference>
<name>b29471bb-a6d0-4730-90ef-191f76756fcb</name>
<entityField>#ENTITY</entityField>
- <view>OrgPreview_view</view>
+ <view>OrganisationPreview_view</view>
</neonViewReference>
<neonViewReference>
<name>14bb5a70-fec1-4346-a8c2-2dde6fb32822</name>
- <entityField>OrgActivity_dfo</entityField>
+ <entityField>Activities</entityField>
<view>ActivityFilter_view</view>
</neonViewReference>
<neonViewReference>
<name>c10533a6-d185-4b13-84ee-53a468544c03</name>
- <entityField>PersOrg_dfo</entityField>
- <view>PersSimpleList_view</view>
+ <entityField>Contacts</entityField>
+ <view>ContactSimpleList_view</view>
</neonViewReference>
<neonViewReference>
<name>78aee175-d3ac-4378-8b3b-27f44a529aa5</name>
- <entityField>OrgProductprice_dfo</entityField>
+ <entityField>Productprices</entityField>
<view>ProductpriceRelation_view</view>
</neonViewReference>
<neonViewReference>
<name>eba90ed2-5e55-4cdb-9e0b-5a09feeb7536</name>
- <entityField>OrgDocument_dfo</entityField>
+ <entityField>Documents</entityField>
<view>DocumentFilter_view</view>
</neonViewReference>
<neonViewReference>
<name>fd099297-e87d-4ada-b7e7-e04afafbd8b0</name>
- <entityField>OrgContract_dfo</entityField>
+ <entityField>Contracts</entityField>
<view>ContractFilter_view</view>
</neonViewReference>
<neonViewReference>
<name>39c98ccb-7f77-4df0-818f-1f302f69fec4</name>
- <entityField>OrgAttr_dfo</entityField>
+ <entityField>Attributes</entityField>
<view>AttributeRelationTree_view</view>
</neonViewReference>
<neonViewReference>
<name>ee7395b9-b787-4662-9021-f6e2d486bd16</name>
- <entityField>ObjectRelation_dfo</entityField>
+ <entityField>ObjectRelations</entityField>
<view>ObjectRelationFilter_view</view>
</neonViewReference>
</children>
diff --git a/neonView/OrgPreview_view/OrgPreview_view.aod b/neonView/OrganisationPreview_view/OrganisationPreview_view.aod
similarity index 91%
rename from neonView/OrgPreview_view/OrgPreview_view.aod
rename to neonView/OrganisationPreview_view/OrganisationPreview_view.aod
index fcb8590774b8b6d80e510a63a4d610dc2dfb8884..ab9edb34ec65966950b0c35087da8be1b72f2b85 100644
--- a/neonView/OrgPreview_view/OrgPreview_view.aod
+++ b/neonView/OrganisationPreview_view/OrganisationPreview_view.aod
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.0.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.0.1">
- <name>OrgPreview_view</name>
+ <name>OrganisationPreview_view</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<layout>
<boxLayout>
@@ -17,12 +17,12 @@
</cardViewTemplate>
<neonViewReference>
<name>2cb11b4e-dd8e-419b-8fff-ef0852ef2641</name>
- <entityField>OrgComm_dfo</entityField>
- <view>CommList_view</view>
+ <entityField>Communications</entityField>
+ <view>CommunicationList_view</view>
</neonViewReference>
<neonViewReference>
<name>df605bb6-5d18-4233-abc0-1da82e4910ca</name>
- <entityField>OrgAddress_dfo</entityField>
+ <entityField>Addresses</entityField>
<view>AddressList_view</view>
</neonViewReference>
<genericViewTemplate>
diff --git a/neonView/SalesprojectCompetitionPreview_view/SalesprojectCompetitionPreview_view.aod b/neonView/SalesprojectCompetitionPreview_view/SalesprojectCompetitionPreview_view.aod
index 204225a58de4b3446098322c046fe3a718c82dc0..6fe84ed770216da9c8b158f383465fd78313fd77 100644
--- a/neonView/SalesprojectCompetitionPreview_view/SalesprojectCompetitionPreview_view.aod
+++ b/neonView/SalesprojectCompetitionPreview_view/SalesprojectCompetitionPreview_view.aod
@@ -61,7 +61,7 @@
<neonViewReference>
<name>3ad88e2c-b159-4c97-b81f-beb689b0fc1c</name>
<entityField>SalesprojectCompetitionOrg_dfo</entityField>
- <view>OrgAttr_view</view>
+ <view>OrganisationAttr_view</view>
</neonViewReference>
</children>
</neonView>
diff --git a/neonView/SalesprojectMain_view/SalesprojectMain_view.aod b/neonView/SalesprojectMain_view/SalesprojectMain_view.aod
index ffebd06fd9624c1adcca492fcdb9f9592cd433c8..5a39f33825f263214a8315dcf8ae8d5f47ee20de 100644
--- a/neonView/SalesprojectMain_view/SalesprojectMain_view.aod
+++ b/neonView/SalesprojectMain_view/SalesprojectMain_view.aod
@@ -16,7 +16,7 @@
</neonViewReference>
<neonViewReference>
<name>e0bc8b4b-7def-4fc7-9c07-132e4fb25c29</name>
- <entityField>SalesprojectActivity_dfo</entityField>
+ <entityField>Activities</entityField>
<view>ActivityFilter_view</view>
</neonViewReference>
<neonViewReference>
diff --git a/others/db_changes/data_alias/data/example_activity/example_activity_gfk.xml b/others/db_changes/data_alias/data/example_activity/example_activity_gfk.xml
index bb609688c0ececcccb9aa78fd22a7aa78909d782..ba2aaf2b07827fa427d557f157f37f4d8df14518 100644
--- a/others/db_changes/data_alias/data/example_activity/example_activity_gfk.xml
+++ b/others/db_changes/data_alias/data/example_activity/example_activity_gfk.xml
@@ -14,7 +14,7 @@
<insert tableName="ACTIVITYLINK">
<column name="ACTIVITYLINKID" value="5a4d249a-e3e4-48e5-80a5-2fd1567a82b8"/>
<column name="ACTIVITY_ID" value="661a7b87-68ae-4d52-bc22-6bf96184e6fe"/>
- <column name="OBJECT_TYPE" value="Org_context"/>
+ <column name="OBJECT_TYPE" value="Organisation_context"/>
<column name="OBJECT_ROWID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
<column name="USER_NEW" value="Admin"/>
<column name="DATE_NEW" valueDate="2018-08-03T12:02:52"/>
@@ -22,7 +22,7 @@
<insert tableName="ACTIVITYLINK">
<column name="ACTIVITYLINKID" value="83337967-5d58-4b17-88c2-2aeefa130c21"/>
<column name="ACTIVITY_ID" value="661a7b87-68ae-4d52-bc22-6bf96184e6fe"/>
- <column name="OBJECT_TYPE" value="Pers_context"/>
+ <column name="OBJECT_TYPE" value="Contact_context"/>
<column name="OBJECT_ROWID" value="6be18a7e-e7fa-11e8-9f32-f2801f1b9fd1"/>
<column name="USER_NEW" value="Admin"/>
<column name="DATE_NEW" valueDate="2018-08-03T12:02:52"/>
@@ -40,7 +40,7 @@
<insert tableName="ACTIVITYLINK">
<column name="ACTIVITYLINKID" value="b0fae79b-0b1e-4650-8d94-853d17cca7bd"/>
<column name="ACTIVITY_ID" value="9dda39bf-966c-4560-be03-5ddbbc1da84a"/>
- <column name="OBJECT_TYPE" value="Org_context"/>
+ <column name="OBJECT_TYPE" value="Organisation_context"/>
<column name="OBJECT_ROWID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
<column name="USER_NEW" value="Admin"/>
<column name="DATE_NEW" valueDate="2018-07-31T12:02:52"/>
@@ -58,7 +58,7 @@
<insert tableName="ACTIVITYLINK">
<column name="ACTIVITYLINKID" value="01ff4193-d5b4-41eb-b2db-ea31e5ed7df4"/>
<column name="ACTIVITY_ID" value="94365b81-cddd-4f56-8379-7ba0a98840a4"/>
- <column name="OBJECT_TYPE" value="Org_context"/>
+ <column name="OBJECT_TYPE" value="Organisation_context"/>
<column name="OBJECT_ROWID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
<column name="USER_NEW" value="Admin"/>
<column name="DATE_NEW" valueDate="2018-08-03T12:02:52"/>
@@ -76,7 +76,7 @@
<insert tableName="ACTIVITYLINK">
<column name="ACTIVITYLINKID" value="80d3de8f-fd86-401b-aeae-63b389b9310c"/>
<column name="ACTIVITY_ID" value="6397161c-afed-40cf-a1bd-12e657054ce4"/>
- <column name="OBJECT_TYPE" value="Org_context"/>
+ <column name="OBJECT_TYPE" value="Organisation_context"/>
<column name="OBJECT_ROWID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
<column name="USER_NEW" value="Admin"/>
<column name="DATE_NEW" valueDate="2018-08-06T12:02:52"/>
@@ -94,7 +94,7 @@
<insert tableName="ACTIVITYLINK">
<column name="ACTIVITYLINKID" value="5ad45b3e-72a0-419e-a183-17aaead38158"/>
<column name="ACTIVITY_ID" value="b378876d-dba5-4e41-865f-9ac056bffa60"/>
- <column name="OBJECT_TYPE" value="Org_context"/>
+ <column name="OBJECT_TYPE" value="Organisation_context"/>
<column name="OBJECT_ROWID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
<column name="USER_NEW" value="Admin"/>
<column name="DATE_NEW" valueDate="2018-08-04T12:02:52"/>
@@ -112,7 +112,7 @@
<insert tableName="ACTIVITYLINK">
<column name="ACTIVITYLINKID" value="6c212e64-a9db-4395-a118-5279dbc6761d"/>
<column name="ACTIVITY_ID" value="beda92e0-bbd6-423a-8b49-78da30064e84"/>
- <column name="OBJECT_TYPE" value="Org_context"/>
+ <column name="OBJECT_TYPE" value="Organisation_context"/>
<column name="OBJECT_ROWID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
<column name="USER_NEW" value="Admin"/>
<column name="DATE_NEW" valueDate="2018-08-09T12:02:52"/>
@@ -130,7 +130,7 @@
<insert tableName="ACTIVITYLINK">
<column name="ACTIVITYLINKID" value="8d384436-9989-4571-a193-cc3061249f97"/>
<column name="ACTIVITY_ID" value="56c78f3d-e126-4e36-8031-d5eef9877243"/>
- <column name="OBJECT_TYPE" value="Org_context"/>
+ <column name="OBJECT_TYPE" value="Organisation_context"/>
<column name="OBJECT_ROWID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
<column name="USER_NEW" value="Admin"/>
<column name="DATE_NEW" valueDate="2018-08-04T12:02:52"/>
@@ -148,7 +148,7 @@
<insert tableName="ACTIVITYLINK">
<column name="ACTIVITYLINKID" value="20a50d5d-fe87-4ed2-8f94-b2571b6b34e7"/>
<column name="ACTIVITY_ID" value="9f498736-c523-4c63-8c53-28e49324b52b"/>
- <column name="OBJECT_TYPE" value="Org_context"/>
+ <column name="OBJECT_TYPE" value="Organisation_context"/>
<column name="OBJECT_ROWID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
<column name="USER_NEW" value="Admin"/>
<column name="DATE_NEW" valueDate="2018-08-12T12:02:52"/>
@@ -166,7 +166,7 @@
<insert tableName="ACTIVITYLINK">
<column name="ACTIVITYLINKID" value="46d9d317-1b7d-4046-8278-9a4957cc1dfe"/>
<column name="ACTIVITY_ID" value="1c711078-8324-4fcf-93ec-2c8aa29c0cc6"/>
- <column name="OBJECT_TYPE" value="Org_context"/>
+ <column name="OBJECT_TYPE" value="Organisation_context"/>
<column name="OBJECT_ROWID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
<column name="USER_NEW" value="Admin"/>
<column name="DATE_NEW" valueDate="2018-08-11T12:02:52"/>
diff --git a/others/db_changes/data_alias/data/example_org/ORG_gfk.xml b/others/db_changes/data_alias/data/example_org/ORG_gfk.xml
index 6716ac48462f70e5c10cda1ba162669b1d029509..de53f641846083c9e7665df2e8dc41436c0659c7 100644
--- a/others/db_changes/data_alias/data/example_org/ORG_gfk.xml
+++ b/others/db_changes/data_alias/data/example_org/ORG_gfk.xml
@@ -16,9 +16,9 @@
<column name="AB_OBJECTRELATIONID" value="102b5d75-304b-41f4-9426-ba13d4dce1c3"/>
<column name="USER_NEW" value="admin"/>
<column name="DATE_NEW" valueDate="2018-06-13T09:03:43"/>
- <column name="OBJECT1_TYPE" value="Org_context"/>
+ <column name="OBJECT1_TYPE" value="Organisation_context"/>
<column name="OBJECT1_ROWID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
- <column name="OBJECT2_TYPE" value="Pers_context"/>
+ <column name="OBJECT2_TYPE" value="Contact_context"/>
<column name="OBJECT2_ROWID" value="1a67eaa7-21da-4a18-97ab-755ac5cb74f7"/>
</insert>
<insert tableName="RELATION">
@@ -87,7 +87,7 @@
<insert tableName="ACTIVITYLINK">
<column name="ACTIVITYLINKID" value="baa5a1da-39f2-48ae-93a5-bad704e5ae48"/>
<column name="ACTIVITY_ID" value="de110a33-bcab-407e-9d60-7a65f028159b"/>
- <column name="OBJECT_TYPE" value="Org_context"/>
+ <column name="OBJECT_TYPE" value="Organisation_context"/>
<column name="OBJECT_ROWID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
<column name="USER_NEW" value="admin"/>
<column name="DATE_NEW" valueDate="2018-08-03T17:33:52"/>
@@ -105,7 +105,7 @@
<insert tableName="ACTIVITYLINK">
<column name="ACTIVITYLINKID" value="caa5a1da-39f2-48ae-93a5-bad704e5ae48"/>
<column name="ACTIVITY_ID" value="de110a35-aaab-407e-9d60-7a65f028159b"/>
- <column name="OBJECT_TYPE" value="Org_context"/>
+ <column name="OBJECT_TYPE" value="Organisation_context"/>
<column name="OBJECT_ROWID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
<column name="USER_NEW" value="admin"/>
<column name="DATE_NEW" valueDate="2018-08-03T12:02:52"/>
diff --git a/others/db_changes/data_alias/data/example_pers/PERS_pfiffig.xml b/others/db_changes/data_alias/data/example_pers/PERS_pfiffig.xml
index 23bd9c5da03c98bf19bb13a7728968dc367186aa..35397d26559b4b06d220760ccc7bfbf66f92753a 100644
--- a/others/db_changes/data_alias/data/example_pers/PERS_pfiffig.xml
+++ b/others/db_changes/data_alias/data/example_pers/PERS_pfiffig.xml
@@ -70,7 +70,7 @@
<insert tableName="ACTIVITYLINK">
<column name="ACTIVITYLINKID" value="b111a1da-39f2-48ae-93a5-bad704e5ae48"/>
<column name="ACTIVITY_ID" value="de110a35-bcab-407e-9d60-7a65f028159b"/>
- <column name="OBJECT_TYPE" value="Pers_context"/>
+ <column name="OBJECT_TYPE" value="Contact_context"/>
<column name="OBJECT_ROWID" value="a2e084e2-d68a-4f1e-a1bb-f8d46ad6293d"/>
<column name="USER_NEW" value="admin"/>
<column name="DATE_NEW" valueDate="2018-06-03T14:02:52"/>
diff --git a/others/db_changes/data_alias/data/example_pers/PERS_sommer.xml b/others/db_changes/data_alias/data/example_pers/PERS_sommer.xml
index b3033b8a0518e8027edcdb4a2d61ccd4132738cc..9af05c3faa22c787e76008e2923427149c08725e 100644
--- a/others/db_changes/data_alias/data/example_pers/PERS_sommer.xml
+++ b/others/db_changes/data_alias/data/example_pers/PERS_sommer.xml
@@ -70,7 +70,7 @@
<insert tableName="ACTIVITYLINK">
<column name="ACTIVITYLINKID" value="a331a1da-39f2-48ae-93a5-bad704e5ae48"/>
<column name="ACTIVITY_ID" value="aa110a35-bcab-407e-9d60-7a65f028159b"/>
- <column name="OBJECT_TYPE" value="Pers_context"/>
+ <column name="OBJECT_TYPE" value="Contact_context"/>
<column name="OBJECT_ROWID" value="ef345d11-a40d-59e0-a24c-afcb6095d2cb"/>
<column name="USER_NEW" value="admin"/>
<column name="DATE_NEW" valueDate="2018-02-12T14:02:52"/>
diff --git a/others/db_changes/data_alias/data/example_salesproject/SALESPROJECT_gfk.xml b/others/db_changes/data_alias/data/example_salesproject/SALESPROJECT_gfk.xml
index e98798d6a817f3d16f99e5b106547551a866ba0f..b5589b6a554d3f00a306ee6726a672fc2af9d89e 100644
--- a/others/db_changes/data_alias/data/example_salesproject/SALESPROJECT_gfk.xml
+++ b/others/db_changes/data_alias/data/example_salesproject/SALESPROJECT_gfk.xml
@@ -25,7 +25,7 @@
<column name="DATE_NEW" valueDate="2018-06-13T09:03:43"/>
<column name="OBJECT1_TYPE" value="Salesproject_context"/>
<column name="OBJECT1_ROWID" value="0833465c-8851-4fbb-b7e3-8c1d73c903da"/>
- <column name="OBJECT2_TYPE" value="Pers_context"/>
+ <column name="OBJECT2_TYPE" value="Contact_context"/>
<column name="OBJECT2_ROWID" value="1a67eaa7-21da-4a18-97ab-755ac5cb74f7"/>
</insert>
<insert tableName="SALESPROJECT_SOURCE">
diff --git a/preferences/_____PREFERENCES_PROJECT/_____PREFERENCES_PROJECT.aod b/preferences/_____PREFERENCES_PROJECT/_____PREFERENCES_PROJECT.aod
index 6315a5a483b64d849f5446a849e251ad9c1cb47c..3f9daeb173f0de1d87682e389317618aba75d421 100644
--- a/preferences/_____PREFERENCES_PROJECT/_____PREFERENCES_PROJECT.aod
+++ b/preferences/_____PREFERENCES_PROJECT/_____PREFERENCES_PROJECT.aod
@@ -2,7 +2,7 @@
<preferences xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="3.0.3" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/preferences/3.0.3">
<name>_____PREFERENCES_PROJECT</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
- <projectName>xRM-Basic2019</projectName>
+ <projectName>basic 2019</projectName>
<jditoMaxContentSize v="57671680" />
<calendarCategoriesEvent>
<entry>
@@ -30,4 +30,3 @@
<indexsearchIncrementingIndexerBunchSize v="250" />
<indexsearchMaximumHits v="50000" />
</preferences>
-
diff --git a/process/Context_lib/process.js b/process/Context_lib/process.js
index 34ae91ccc4bcb403fe4f58f47dde87cc4f28aa5a..977e94750efb3b4c0338fea69a67142a274cdaf1 100644
--- a/process/Context_lib/process.js
+++ b/process/Context_lib/process.js
@@ -51,8 +51,8 @@ ContextUtils.getNameSubselectSql = function(pContextIdDbField, pRowIdDbField)
var select = "(case " + pContextIdDbField + " ";
var maskingUtils = new SqlMaskingUtils();
- select += "when 'Org_context' then (select \"NAME\" from ORG where ORG.ORGID = " + pRowIdDbField + ") ";
- select += "when 'Pers_context' then (select " + maskingUtils.concat(["FIRSTNAME", "LASTNAME"]) + " from PERS where PERS.PERSID = " + pRowIdDbField + ") ";
+ select += "when 'Organisation_context' then (select \"NAME\" from ORG where ORG.ORGID = " + pRowIdDbField + ") ";
+ select += "when 'Contact_context' then (select " + maskingUtils.concat(["FIRSTNAME", "LASTNAME"]) + " from PERS where PERS.PERSID = " + pRowIdDbField + ") ";
select += "when 'Activity_context' then (select SUBJECT from ACTIVITY where ACTIVITY.ACTIVITYID = " + pRowIdDbField + ") ";
select += "when 'Salesproject_context' then (select " + maskingUtils.concat([maskingUtils.cast("PROJECTCODE", SQLTYPES.VARCHAR, 10), "':'", "PROJECTTITLE"]) + " from SALESPROJECT where SALESPROJECT.SALESPROJECTID = " + pRowIdDbField + ") ";
// TODO: keywords sind noch nicht in der DB somit gibt es nichts ähnliches zu getKeySQL.
diff --git a/process/Relation_lib/process.js b/process/Relation_lib/process.js
index e3dac3e9360959c422e934ec837b82823c9c6c42..3fc7855724d2a63327c84a9096bd162e88b42d2e 100644
--- a/process/Relation_lib/process.js
+++ b/process/Relation_lib/process.js
@@ -143,10 +143,10 @@ RelationUtils.getContextByPersOrg = function(pPersId, pOrgId)
switch (RelationUtils.getRelationTypeByPersOrg(pPersId, pOrgId))
{
case 1: // Org
- return ContextUtils.getContextName("Org_context");
+ return ContextUtils.getContextName("Organisation_context");
case 2: // private Pers
case 3: // Pers
- return ContextUtils.getContextName("Pers_context");
+ return ContextUtils.getContextName("Contact_context");
default:
return "";
}
diff --git a/process/Sql_lib/process.js b/process/Sql_lib/process.js
index 88d620b126dc87ba2dd144e968f05d5fb4872ae4..787e301de578910b6aded79ae24c6ce331a261e3 100644
--- a/process/Sql_lib/process.js
+++ b/process/Sql_lib/process.js
@@ -384,7 +384,7 @@ SqlCondition.prototype._prepare = function(field, value, cond, fieldType) {
SqlCondition.prototype.clear = function() {
this._sqlStorage = "";
this.preparedValues = [];
- return null;
+ return this;
}
/**