From 3a772669bf574044350cd6db7f94ba5912e2e8c8 Mon Sep 17 00:00:00 2001
From: Maria Hofmann <m.hofmann@adito.de>
Date: Thu, 14 Mar 2019 16:15:38 +0000
Subject: [PATCH] =?UTF-8?q?[Projekt:=20Entwicklung=20-=20Neon][TicketNr.:?=
=?UTF-8?q?=201034406][Kl=C3=A4rung=20und=20Refactoring=20-=20Wie=20sind?=
=?UTF-8?q?=20die=20Codingguidlines=20f=C3=BCr=20View-Templates=3F]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../valueProcess.js => .merge_file_a07900 | 2 +-
aliasDefinition/Data_alias/Data_alias.aod | 160 ++++++++++++------
.../ActivityLink_entity.aod | 6 +-
entity/Activity_entity/Activity_entity.aod | 36 ++--
entity/Activity_entity/afterOperatingState.js | 28 +--
.../children/objecttype_param/valueProcess.js | 4 +
.../containername_param/valueProcess.js | 0
.../activityid_param}/valueProcess.js | 2 +-
.../valueProcess.js | 0
.../children/{id => id_param}/valueProcess.js | 0
.../newactivity/tooltipProcess.js | 6 +-
.../entityfields/subject/onValueChange.js | 28 +--
.../AddressType_entity/AddressType_entity.aod | 7 +-
entity/Address_entity/Address_entity.aod | 9 +-
.../contacttype_param/valueProcess.js | 4 +-
.../usagefilter_param/valueProcess.js | 0
.../contacttype_param/valueProcess.js | 4 -
.../contacttype_param/valueProcess.js | 4 -
.../AnyContact_entity/AnyContact_entity.aod | 6 +-
.../children/contactid_param/valueProcess.js | 0
.../children/contactid_param/valueProcess.js | 0
.../AppointmentLink_entity.aod | 6 +-
.../Appointment_entity/Appointment_entity.aod | 2 +-
.../AttributeRelation_entity.aod | 29 +---
.../possibleItemsProcess.js | 2 +-
.../containername_param/valueProcess.js | 2 +-
.../entityfields/object_rowid/valueProcess.js | 12 +-
.../entityfields/object_type/valueProcess.js | 12 +-
.../valueProcess.js | 2 +-
.../children/objecttype_param/valueProcess.js | 2 +-
.../valueProcess.js | 4 +
.../children/objecttype_param/valueProcess.js | 4 +
.../recordcontainers/db/conditionProcess.js | 6 +-
.../AttributeUsage_entity.aod | 14 +-
entity/Attribute_entity/Attribute_entity.aod | 45 ++---
.../Attribute_entity/afterOperatingState.js | 48 +++---
.../attribute_type/onValueChange.js | 14 +-
.../attrparenttype_param/valueProcess.js | 2 +-
.../attributeid_param/valueProcess.js | 2 +-
.../keyword_container/stateProcess.js | 24 +--
.../containername_param/valueProcess.js | 2 +-
.../recordcontainers/db/conditionProcess.js | 14 +-
.../Communication_entity.aod | 9 +-
.../containername_param/valueProcess.js | 2 +-
.../entityfields/medium_id/onValueChange.js | 20 +--
entity/Context_entity/Context_entity.aod | 8 +-
entity/Contract_entity/Contract_entity.aod | 18 +-
.../objectrowid_param/valueProcess.js | 2 +-
.../children/objecttype_param/valueProcess.js | 2 +-
.../containername_param/valueProcess.js | 2 +-
.../containername_param/valueProcess.js | 2 +-
.../containername_param/valueProcess.js | 2 +-
entity/Countries_Entity/Countries_Entity.aod | 6 +-
.../iso2_name2/children/key_param/code.js | 2 +
.../iso2_name2/children/value_param/code.js | 2 +
.../iso2_names/children/key_param/code.js | 2 +
.../iso2_names/children/value_param/code.js | 2 +
.../children/key_param/valueProcess.js | 2 +
.../children/value_param/valueProcess.js | 2 +
.../children/key_param/valueProcess.js | 2 +
.../children/value_param/valueProcess.js | 2 +
.../KeywordAttributeRelation_entity.aod | 18 +-
.../containername_param/valueProcess.js | 2 +-
.../valueProcess.js | 2 +-
.../KeywordAttribute_entity.aod | 25 ++-
.../containername_param/valueProcess.js | 5 +
.../containername_param/valueProcess.js | 2 +-
.../documentation.adoc | 0
.../KeywordEntry_entity.aod | 50 +++---
.../onlyactives_param/valueProcess.js | 2 +-
.../recordcontainers/db/conditionProcess.js | 2 +-
entity/Language_entity/Language_entity.aod | 2 +-
.../ModuleTree_entity/ModuleTree_entity.aod | 6 +-
.../containername_param/valueProcess.js | 0
.../children/objecttype_param/valueProcess.js | 4 +
.../children/objecttype_param/valueProcess.js | 4 +
entity/Offer_entity/Offer_entity.aod | 17 +-
.../containername_param/valueProcess.js | 2 +-
.../containername_param/valueProcess.js | 6 +-
.../containername_param/valueProcess.js | 2 +-
.../containername_param/valueProcess.js | 6 +-
.../containername_param/valueProcess.js | 2 +-
.../newactivity/tooltipProcess.js | 6 +-
.../deliveryterms.displayvalue/expression.js | 10 +-
.../paymentterms.displayvalue/expression.js | 10 +-
entity/Offeritem_entity/Offeritem_entity.aod | 6 +-
.../containername_param/valueProcess.js | 2 +-
.../containername_param/valueProcess.js | 2 +-
entity/Order_entity/Order_entity.aod | 8 +-
.../containername_param/valueProcess.js | 2 +-
.../containername_param/valueProcess.js | 2 +-
.../newactivity/tooltipProcess.js | 6 +-
entity/Orderitem_entity/Orderitem_entity.aod | 6 +-
.../containername_param/valueProcess.js | 2 +-
.../containername_param/valueProcess.js | 2 +-
.../Organisation_entity.aod | 54 +++---
.../children/objecttype_param/valueProcess.js | 2 +-
.../children/orgid_param/valueProcess.js | 0
.../children/contactid_param/valueProcess.js | 1 +
.../children/contactid_param/valueProcess.js | 4 +
.../containername_param/valueProcess.js | 2 +-
.../containername_param/valueProcess.js | 2 +-
.../containername_param/valueProcess.js | 5 +
.../containername_param/valueProcess.js | 5 +
.../newactivity/tooltipProcess.js | 6 +-
.../children/contactid_param/valueProcess.js | 6 +-
entity/Person_entity/Person_entity.aod | 13 +-
.../objectrowid_param/valueProcess.js | 2 +-
.../children/objecttype_param/valueProcess.js | 2 +-
.../children/contactid_param/valueProcess.js | 4 +
.../newactivity/tooltipProcess.js | 6 +-
entity/Product_entity/Product_entity.aod | 26 +--
.../objectrowid_param/valueProcess.js | 2 +-
.../children/objecttype_param/valueProcess.js | 2 +-
.../containername_param/valueProcess.js | 2 +-
.../containername_param/valueProcess.js | 2 +-
.../newactivity/tooltipProcess.js | 6 +-
.../children/productid_param/valueProcess.js | 0
.../children/productid_param/valueProcess.js | 0
.../Productprice_entity.aod | 6 +-
.../SalesprojectCompetition_entity.aod | 58 ++++---
.../objectrowid_param/valueProcess.js | 2 +-
.../children/objecttype_param/valueProcess.js | 2 +-
.../containername_param/valueProcess.js | 2 +-
.../containername_param/valueProcess.js | 5 -
.../containername_param/valueProcess.js | 5 +
.../containername_param/valueProcess.js | 5 -
.../containername_param/valueProcess.js | 5 +
.../containername_param/valueProcess.js | 5 -
.../containername_param/valueProcess.js | 5 +
.../containername_param/valueProcess.js | 2 +-
.../SalesprojectForecast_entity.aod | 4 +-
.../containername_param/documentation.adoc | 0
.../containername_param/valueProcess.js | 2 +-
.../SalesprojectMember_entity.aod | 5 +-
.../containername_param/valueProcess.js | 2 +-
.../SalesprojectSource_entity.aod | 3 +-
.../containername_param/valueProcess.js | 2 +-
.../Salesproject_entity.aod | 22 ++-
.../containername_param/valueProcess.js | 5 +
.../containername_param/valueProcess.js | 2 +-
.../containername_param/valueProcess.js | 5 -
.../containername_param/valueProcess.js | 5 +
.../newactivity/tooltipProcess.js | 6 +-
entity/Stock_entity/Stock_entity.aod | 7 +-
.../containername_param/valueProcess.js | 2 +-
entity/Task_entity/Task_entity.aod | 30 ++--
entity/Task_entity/afterOperatingState.js | 28 +--
.../containername_param/valueProcess.js | 2 +-
.../containername_param/valueProcess.js | 2 +-
.../containername_param/valueProcess.js | 2 +-
.../children/contextname/documentation.adoc | 0
.../valueProcess.js | 0
.../children/{id => id_param}/valueProcess.js | 0
.../newactivity/tooltipProcess.js | 6 +-
entity/Turnover_entity/Turnover_entity.aod | 2 +-
.../ActivityDetail_view.aod | 2 +-
.../ActivityEdit_view/ActivityEdit_view.aod | 2 +-
.../ActivityFilter_view.aod | 6 +-
.../ActivityLinkFilter_view.aod | 2 +-
.../ActivityLinkPreview_view.aod | 2 +-
.../ActivityPreview_view.aod | 4 +-
.../ActivityTimeline_view.aod | 2 +-
.../AddressEdit_view/AddressEdit_view.aod | 2 +-
.../AddressFilter_view/AddressFilter_view.aod | 2 +-
.../AddressList_view/AddressList_view.aod | 2 +-
.../AdressMultiEdit_view.aod | 2 +-
.../AnyContactLookup_view.aod | 2 +-
.../AppointmentEdit_view.aod | 2 +-
.../AppointmentPreview_view.aod | 2 +-
.../AttributeEdit_view/AttributeEdit_view.aod | 2 +-
.../AttributeFilter_view.aod | 4 +-
.../AttributePreview_view.aod | 4 +-
.../AttributeRelationEdit_view.aod | 2 +-
.../AttributeRelationFilter_view.aod | 4 +-
.../AttributeRelationPreviewList.aod | 2 +-
.../AttributeTree_view/AttributeTree_view.aod | 2 +-
.../AttributeUsageFilter_view.aod | 2 +-
.../AttributeUsageMultiEdit_view.aod | 2 +-
.../CommunicationEdit_view.aod | 2 +-
.../CommunicationFilter_view.aod | 2 +-
.../CommunicationList_view.aod | 2 +-
.../CommunicationMultiEdit_view.aod | 2 +-
.../ContextLookup_view/ContextLookup_view.aod | 2 +-
.../ContractEdit_view/ContractEdit_view.aod | 2 +-
.../ContractFilter_view.aod | 2 +-
.../ContractPreview_view.aod | 6 +-
.../CountriesPreview_view.aod | 4 +-
.../CountriesTable_view.aod | 2 +-
.../DefaultLookup_view/DefaultLookup_view.aod | 2 +-
.../DocumentEdit_view/DocumentEdit_view.aod | 2 +-
.../DocumentFilter_view.aod | 2 +-
.../DocumentList_view/DocumentList_view.aod | 2 +-
.../DocumentPreview_view.aod | 4 +-
.../FacebookTimeline_view.aod | 2 +-
.../KeywordAttributeEdit_view.aod | 2 +-
.../KeywordAttributeFilter_view.aod | 2 +-
.../KeywordAttributeRelationRows_view.aod | 2 +-
.../KeywordEntryEdit_view.aod | 2 +-
.../KeywordEntryFilter_view.aod | 4 +-
.../KeywordEntryPreview_view.aod | 4 +-
neonView/ModuleTree_view/ModuleTree_view.aod | 2 +-
.../ObjectLookup_view/ObjectLookup_view.aod | 2 +-
.../ObjectRelationEdit_view.aod | 2 +-
.../ObjectRelationPreview_view.aod | 2 +-
.../ObjectRelationTree_view.aod | 2 +-
.../OfferDetail_view/OfferDetail_view.aod | 2 +-
neonView/OfferEdit_view/OfferEdit_view.aod | 2 +-
.../OfferFilter_view/OfferFilter_view.aod | 2 +-
.../OfferPreview_view/OfferPreview_view.aod | 8 +-
.../OfferitemFilter_view.aod | 2 +-
.../OfferitemMultiEdit_view.aod | 2 +-
.../OfferitemPreview_view.aod | 4 +-
neonView/Options1_View/Options1_View.aod | 2 +-
neonView/Options2_View/Options2_View.aod | 2 +-
neonView/OrderEdit_view/OrderEdit_view.aod | 2 +-
.../OrderFilter_view/OrderFilter_view.aod | 2 +-
.../OrderPreview_view/OrderPreview_view.aod | 8 +-
.../OrderitemFilter_view.aod | 2 +-
.../OrderitemMultiEdit_view.aod | 2 +-
.../OrderitemPreview_view.aod | 4 +-
.../OrganisationEditDefaults_view.aod | 2 +-
.../OrganisationEdit_view.aod | 2 +-
.../OrganisationFilter_view.aod | 2 +-
.../OrganisationLookup_view.aod | 2 +-
.../OrganisationMain_view.aod | 2 +-
.../OrganisationPreview_view.aod | 4 +-
.../PersonDetail_view/PersonDetail_view.aod | 2 +-
.../PersonEditDefaults_view.aod | 2 +-
neonView/PersonEdit_view/PersonEdit_view.aod | 2 +-
.../PersonFilter_view/PersonFilter_view.aod | 2 +-
.../PersonLookup_view/PersonLookup_view.aod | 2 +-
.../PersonPreview_view/PersonPreview_view.aod | 4 +-
.../PersonSimpleList_view.aod | 2 +-
.../Prod2prodFilter_view.aod | 2 +-
.../ProductDescription_view.aod | 2 +-
.../ProductEdit_view/ProductEdit_view.aod | 2 +-
.../ProductFilter_view/ProductFilter_view.aod | 2 +-
.../ProductPreview_view.aod | 6 +-
.../ProductpriceEdit_view.aod | 2 +-
.../ProductpriceFilter_view.aod | 2 +-
.../ProductpriceRelation_view.aod | 2 +-
...lesprojectClassificationEntryEdit_view.aod | 2 +-
...projectClassificationEntryPreview_view.aod | 2 +-
.../SalesprojectClassificationFilter_view.aod | 2 +-
...SalesprojectClassificationPreview_view.aod | 2 +-
.../SalesprojectCompetitionEdit_view.aod | 2 +-
.../SalesprojectCompetitionFilter_view.aod | 2 +-
.../SalesprojectCompetitionPreview_view.aod | 4 +-
.../SalesprojectCycleEdit_view.aod | 2 +-
.../SalesprojectCycleFilter_view.aod | 2 +-
.../SalesprojectCyclePreview_view.aod | 4 +-
.../SalesprojectEdit_view.aod | 2 +-
.../SalesprojectFilter_view.aod | 2 +-
.../SalesprojectForecastEdit_view.aod | 2 +-
.../SalesprojectForecastFilter_view.aod | 2 +-
.../SalesprojectForecastPreview_view.aod | 4 +-
.../SalesprojectMemberEdit_view.aod | 2 +-
.../SalesprojectMemberFilter_view.aod | 2 +-
.../SalesprojectMemberPreview_view.aod | 2 +-
.../SalesprojectPreview_view.aod | 8 +-
.../SalesprojectSourceEdit_view.aod | 2 +-
.../SalesprojectSourceFilter_view.aod | 2 +-
.../SalesprojectSourcePreview_view.aod | 4 +-
.../TwitterTimeline_view.aod | 2 +-
265 files changed, 832 insertions(+), 714 deletions(-)
rename entity/Task_entity/entityfields/keywordpriority/children/containername_param/valueProcess.js => .merge_file_a07900 (63%)
create mode 100644 entity/Activity_entity/entityfields/attributes/children/objecttype_param/valueProcess.js
rename entity/Activity_entity/entityfields/{keywordcategory => keywordcategories}/children/containername_param/valueProcess.js (100%)
rename entity/{Organisation_entity/entityfields/attributes/children/objectrowid_param => Activity_entity/entityfields/link/children/activityid_param}/valueProcess.js (50%)
rename entity/Activity_entity/entityfields/moduletrees/children/{contextname => contextname_param}/valueProcess.js (100%)
rename entity/Activity_entity/entityfields/moduletrees/children/{id => id_param}/valueProcess.js (100%)
rename entity/Address_entity/entityfields/{keywordaddresstype => keywordaddresstypes}/children/usagefilter_param/valueProcess.js (100%)
delete mode 100644 entity/Address_entity/entityfields/organisationaddresses/children/contacttype_param/valueProcess.js
delete mode 100644 entity/Address_entity/entityfields/organisationaddressesbycontact/children/contacttype_param/valueProcess.js
rename entity/AnyContact_entity/entityfields/{contact => contacts}/children/contactid_param/valueProcess.js (100%)
rename entity/AnyContact_entity/entityfields/{organisation => organisations}/children/contactid_param/valueProcess.js (100%)
rename entity/AttributeRelation_entity/entityfields/{keyword => keywords}/children/containername_param/valueProcess.js (86%)
create mode 100644 entity/AttributeRelation_entity/entityfields/specificattributes/children/filteredattributeids_param/valueProcess.js
create mode 100644 entity/AttributeRelation_entity/entityfields/specificattributes/children/objecttype_param/valueProcess.js
rename entity/{Offer_entity/entityfields/keywordprobability => Attribute_entity/entityfields/keywordattributetypes}/children/containername_param/valueProcess.js (61%)
rename entity/{Organisation_entity/entityfields/keywordweakness => Communication_entity/entityfields/keywordmediums}/children/containername_param/valueProcess.js (59%)
create mode 100644 entity/Countries_Entity/entityfields/iso2_name2/children/key_param/code.js
create mode 100644 entity/Countries_Entity/entityfields/iso2_name2/children/value_param/code.js
create mode 100644 entity/Countries_Entity/entityfields/iso2_names/children/key_param/code.js
create mode 100644 entity/Countries_Entity/entityfields/iso2_names/children/value_param/code.js
create mode 100644 entity/Countries_Entity/entityfields/iso2name/children/key_param/valueProcess.js
create mode 100644 entity/Countries_Entity/entityfields/iso2name/children/value_param/valueProcess.js
create mode 100644 entity/Countries_Entity/entityfields/iso2names/children/key_param/valueProcess.js
create mode 100644 entity/Countries_Entity/entityfields/iso2names/children/value_param/valueProcess.js
create mode 100644 entity/KeywordAttribute_entity/entityfields/keywordattributetype/children/containername_param/valueProcess.js
rename entity/{Organisation_entity/entityfields/keywordstrenght => KeywordAttribute_entity/entityfields/keywordattributetypes}/children/containername_param/valueProcess.js (59%)
rename entity/KeywordAttribute_entity/entityfields/{specificcontainerkeywords => specificcontainerkeyword}/documentation.adoc (100%)
delete mode 100644 entity/ObjectRelation_entity/entityfields/keywordobjectrelationtype/children/containername_param/valueProcess.js
create mode 100644 entity/ObjectRelation_entity/entityfields/object1/children/objecttype_param/valueProcess.js
create mode 100644 entity/ObjectRelation_entity/entityfields/object2/children/objecttype_param/valueProcess.js
rename entity/{SalesprojectCompetition_entity/entityfields/keywordphase => Offer_entity/entityfields/keywordprobabilities}/children/containername_param/valueProcess.js (61%)
rename entity/Organisation_entity/entityfields/{contacts => contact}/children/orgid_param/valueProcess.js (100%)
create mode 100644 entity/Organisation_entity/entityfields/contract/children/contactid_param/valueProcess.js
rename entity/Organisation_entity/entityfields/{keywordprice_politics => keywordpricepolitics}/children/containername_param/valueProcess.js (57%)
create mode 100644 entity/Organisation_entity/entityfields/keywordstrenghts/children/containername_param/valueProcess.js
create mode 100644 entity/Organisation_entity/entityfields/keywordweaknesses/children/containername_param/valueProcess.js
create mode 100644 entity/Person_entity/entityfields/contract/children/contactid_param/valueProcess.js
rename entity/Product_entity/entityfields/{stock => stockcounts}/children/productid_param/valueProcess.js (100%)
rename entity/Product_entity/entityfields/{stockcount => stocks}/children/productid_param/valueProcess.js (100%)
rename entity/{Salesproject_entity/entityfields/keywordphase => SalesprojectCompetition_entity/entityfields/keywordphases}/children/containername_param/valueProcess.js (60%)
delete mode 100644 entity/SalesprojectCompetition_entity/entityfields/keywordprice_politics/children/containername_param/valueProcess.js
create mode 100644 entity/SalesprojectCompetition_entity/entityfields/keywordpricepolitics/children/containername_param/valueProcess.js
delete mode 100644 entity/SalesprojectCompetition_entity/entityfields/keywordstate/children/containername_param/valueProcess.js
create mode 100644 entity/SalesprojectCompetition_entity/entityfields/keywordstates/children/containername_param/valueProcess.js
delete mode 100644 entity/SalesprojectCompetition_entity/entityfields/keywordstrenght/children/containername_param/valueProcess.js
create mode 100644 entity/SalesprojectCompetition_entity/entityfields/keywordstrenghts/children/containername_param/valueProcess.js
rename entity/SalesprojectCompetition_entity/entityfields/{keywordweakness => keywordweaknesses}/children/containername_param/valueProcess.js (90%)
delete mode 100644 entity/SalesprojectForecast_entity/entityfields/keywordproductgroupcodes/children/containername_param/documentation.adoc
create mode 100644 entity/Salesproject_entity/entityfields/keywordphases/children/containername_param/valueProcess.js
delete mode 100644 entity/Salesproject_entity/entityfields/keywordstate/children/containername_param/valueProcess.js
create mode 100644 entity/Salesproject_entity/entityfields/keywordstates/children/containername_param/valueProcess.js
rename entity/{Attribute_entity/entityfields/keywordattributetype => Task_entity/entityfields/keywordpriorities}/children/containername_param/valueProcess.js (63%)
delete mode 100644 entity/Task_entity/entityfields/moduletrees/children/contextname/documentation.adoc
rename entity/Task_entity/entityfields/moduletrees/children/{contextname => contextname_param}/valueProcess.js (100%)
rename entity/Task_entity/entityfields/moduletrees/children/{id => id_param}/valueProcess.js (100%)
diff --git a/entity/Task_entity/entityfields/keywordpriority/children/containername_param/valueProcess.js b/.merge_file_a07900
similarity index 63%
rename from entity/Task_entity/entityfields/keywordpriority/children/containername_param/valueProcess.js
rename to .merge_file_a07900
index 8a4cee1603..167d3dc35f 100644
--- a/entity/Task_entity/entityfields/keywordpriority/children/containername_param/valueProcess.js
+++ b/.merge_file_a07900
@@ -2,4 +2,4 @@ import("system.result");
import("Keyword_lib");
import("KeywordRegistry_basic");
-result.string($KeywordRegistry.taskPriority());
\ No newline at end of file
+result.string($KeywordRegistry.addressType());
\ No newline at end of file
diff --git a/aliasDefinition/Data_alias/Data_alias.aod b/aliasDefinition/Data_alias/Data_alias.aod
index 3300832e69..5f9b83200e 100644
--- a/aliasDefinition/Data_alias/Data_alias.aod
+++ b/aliasDefinition/Data_alias/Data_alias.aod
@@ -90,48 +90,6 @@
<title></title>
<description></description>
</entityFieldDb>
- <entityFieldDb>
- <name>STRENGTH</name>
- <dbName></dbName>
- <primaryKey v="false" />
- <columnType v="1" />
- <size v="36" />
- <scale v="0" />
- <notNull v="false" />
- <isUnique v="false" />
- <index v="false" />
- <documentation></documentation>
- <title></title>
- <description></description>
- </entityFieldDb>
- <entityFieldDb>
- <name>WEAKNESS</name>
- <dbName></dbName>
- <primaryKey v="false" />
- <columnType v="1" />
- <size v="36" />
- <scale v="0" />
- <notNull v="false" />
- <isUnique v="false" />
- <index v="false" />
- <documentation></documentation>
- <title></title>
- <description></description>
- </entityFieldDb>
- <entityFieldDb>
- <name>PRICE_POLITICS</name>
- <dbName></dbName>
- <primaryKey v="false" />
- <columnType v="1" />
- <size v="36" />
- <scale v="0" />
- <notNull v="false" />
- <isUnique v="false" />
- <index v="false" />
- <documentation></documentation>
- <title></title>
- <description></description>
- </entityFieldDb>
<entityFieldDb>
<name>ORGANISATIONID</name>
<dbName></dbName>
@@ -3820,11 +3778,11 @@
<description></description>
</entityFieldDb>
<entityFieldDb>
- <name>OBJECT2_TYPE</name>
+ <name>OBJECT1_ROWID</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="12" />
- <size v="63" />
+ <columnType v="1" />
+ <size v="36" />
<scale v="0" />
<notNull v="true" />
<isUnique v="false" />
@@ -3834,27 +3792,27 @@
<description></description>
</entityFieldDb>
<entityFieldDb>
- <name>OBJECT1_TYPE</name>
+ <name>AB_OBJECTRELATIONID</name>
<dbName></dbName>
- <primaryKey v="false" />
- <columnType v="12" />
- <size v="50" />
+ <primaryKey v="true" />
+ <columnType v="1" />
+ <size v="36" />
<scale v="0" />
<notNull v="true" />
- <isUnique v="false" />
+ <isUnique v="true" />
<index v="false" />
<documentation></documentation>
<title></title>
<description></description>
</entityFieldDb>
<entityFieldDb>
- <name>OBJECT1_ROWID</name>
+ <name>AB_OBJECTRELATIONTYPE1</name>
<dbName></dbName>
<primaryKey v="false" />
<columnType v="1" />
<size v="36" />
<scale v="0" />
- <notNull v="true" />
+ <notNull v="false" />
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
@@ -3862,14 +3820,14 @@
<description></description>
</entityFieldDb>
<entityFieldDb>
- <name>AB_OBJECTRELATIONID</name>
+ <name>AB_OBJECTRELATIONTYPE2</name>
<dbName></dbName>
- <primaryKey v="true" />
+ <primaryKey v="false" />
<columnType v="1" />
<size v="36" />
<scale v="0" />
- <notNull v="true" />
- <isUnique v="true" />
+ <notNull v="false" />
+ <isUnique v="false" />
<index v="false" />
<documentation></documentation>
<title></title>
@@ -4880,6 +4838,96 @@
</entityFieldDb>
</entityFields>
</entityDb>
+ <entityDb>
+ <name>AB_OBJECTRELATIONTYPE</name>
+ <dbName></dbName>
+ <idColumn>AB_OBJECTRELATIONTYPEID</idColumn>
+ <idGeneratorType v="0" />
+ <idGeneratorInterval v="1" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ <auditSyncConfig>
+ <name>auditSyncConfig</name>
+ <auditMode v="0" />
+ <syncActive v="false" />
+ <syncComplete v="true" />
+ <syncDirection v="1" />
+ <syncIds></syncIds>
+ </auditSyncConfig>
+ <entityFields>
+ <entityFieldDb>
+ <name>AB_OBJECTRELATIONTYPEID</name>
+ <dbName></dbName>
+ <primaryKey v="true" />
+ <columnType v="1" />
+ <size v="36" />
+ <scale v="0" />
+ <notNull v="true" />
+ <isUnique v="true" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>SIDE</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="4" />
+ <size v="10" />
+ <scale v="0" />
+ <notNull v="true" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>RELATION_TYPE</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="1" />
+ <size v="36" />
+ <scale v="0" />
+ <notNull v="true" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>OBJECT_TYPE</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="12" />
+ <size v="50" />
+ <scale v="0" />
+ <notNull v="true" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>RELATION_TITLE</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="12" />
+ <size v="80" />
+ <scale v="0" />
+ <notNull v="true" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ </entityFields>
+ </entityDb>
</entities>
</entityGroup>
</aliasDefDb>
diff --git a/entity/ActivityLink_entity/ActivityLink_entity.aod b/entity/ActivityLink_entity/ActivityLink_entity.aod
index 11c38d8792..66ef8d1d9a 100644
--- a/entity/ActivityLink_entity/ActivityLink_entity.aod
+++ b/entity/ActivityLink_entity/ActivityLink_entity.aod
@@ -15,7 +15,7 @@
<entityField>
<name>OBJECT_TYPE</name>
<title>Object type</title>
- <consumer>Contexts</consumer>
+ <consumer>Context</consumer>
<linkedContext>Context</linkedContext>
<displayValueProcess>%aditoprj%/entity/ActivityLink_entity/entityfields/object_type/displayValueProcess.js</displayValueProcess>
</entityField>
@@ -31,7 +31,7 @@
<valueProcess>%aditoprj%/entity/ActivityLink_entity/entityfields/activity_id/valueProcess.js</valueProcess>
</entityField>
<entityProvider>
- <name>Link</name>
+ <name>Links</name>
<fieldType>DEPENDENCY_IN</fieldType>
<targetContextField>OBJECT_TYPE</targetContextField>
<targetIdField>OBJECT_ROWID</targetIdField>
@@ -68,7 +68,7 @@
</children>
</entityConsumer>
<entityConsumer>
- <name>Contexts</name>
+ <name>Context</name>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
<name>dependency</name>
diff --git a/entity/Activity_entity/Activity_entity.aod b/entity/Activity_entity/Activity_entity.aod
index b033f2486d..02008d0638 100644
--- a/entity/Activity_entity/Activity_entity.aod
+++ b/entity/Activity_entity/Activity_entity.aod
@@ -37,7 +37,7 @@
<entityField>
<name>CATEGORY</name>
<title>Category</title>
- <consumer>KeywordCategory</consumer>
+ <consumer>KeywordCategories</consumer>
<mandatory v="false" />
<groupable v="true" />
</entityField>
@@ -159,7 +159,7 @@
<dependency>
<name>dependency</name>
<entityName>ActivityLink_entity</entityName>
- <fieldName>Link</fieldName>
+ <fieldName>Links</fieldName>
</dependency>
<children>
<entityParameter>
@@ -179,8 +179,9 @@
</dependency>
<children>
<entityParameter>
- <name>containerName_param</name>
+ <name>ContainerName_param</name>
<valueProcess>%aditoprj%/entity/Activity_entity/entityfields/keyworddirections/children/containername_param/valueProcess.js</valueProcess>
+ <expose v="false" />
</entityParameter>
</children>
</entityConsumer>
@@ -268,16 +269,20 @@
<dependency>
<name>dependency</name>
<entityName>ModuleTree_entity</entityName>
- <fieldName>TreeProvider</fieldName>
+ <fieldName>TreeProviders</fieldName>
</dependency>
<children>
<entityParameter>
- <name>ContextName</name>
- <valueProcess>%aditoprj%/entity/Activity_entity/entityfields/moduletrees/children/contextname/valueProcess.js</valueProcess>
+ <name>ContextName_param</name>
+ <valueProcess>%aditoprj%/entity/Activity_entity/entityfields/moduletrees/children/contextname_param/valueProcess.js</valueProcess>
+ <expose v="false" />
+ <mandatory v="false" />
</entityParameter>
<entityParameter>
- <name>ID</name>
- <valueProcess>%aditoprj%/entity/Activity_entity/entityfields/moduletrees/children/id/valueProcess.js</valueProcess>
+ <name>ID_param</name>
+ <valueProcess>%aditoprj%/entity/Activity_entity/entityfields/moduletrees/children/id_param/valueProcess.js</valueProcess>
+ <expose v="false" />
+ <mandatory v="false" />
</entityParameter>
</children>
</entityConsumer>
@@ -321,7 +326,7 @@
<valueProcess>%aditoprj%/entity/Activity_entity/entityfields/parent_context/valueProcess.js</valueProcess>
</entityField>
<entityConsumer>
- <name>KeywordCategory</name>
+ <name>KeywordCategories</name>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
<name>dependency</name>
@@ -330,8 +335,9 @@
</dependency>
<children>
<entityParameter>
- <name>containerName_param</name>
- <valueProcess>%aditoprj%/entity/Activity_entity/entityfields/keywordcategory/children/containername_param/valueProcess.js</valueProcess>
+ <name>ContainerName_param</name>
+ <valueProcess>%aditoprj%/entity/Activity_entity/entityfields/keywordcategories/children/containername_param/valueProcess.js</valueProcess>
+ <expose v="true" />
</entityParameter>
</children>
</entityConsumer>
@@ -352,12 +358,12 @@
</dependency>
<children>
<entityParameter>
- <name>objectRowId_param</name>
- <triggerRecalculation v="true" />
+ <name>ObjectRowId_param</name>
+ <valueProcess>%aditoprj%/entity/Activity_entity/entityfields/attributes/children/objectrowid_param/valueProcess.js</valueProcess>
</entityParameter>
<entityParameter>
- <name>objectType_param</name>
- <triggerRecalculation v="true" />
+ <name>ObjectType_param</name>
+ <valueProcess>%aditoprj%/entity/Activity_entity/entityfields/attributes/children/objecttype_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
</entityConsumer>
diff --git a/entity/Activity_entity/afterOperatingState.js b/entity/Activity_entity/afterOperatingState.js
index 3ecca0b8c1..86428a9e4f 100644
--- a/entity/Activity_entity/afterOperatingState.js
+++ b/entity/Activity_entity/afterOperatingState.js
@@ -1,15 +1,15 @@
-import("system.util");
-import("system.db");
-import("system.neon");
-import("system.vars");
-import("Context_lib");
-
-if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW
- && vars.exists("$param.RowId_param") && vars.get("$param.RowId_param")
- && vars.exists("$param.ObjectId_param") && vars.get("$param.ObjectId_param"))
-{
- neon.addRecord(null, "Links", {
- "OBJECT_TYPE" : vars.get("$param.ObjectId_param"),
- "OBJECT_ROWID" : vars.get("$param.RowId_param")
- });
+import("system.util");
+import("system.db");
+import("system.neon");
+import("system.vars");
+import("Context_lib");
+
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW
+ && vars.exists("$param.RowId_param") && vars.get("$param.RowId_param")
+ && vars.exists("$param.ObjectId_param") && vars.get("$param.ObjectId_param"))
+{
+ neon.addRecord(null, "Links", {
+ "OBJECT_TYPE" : vars.get("$param.ObjectId_param"),
+ "OBJECT_ROWID" : vars.get("$param.RowId_param")
+ });
}
\ No newline at end of file
diff --git a/entity/Activity_entity/entityfields/attributes/children/objecttype_param/valueProcess.js b/entity/Activity_entity/entityfields/attributes/children/objecttype_param/valueProcess.js
new file mode 100644
index 0000000000..e8b4e72e74
--- /dev/null
+++ b/entity/Activity_entity/entityfields/attributes/children/objecttype_param/valueProcess.js
@@ -0,0 +1,4 @@
+import("system.result");
+import("Context_lib");
+
+result.string(ContextUtils.getCurrentContextId());
diff --git a/entity/Activity_entity/entityfields/keywordcategory/children/containername_param/valueProcess.js b/entity/Activity_entity/entityfields/keywordcategories/children/containername_param/valueProcess.js
similarity index 100%
rename from entity/Activity_entity/entityfields/keywordcategory/children/containername_param/valueProcess.js
rename to entity/Activity_entity/entityfields/keywordcategories/children/containername_param/valueProcess.js
diff --git a/entity/Organisation_entity/entityfields/attributes/children/objectrowid_param/valueProcess.js b/entity/Activity_entity/entityfields/link/children/activityid_param/valueProcess.js
similarity index 50%
rename from entity/Organisation_entity/entityfields/attributes/children/objectrowid_param/valueProcess.js
rename to entity/Activity_entity/entityfields/link/children/activityid_param/valueProcess.js
index bcfda44fe7..a8267b6206 100644
--- a/entity/Organisation_entity/entityfields/attributes/children/objectrowid_param/valueProcess.js
+++ b/entity/Activity_entity/entityfields/link/children/activityid_param/valueProcess.js
@@ -1,4 +1,4 @@
import("system.vars");
import("system.result");
-result.string(vars.get("$field.ORGANISATIONID"));
\ No newline at end of file
+result.string(vars.get("$field.ACTIVITYID"));
\ No newline at end of file
diff --git a/entity/Activity_entity/entityfields/moduletrees/children/contextname/valueProcess.js b/entity/Activity_entity/entityfields/moduletrees/children/contextname_param/valueProcess.js
similarity index 100%
rename from entity/Activity_entity/entityfields/moduletrees/children/contextname/valueProcess.js
rename to entity/Activity_entity/entityfields/moduletrees/children/contextname_param/valueProcess.js
diff --git a/entity/Activity_entity/entityfields/moduletrees/children/id/valueProcess.js b/entity/Activity_entity/entityfields/moduletrees/children/id_param/valueProcess.js
similarity index 100%
rename from entity/Activity_entity/entityfields/moduletrees/children/id/valueProcess.js
rename to entity/Activity_entity/entityfields/moduletrees/children/id_param/valueProcess.js
diff --git a/entity/Activity_entity/entityfields/newactivity/tooltipProcess.js b/entity/Activity_entity/entityfields/newactivity/tooltipProcess.js
index 2cdf4480a4..c71e677c22 100644
--- a/entity/Activity_entity/entityfields/newactivity/tooltipProcess.js
+++ b/entity/Activity_entity/entityfields/newactivity/tooltipProcess.js
@@ -1,4 +1,4 @@
-import("system.translate");
-import("system.result");
-
+import("system.translate");
+import("system.result");
+
result.string(translate.text("New activity"));
\ No newline at end of file
diff --git a/entity/Activity_entity/entityfields/subject/onValueChange.js b/entity/Activity_entity/entityfields/subject/onValueChange.js
index 3ecca0b8c1..86428a9e4f 100644
--- a/entity/Activity_entity/entityfields/subject/onValueChange.js
+++ b/entity/Activity_entity/entityfields/subject/onValueChange.js
@@ -1,15 +1,15 @@
-import("system.util");
-import("system.db");
-import("system.neon");
-import("system.vars");
-import("Context_lib");
-
-if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW
- && vars.exists("$param.RowId_param") && vars.get("$param.RowId_param")
- && vars.exists("$param.ObjectId_param") && vars.get("$param.ObjectId_param"))
-{
- neon.addRecord(null, "Links", {
- "OBJECT_TYPE" : vars.get("$param.ObjectId_param"),
- "OBJECT_ROWID" : vars.get("$param.RowId_param")
- });
+import("system.util");
+import("system.db");
+import("system.neon");
+import("system.vars");
+import("Context_lib");
+
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW
+ && vars.exists("$param.RowId_param") && vars.get("$param.RowId_param")
+ && vars.exists("$param.ObjectId_param") && vars.get("$param.ObjectId_param"))
+{
+ neon.addRecord(null, "Links", {
+ "OBJECT_TYPE" : vars.get("$param.ObjectId_param"),
+ "OBJECT_ROWID" : vars.get("$param.RowId_param")
+ });
}
\ No newline at end of file
diff --git a/entity/AddressType_entity/AddressType_entity.aod b/entity/AddressType_entity/AddressType_entity.aod
index 8a71a164f3..c55a30f4a0 100644
--- a/entity/AddressType_entity/AddressType_entity.aod
+++ b/entity/AddressType_entity/AddressType_entity.aod
@@ -25,20 +25,19 @@
<entityDependency>
<name>b6ddc934-51ac-43a5-8aa9-7239423ea14d</name>
<entityName>Address_entity</entityName>
- <fieldName>KeywordAddressType</fieldName>
+ <fieldName>KeywordAddressTypes</fieldName>
<isConsumer v="false" />
</entityDependency>
</dependencies>
<children>
<entityParameter>
- <name>usageFilter_param</name>
- <expose v="true" />
+ <name>UsageFilter_param</name>
<mandatory v="true" />
</entityParameter>
</children>
</entityProvider>
<entityParameter>
- <name>usageFilter_param</name>
+ <name>UsageFilter_param</name>
<title></title>
<expose v="true" />
<description>PARAMETER</description>
diff --git a/entity/Address_entity/Address_entity.aod b/entity/Address_entity/Address_entity.aod
index aa37a56581..06638b363e 100644
--- a/entity/Address_entity/Address_entity.aod
+++ b/entity/Address_entity/Address_entity.aod
@@ -26,7 +26,7 @@
<name>ADDR_TYPE</name>
<documentation>%aditoprj%/entity/Address_entity/entityfields/addr_type/documentation.adoc</documentation>
<title>Addresstype</title>
- <consumer>KeywordAddressType</consumer>
+ <consumer>KeywordAddressTypes</consumer>
</entityField>
<entityField>
<name>BUILDINGNO</name>
@@ -106,7 +106,6 @@
<entityProvider>
<name>ContactAddresses</name>
<fieldType>DEPENDENCY_IN</fieldType>
- <recordContainer>db</recordContainer>
<dependencies>
<entityDependency>
<name>efdb2f19-ab41-4f49-941a-843610e2b31b</name>
@@ -161,7 +160,7 @@
<entityParameter>
<name>ContactType_param</name>
<valueProcess>%aditoprj%/entity/Address_entity/entityfields/organisationaddressesbycontact/children/contacttype_param/valueProcess.js</valueProcess>
- <expose v="true" />
+ <expose v="false" />
<description>TODO: expose auf false. aktuell wird der Code nicht ausgeführt, wenn Expose false ist.</description>
</entityParameter>
</children>
@@ -187,7 +186,7 @@
<description>PARAMETER</description>
</entityParameter>
<entityConsumer>
- <name>KeywordAddressType</name>
+ <name>KeywordAddressTypes</name>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
<name>dependency</name>
@@ -196,7 +195,7 @@
</dependency>
<children>
<entityParameter>
- <name>containerName_param</name>
+ <name>ContainerName_param</name>
<valueProcess>%aditoprj%/entity/Address_entity/entityfields/keywordaddresstype/children/containername_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
diff --git a/entity/Address_entity/entityfields/contactaddresses/children/contacttype_param/valueProcess.js b/entity/Address_entity/entityfields/contactaddresses/children/contacttype_param/valueProcess.js
index cfff5cf20d..805812e9e7 100644
--- a/entity/Address_entity/entityfields/contactaddresses/children/contacttype_param/valueProcess.js
+++ b/entity/Address_entity/entityfields/contactaddresses/children/contacttype_param/valueProcess.js
@@ -1,4 +1,2 @@
import("system.result");
-import("Contact_lib");
-
-result.object(Contact.TYPES.Contact);
\ No newline at end of file
+result.object(2);
\ No newline at end of file
diff --git a/entity/Address_entity/entityfields/keywordaddresstype/children/usagefilter_param/valueProcess.js b/entity/Address_entity/entityfields/keywordaddresstypes/children/usagefilter_param/valueProcess.js
similarity index 100%
rename from entity/Address_entity/entityfields/keywordaddresstype/children/usagefilter_param/valueProcess.js
rename to entity/Address_entity/entityfields/keywordaddresstypes/children/usagefilter_param/valueProcess.js
diff --git a/entity/Address_entity/entityfields/organisationaddresses/children/contacttype_param/valueProcess.js b/entity/Address_entity/entityfields/organisationaddresses/children/contacttype_param/valueProcess.js
deleted file mode 100644
index fde2b2a8d4..0000000000
--- a/entity/Address_entity/entityfields/organisationaddresses/children/contacttype_param/valueProcess.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import("system.result");
-import("Contact_lib");
-
-result.object(Contact.TYPES.Organisation);
\ No newline at end of file
diff --git a/entity/Address_entity/entityfields/organisationaddressesbycontact/children/contacttype_param/valueProcess.js b/entity/Address_entity/entityfields/organisationaddressesbycontact/children/contacttype_param/valueProcess.js
deleted file mode 100644
index fde2b2a8d4..0000000000
--- a/entity/Address_entity/entityfields/organisationaddressesbycontact/children/contacttype_param/valueProcess.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import("system.result");
-import("Contact_lib");
-
-result.object(Contact.TYPES.Organisation);
\ No newline at end of file
diff --git a/entity/AnyContact_entity/AnyContact_entity.aod b/entity/AnyContact_entity/AnyContact_entity.aod
index 66244e2a5a..257efb852a 100644
--- a/entity/AnyContact_entity/AnyContact_entity.aod
+++ b/entity/AnyContact_entity/AnyContact_entity.aod
@@ -73,17 +73,17 @@ See ContactUtils.getRelationTypeByPersOrg for possible values</description>
<children>
<entityParameter>
<name>ContactId_param</name>
- <valueProcess>%aditoprj%/entity/AnyContact_entity/entityfields/contact/children/ContactId_param/valueProcess.js</valueProcess>
+ <valueProcess>%aditoprj%/entity/AnyContact_entity/entityfields/contact/children/contactid_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
</entityConsumer>
<entityConsumer>
- <name>Organisation</name>
+ <name>Organisations</name>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
<name>dependency</name>
<entityName>Organisation_entity</entityName>
- <fieldName>Organisation</fieldName>
+ <fieldName>Organisations</fieldName>
</dependency>
<children>
<entityParameter>
diff --git a/entity/AnyContact_entity/entityfields/contact/children/contactid_param/valueProcess.js b/entity/AnyContact_entity/entityfields/contacts/children/contactid_param/valueProcess.js
similarity index 100%
rename from entity/AnyContact_entity/entityfields/contact/children/contactid_param/valueProcess.js
rename to entity/AnyContact_entity/entityfields/contacts/children/contactid_param/valueProcess.js
diff --git a/entity/AnyContact_entity/entityfields/organisation/children/contactid_param/valueProcess.js b/entity/AnyContact_entity/entityfields/organisations/children/contactid_param/valueProcess.js
similarity index 100%
rename from entity/AnyContact_entity/entityfields/organisation/children/contactid_param/valueProcess.js
rename to entity/AnyContact_entity/entityfields/organisations/children/contactid_param/valueProcess.js
diff --git a/entity/AppointmentLink_entity/AppointmentLink_entity.aod b/entity/AppointmentLink_entity/AppointmentLink_entity.aod
index ce1a58465c..6735e3aea9 100644
--- a/entity/AppointmentLink_entity/AppointmentLink_entity.aod
+++ b/entity/AppointmentLink_entity/AppointmentLink_entity.aod
@@ -23,7 +23,7 @@
</entityField>
<entityField>
<name>OBJECTTYPE</name>
- <consumer>Contexts</consumer>
+ <consumer>Context</consumer>
<linkedContext>Context_context</linkedContext>
<displayValueProcess>%aditoprj%/entity/AppointmentLink_entity/entityfields/objecttype/displayValueProcess.js</displayValueProcess>
</entityField>
@@ -34,7 +34,7 @@
<description>PARAMETER</description>
</entityParameter>
<entityProvider>
- <name>Link</name>
+ <name>Links</name>
<fieldType>DEPENDENCY_IN</fieldType>
<targetContextField>OBJECTTYPE</targetContextField>
<targetIdField>OBJECTID</targetIdField>
@@ -55,7 +55,7 @@
</children>
</entityProvider>
<entityConsumer>
- <name>Contexts</name>
+ <name>Context</name>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
<name>dependency</name>
diff --git a/entity/Appointment_entity/Appointment_entity.aod b/entity/Appointment_entity/Appointment_entity.aod
index bb3d110a87..2a7d91fb2c 100644
--- a/entity/Appointment_entity/Appointment_entity.aod
+++ b/entity/Appointment_entity/Appointment_entity.aod
@@ -151,7 +151,7 @@
<dependency>
<name>dependency</name>
<entityName>AppointmentLink_entity</entityName>
- <fieldName>Link</fieldName>
+ <fieldName>Links</fieldName>
</dependency>
<children>
<entityParameter>
diff --git a/entity/AttributeRelation_entity/AttributeRelation_entity.aod b/entity/AttributeRelation_entity/AttributeRelation_entity.aod
index 8bd2d5bfe3..614c1bf06c 100644
--- a/entity/AttributeRelation_entity/AttributeRelation_entity.aod
+++ b/entity/AttributeRelation_entity/AttributeRelation_entity.aod
@@ -95,19 +95,9 @@
<isConsumer v="false" />
</entityDependency>
</dependencies>
- <children>
- <entityParameter>
- <name>objectRowId_param</name>
- <expose v="true" />
- </entityParameter>
- <entityParameter>
- <name>objectType_param</name>
- <expose v="true" />
- </entityParameter>
- </children>
</entityProvider>
<entityParameter>
- <name>objectRowId_param</name>
+ <name>ObjectRowId_param</name>
<expose v="true" />
<description>PARAMETER</description>
</entityParameter>
@@ -122,7 +112,7 @@
<state>EDITABLE</state>
</entityField>
<entityParameter>
- <name>objectType_param</name>
+ <name>ObjectType_param</name>
<expose v="true" />
<description>PARAMETER</description>
</entityParameter>
@@ -145,7 +135,7 @@
</onValueChangeTypes>
</entityField>
<entityConsumer>
- <name>Keyword</name>
+ <name>Keywords</name>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
<name>dependency</name>
@@ -154,8 +144,9 @@
</dependency>
<children>
<entityParameter>
- <name>containerName_param</name>
- <valueProcess>%aditoprj%/entity/AttributeRelation_entity/entityfields/keyword/children/containername_param/valueProcess.js</valueProcess>
+ <name>ContainerName_param</name>
+ <valueProcess>%aditoprj%/entity/AttributeRelation_entity/entityfields/keywords/children/containername_param/valueProcess.js</valueProcess>
+ <expose v="false" />
<triggerRecalculation v="true" />
</entityParameter>
</children>
@@ -164,7 +155,7 @@
<name>MEMO_VALUE</name>
</entityField>
<entityParameter>
- <name>filteredAttributeIds_param</name>
+ <name>FilteredAttributeIds_param</name>
<expose v="true" />
<description>PARAMETER</description>
</entityParameter>
@@ -178,15 +169,13 @@
</dependency>
<children>
<entityParameter>
- <name>objectType_param</name>
+ <name>ObjectType_param</name>
<valueProcess>%aditoprj%/entity/AttributeRelation_entity/entityfields/specificattribute/children/objecttype_param/valueProcess.js</valueProcess>
- <expose v="true" />
<triggerRecalculation v="true" />
</entityParameter>
<entityParameter>
- <name>filteredAttributeIds_param</name>
+ <name>FilteredAttributeIds_param</name>
<valueProcess>%aditoprj%/entity/AttributeRelation_entity/entityfields/specificattribute/children/filteredattributeids_param/valueProcess.js</valueProcess>
- <expose v="true" />
<triggerRecalculation v="true" />
</entityParameter>
</children>
diff --git a/entity/AttributeRelation_entity/entityfields/attribute_parent_id/possibleItemsProcess.js b/entity/AttributeRelation_entity/entityfields/attribute_parent_id/possibleItemsProcess.js
index eccc2a2690..816f528b0c 100644
--- a/entity/AttributeRelation_entity/entityfields/attribute_parent_id/possibleItemsProcess.js
+++ b/entity/AttributeRelation_entity/entityfields/attribute_parent_id/possibleItemsProcess.js
@@ -2,4 +2,4 @@ import("system.vars");
import("system.result");
import("Attribute_lib");
-result.object(AttributeUtil.getPossibleAttributes(vars.get("$param.objectType_param"), true));
+result.object(AttributeUtil.getPossibleAttributes(vars.get("$param.ObjectType_param"), true));
diff --git a/entity/AttributeRelation_entity/entityfields/keyword/children/containername_param/valueProcess.js b/entity/AttributeRelation_entity/entityfields/keywords/children/containername_param/valueProcess.js
similarity index 86%
rename from entity/AttributeRelation_entity/entityfields/keyword/children/containername_param/valueProcess.js
rename to entity/AttributeRelation_entity/entityfields/keywords/children/containername_param/valueProcess.js
index 6c3a508f22..0ad606c237 100644
--- a/entity/AttributeRelation_entity/entityfields/keyword/children/containername_param/valueProcess.js
+++ b/entity/AttributeRelation_entity/entityfields/keywords/children/containername_param/valueProcess.js
@@ -6,4 +6,4 @@ var attrKeywordSelect = "select KEYWORD_CONTAINER from AB_ATTRIBUTE";
attrKeywordSelect = SqlCondition.begin()
.andPrepareVars("AB_ATTRIBUTE.AB_ATTRIBUTEID", "$field.AB_ATTRIBUTE_ID")
.buildSql(attrKeywordSelect);
-result.string(db.cell(attrKeywordSelect));
\ No newline at end of file
+result.string(db.cell(attrKeywordSelect));
diff --git a/entity/AttributeRelation_entity/entityfields/object_rowid/valueProcess.js b/entity/AttributeRelation_entity/entityfields/object_rowid/valueProcess.js
index 5f2f5a7b0d..4e3d5a6e48 100644
--- a/entity/AttributeRelation_entity/entityfields/object_rowid/valueProcess.js
+++ b/entity/AttributeRelation_entity/entityfields/object_rowid/valueProcess.js
@@ -1,6 +1,6 @@
-import("system.vars");
-import("system.result");
-import("system.neon");
-
-if (vars.exists("$param.objectRowId_param") && vars.get("$param.objectRowId_param") != null)
- result.string(vars.get("$param.objectRowId_param"));
\ No newline at end of file
+import("system.vars");
+import("system.result");
+import("system.neon");
+
+if (vars.exists("$param.ObjectRowId_param") && vars.get("$param.ObjectRowId_param") != null)
+ result.string(vars.get("$param.ObjectRowId_param"));
\ No newline at end of file
diff --git a/entity/AttributeRelation_entity/entityfields/object_type/valueProcess.js b/entity/AttributeRelation_entity/entityfields/object_type/valueProcess.js
index a2239bdb8c..2ce3f28be9 100644
--- a/entity/AttributeRelation_entity/entityfields/object_type/valueProcess.js
+++ b/entity/AttributeRelation_entity/entityfields/object_type/valueProcess.js
@@ -1,6 +1,6 @@
-import("system.vars");
-import("system.result");
-import("system.neon");
-
-if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.exists("$param.objectType_param") && vars.get("$param.objectType_param") != null)
- result.string(vars.get("$param.objectType_param"));
\ No newline at end of file
+import("system.vars");
+import("system.result");
+import("system.neon");
+
+if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.exists("$param.ObjectType_param") && vars.get("$param.ObjectType_param") != null)
+ result.string(vars.get("$param.ObjectType_param"));
\ No newline at end of file
diff --git a/entity/AttributeRelation_entity/entityfields/specificattribute/children/filteredattributeids_param/valueProcess.js b/entity/AttributeRelation_entity/entityfields/specificattribute/children/filteredattributeids_param/valueProcess.js
index 823de40438..0f10b7075d 100644
--- a/entity/AttributeRelation_entity/entityfields/specificattribute/children/filteredattributeids_param/valueProcess.js
+++ b/entity/AttributeRelation_entity/entityfields/specificattribute/children/filteredattributeids_param/valueProcess.js
@@ -1,4 +1,4 @@
import("system.vars");
import("system.result");
-result.string(vars.exists("$param.filteredAttributeIds_param") ? vars.get("$param.filteredAttributeIds_param") : "");
\ No newline at end of file
+result.string(vars.exists("$param.FilteredAttributeIds_param") ? vars.get("$param.FilteredAttributeIds_param") : "");
diff --git a/entity/AttributeRelation_entity/entityfields/specificattribute/children/objecttype_param/valueProcess.js b/entity/AttributeRelation_entity/entityfields/specificattribute/children/objecttype_param/valueProcess.js
index 987f30bf1e..5c2ba1e99b 100644
--- a/entity/AttributeRelation_entity/entityfields/specificattribute/children/objecttype_param/valueProcess.js
+++ b/entity/AttributeRelation_entity/entityfields/specificattribute/children/objecttype_param/valueProcess.js
@@ -1,4 +1,4 @@
import("system.vars");
import("system.result");
-result.string(vars.exists("$param.objectType_param") ? vars.get("$param.objectType_param") : "");
\ No newline at end of file
+result.string(vars.exists("$param.ObjectType_param") ? vars.get("$param.ObjectType_param") : "");
diff --git a/entity/AttributeRelation_entity/entityfields/specificattributes/children/filteredattributeids_param/valueProcess.js b/entity/AttributeRelation_entity/entityfields/specificattributes/children/filteredattributeids_param/valueProcess.js
new file mode 100644
index 0000000000..71802ad6ba
--- /dev/null
+++ b/entity/AttributeRelation_entity/entityfields/specificattributes/children/filteredattributeids_param/valueProcess.js
@@ -0,0 +1,4 @@
+import("system.vars");
+import("system.result");
+
+result.string(vars.exists("$param.FilteredAttributeIds_param") ? vars.get("$param.FilteredAttributeIds_param") : "");
\ No newline at end of file
diff --git a/entity/AttributeRelation_entity/entityfields/specificattributes/children/objecttype_param/valueProcess.js b/entity/AttributeRelation_entity/entityfields/specificattributes/children/objecttype_param/valueProcess.js
new file mode 100644
index 0000000000..26ba533642
--- /dev/null
+++ b/entity/AttributeRelation_entity/entityfields/specificattributes/children/objecttype_param/valueProcess.js
@@ -0,0 +1,4 @@
+import("system.vars");
+import("system.result");
+
+result.string(vars.exists("$param.ObjectType_param") ? vars.get("$param.ObjectType_param") : "");
\ No newline at end of file
diff --git a/entity/AttributeRelation_entity/recordcontainers/db/conditionProcess.js b/entity/AttributeRelation_entity/recordcontainers/db/conditionProcess.js
index f48af1586c..8d6879931d 100644
--- a/entity/AttributeRelation_entity/recordcontainers/db/conditionProcess.js
+++ b/entity/AttributeRelation_entity/recordcontainers/db/conditionProcess.js
@@ -6,11 +6,11 @@ import("Sql_lib");
var cond = SqlCondition.begin()
- .andPrepareVars("AB_ATTRIBUTERELATION.OBJECT_ROWID", "$param.objectRowId_param");
+ .andPrepareVars("AB_ATTRIBUTERELATION.OBJECT_ROWID", "$param.ObjectRowId_param");
-if (vars.exists("$param.filteredAttributeIds_param") && vars.get("$param.filteredAttributeIds_param"))
+if (vars.exists("$param.FilteredAttributeIds_param") && vars.get("$param.FilteredAttributeIds_param"))
{
- var filteredIds = JSON.parse(vars.get("$param.filteredAttributeIds_param"));
+ var filteredIds = JSON.parse(vars.get("$param.FilteredAttributeIds_param"));
var filteredIdsCondition = new SqlCondition();
filteredIds.forEach(function(id)
diff --git a/entity/AttributeUsage_entity/AttributeUsage_entity.aod b/entity/AttributeUsage_entity/AttributeUsage_entity.aod
index f35db01ad2..cac04071f2 100644
--- a/entity/AttributeUsage_entity/AttributeUsage_entity.aod
+++ b/entity/AttributeUsage_entity/AttributeUsage_entity.aod
@@ -12,7 +12,7 @@
<entityField>
<name>OBJECT_TYPE</name>
<title>Module</title>
- <consumer>Contexts</consumer>
+ <consumer>Context</consumer>
</entityField>
<entityField>
<name>AB_ATTRIBUTEUSAGEID</name>
@@ -24,7 +24,7 @@
<valueProcess>%aditoprj%/entity/AttributeUsage_entity/entityfields/ab_attribute_id/valueProcess.js</valueProcess>
</entityField>
<entityProvider>
- <name>specificAttribute</name>
+ <name>SpecificAttribute</name>
<fieldType>DEPENDENCY_IN</fieldType>
<recordContainer>db</recordContainer>
<dependencies>
@@ -35,15 +35,9 @@
<isConsumer v="false" />
</entityDependency>
</dependencies>
- <children>
- <entityParameter>
- <name>attributeId_param</name>
- <expose v="true" />
- </entityParameter>
- </children>
</entityProvider>
<entityParameter>
- <name>attributeId_param</name>
+ <name>AttributeId_param</name>
<expose v="true" />
<description>PARAMETER</description>
</entityParameter>
@@ -62,7 +56,7 @@
<onValidation>%aditoprj%/entity/AttributeUsage_entity/entityfields/max_count/onValidation.js</onValidation>
</entityField>
<entityConsumer>
- <name>Contexts</name>
+ <name>Context</name>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
<name>dependency</name>
diff --git a/entity/Attribute_entity/Attribute_entity.aod b/entity/Attribute_entity/Attribute_entity.aod
index ac48686c77..2b1e324f9f 100644
--- a/entity/Attribute_entity/Attribute_entity.aod
+++ b/entity/Attribute_entity/Attribute_entity.aod
@@ -22,7 +22,7 @@
<entityField>
<name>ATTRIBUTE_TYPE</name>
<title>Type</title>
- <consumer>KeywordAttributeType</consumer>
+ <consumer>KeywordAttributeTypes</consumer>
<mandatory v="true" />
<stateProcess>%aditoprj%/entity/Attribute_entity/entityfields/attribute_type/stateProcess.js</stateProcess>
<valueProcess>%aditoprj%/entity/Attribute_entity/entityfields/attribute_type/valueProcess.js</valueProcess>
@@ -54,14 +54,15 @@
</dependency>
<children>
<entityParameter>
- <name>attrParentId_param</name>
+ <name>AttrParentId_param</name>
<valueProcess>%aditoprj%/entity/Attribute_entity/entityfields/attributechildren/children/attrparentid_param/valueProcess.js</valueProcess>
+ <expose v="false" />
<triggerRecalculation v="true" />
- <mandatory v="false" />
</entityParameter>
<entityParameter>
- <name>attrParentType_param</name>
+ <name>AttrParentType_param</name>
<valueProcess>%aditoprj%/entity/Attribute_entity/entityfields/attributechildren/children/attrparenttype_param/valueProcess.js</valueProcess>
+ <expose v="false" />
<triggerRecalculation v="true" />
</entityParameter>
</children>
@@ -78,15 +79,9 @@
<isConsumer v="false" />
</entityDependency>
</dependencies>
- <children>
- <entityParameter>
- <name>attrParentId_param</name>
- <expose v="true" />
- </entityParameter>
- </children>
</entityProvider>
<entityParameter>
- <name>attrParentId_param</name>
+ <name>AttrParentId_param</name>
<expose v="true" />
<description>PARAMETER</description>
</entityParameter>
@@ -97,12 +92,13 @@
<dependency>
<name>dependency</name>
<entityName>AttributeUsage_entity</entityName>
- <fieldName>specificAttribute</fieldName>
+ <fieldName>SpecificAttribute</fieldName>
</dependency>
<children>
<entityParameter>
- <name>attributeId_param</name>
+ <name>AttributeId_param</name>
<valueProcess>%aditoprj%/entity/Attribute_entity/entityfields/attributeusages/children/attributeid_param/valueProcess.js</valueProcess>
+ <expose v="false" />
<triggerRecalculation v="true" />
</entityParameter>
</children>
@@ -115,7 +111,7 @@
<valueProcess>%aditoprj%/entity/Attribute_entity/entityfields/attribute_active/valueProcess.js</valueProcess>
</entityField>
<entityConsumer>
- <name>KeywordAttributeType</name>
+ <name>KeywordAttributeTypes</name>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
<name>dependency</name>
@@ -124,8 +120,9 @@
</dependency>
<children>
<entityParameter>
- <name>containerName_param</name>
- <valueProcess>%aditoprj%/entity/Attribute_entity/entityfields/keywordattributetype/children/containername_param/valueProcess.js</valueProcess>
+ <name>ContainerName_param</name>
+ <valueProcess>%aditoprj%/entity/Attribute_entity/entityfields/keywordattributetypes/children/containername_param/valueProcess.js</valueProcess>
+ <expose v="false" />
</entityParameter>
</children>
</entityConsumer>
@@ -144,12 +141,12 @@
<stateProcess>%aditoprj%/entity/Attribute_entity/entityfields/keyword_container/stateProcess.js</stateProcess>
</entityField>
<entityParameter>
- <name>attrParentType_param</name>
+ <name>AttrParentType_param</name>
<expose v="true" />
<description>PARAMETER</description>
</entityParameter>
<entityParameter>
- <name>objectType_param</name>
+ <name>ObjectType_param</name>
<expose v="true" />
<description>PARAMETER</description>
</entityParameter>
@@ -165,23 +162,13 @@
<isConsumer v="false" />
</entityDependency>
</dependencies>
- <children>
- <entityParameter>
- <name>objectType_param</name>
- <expose v="true" />
- </entityParameter>
- <entityParameter>
- <name>filteredAttributeIds_param</name>
- <expose v="true" />
- </entityParameter>
- </children>
</entityProvider>
<entityField>
<name>FULL_ATTRIBUTE_NAME</name>
<valueProcess>%aditoprj%/entity/Attribute_entity/entityfields/full_attribute_name/valueProcess.js</valueProcess>
</entityField>
<entityParameter>
- <name>filteredAttributeIds_param</name>
+ <name>FilteredAttributeIds_param</name>
<expose v="true" />
<description>PARAMETER</description>
</entityParameter>
diff --git a/entity/Attribute_entity/afterOperatingState.js b/entity/Attribute_entity/afterOperatingState.js
index f52c883d54..30104d6d3f 100644
--- a/entity/Attribute_entity/afterOperatingState.js
+++ b/entity/Attribute_entity/afterOperatingState.js
@@ -1,25 +1,25 @@
-import("system.util");
-import("system.db");
-import("system.neon");
-import("system.vars");
-import("Context_lib");
-
-if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW
- && vars.exists("$param.attrParentId_param") && vars.get("$param.attrParentId_param"))
-{
- var parentId = vars.get("$param.attrParentId_param");
- var attributeId = vars.get("$field.AB_ATTRIBUTEID");
-
- var usageSql = SqlCondition.begin()
- .andPrepare("AB_ATTRIBUTEUSAGE.AB_ATTRIBUTE_ID", parentId)
- .buildSql("select OBJECT_TYPE from AB_ATTRIBUTEUSAGE", "1=0");
- var usages = db.array(db.COLUMN, usageSql);
-
- //preset the usages with the ones from the parent
- usages.forEach(function (usage)
- {
- neon.addRecord(null, "AttributeUsages", {
- "OBJECT_TYPE" : usage
- });
- });
+import("system.util");
+import("system.db");
+import("system.neon");
+import("system.vars");
+import("Context_lib");
+
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW
+ && vars.exists("$param.attrParentId_param") && vars.get("$param.attrParentId_param"))
+{
+ var parentId = vars.get("$param.attrParentId_param");
+ var attributeId = vars.get("$field.AB_ATTRIBUTEID");
+
+ var usageSql = SqlCondition.begin()
+ .andPrepare("AB_ATTRIBUTEUSAGE.AB_ATTRIBUTE_ID", parentId)
+ .buildSql("select OBJECT_TYPE from AB_ATTRIBUTEUSAGE", "1=0");
+ var usages = db.array(db.COLUMN, usageSql);
+
+ //preset the usages with the ones from the parent
+ usages.forEach(function (usage)
+ {
+ neon.addRecord(null, "AttributeUsages", {
+ "OBJECT_TYPE" : usage
+ });
+ });
}
\ No newline at end of file
diff --git a/entity/Attribute_entity/entityfields/attribute_type/onValueChange.js b/entity/Attribute_entity/entityfields/attribute_type/onValueChange.js
index 9b54cffaa7..1e41dcc648 100644
--- a/entity/Attribute_entity/entityfields/attribute_type/onValueChange.js
+++ b/entity/Attribute_entity/entityfields/attribute_type/onValueChange.js
@@ -1,8 +1,8 @@
-import("system.neon");
-import("system.vars");
-import("Attribute_lib");
-import("Entity_lib");
-
-var type = ProcessHandlingUtils.getOnValidationValue(vars.get("$field.ATTRIBUTE_TYPE")) || "";
-if (type.trim() != $AttributeTypes.KEYWORD && vars.get("$field.KEYWORD_CONTAINER"))
+import("system.neon");
+import("system.vars");
+import("Attribute_lib");
+import("Entity_lib");
+
+var type = ProcessHandlingUtils.getOnValidationValue(vars.get("$field.ATTRIBUTE_TYPE")) || "";
+if (type.trim() != $AttributeTypes.KEYWORD && vars.get("$field.KEYWORD_CONTAINER"))
neon.setFieldValue("$field.KEYWORD_CONTAINER", "");
\ No newline at end of file
diff --git a/entity/Attribute_entity/entityfields/attributechildren/children/attrparenttype_param/valueProcess.js b/entity/Attribute_entity/entityfields/attributechildren/children/attrparenttype_param/valueProcess.js
index cbb5a62f5f..fe18eca06c 100644
--- a/entity/Attribute_entity/entityfields/attributechildren/children/attrparenttype_param/valueProcess.js
+++ b/entity/Attribute_entity/entityfields/attributechildren/children/attrparenttype_param/valueProcess.js
@@ -1,4 +1,4 @@
import("system.vars");
import("system.result");
-result.string(vars.getString("$field.ATTRIBUTE_TYPE").trim());
\ No newline at end of file
+result.string(vars.getString("$field.ATTRIBUTE_TYPE").trim());
diff --git a/entity/Attribute_entity/entityfields/attributeusages/children/attributeid_param/valueProcess.js b/entity/Attribute_entity/entityfields/attributeusages/children/attributeid_param/valueProcess.js
index c9a3d90e33..f7ac894928 100644
--- a/entity/Attribute_entity/entityfields/attributeusages/children/attributeid_param/valueProcess.js
+++ b/entity/Attribute_entity/entityfields/attributeusages/children/attributeid_param/valueProcess.js
@@ -1,4 +1,4 @@
import("system.vars");
import("system.result");
-result.string(vars.get("$field.AB_ATTRIBUTEID"));
\ No newline at end of file
+result.string(vars.get("$field.AB_ATTRIBUTEID"));
diff --git a/entity/Attribute_entity/entityfields/keyword_container/stateProcess.js b/entity/Attribute_entity/entityfields/keyword_container/stateProcess.js
index ed2192032e..205bd328d1 100644
--- a/entity/Attribute_entity/entityfields/keyword_container/stateProcess.js
+++ b/entity/Attribute_entity/entityfields/keyword_container/stateProcess.js
@@ -1,13 +1,13 @@
-import("system.logging");
-import("system.neon");
-import("system.vars");
-import("system.result");
-import("Attribute_lib");
-
-var fieldState;
-if (vars.get("$field.ATTRIBUTE_TYPE").trim() == $AttributeTypes.KEYWORD)
- fieldState = neon.COMPONENTSTATE_EDITABLE;
-else
- fieldState = neon.COMPONENTSTATE_DISABLED;
-
+import("system.logging");
+import("system.neon");
+import("system.vars");
+import("system.result");
+import("Attribute_lib");
+
+var fieldState;
+if (vars.get("$field.ATTRIBUTE_TYPE").trim() == $AttributeTypes.KEYWORD)
+ fieldState = neon.COMPONENTSTATE_EDITABLE;
+else
+ fieldState = neon.COMPONENTSTATE_DISABLED;
+
result.string(fieldState);
\ No newline at end of file
diff --git a/entity/Offer_entity/entityfields/keywordprobability/children/containername_param/valueProcess.js b/entity/Attribute_entity/entityfields/keywordattributetypes/children/containername_param/valueProcess.js
similarity index 61%
rename from entity/Offer_entity/entityfields/keywordprobability/children/containername_param/valueProcess.js
rename to entity/Attribute_entity/entityfields/keywordattributetypes/children/containername_param/valueProcess.js
index b5612781a1..fa56a9436e 100644
--- a/entity/Offer_entity/entityfields/keywordprobability/children/containername_param/valueProcess.js
+++ b/entity/Attribute_entity/entityfields/keywordattributetypes/children/containername_param/valueProcess.js
@@ -2,4 +2,4 @@ import("system.result");
import("Keyword_lib");
import("KeywordRegistry_basic");
-result.string($KeywordRegistry.offerProbability());
\ No newline at end of file
+result.string($KeywordRegistry.attributeType());
diff --git a/entity/Attribute_entity/recordcontainers/db/conditionProcess.js b/entity/Attribute_entity/recordcontainers/db/conditionProcess.js
index 3ed5587eb6..b6c5e92cac 100644
--- a/entity/Attribute_entity/recordcontainers/db/conditionProcess.js
+++ b/entity/Attribute_entity/recordcontainers/db/conditionProcess.js
@@ -6,19 +6,19 @@ import("Attribute_lib");
var condition = "1 = 2";
-var objectType = vars.exists("$param.objectType_param") && vars.get("$param.objectType_param");
+var objectType = vars.exists("$param.ObjectType_param") && vars.get("$param.ObjectType_param");
if (objectType) //if there's an objectType, it comes from the AttributeRelation entity
{
var filteredAttributes = [];
- if (vars.exists("$param.filteredAttributeIds_param") && vars.get("$param.filteredAttributeIds_param"))
- filteredAttributes = JSON.parse(vars.get("$param.filteredAttributeIds_param"));
+ if (vars.exists("$param.FilteredAttributeIds_param") && vars.get("$param.FilteredAttributeIds_param"))
+ filteredAttributes = JSON.parse(vars.get("$param.FilteredAttributeIds_param"));
var ids = AttributeUtil.getPossibleAttributes(objectType, false, filteredAttributes);
condition = "AB_ATTRIBUTE.AB_ATTRIBUTEID in ('" + ids.join("','") + "')";
}
else
{
- var type = vars.exists("$param.attrParentType_param") && vars.get("$param.attrParentType_param");
+ var type = vars.exists("$param.AttrParentType_param") && vars.get("$param.AttrParentType_param");
if (type != $AttributeTypes.COMBOVALUE)
condition = SqlCondition.begin()
.andPrepare("AB_ATTRIBUTE.ATTRIBUTE_TYPE", $AttributeTypes.GROUP)
@@ -26,12 +26,12 @@ else
if (type == $AttributeTypes.COMBO)
condition = SqlCondition.begin()
- .andPrepareVars("AB_ATTRIBUTE.ATTRIBUTE_PARENT_ID", "$param.attrParentId_param")
+ .andPrepareVars("AB_ATTRIBUTE.ATTRIBUTE_PARENT_ID", "$param.AttrParentId_param")
.build();
- var parentId = vars.exists("$param.attrParentId_param") && vars.get("$param.attrParentId_param");
+ var parentId = vars.exists("$param.AttrParentId_param") && vars.get("$param.AttrParentId_param");
if (parentId)
- condition = "AB_ATTRIBUTE.AB_ATTRIBUTEID in ('" + AttributeUtil.getAllChildren(vars.getString("$param.attrParentId_param")).join("','") + "')";
+ condition = "AB_ATTRIBUTE.AB_ATTRIBUTEID in ('" + AttributeUtil.getAllChildren(vars.getString("$param.AttrParentId_param")).join("','") + "')";
else if (!type)
condition = "";
diff --git a/entity/Communication_entity/Communication_entity.aod b/entity/Communication_entity/Communication_entity.aod
index 37c88b676b..0837932c10 100644
--- a/entity/Communication_entity/Communication_entity.aod
+++ b/entity/Communication_entity/Communication_entity.aod
@@ -21,7 +21,7 @@
<entityField>
<name>MEDIUM_ID</name>
<title>Medium</title>
- <consumer>KeywordMedium</consumer>
+ <consumer>KeywordMediums</consumer>
<mandatory v="true" />
<onValueChange>%aditoprj%/entity/Communication_entity/entityfields/medium_id/onValueChange.js</onValueChange>
<onValueChangeTypes>
@@ -182,7 +182,7 @@ Usually this is used for filtering COMMUNICATION-entries by a specified contact
<description>PARAMETER</description>
</entityParameter>
<entityConsumer>
- <name>KeywordMedium</name>
+ <name>KeywordMediums</name>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
<name>dependency</name>
@@ -191,8 +191,9 @@ Usually this is used for filtering COMMUNICATION-entries by a specified contact
</dependency>
<children>
<entityParameter>
- <name>containerName_param</name>
- <valueProcess>%aditoprj%/entity/Communication_entity/entityfields/keywordmedium/children/containername_param/valueProcess.js</valueProcess>
+ <name>ContainerName_param</name>
+ <valueProcess>%aditoprj%/entity/Communication_entity/entityfields/keywordmediums/children/containername_param/valueProcess.js</valueProcess>
+ <expose v="false" />
</entityParameter>
</children>
</entityConsumer>
diff --git a/entity/Organisation_entity/entityfields/keywordweakness/children/containername_param/valueProcess.js b/entity/Communication_entity/entityfields/keywordmediums/children/containername_param/valueProcess.js
similarity index 59%
rename from entity/Organisation_entity/entityfields/keywordweakness/children/containername_param/valueProcess.js
rename to entity/Communication_entity/entityfields/keywordmediums/children/containername_param/valueProcess.js
index 9973fed72b..7ce6a565f5 100644
--- a/entity/Organisation_entity/entityfields/keywordweakness/children/containername_param/valueProcess.js
+++ b/entity/Communication_entity/entityfields/keywordmediums/children/containername_param/valueProcess.js
@@ -2,4 +2,4 @@ import("system.result");
import("Keyword_lib");
import("KeywordRegistry_basic");
-result.string($KeywordRegistry.salesprojectWeakness());
\ No newline at end of file
+result.string($KeywordRegistry.communicationMedium());
diff --git a/entity/Communication_entity/entityfields/medium_id/onValueChange.js b/entity/Communication_entity/entityfields/medium_id/onValueChange.js
index 93c60950bb..2befa48edc 100644
--- a/entity/Communication_entity/entityfields/medium_id/onValueChange.js
+++ b/entity/Communication_entity/entityfields/medium_id/onValueChange.js
@@ -1,11 +1,11 @@
-import("system.neon");
-import("system.vars");
-import("Entity_lib");
-
-var isInternet = ProcessHandlingUtils.getOnValidationValue(vars.get("$field.MEDIUM_ID")) == "d08956b8-369e-4b65-88fa-1c37b3368ae3";
-var internetPreset = "https://";
-
-if (isInternet && vars.get("$field.ADDR") == "") //medium == Internet
- neon.setFieldValue("$field.ADDR", internetPreset);
-else if (!isInternet && vars.get("$field.ADDR") == internetPreset)
+import("system.neon");
+import("system.vars");
+import("Entity_lib");
+
+var isInternet = ProcessHandlingUtils.getOnValidationValue(vars.get("$field.MEDIUM_ID")) == "d08956b8-369e-4b65-88fa-1c37b3368ae3";
+var internetPreset = "https://";
+
+if (isInternet && vars.get("$field.ADDR") == "") //medium == Internet
+ neon.setFieldValue("$field.ADDR", internetPreset);
+else if (!isInternet && vars.get("$field.ADDR") == internetPreset)
neon.setFieldValue("$field.ADDR", "");
\ No newline at end of file
diff --git a/entity/Context_entity/Context_entity.aod b/entity/Context_entity/Context_entity.aod
index 15af48b45e..025b0cdddb 100644
--- a/entity/Context_entity/Context_entity.aod
+++ b/entity/Context_entity/Context_entity.aod
@@ -13,13 +13,13 @@
<entityDependency>
<name>fcccd077-46c9-4d57-9d9f-27915e40dbce</name>
<entityName>ObjectRelation_entity</entityName>
- <fieldName>Contexts</fieldName>
+ <fieldName>Context</fieldName>
<isConsumer v="false" />
</entityDependency>
<entityDependency>
<name>d713987f-1cf0-4c6c-8373-24d135d22dc8</name>
<entityName>ActivityLink_entity</entityName>
- <fieldName>Contexts</fieldName>
+ <fieldName>Context</fieldName>
<isConsumer v="false" />
</entityDependency>
<entityDependency>
@@ -52,13 +52,13 @@
<entityDependency>
<name>628bd4db-3b31-4337-88ac-1c000307836f</name>
<entityName>AttributeUsage_entity</entityName>
- <fieldName>Contexts</fieldName>
+ <fieldName>Context</fieldName>
<isConsumer v="false" />
</entityDependency>
<entityDependency>
<name>64f5aca8-e756-4a6d-a7a3-89bdc67ddfb3</name>
<entityName>AppointmentLink_entity</entityName>
- <fieldName>Contexts</fieldName>
+ <fieldName>Context</fieldName>
<isConsumer v="false" />
</entityDependency>
</dependencies>
diff --git a/entity/Contract_entity/Contract_entity.aod b/entity/Contract_entity/Contract_entity.aod
index 9aee7a44cb..0d691e0862 100644
--- a/entity/Contract_entity/Contract_entity.aod
+++ b/entity/Contract_entity/Contract_entity.aod
@@ -228,8 +228,9 @@
</dependency>
<children>
<entityParameter>
- <name>containerName_param</name>
+ <name>ContainerName_param</name>
<valueProcess>%aditoprj%/entity/Contract_entity/entityfields/contractpayments/children/containername_param/valueProcess.js</valueProcess>
+ <expose v="false" />
</entityParameter>
</children>
</entityConsumer>
@@ -243,8 +244,9 @@
</dependency>
<children>
<entityParameter>
- <name>containerName_param</name>
+ <name>ContainerName_param</name>
<valueProcess>%aditoprj%/entity/Contract_entity/entityfields/contractstates/children/containername_param/valueProcess.js</valueProcess>
+ <expose v="false" />
</entityParameter>
</children>
</entityConsumer>
@@ -258,8 +260,9 @@
</dependency>
<children>
<entityParameter>
- <name>containerName_param</name>
+ <name>ContainerName_param</name>
<valueProcess>%aditoprj%/entity/Contract_entity/entityfields/contracttypes/children/containername_param/valueProcess.js</valueProcess>
+ <expose v="false" />
</entityParameter>
</children>
</entityConsumer>
@@ -281,14 +284,15 @@
</dependency>
<children>
<entityParameter>
- <name>objectType_param</name>
- <valueProcess>%aditoprj%/entity/Contract_entity/entityfields/attributes/children/objecttype_param/valueProcess.js</valueProcess>
+ <name>ObjectRowId_param</name>
+ <valueProcess>%aditoprj%/entity/Contract_entity/entityfields/attributes/children/objectrowid_param/valueProcess.js</valueProcess>
<expose v="false" />
<triggerRecalculation v="true" />
</entityParameter>
<entityParameter>
- <name>objectRowId_param</name>
- <valueProcess>%aditoprj%/entity/Contract_entity/entityfields/attributes/children/objectrowid_param/valueProcess.js</valueProcess>
+ <name>ObjectType_param</name>
+ <valueProcess>%aditoprj%/entity/Contract_entity/entityfields/attributes/children/objecttype_param/valueProcess.js</valueProcess>
+ <expose v="false" />
<triggerRecalculation v="true" />
</entityParameter>
</children>
diff --git a/entity/Contract_entity/entityfields/attributes/children/objectrowid_param/valueProcess.js b/entity/Contract_entity/entityfields/attributes/children/objectrowid_param/valueProcess.js
index 6a98694895..0cbf256ef5 100644
--- a/entity/Contract_entity/entityfields/attributes/children/objectrowid_param/valueProcess.js
+++ b/entity/Contract_entity/entityfields/attributes/children/objectrowid_param/valueProcess.js
@@ -1,4 +1,4 @@
import("system.vars");
import("system.result");
-result.string(vars.get("$field.CONTRACTID"));
\ No newline at end of file
+result.string(vars.get("$field.CONTRACTID"));
diff --git a/entity/Contract_entity/entityfields/attributes/children/objecttype_param/valueProcess.js b/entity/Contract_entity/entityfields/attributes/children/objecttype_param/valueProcess.js
index 008915f61d..e8b4e72e74 100644
--- a/entity/Contract_entity/entityfields/attributes/children/objecttype_param/valueProcess.js
+++ b/entity/Contract_entity/entityfields/attributes/children/objecttype_param/valueProcess.js
@@ -1,4 +1,4 @@
import("system.result");
import("Context_lib");
-result.string(ContextUtils.getCurrentContextId());
\ No newline at end of file
+result.string(ContextUtils.getCurrentContextId());
diff --git a/entity/Contract_entity/entityfields/contractpayments/children/containername_param/valueProcess.js b/entity/Contract_entity/entityfields/contractpayments/children/containername_param/valueProcess.js
index f17d453fcd..b99d2d74ff 100644
--- a/entity/Contract_entity/entityfields/contractpayments/children/containername_param/valueProcess.js
+++ b/entity/Contract_entity/entityfields/contractpayments/children/containername_param/valueProcess.js
@@ -2,4 +2,4 @@ import("system.result");
import("Keyword_lib");
import("KeywordRegistry_basic");
-result.string($KeywordRegistry.contractPayment());
\ No newline at end of file
+result.string($KeywordRegistry.contractPayment());
diff --git a/entity/Contract_entity/entityfields/contractstates/children/containername_param/valueProcess.js b/entity/Contract_entity/entityfields/contractstates/children/containername_param/valueProcess.js
index 8c1535d18c..f071a8b58d 100644
--- a/entity/Contract_entity/entityfields/contractstates/children/containername_param/valueProcess.js
+++ b/entity/Contract_entity/entityfields/contractstates/children/containername_param/valueProcess.js
@@ -2,4 +2,4 @@ import("system.result");
import("Keyword_lib");
import("KeywordRegistry_basic");
-result.string($KeywordRegistry.contractStatus());
\ No newline at end of file
+result.string($KeywordRegistry.contractStatus());
diff --git a/entity/Contract_entity/entityfields/contracttypes/children/containername_param/valueProcess.js b/entity/Contract_entity/entityfields/contracttypes/children/containername_param/valueProcess.js
index 8b18510674..6d492e72de 100644
--- a/entity/Contract_entity/entityfields/contracttypes/children/containername_param/valueProcess.js
+++ b/entity/Contract_entity/entityfields/contracttypes/children/containername_param/valueProcess.js
@@ -2,4 +2,4 @@ import("system.result");
import("Keyword_lib");
import("KeywordRegistry_basic");
-result.string($KeywordRegistry.contractType());
\ No newline at end of file
+result.string($KeywordRegistry.contractType());
diff --git a/entity/Countries_Entity/Countries_Entity.aod b/entity/Countries_Entity/Countries_Entity.aod
index 672fa25725..2c137a6208 100644
--- a/entity/Countries_Entity/Countries_Entity.aod
+++ b/entity/Countries_Entity/Countries_Entity.aod
@@ -13,7 +13,7 @@
<recordContainer>db</recordContainer>
</entityProvider>
<entityProvider>
- <name>ISO2_NAME</name>
+ <name>ISO2Name</name>
<fieldType>DEPENDENCY_IN</fieldType>
<dependencies>
<entityDependency>
@@ -32,12 +32,12 @@
<children>
<entityParameter>
<name>Key_param</name>
- <valueProcess>%aditoprj%/entity/Countries_Entity/entityfields/iso2_name/children/key_param/valueProcess.js</valueProcess>
+ <valueProcess>%aditoprj%/entity/Countries_Entity/entityfields/iso2name/children/key_param/valueProcess.js</valueProcess>
<expose v="false" />
</entityParameter>
<entityParameter>
<name>Value_param</name>
- <valueProcess>%aditoprj%/entity/Countries_Entity/entityfields/iso2_name/children/value_param/valueProcess.js</valueProcess>
+ <valueProcess>%aditoprj%/entity/Countries_Entity/entityfields/iso2name/children/value_param/valueProcess.js</valueProcess>
<expose v="false" />
</entityParameter>
</children>
diff --git a/entity/Countries_Entity/entityfields/iso2_name2/children/key_param/code.js b/entity/Countries_Entity/entityfields/iso2_name2/children/key_param/code.js
new file mode 100644
index 0000000000..ce35888708
--- /dev/null
+++ b/entity/Countries_Entity/entityfields/iso2_name2/children/key_param/code.js
@@ -0,0 +1,2 @@
+import("system.result");
+result.string("ISO2");
\ No newline at end of file
diff --git a/entity/Countries_Entity/entityfields/iso2_name2/children/value_param/code.js b/entity/Countries_Entity/entityfields/iso2_name2/children/value_param/code.js
new file mode 100644
index 0000000000..02118b5079
--- /dev/null
+++ b/entity/Countries_Entity/entityfields/iso2_name2/children/value_param/code.js
@@ -0,0 +1,2 @@
+import("system.result");
+result.string("NAME");
\ No newline at end of file
diff --git a/entity/Countries_Entity/entityfields/iso2_names/children/key_param/code.js b/entity/Countries_Entity/entityfields/iso2_names/children/key_param/code.js
new file mode 100644
index 0000000000..ce35888708
--- /dev/null
+++ b/entity/Countries_Entity/entityfields/iso2_names/children/key_param/code.js
@@ -0,0 +1,2 @@
+import("system.result");
+result.string("ISO2");
\ No newline at end of file
diff --git a/entity/Countries_Entity/entityfields/iso2_names/children/value_param/code.js b/entity/Countries_Entity/entityfields/iso2_names/children/value_param/code.js
new file mode 100644
index 0000000000..02118b5079
--- /dev/null
+++ b/entity/Countries_Entity/entityfields/iso2_names/children/value_param/code.js
@@ -0,0 +1,2 @@
+import("system.result");
+result.string("NAME");
\ No newline at end of file
diff --git a/entity/Countries_Entity/entityfields/iso2name/children/key_param/valueProcess.js b/entity/Countries_Entity/entityfields/iso2name/children/key_param/valueProcess.js
new file mode 100644
index 0000000000..ce35888708
--- /dev/null
+++ b/entity/Countries_Entity/entityfields/iso2name/children/key_param/valueProcess.js
@@ -0,0 +1,2 @@
+import("system.result");
+result.string("ISO2");
\ No newline at end of file
diff --git a/entity/Countries_Entity/entityfields/iso2name/children/value_param/valueProcess.js b/entity/Countries_Entity/entityfields/iso2name/children/value_param/valueProcess.js
new file mode 100644
index 0000000000..02118b5079
--- /dev/null
+++ b/entity/Countries_Entity/entityfields/iso2name/children/value_param/valueProcess.js
@@ -0,0 +1,2 @@
+import("system.result");
+result.string("NAME");
\ No newline at end of file
diff --git a/entity/Countries_Entity/entityfields/iso2names/children/key_param/valueProcess.js b/entity/Countries_Entity/entityfields/iso2names/children/key_param/valueProcess.js
new file mode 100644
index 0000000000..ce35888708
--- /dev/null
+++ b/entity/Countries_Entity/entityfields/iso2names/children/key_param/valueProcess.js
@@ -0,0 +1,2 @@
+import("system.result");
+result.string("ISO2");
\ No newline at end of file
diff --git a/entity/Countries_Entity/entityfields/iso2names/children/value_param/valueProcess.js b/entity/Countries_Entity/entityfields/iso2names/children/value_param/valueProcess.js
new file mode 100644
index 0000000000..02118b5079
--- /dev/null
+++ b/entity/Countries_Entity/entityfields/iso2names/children/value_param/valueProcess.js
@@ -0,0 +1,2 @@
+import("system.result");
+result.string("NAME");
\ No newline at end of file
diff --git a/entity/KeywordAttributeRelation_entity/KeywordAttributeRelation_entity.aod b/entity/KeywordAttributeRelation_entity/KeywordAttributeRelation_entity.aod
index b14fc3e981..e18e421f3c 100644
--- a/entity/KeywordAttributeRelation_entity/KeywordAttributeRelation_entity.aod
+++ b/entity/KeywordAttributeRelation_entity/KeywordAttributeRelation_entity.aod
@@ -53,13 +53,14 @@
</dependencies>
<children>
<entityParameter>
- <name>keywordEntryId_param</name>
- <expose v="true" />
+ <name>KeywordEntryId_param</name>
+ <triggerRecalculation v="false" />
+ <mandatory v="false" />
</entityParameter>
</children>
</entityProvider>
<entityParameter>
- <name>containerName_param</name>
+ <name>ContainerName_param</name>
<valueProcess>%aditoprj%/entity/KeywordAttributeRelation_entity/entityfields/containername_param/valueProcess.js</valueProcess>
<triggerRecalculation v="true" />
<mandatory v="false" />
@@ -71,21 +72,24 @@
<dependency>
<name>dependency</name>
<entityName>KeywordAttribute_entity</entityName>
- <fieldName>SpecificContainerKeywords</fieldName>
+ <fieldName>SpecificContainerKeyword</fieldName>
</dependency>
<children>
<entityParameter>
- <name>containerName_param</name>
+ <name>ContainerName_param</name>
<valueProcess>%aditoprj%/entity/KeywordAttributeRelation_entity/entityfields/keywordattributes/children/containername_param/valueProcess.js</valueProcess>
+ <expose v="false" />
+ <triggerRecalculation v="false" />
</entityParameter>
<entityParameter>
- <name>filterAlreadyUsedByEntryId_param</name>
+ <name>FilterAlreadyUsedByEntryId_param</name>
<valueProcess>%aditoprj%/entity/KeywordAttributeRelation_entity/entityfields/keywordattributes/children/filteralreadyusedbyentryid_param/valueProcess.js</valueProcess>
+ <expose v="false" />
</entityParameter>
</children>
</entityConsumer>
<entityParameter>
- <name>keywordEntryId_param</name>
+ <name>KeywordEntryId_param</name>
<expose v="true" />
<triggerRecalculation v="true" />
<mandatory v="true" />
diff --git a/entity/KeywordAttributeRelation_entity/entityfields/keywordattributes/children/containername_param/valueProcess.js b/entity/KeywordAttributeRelation_entity/entityfields/keywordattributes/children/containername_param/valueProcess.js
index 04bac24542..3a71fd3b9c 100644
--- a/entity/KeywordAttributeRelation_entity/entityfields/keywordattributes/children/containername_param/valueProcess.js
+++ b/entity/KeywordAttributeRelation_entity/entityfields/keywordattributes/children/containername_param/valueProcess.js
@@ -1,4 +1,4 @@
import("system.vars");
import("system.result");
-result.string(vars.get("$param.containerName_param"));
\ No newline at end of file
+result.string(vars.get("$param.containerName_param"));
diff --git a/entity/KeywordAttributeRelation_entity/entityfields/keywordattributes/children/filteralreadyusedbyentryid_param/valueProcess.js b/entity/KeywordAttributeRelation_entity/entityfields/keywordattributes/children/filteralreadyusedbyentryid_param/valueProcess.js
index f488dd1681..dcf07dae9b 100644
--- a/entity/KeywordAttributeRelation_entity/entityfields/keywordattributes/children/filteralreadyusedbyentryid_param/valueProcess.js
+++ b/entity/KeywordAttributeRelation_entity/entityfields/keywordattributes/children/filteralreadyusedbyentryid_param/valueProcess.js
@@ -1,4 +1,4 @@
import("system.vars");
import("system.result");
-result.string(vars.get("$field.AB_KEYWORD_ENTRY_ID"));
\ No newline at end of file
+result.string(vars.get("$field.AB_KEYWORD_ENTRY_ID"));
diff --git a/entity/KeywordAttribute_entity/KeywordAttribute_entity.aod b/entity/KeywordAttribute_entity/KeywordAttribute_entity.aod
index 8796c26521..5e4b0be7d2 100644
--- a/entity/KeywordAttribute_entity/KeywordAttribute_entity.aod
+++ b/entity/KeywordAttribute_entity/KeywordAttribute_entity.aod
@@ -32,13 +32,13 @@
<entityField>
<name>TYPE</name>
<title>Type</title>
- <consumer>KeywordKeywordAttributeTypes</consumer>
+ <consumer>KeywordAttributeTypes</consumer>
<mandatory v="true" />
</entityField>
<entityProvider>
- <name>SpecificContainerKeywords</name>
+ <name>SpecificContainerKeyword</name>
<fieldType>DEPENDENCY_IN</fieldType>
- <documentation>%aditoprj%/entity/KeywordAttribute_entity/entityfields/specificcontainerkeywords/documentation.adoc</documentation>
+ <documentation>%aditoprj%/entity/KeywordAttribute_entity/entityfields/specificcontainerkeyword/documentation.adoc</documentation>
<dependencies>
<entityDependency>
<name>1d11c064-1cf2-4f08-b842-9fa941ad3157</name>
@@ -49,30 +49,26 @@
</dependencies>
<children>
<entityParameter>
- <name>containerName_param</name>
- <expose v="true" />
- </entityParameter>
- <entityParameter>
- <name>filterAlreadyUsedByEntryId_param</name>
- <expose v="true" />
+ <name>ContainerName_param</name>
+ <triggerRecalculation v="false" />
</entityParameter>
</children>
</entityProvider>
<entityParameter>
- <name>containerName_param</name>
+ <name>ContainerName_param</name>
<expose v="true" />
<triggerRecalculation v="true" />
<description>PARAMETER</description>
</entityParameter>
<entityParameter>
- <name>filterAlreadyUsedByEntryId_param</name>
+ <name>FilterAlreadyUsedByEntryId_param</name>
<expose v="true" />
<mandatory v="false" />
<documentation>%aditoprj%/entity/KeywordAttribute_entity/entityfields/filteralreadyusedbyentryid_param/documentation.adoc</documentation>
<description>PARAMETER</description>
</entityParameter>
<entityConsumer>
- <name>KeywordKeywordAttributeTypes</name>
+ <name>KeywordAttributeTypes</name>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
<name>dependency</name>
@@ -81,8 +77,9 @@
</dependency>
<children>
<entityParameter>
- <name>containerName_param</name>
- <valueProcess>%aditoprj%/entity/KeywordAttribute_entity/entityfields/keywordkeywordattributetypes/children/containername_param/valueProcess.js</valueProcess>
+ <name>ContainerName_param</name>
+ <valueProcess>%aditoprj%/entity/KeywordAttribute_entity/entityfields/keywordattributetypes/children/containername_param/valueProcess.js</valueProcess>
+ <expose v="false" />
</entityParameter>
</children>
</entityConsumer>
diff --git a/entity/KeywordAttribute_entity/entityfields/keywordattributetype/children/containername_param/valueProcess.js b/entity/KeywordAttribute_entity/entityfields/keywordattributetype/children/containername_param/valueProcess.js
new file mode 100644
index 0000000000..286c720daa
--- /dev/null
+++ b/entity/KeywordAttribute_entity/entityfields/keywordattributetype/children/containername_param/valueProcess.js
@@ -0,0 +1,5 @@
+import("system.result");
+import("Keyword_lib");
+import("KeywordRegistry_basic");
+
+result.string($KeywordRegistry.keywordAttributeType());
diff --git a/entity/Organisation_entity/entityfields/keywordstrenght/children/containername_param/valueProcess.js b/entity/KeywordAttribute_entity/entityfields/keywordattributetypes/children/containername_param/valueProcess.js
similarity index 59%
rename from entity/Organisation_entity/entityfields/keywordstrenght/children/containername_param/valueProcess.js
rename to entity/KeywordAttribute_entity/entityfields/keywordattributetypes/children/containername_param/valueProcess.js
index cae1ead387..e52675c31d 100644
--- a/entity/Organisation_entity/entityfields/keywordstrenght/children/containername_param/valueProcess.js
+++ b/entity/KeywordAttribute_entity/entityfields/keywordattributetypes/children/containername_param/valueProcess.js
@@ -2,4 +2,4 @@ import("system.result");
import("Keyword_lib");
import("KeywordRegistry_basic");
-result.string($KeywordRegistry.salesprojectStrenght());
\ No newline at end of file
+result.string($KeywordRegistry.keywordAttributeType());
\ No newline at end of file
diff --git a/entity/KeywordAttribute_entity/entityfields/specificcontainerkeywords/documentation.adoc b/entity/KeywordAttribute_entity/entityfields/specificcontainerkeyword/documentation.adoc
similarity index 100%
rename from entity/KeywordAttribute_entity/entityfields/specificcontainerkeywords/documentation.adoc
rename to entity/KeywordAttribute_entity/entityfields/specificcontainerkeyword/documentation.adoc
diff --git a/entity/KeywordEntry_entity/KeywordEntry_entity.aod b/entity/KeywordEntry_entity/KeywordEntry_entity.aod
index b8ac899bf3..e0f3ed9282 100644
--- a/entity/KeywordEntry_entity/KeywordEntry_entity.aod
+++ b/entity/KeywordEntry_entity/KeywordEntry_entity.aod
@@ -68,7 +68,7 @@
<state>READONLY</state>
</entityField>
<entityParameter>
- <name>containerName_param</name>
+ <name>ContainerName_param</name>
<expose v="true" />
<documentation>%aditoprj%/entity/KeywordEntry_entity/entityfields/containername_param/documentation.adoc</documentation>
</entityParameter>
@@ -237,13 +237,13 @@
<entityDependency>
<name>403c40a4-f747-4e47-ad60-07334724d6fb</name>
<entityName>KeywordAttribute_entity</entityName>
- <fieldName>KeywordKeywordAttributeTypes</fieldName>
+ <fieldName>KeywordAttributeTypes</fieldName>
<isConsumer v="false" />
</entityDependency>
<entityDependency>
<name>078bbd52-87fa-44cc-9902-04af935b5fbc</name>
<entityName>Attribute_entity</entityName>
- <fieldName>KeywordAttributeType</fieldName>
+ <fieldName>KeywordAttributeTypes</fieldName>
<isConsumer v="false" />
</entityDependency>
<entityDependency>
@@ -255,85 +255,91 @@
<entityDependency>
<name>a44375e9-917c-4db8-9aa8-de0625caf78f</name>
<entityName>Activity_entity</entityName>
- <fieldName>KeywordCategory</fieldName>
+ <fieldName>KeywordCategories</fieldName>
<isConsumer v="false" />
</entityDependency>
<entityDependency>
<name>f442a641-4dff-4860-bf4c-cfddc054e075</name>
<entityName>Offer_entity</entityName>
- <fieldName>KeywordProbability</fieldName>
+ <fieldName>KeywordProbabilities</fieldName>
<isConsumer v="false" />
</entityDependency>
<entityDependency>
<name>fa831dac-3287-422a-8f28-504fc525876a</name>
<entityName>Communication_entity</entityName>
- <fieldName>KeywordMedium</fieldName>
+ <fieldName>KeywordMediums</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>2ed3c1ee-0cae-4017-aaf2-49bf4307abc4</name>
+ <entityName>Address_entity</entityName>
+ <fieldName>KeywordAddressTypes</fieldName>
<isConsumer v="false" />
</entityDependency>
<entityDependency>
<name>04b28ce6-a144-4c19-ac2d-4cfbc3568700</name>
<entityName>Organisation_entity</entityName>
- <fieldName>KeywordPrice_Politics</fieldName>
+ <fieldName>KeywordPricePolitics</fieldName>
<isConsumer v="false" />
</entityDependency>
<entityDependency>
<name>f024df05-2faf-4447-9eed-ae31b329d542</name>
<entityName>SalesprojectCompetition_entity</entityName>
- <fieldName>KeywordPrice_Politics</fieldName>
+ <fieldName>KeywordPricePolitics</fieldName>
<isConsumer v="false" />
</entityDependency>
<entityDependency>
<name>60840c28-9875-4e3e-8099-5ca208d58bbe</name>
<entityName>Organisation_entity</entityName>
- <fieldName>KeywordWeakness</fieldName>
+ <fieldName>KeywordWeaknesses</fieldName>
<isConsumer v="false" />
</entityDependency>
<entityDependency>
<name>854148e2-2532-4562-b393-832819e8d462</name>
<entityName>Organisation_entity</entityName>
- <fieldName>KeywordStrenght</fieldName>
+ <fieldName>KeywordStrenghts</fieldName>
<isConsumer v="false" />
</entityDependency>
<entityDependency>
<name>613d5861-0494-45f9-a839-a705347a68da</name>
<entityName>SalesprojectCompetition_entity</entityName>
- <fieldName>KeywordWeakness</fieldName>
+ <fieldName>KeywordWeaknesses</fieldName>
<isConsumer v="false" />
</entityDependency>
<entityDependency>
<name>119d79d0-9e04-4dd0-80bb-0bc32eaae775</name>
<entityName>SalesprojectCompetition_entity</entityName>
- <fieldName>KeywordStrenght</fieldName>
+ <fieldName>KeywordStrenghts</fieldName>
<isConsumer v="false" />
</entityDependency>
<entityDependency>
<name>6e2d164c-1ac7-4ed0-ad8f-7bfda1328493</name>
<entityName>Salesproject_entity</entityName>
- <fieldName>KeywordState</fieldName>
+ <fieldName>KeywordStates</fieldName>
<isConsumer v="false" />
</entityDependency>
<entityDependency>
<name>3ca6d3c7-83d2-4761-bab4-50d2baecdbd6</name>
<entityName>SalesprojectCompetition_entity</entityName>
- <fieldName>KeywordPhase</fieldName>
+ <fieldName>KeywordPhases</fieldName>
<isConsumer v="false" />
</entityDependency>
<entityDependency>
<name>f672b4a5-7d68-46c8-9834-4f706d0d8720</name>
<entityName>Salesproject_entity</entityName>
- <fieldName>KeywordPhase</fieldName>
+ <fieldName>KeywordPhases</fieldName>
<isConsumer v="false" />
</entityDependency>
<entityDependency>
<name>1053a90d-574a-4ca2-b41d-42b513db0fd2</name>
<entityName>Task_entity</entityName>
- <fieldName>KeywordPriority</fieldName>
+ <fieldName>KeywordPriorities</fieldName>
<isConsumer v="false" />
</entityDependency>
<entityDependency>
<name>bf9f7a07-dfb9-44d0-8f9b-d3814053683e</name>
<entityName>SalesprojectCompetition_entity</entityName>
- <fieldName>KeywordState</fieldName>
+ <fieldName>KeywordStates</fieldName>
<isConsumer v="false" />
</entityDependency>
<entityDependency>
@@ -357,13 +363,9 @@
</dependencies>
<children>
<entityParameter>
- <name>onlyActives_param</name>
+ <name>OnlyActives_param</name>
<valueProcess>%aditoprj%/entity/KeywordEntry_entity/entityfields/specificcontainerkeywords/children/onlyactives_param/valueProcess.js</valueProcess>
- <expose v="true" />
- </entityParameter>
- <entityParameter>
- <name>containerName_param</name>
- <expose v="true" />
+ <triggerRecalculation v="false" />
</entityParameter>
</children>
</entityProvider>
@@ -372,7 +374,7 @@
<valueProcess>%aditoprj%/entity/KeywordEntry_entity/entityfields/title_translated/valueProcess.js</valueProcess>
</entityField>
<entityParameter>
- <name>onlyActives_param</name>
+ <name>OnlyActives_param</name>
<valueProcess>%aditoprj%/entity/KeywordEntry_entity/entityfields/onlyactives_param/valueProcess.js</valueProcess>
<expose v="true" />
<triggerRecalculation v="true" />
diff --git a/entity/KeywordEntry_entity/entityfields/specificcontainerkeywords/children/onlyactives_param/valueProcess.js b/entity/KeywordEntry_entity/entityfields/specificcontainerkeywords/children/onlyactives_param/valueProcess.js
index 0e7522714a..cdda594564 100644
--- a/entity/KeywordEntry_entity/entityfields/specificcontainerkeywords/children/onlyactives_param/valueProcess.js
+++ b/entity/KeywordEntry_entity/entityfields/specificcontainerkeywords/children/onlyactives_param/valueProcess.js
@@ -1,2 +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
+result.string("true");//TODO: provider-code is not executed correct (did not receive the value from here)
diff --git a/entity/KeywordEntry_entity/recordcontainers/db/conditionProcess.js b/entity/KeywordEntry_entity/recordcontainers/db/conditionProcess.js
index 6be8b4e13c..1a47f13073 100644
--- a/entity/KeywordEntry_entity/recordcontainers/db/conditionProcess.js
+++ b/entity/KeywordEntry_entity/recordcontainers/db/conditionProcess.js
@@ -5,7 +5,7 @@ import("Sql_lib");
var cond = SqlCondition.begin().andPrepareVars("AB_KEYWORD_ENTRY.CONTAINER", "$param.containerName_param");
-if (vars.get("$param.onlyActives_param") == "true")
+if (vars.get("$param.OnlyActives_param") == "true")
{
cond.andPrepare("AB_KEYWORD_ENTRY.ISACTIVE", "1");
}
diff --git a/entity/Language_entity/Language_entity.aod b/entity/Language_entity/Language_entity.aod
index 29207002f6..e15560225f 100644
--- a/entity/Language_entity/Language_entity.aod
+++ b/entity/Language_entity/Language_entity.aod
@@ -27,7 +27,7 @@
<possibleItemsProcess>%aditoprj%/entity/Language_entity/entityfields/isactive/possibleItemsProcess.js</possibleItemsProcess>
</entityField>
<entityProvider>
- <name>LanguagesISO3Code</name>
+ <name>ISO3Name</name>
<fieldType>DEPENDENCY_IN</fieldType>
<lookupIdfield>ISO3</lookupIdfield>
<recordContainer>db</recordContainer>
diff --git a/entity/ModuleTree_entity/ModuleTree_entity.aod b/entity/ModuleTree_entity/ModuleTree_entity.aod
index 8aff9b18a1..53dcc4b3d1 100644
--- a/entity/ModuleTree_entity/ModuleTree_entity.aod
+++ b/entity/ModuleTree_entity/ModuleTree_entity.aod
@@ -18,7 +18,7 @@
<name>ICON</name>
</entityField>
<entityProvider>
- <name>TreeProvider</name>
+ <name>TreeProviders</name>
<fieldType>DEPENDENCY_IN</fieldType>
<targetContextField>TYPE</targetContextField>
<targetIdField>UID</targetIdField>
@@ -51,13 +51,13 @@
<name>TYPE</name>
</entityField>
<entityParameter>
- <name>ContextName</name>
+ <name>ContextName_param</name>
<expose v="true" />
<mandatory v="true" />
<description>PARAMETER</description>
</entityParameter>
<entityParameter>
- <name>ID</name>
+ <name>ID_param</name>
<expose v="true" />
<mandatory v="true" />
<description>PARAMETER</description>
diff --git a/entity/ObjectRelation_entity/entityfields/keywordobjectrelationtype/children/containername_param/valueProcess.js b/entity/ObjectRelation_entity/entityfields/keywordobjectrelationtype/children/containername_param/valueProcess.js
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/entity/ObjectRelation_entity/entityfields/object1/children/objecttype_param/valueProcess.js b/entity/ObjectRelation_entity/entityfields/object1/children/objecttype_param/valueProcess.js
new file mode 100644
index 0000000000..0e35811c9f
--- /dev/null
+++ b/entity/ObjectRelation_entity/entityfields/object1/children/objecttype_param/valueProcess.js
@@ -0,0 +1,4 @@
+import("system.vars");
+import("system.result");
+
+result.string(vars.get("$field.OBJECT1_TYPE"))
\ No newline at end of file
diff --git a/entity/ObjectRelation_entity/entityfields/object2/children/objecttype_param/valueProcess.js b/entity/ObjectRelation_entity/entityfields/object2/children/objecttype_param/valueProcess.js
new file mode 100644
index 0000000000..e4c1084f9a
--- /dev/null
+++ b/entity/ObjectRelation_entity/entityfields/object2/children/objecttype_param/valueProcess.js
@@ -0,0 +1,4 @@
+import("system.vars");
+import("system.result");
+
+result.string(vars.get("$field.OBJECT2_TYPE"))
\ No newline at end of file
diff --git a/entity/Offer_entity/Offer_entity.aod b/entity/Offer_entity/Offer_entity.aod
index 406ba51591..ba77820ace 100644
--- a/entity/Offer_entity/Offer_entity.aod
+++ b/entity/Offer_entity/Offer_entity.aod
@@ -43,7 +43,7 @@
<entityField>
<name>PROBABILITY</name>
<title>Probability</title>
- <consumer>KeywordProbability</consumer>
+ <consumer>KeywordProbabilities</consumer>
</entityField>
<entityField>
<name>CONTACT_ID</name>
@@ -352,8 +352,9 @@
</dependency>
<children>
<entityParameter>
- <name>containerName_param</name>
+ <name>ContainerName_param</name>
<valueProcess>%aditoprj%/entity/Offer_entity/entityfields/keywordcurrencies/children/containername_param/valueProcess.js</valueProcess>
+ <expose v="false" />
</entityParameter>
</children>
</entityConsumer>
@@ -367,8 +368,9 @@
</dependency>
<children>
<entityParameter>
- <name>containerName_param</name>
+ <name>ContainerName_param</name>
<valueProcess>%aditoprj%/entity/Offer_entity/entityfields/keywordofferstates/children/containername_param/valueProcess.js</valueProcess>
+ <expose v="false" />
</entityParameter>
</children>
</entityConsumer>
@@ -385,11 +387,11 @@
<dependency>
<name>dependency</name>
<entityName>Language_entity</entityName>
- <fieldName>LanguagesISO3Code</fieldName>
+ <fieldName>ISO3Name</fieldName>
</dependency>
</entityConsumer>
<entityConsumer>
- <name>KeywordProbability</name>
+ <name>KeywordProbabilities</name>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
<name>dependency</name>
@@ -398,8 +400,9 @@
</dependency>
<children>
<entityParameter>
- <name>containerName_param</name>
- <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/keywordprobability/children/containername_param/valueProcess.js</valueProcess>
+ <name>ContainerName_param</name>
+ <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/keywordprobabilities/children/containername_param/valueProcess.js</valueProcess>
+ <expose v="false" />
</entityParameter>
</children>
</entityConsumer>
diff --git a/entity/Offer_entity/entityfields/keywordcurrencies/children/containername_param/valueProcess.js b/entity/Offer_entity/entityfields/keywordcurrencies/children/containername_param/valueProcess.js
index 4c7780fc3a..05d20a465b 100644
--- a/entity/Offer_entity/entityfields/keywordcurrencies/children/containername_param/valueProcess.js
+++ b/entity/Offer_entity/entityfields/keywordcurrencies/children/containername_param/valueProcess.js
@@ -2,4 +2,4 @@ import("system.result");
import("Keyword_lib");
import("KeywordRegistry_basic");
-result.string($KeywordRegistry.currency());
\ No newline at end of file
+result.string($KeywordRegistry.currency());
diff --git a/entity/Offer_entity/entityfields/keyworddeliveryterm/children/containername_param/valueProcess.js b/entity/Offer_entity/entityfields/keyworddeliveryterm/children/containername_param/valueProcess.js
index c7114a8904..25f4733023 100644
--- a/entity/Offer_entity/entityfields/keyworddeliveryterm/children/containername_param/valueProcess.js
+++ b/entity/Offer_entity/entityfields/keyworddeliveryterm/children/containername_param/valueProcess.js
@@ -1,4 +1,4 @@
-import("system.result");
-import("KeywordRegistry_basic");
-
+import("system.result");
+import("KeywordRegistry_basic");
+
result.string($KeywordRegistry.deliveryTerm());
\ No newline at end of file
diff --git a/entity/Offer_entity/entityfields/keywordofferstates/children/containername_param/valueProcess.js b/entity/Offer_entity/entityfields/keywordofferstates/children/containername_param/valueProcess.js
index 84f4d79519..1b56fa019e 100644
--- a/entity/Offer_entity/entityfields/keywordofferstates/children/containername_param/valueProcess.js
+++ b/entity/Offer_entity/entityfields/keywordofferstates/children/containername_param/valueProcess.js
@@ -2,4 +2,4 @@ import("system.result");
import("Keyword_lib");
import("KeywordRegistry_basic");
-result.string($KeywordRegistry.offerStatus());
\ No newline at end of file
+result.string($KeywordRegistry.offerStatus());
diff --git a/entity/Offer_entity/entityfields/keywordpaymentterm/children/containername_param/valueProcess.js b/entity/Offer_entity/entityfields/keywordpaymentterm/children/containername_param/valueProcess.js
index 1f840f4c59..f56caab574 100644
--- a/entity/Offer_entity/entityfields/keywordpaymentterm/children/containername_param/valueProcess.js
+++ b/entity/Offer_entity/entityfields/keywordpaymentterm/children/containername_param/valueProcess.js
@@ -1,4 +1,4 @@
-import("system.result");
-import("KeywordRegistry_basic");
-
+import("system.result");
+import("KeywordRegistry_basic");
+
result.string($KeywordRegistry.paymentTerm());
\ No newline at end of file
diff --git a/entity/SalesprojectCompetition_entity/entityfields/keywordphase/children/containername_param/valueProcess.js b/entity/Offer_entity/entityfields/keywordprobabilities/children/containername_param/valueProcess.js
similarity index 61%
rename from entity/SalesprojectCompetition_entity/entityfields/keywordphase/children/containername_param/valueProcess.js
rename to entity/Offer_entity/entityfields/keywordprobabilities/children/containername_param/valueProcess.js
index 0fda06efff..5201e2bd08 100644
--- a/entity/SalesprojectCompetition_entity/entityfields/keywordphase/children/containername_param/valueProcess.js
+++ b/entity/Offer_entity/entityfields/keywordprobabilities/children/containername_param/valueProcess.js
@@ -2,4 +2,4 @@ import("system.result");
import("Keyword_lib");
import("KeywordRegistry_basic");
-result.string($KeywordRegistry.salesprojectPhase());
\ No newline at end of file
+result.string($KeywordRegistry.offerProbability());
diff --git a/entity/Offer_entity/entityfields/newactivity/tooltipProcess.js b/entity/Offer_entity/entityfields/newactivity/tooltipProcess.js
index 2cdf4480a4..c71e677c22 100644
--- a/entity/Offer_entity/entityfields/newactivity/tooltipProcess.js
+++ b/entity/Offer_entity/entityfields/newactivity/tooltipProcess.js
@@ -1,4 +1,4 @@
-import("system.translate");
-import("system.result");
-
+import("system.translate");
+import("system.result");
+
result.string(translate.text("New activity"));
\ No newline at end of file
diff --git a/entity/Offer_entity/recordcontainers/db/recordfieldmappings/deliveryterms.displayvalue/expression.js b/entity/Offer_entity/recordcontainers/db/recordfieldmappings/deliveryterms.displayvalue/expression.js
index da3eb8bffc..4cd5252031 100644
--- a/entity/Offer_entity/recordcontainers/db/recordfieldmappings/deliveryterms.displayvalue/expression.js
+++ b/entity/Offer_entity/recordcontainers/db/recordfieldmappings/deliveryterms.displayvalue/expression.js
@@ -1,6 +1,6 @@
-import("system.result");
-import("Keyword_lib");
-import("KeywordRegistry_basic");
-
-var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.deliveryTerm(), "OFFER.DELIVERYTERMS");
+import("system.result");
+import("Keyword_lib");
+import("KeywordRegistry_basic");
+
+var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.deliveryTerm(), "OFFER.DELIVERYTERMS");
result.string(sql);
\ No newline at end of file
diff --git a/entity/Offer_entity/recordcontainers/db/recordfieldmappings/paymentterms.displayvalue/expression.js b/entity/Offer_entity/recordcontainers/db/recordfieldmappings/paymentterms.displayvalue/expression.js
index d1d4de6219..6025b86408 100644
--- a/entity/Offer_entity/recordcontainers/db/recordfieldmappings/paymentterms.displayvalue/expression.js
+++ b/entity/Offer_entity/recordcontainers/db/recordfieldmappings/paymentterms.displayvalue/expression.js
@@ -1,6 +1,6 @@
-import("system.result");
-import("Keyword_lib");
-import("KeywordRegistry_basic");
-
-var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.paymentTerm(), "OFFER.PAYMENTTERMS");
+import("system.result");
+import("Keyword_lib");
+import("KeywordRegistry_basic");
+
+var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.paymentTerm(), "OFFER.PAYMENTTERMS");
result.string(sql);
\ No newline at end of file
diff --git a/entity/Offeritem_entity/Offeritem_entity.aod b/entity/Offeritem_entity/Offeritem_entity.aod
index ef7a5704ad..e41bee7838 100644
--- a/entity/Offeritem_entity/Offeritem_entity.aod
+++ b/entity/Offeritem_entity/Offeritem_entity.aod
@@ -187,8 +187,9 @@
</dependency>
<children>
<entityParameter>
- <name>containerName_param</name>
+ <name>ContainerName_param</name>
<valueProcess>%aditoprj%/entity/Offeritem_entity/entityfields/keywordproductgroupcodes/children/containername_param/valueProcess.js</valueProcess>
+ <expose v="false" />
</entityParameter>
</children>
</entityConsumer>
@@ -202,8 +203,9 @@
</dependency>
<children>
<entityParameter>
- <name>containerName_param</name>
+ <name>ContainerName_param</name>
<valueProcess>%aditoprj%/entity/Offeritem_entity/entityfields/keywordquantityunits/children/containername_param/valueProcess.js</valueProcess>
+ <expose v="false" />
</entityParameter>
</children>
</entityConsumer>
diff --git a/entity/Offeritem_entity/entityfields/keywordproductgroupcodes/children/containername_param/valueProcess.js b/entity/Offeritem_entity/entityfields/keywordproductgroupcodes/children/containername_param/valueProcess.js
index 0881ceab58..e0b3a6dd6b 100644
--- a/entity/Offeritem_entity/entityfields/keywordproductgroupcodes/children/containername_param/valueProcess.js
+++ b/entity/Offeritem_entity/entityfields/keywordproductgroupcodes/children/containername_param/valueProcess.js
@@ -2,4 +2,4 @@ import("system.result");
import("Keyword_lib");
import("KeywordRegistry_basic");
-result.string($KeywordRegistry.productGroupcode());
\ No newline at end of file
+result.string($KeywordRegistry.productGroupcode());
diff --git a/entity/Offeritem_entity/entityfields/keywordquantityunits/children/containername_param/valueProcess.js b/entity/Offeritem_entity/entityfields/keywordquantityunits/children/containername_param/valueProcess.js
index 116859e4d9..f9b47cf535 100644
--- a/entity/Offeritem_entity/entityfields/keywordquantityunits/children/containername_param/valueProcess.js
+++ b/entity/Offeritem_entity/entityfields/keywordquantityunits/children/containername_param/valueProcess.js
@@ -2,4 +2,4 @@ import("system.result");
import("Keyword_lib");
import("KeywordRegistry_basic");
-result.string($KeywordRegistry.quantityUnit());
\ No newline at end of file
+result.string($KeywordRegistry.quantityUnit());
diff --git a/entity/Order_entity/Order_entity.aod b/entity/Order_entity/Order_entity.aod
index 43d51a741e..f4144c47ef 100644
--- a/entity/Order_entity/Order_entity.aod
+++ b/entity/Order_entity/Order_entity.aod
@@ -297,8 +297,9 @@
</dependency>
<children>
<entityParameter>
- <name>containerName_param</name>
+ <name>ContainerName_param</name>
<valueProcess>%aditoprj%/entity/Order_entity/entityfields/keywordcurrencies/children/containername_param/valueProcess.js</valueProcess>
+ <expose v="false" />
</entityParameter>
</children>
</entityConsumer>
@@ -312,8 +313,9 @@
</dependency>
<children>
<entityParameter>
- <name>containerName_param</name>
+ <name>ContainerName_param</name>
<valueProcess>%aditoprj%/entity/Order_entity/entityfields/keywordstates/children/containername_param/valueProcess.js</valueProcess>
+ <expose v="false" />
</entityParameter>
</children>
</entityConsumer>
@@ -351,7 +353,7 @@
<dependency>
<name>dependency</name>
<entityName>Language_entity</entityName>
- <fieldName>LanguagesISO3Code</fieldName>
+ <fieldName>ISO3Name</fieldName>
</dependency>
</entityConsumer>
<entityParameter>
diff --git a/entity/Order_entity/entityfields/keywordcurrencies/children/containername_param/valueProcess.js b/entity/Order_entity/entityfields/keywordcurrencies/children/containername_param/valueProcess.js
index 4c7780fc3a..05d20a465b 100644
--- a/entity/Order_entity/entityfields/keywordcurrencies/children/containername_param/valueProcess.js
+++ b/entity/Order_entity/entityfields/keywordcurrencies/children/containername_param/valueProcess.js
@@ -2,4 +2,4 @@ import("system.result");
import("Keyword_lib");
import("KeywordRegistry_basic");
-result.string($KeywordRegistry.currency());
\ No newline at end of file
+result.string($KeywordRegistry.currency());
diff --git a/entity/Order_entity/entityfields/keywordstates/children/containername_param/valueProcess.js b/entity/Order_entity/entityfields/keywordstates/children/containername_param/valueProcess.js
index 21e1ac4efb..060269c7e5 100644
--- a/entity/Order_entity/entityfields/keywordstates/children/containername_param/valueProcess.js
+++ b/entity/Order_entity/entityfields/keywordstates/children/containername_param/valueProcess.js
@@ -2,4 +2,4 @@ import("system.result");
import("Keyword_lib");
import("KeywordRegistry_basic");
-result.string($KeywordRegistry.salesorderState());
\ No newline at end of file
+result.string($KeywordRegistry.salesorderState());
diff --git a/entity/Order_entity/entityfields/newactivity/tooltipProcess.js b/entity/Order_entity/entityfields/newactivity/tooltipProcess.js
index 2cdf4480a4..c71e677c22 100644
--- a/entity/Order_entity/entityfields/newactivity/tooltipProcess.js
+++ b/entity/Order_entity/entityfields/newactivity/tooltipProcess.js
@@ -1,4 +1,4 @@
-import("system.translate");
-import("system.result");
-
+import("system.translate");
+import("system.result");
+
result.string(translate.text("New activity"));
\ No newline at end of file
diff --git a/entity/Orderitem_entity/Orderitem_entity.aod b/entity/Orderitem_entity/Orderitem_entity.aod
index 949fae1568..3cf710815f 100644
--- a/entity/Orderitem_entity/Orderitem_entity.aod
+++ b/entity/Orderitem_entity/Orderitem_entity.aod
@@ -181,8 +181,9 @@
</dependency>
<children>
<entityParameter>
- <name>containerName_param</name>
+ <name>ContainerName_param</name>
<valueProcess>%aditoprj%/entity/Orderitem_entity/entityfields/keywordproductgroupcodes/children/containername_param/valueProcess.js</valueProcess>
+ <expose v="false" />
</entityParameter>
</children>
</entityConsumer>
@@ -196,8 +197,9 @@
</dependency>
<children>
<entityParameter>
- <name>containerName_param</name>
+ <name>ContainerName_param</name>
<valueProcess>%aditoprj%/entity/Orderitem_entity/entityfields/keywordquantityunits/children/containername_param/valueProcess.js</valueProcess>
+ <expose v="false" />
</entityParameter>
</children>
</entityConsumer>
diff --git a/entity/Orderitem_entity/entityfields/keywordproductgroupcodes/children/containername_param/valueProcess.js b/entity/Orderitem_entity/entityfields/keywordproductgroupcodes/children/containername_param/valueProcess.js
index 0881ceab58..e0b3a6dd6b 100644
--- a/entity/Orderitem_entity/entityfields/keywordproductgroupcodes/children/containername_param/valueProcess.js
+++ b/entity/Orderitem_entity/entityfields/keywordproductgroupcodes/children/containername_param/valueProcess.js
@@ -2,4 +2,4 @@ import("system.result");
import("Keyword_lib");
import("KeywordRegistry_basic");
-result.string($KeywordRegistry.productGroupcode());
\ No newline at end of file
+result.string($KeywordRegistry.productGroupcode());
diff --git a/entity/Orderitem_entity/entityfields/keywordquantityunits/children/containername_param/valueProcess.js b/entity/Orderitem_entity/entityfields/keywordquantityunits/children/containername_param/valueProcess.js
index 116859e4d9..f9b47cf535 100644
--- a/entity/Orderitem_entity/entityfields/keywordquantityunits/children/containername_param/valueProcess.js
+++ b/entity/Orderitem_entity/entityfields/keywordquantityunits/children/containername_param/valueProcess.js
@@ -2,4 +2,4 @@ import("system.result");
import("Keyword_lib");
import("KeywordRegistry_basic");
-result.string($KeywordRegistry.quantityUnit());
\ No newline at end of file
+result.string($KeywordRegistry.quantityUnit());
diff --git a/entity/Organisation_entity/Organisation_entity.aod b/entity/Organisation_entity/Organisation_entity.aod
index a8da3d81ff..37690a29fb 100644
--- a/entity/Organisation_entity/Organisation_entity.aod
+++ b/entity/Organisation_entity/Organisation_entity.aod
@@ -79,7 +79,7 @@
</children>
</entityConsumer>
<entityConsumer>
- <name>Contacts</name>
+ <name>Contact</name>
<title>Contacts</title>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
@@ -90,12 +90,11 @@
<children>
<entityParameter>
<name>OrgId_param</name>
- <valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/contacts/children/orgid_param/valueProcess.js</valueProcess>
+ <valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/contact/children/orgid_param/valueProcess.js</valueProcess>
<triggerRecalculation v="true" />
</entityParameter>
<entityParameter>
<name>ContactId_param</name>
- <valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/contacts/children/contactid_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
</entityConsumer>
@@ -117,14 +116,14 @@
</fields>
</entityFieldGroup>
<entityProvider>
- <name>Organisation</name>
+ <name>Organisations</name>
<fieldType>DEPENDENCY_IN</fieldType>
<recordContainer>db</recordContainer>
<dependencies>
<entityDependency>
<name>e56d51be-aaf7-4ddc-8bed-7a4a3c42b4dd</name>
<entityName>AnyContact_entity</entityName>
- <fieldName>Organisation</fieldName>
+ <fieldName>Organisations</fieldName>
<isConsumer v="false" />
</entityDependency>
<entityDependency>
@@ -380,7 +379,7 @@
<dependency>
<name>dependency</name>
<entityName>Countries_Entity</entityName>
- <fieldName>ISO2_NAME</fieldName>
+ <fieldName>ISO2Name</fieldName>
</dependency>
</entityConsumer>
<entityConsumer>
@@ -394,14 +393,14 @@
</dependency>
<children>
<entityParameter>
- <name>objectRowId_param</name>
+ <name>ObjectRowId_param</name>
<valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/attributes/children/objectrowid_param/valueProcess.js</valueProcess>
- <expose v="true" />
<triggerRecalculation v="true" />
</entityParameter>
<entityParameter>
- <name>objectType_param</name>
+ <name>ObjectType_param</name>
<valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/attributes/children/objecttype_param/valueProcess.js</valueProcess>
+ <expose v="false" />
<triggerRecalculation v="true" />
</entityParameter>
</children>
@@ -436,8 +435,9 @@
</dependency>
<children>
<entityParameter>
- <name>containerName_param</name>
+ <name>ContainerName_param</name>
<valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/keywordcontactstates/children/containername_param/valueProcess.js</valueProcess>
+ <expose v="false" />
</entityParameter>
</children>
</entityConsumer>
@@ -451,8 +451,9 @@
</dependency>
<children>
<entityParameter>
- <name>containerName_param</name>
+ <name>ContainerName_param</name>
<valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/keywordorganisationtypes/children/containername_param/valueProcess.js</valueProcess>
+ <expose v="false" />
</entityParameter>
</children>
</entityConsumer>
@@ -462,11 +463,11 @@
<dependency>
<name>dependency</name>
<entityName>Language_entity</entityName>
- <fieldName>LanguagesISO3Code</fieldName>
+ <fieldName>ISO3Name</fieldName>
</dependency>
</entityConsumer>
<entityConsumer>
- <name>KeywordPrice_Politics</name>
+ <name>KeywordPricePolitics</name>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
<name>dependency</name>
@@ -475,13 +476,14 @@
</dependency>
<children>
<entityParameter>
- <name>containerName_param</name>
- <valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/keywordprice_politics/children/containername_param/valueProcess.js</valueProcess>
+ <name>ContainerName_param</name>
+ <valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/keywordpricepolitics/children/containername_param/valueProcess.js</valueProcess>
+ <expose v="false" />
</entityParameter>
</children>
</entityConsumer>
<entityConsumer>
- <name>KeywordWeakness</name>
+ <name>KeywordWeaknesses</name>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
<name>dependency</name>
@@ -490,13 +492,14 @@
</dependency>
<children>
<entityParameter>
- <name>containerName_param</name>
- <valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/keywordweakness/children/containername_param/valueProcess.js</valueProcess>
+ <name>ContainerName_param</name>
+ <valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/keywordweaknesses/children/containername_param/valueProcess.js</valueProcess>
+ <expose v="false" />
</entityParameter>
</children>
</entityConsumer>
<entityConsumer>
- <name>KeywordStrenght</name>
+ <name>KeywordStrenghts</name>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
<name>dependency</name>
@@ -505,8 +508,9 @@
</dependency>
<children>
<entityParameter>
- <name>containerName_param</name>
- <valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/keywordstrenght/children/containername_param/valueProcess.js</valueProcess>
+ <name>ContainerName_param</name>
+ <valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/keywordstrenghts/children/containername_param/valueProcess.js</valueProcess>
+ <expose v="false" />
</entityParameter>
</children>
</entityConsumer>
@@ -518,14 +522,6 @@
<actionOrder v="3" />
<iconId>VAADIN:TASKS</iconId>
</entityActionField>
- <entityConsumer>
- <name>TaskObjectRelations</name>
- <title>Tasks</title>
- <fieldType>DEPENDENCY_OUT</fieldType>
- <dependency>
- <name>dependency</name>
- </dependency>
- </entityConsumer>
<entityConsumer>
<name>Salesprojects</name>
<title>Salesprojects</title>
diff --git a/entity/Organisation_entity/entityfields/attributes/children/objecttype_param/valueProcess.js b/entity/Organisation_entity/entityfields/attributes/children/objecttype_param/valueProcess.js
index 008915f61d..e8b4e72e74 100644
--- a/entity/Organisation_entity/entityfields/attributes/children/objecttype_param/valueProcess.js
+++ b/entity/Organisation_entity/entityfields/attributes/children/objecttype_param/valueProcess.js
@@ -1,4 +1,4 @@
import("system.result");
import("Context_lib");
-result.string(ContextUtils.getCurrentContextId());
\ No newline at end of file
+result.string(ContextUtils.getCurrentContextId());
diff --git a/entity/Organisation_entity/entityfields/contacts/children/orgid_param/valueProcess.js b/entity/Organisation_entity/entityfields/contact/children/orgid_param/valueProcess.js
similarity index 100%
rename from entity/Organisation_entity/entityfields/contacts/children/orgid_param/valueProcess.js
rename to entity/Organisation_entity/entityfields/contact/children/orgid_param/valueProcess.js
diff --git a/entity/Organisation_entity/entityfields/contacts/children/contactid_param/valueProcess.js b/entity/Organisation_entity/entityfields/contacts/children/contactid_param/valueProcess.js
index e69de29bb2..0519ecba6e 100644
--- a/entity/Organisation_entity/entityfields/contacts/children/contactid_param/valueProcess.js
+++ b/entity/Organisation_entity/entityfields/contacts/children/contactid_param/valueProcess.js
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/entity/Organisation_entity/entityfields/contract/children/contactid_param/valueProcess.js b/entity/Organisation_entity/entityfields/contract/children/contactid_param/valueProcess.js
new file mode 100644
index 0000000000..70a1c0fcc1
--- /dev/null
+++ b/entity/Organisation_entity/entityfields/contract/children/contactid_param/valueProcess.js
@@ -0,0 +1,4 @@
+import("system.result");
+import("system.vars");
+
+result.string(vars.get("$field.CONTACTID"));
\ No newline at end of file
diff --git a/entity/Organisation_entity/entityfields/keywordcontactstates/children/containername_param/valueProcess.js b/entity/Organisation_entity/entityfields/keywordcontactstates/children/containername_param/valueProcess.js
index 2f4d03edea..43e8d27c6a 100644
--- a/entity/Organisation_entity/entityfields/keywordcontactstates/children/containername_param/valueProcess.js
+++ b/entity/Organisation_entity/entityfields/keywordcontactstates/children/containername_param/valueProcess.js
@@ -2,4 +2,4 @@ import("system.result");
import("Keyword_lib");
import("KeywordRegistry_basic");
-result.string($KeywordRegistry.contactStatus());
\ No newline at end of file
+result.string($KeywordRegistry.contactStatus());
diff --git a/entity/Organisation_entity/entityfields/keywordprice_politics/children/containername_param/valueProcess.js b/entity/Organisation_entity/entityfields/keywordpricepolitics/children/containername_param/valueProcess.js
similarity index 57%
rename from entity/Organisation_entity/entityfields/keywordprice_politics/children/containername_param/valueProcess.js
rename to entity/Organisation_entity/entityfields/keywordpricepolitics/children/containername_param/valueProcess.js
index a76a727534..8ddda74390 100644
--- a/entity/Organisation_entity/entityfields/keywordprice_politics/children/containername_param/valueProcess.js
+++ b/entity/Organisation_entity/entityfields/keywordpricepolitics/children/containername_param/valueProcess.js
@@ -2,4 +2,4 @@ import("system.result");
import("Keyword_lib");
import("KeywordRegistry_basic");
-result.string($KeywordRegistry.salesprojectPricePolitics());
\ No newline at end of file
+result.string($KeywordRegistry.salesprojectPricePolitics());
diff --git a/entity/Organisation_entity/entityfields/keywordstrenghts/children/containername_param/valueProcess.js b/entity/Organisation_entity/entityfields/keywordstrenghts/children/containername_param/valueProcess.js
new file mode 100644
index 0000000000..b71211967e
--- /dev/null
+++ b/entity/Organisation_entity/entityfields/keywordstrenghts/children/containername_param/valueProcess.js
@@ -0,0 +1,5 @@
+import("system.result");
+import("Keyword_lib");
+import("KeywordRegistry_basic");
+
+result.string($KeywordRegistry.salesprojectStrenght());
diff --git a/entity/Organisation_entity/entityfields/keywordweaknesses/children/containername_param/valueProcess.js b/entity/Organisation_entity/entityfields/keywordweaknesses/children/containername_param/valueProcess.js
new file mode 100644
index 0000000000..f4e1a14c00
--- /dev/null
+++ b/entity/Organisation_entity/entityfields/keywordweaknesses/children/containername_param/valueProcess.js
@@ -0,0 +1,5 @@
+import("system.result");
+import("Keyword_lib");
+import("KeywordRegistry_basic");
+
+result.string($KeywordRegistry.salesprojectWeakness());
diff --git a/entity/Organisation_entity/entityfields/newactivity/tooltipProcess.js b/entity/Organisation_entity/entityfields/newactivity/tooltipProcess.js
index 2cdf4480a4..c71e677c22 100644
--- a/entity/Organisation_entity/entityfields/newactivity/tooltipProcess.js
+++ b/entity/Organisation_entity/entityfields/newactivity/tooltipProcess.js
@@ -1,4 +1,4 @@
-import("system.translate");
-import("system.result");
-
+import("system.translate");
+import("system.result");
+
result.string(translate.text("New activity"));
\ No newline at end of file
diff --git a/entity/Organisation_entity/entityfields/offers/children/contactid_param/valueProcess.js b/entity/Organisation_entity/entityfields/offers/children/contactid_param/valueProcess.js
index ed4a4f567a..7b6137b4d1 100644
--- a/entity/Organisation_entity/entityfields/offers/children/contactid_param/valueProcess.js
+++ b/entity/Organisation_entity/entityfields/offers/children/contactid_param/valueProcess.js
@@ -1,4 +1,4 @@
-import("system.vars");
-import("system.result");
-
+import("system.vars");
+import("system.result");
+
result.string(vars.get("$field.CONTACTID"));
\ No newline at end of file
diff --git a/entity/Person_entity/Person_entity.aod b/entity/Person_entity/Person_entity.aod
index 2818cdc999..0e1d788604 100644
--- a/entity/Person_entity/Person_entity.aod
+++ b/entity/Person_entity/Person_entity.aod
@@ -112,7 +112,7 @@
<entityDependency>
<name>41952879-c2f0-411f-8ca1-36c38914a629</name>
<entityName>Organisation_entity</entityName>
- <fieldName>Contacts</fieldName>
+ <fieldName>Contact</fieldName>
<isConsumer v="false" />
</entityDependency>
</dependencies>
@@ -505,8 +505,9 @@ Usually this is used for filtering COMMUNICATION-entries by a specified contact
</dependency>
<children>
<entityParameter>
- <name>containerName_param</name>
+ <name>ContainerName_param</name>
<valueProcess>%aditoprj%/entity/Person_entity/entityfields/keywordgenders/children/containername_param/valueProcess.js</valueProcess>
+ <expose v="false" />
</entityParameter>
</children>
</entityConsumer>
@@ -516,7 +517,7 @@ Usually this is used for filtering COMMUNICATION-entries by a specified contact
<dependency>
<name>dependency</name>
<entityName>Language_entity</entityName>
- <fieldName>LanguagesISO3Code</fieldName>
+ <fieldName>ISO3Name</fieldName>
</dependency>
</entityConsumer>
<entityConsumer>
@@ -546,14 +547,14 @@ Usually this is used for filtering COMMUNICATION-entries by a specified contact
</dependency>
<children>
<entityParameter>
- <name>objectRowId_param</name>
+ <name>ObjectRowId_param</name>
<valueProcess>%aditoprj%/entity/Person_entity/entityfields/attributes/children/objectrowid_param/valueProcess.js</valueProcess>
- <expose v="true" />
<triggerRecalculation v="true" />
</entityParameter>
<entityParameter>
- <name>objectType_param</name>
+ <name>ObjectType_param</name>
<valueProcess>%aditoprj%/entity/Person_entity/entityfields/attributes/children/objecttype_param/valueProcess.js</valueProcess>
+ <expose v="false" />
<triggerRecalculation v="true" />
</entityParameter>
</children>
diff --git a/entity/Person_entity/entityfields/attributes/children/objectrowid_param/valueProcess.js b/entity/Person_entity/entityfields/attributes/children/objectrowid_param/valueProcess.js
index ee0cddc370..4170a76c71 100644
--- a/entity/Person_entity/entityfields/attributes/children/objectrowid_param/valueProcess.js
+++ b/entity/Person_entity/entityfields/attributes/children/objectrowid_param/valueProcess.js
@@ -1,4 +1,4 @@
import("system.vars");
import("system.result");
-result.string(vars.get("$field.PERSONID"));
\ No newline at end of file
+result.string(vars.get("$field.PERSONID"));
diff --git a/entity/Person_entity/entityfields/attributes/children/objecttype_param/valueProcess.js b/entity/Person_entity/entityfields/attributes/children/objecttype_param/valueProcess.js
index 008915f61d..e8b4e72e74 100644
--- a/entity/Person_entity/entityfields/attributes/children/objecttype_param/valueProcess.js
+++ b/entity/Person_entity/entityfields/attributes/children/objecttype_param/valueProcess.js
@@ -1,4 +1,4 @@
import("system.result");
import("Context_lib");
-result.string(ContextUtils.getCurrentContextId());
\ No newline at end of file
+result.string(ContextUtils.getCurrentContextId());
diff --git a/entity/Person_entity/entityfields/contract/children/contactid_param/valueProcess.js b/entity/Person_entity/entityfields/contract/children/contactid_param/valueProcess.js
new file mode 100644
index 0000000000..70a1c0fcc1
--- /dev/null
+++ b/entity/Person_entity/entityfields/contract/children/contactid_param/valueProcess.js
@@ -0,0 +1,4 @@
+import("system.result");
+import("system.vars");
+
+result.string(vars.get("$field.CONTACTID"));
\ No newline at end of file
diff --git a/entity/Person_entity/entityfields/newactivity/tooltipProcess.js b/entity/Person_entity/entityfields/newactivity/tooltipProcess.js
index 2cdf4480a4..c71e677c22 100644
--- a/entity/Person_entity/entityfields/newactivity/tooltipProcess.js
+++ b/entity/Person_entity/entityfields/newactivity/tooltipProcess.js
@@ -1,4 +1,4 @@
-import("system.translate");
-import("system.result");
-
+import("system.translate");
+import("system.result");
+
result.string(translate.text("New activity"));
\ No newline at end of file
diff --git a/entity/Product_entity/Product_entity.aod b/entity/Product_entity/Product_entity.aod
index d388d08f6b..33f4c12de0 100644
--- a/entity/Product_entity/Product_entity.aod
+++ b/entity/Product_entity/Product_entity.aod
@@ -101,7 +101,7 @@
</children>
</entityConsumer>
<entityConsumer>
- <name>Stock</name>
+ <name>Stocks</name>
<title>Stock</title>
<fieldType>DEPENDENCY_OUT</fieldType>
<selectionMode>SINGLE</selectionMode>
@@ -113,7 +113,7 @@
<children>
<entityParameter>
<name>ProductId_param</name>
- <valueProcess>%aditoprj%/entity/Product_entity/entityfields/stock/children/productid_param/valueProcess.js</valueProcess>
+ <valueProcess>%aditoprj%/entity/Product_entity/entityfields/stocks/children/productid_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
</entityConsumer>
@@ -127,7 +127,7 @@
</onValueChangeTypes>
</entityField>
<entityConsumer>
- <name>StockCount</name>
+ <name>StockCounts</name>
<title>Stock</title>
<fieldType>DEPENDENCY_OUT</fieldType>
<state>READONLY</state>
@@ -139,7 +139,7 @@
<children>
<entityParameter>
<name>ProductId_param</name>
- <valueProcess>%aditoprj%/entity/Product_entity/entityfields/stockcount/children/productid_param/valueProcess.js</valueProcess>
+ <valueProcess>%aditoprj%/entity/Product_entity/entityfields/stockcounts/children/productid_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
</entityConsumer>
@@ -253,8 +253,9 @@
</dependency>
<children>
<entityParameter>
- <name>containerName_param</name>
+ <name>ContainerName_param</name>
<valueProcess>%aditoprj%/entity/Product_entity/entityfields/keywordproductgroupcodes/children/containername_param/valueProcess.js</valueProcess>
+ <expose v="false" />
</entityParameter>
</children>
</entityConsumer>
@@ -268,8 +269,9 @@
</dependency>
<children>
<entityParameter>
- <name>containerName_param</name>
+ <name>ContainerName_param</name>
<valueProcess>%aditoprj%/entity/Product_entity/entityfields/keywordquantityunits/children/containername_param/valueProcess.js</valueProcess>
+ <expose v="false" />
</entityParameter>
</children>
</entityConsumer>
@@ -284,7 +286,7 @@
<dependency>
<name>dependency</name>
<entityName>Language_entity</entityName>
- <fieldName>LanguagesISO3Code</fieldName>
+ <fieldName>ISO3Name</fieldName>
</dependency>
</entityConsumer>
<entityConsumer>
@@ -327,12 +329,14 @@
</dependency>
<children>
<entityParameter>
- <name>objectType_param</name>
- <valueProcess>%aditoprj%/entity/Product_entity/entityfields/attributes/children/objecttype_param/valueProcess.js</valueProcess>
+ <name>ObjectRowId_param</name>
+ <valueProcess>%aditoprj%/entity/Product_entity/entityfields/attributes/children/objectrowid_param/valueProcess.js</valueProcess>
+ <expose v="false" />
</entityParameter>
<entityParameter>
- <name>objectRowId_param</name>
- <valueProcess>%aditoprj%/entity/Product_entity/entityfields/attributes/children/objectrowid_param/valueProcess.js</valueProcess>
+ <name>ObjectType_param</name>
+ <valueProcess>%aditoprj%/entity/Product_entity/entityfields/attributes/children/objecttype_param/valueProcess.js</valueProcess>
+ <expose v="false" />
</entityParameter>
</children>
</entityConsumer>
diff --git a/entity/Product_entity/entityfields/attributes/children/objectrowid_param/valueProcess.js b/entity/Product_entity/entityfields/attributes/children/objectrowid_param/valueProcess.js
index 9635e2f4c4..94eb4c992d 100644
--- a/entity/Product_entity/entityfields/attributes/children/objectrowid_param/valueProcess.js
+++ b/entity/Product_entity/entityfields/attributes/children/objectrowid_param/valueProcess.js
@@ -2,4 +2,4 @@ import("system.vars");
import("system.result");
import("Context_lib");
-result.string(vars.get("$field.PRODUCTID"));
\ No newline at end of file
+result.string(vars.get("$field.PRODUCTID"));
diff --git a/entity/Product_entity/entityfields/attributes/children/objecttype_param/valueProcess.js b/entity/Product_entity/entityfields/attributes/children/objecttype_param/valueProcess.js
index 008915f61d..e8b4e72e74 100644
--- a/entity/Product_entity/entityfields/attributes/children/objecttype_param/valueProcess.js
+++ b/entity/Product_entity/entityfields/attributes/children/objecttype_param/valueProcess.js
@@ -1,4 +1,4 @@
import("system.result");
import("Context_lib");
-result.string(ContextUtils.getCurrentContextId());
\ No newline at end of file
+result.string(ContextUtils.getCurrentContextId());
diff --git a/entity/Product_entity/entityfields/keywordproductgroupcodes/children/containername_param/valueProcess.js b/entity/Product_entity/entityfields/keywordproductgroupcodes/children/containername_param/valueProcess.js
index 0881ceab58..e0b3a6dd6b 100644
--- a/entity/Product_entity/entityfields/keywordproductgroupcodes/children/containername_param/valueProcess.js
+++ b/entity/Product_entity/entityfields/keywordproductgroupcodes/children/containername_param/valueProcess.js
@@ -2,4 +2,4 @@ import("system.result");
import("Keyword_lib");
import("KeywordRegistry_basic");
-result.string($KeywordRegistry.productGroupcode());
\ No newline at end of file
+result.string($KeywordRegistry.productGroupcode());
diff --git a/entity/Product_entity/entityfields/keywordquantityunits/children/containername_param/valueProcess.js b/entity/Product_entity/entityfields/keywordquantityunits/children/containername_param/valueProcess.js
index 116859e4d9..f9b47cf535 100644
--- a/entity/Product_entity/entityfields/keywordquantityunits/children/containername_param/valueProcess.js
+++ b/entity/Product_entity/entityfields/keywordquantityunits/children/containername_param/valueProcess.js
@@ -2,4 +2,4 @@ import("system.result");
import("Keyword_lib");
import("KeywordRegistry_basic");
-result.string($KeywordRegistry.quantityUnit());
\ No newline at end of file
+result.string($KeywordRegistry.quantityUnit());
diff --git a/entity/Product_entity/entityfields/newactivity/tooltipProcess.js b/entity/Product_entity/entityfields/newactivity/tooltipProcess.js
index 2cdf4480a4..c71e677c22 100644
--- a/entity/Product_entity/entityfields/newactivity/tooltipProcess.js
+++ b/entity/Product_entity/entityfields/newactivity/tooltipProcess.js
@@ -1,4 +1,4 @@
-import("system.translate");
-import("system.result");
-
+import("system.translate");
+import("system.result");
+
result.string(translate.text("New activity"));
\ No newline at end of file
diff --git a/entity/Product_entity/entityfields/stock/children/productid_param/valueProcess.js b/entity/Product_entity/entityfields/stockcounts/children/productid_param/valueProcess.js
similarity index 100%
rename from entity/Product_entity/entityfields/stock/children/productid_param/valueProcess.js
rename to entity/Product_entity/entityfields/stockcounts/children/productid_param/valueProcess.js
diff --git a/entity/Product_entity/entityfields/stockcount/children/productid_param/valueProcess.js b/entity/Product_entity/entityfields/stocks/children/productid_param/valueProcess.js
similarity index 100%
rename from entity/Product_entity/entityfields/stockcount/children/productid_param/valueProcess.js
rename to entity/Product_entity/entityfields/stocks/children/productid_param/valueProcess.js
diff --git a/entity/Productprice_entity/Productprice_entity.aod b/entity/Productprice_entity/Productprice_entity.aod
index 811cb33671..98794639c7 100644
--- a/entity/Productprice_entity/Productprice_entity.aod
+++ b/entity/Productprice_entity/Productprice_entity.aod
@@ -170,8 +170,9 @@
</dependency>
<children>
<entityParameter>
- <name>containerName_param</name>
+ <name>ContainerName_param</name>
<valueProcess>%aditoprj%/entity/Productprice_entity/entityfields/keywordcurrencies/children/containername_param/valueProcess.js</valueProcess>
+ <expose v="false" />
</entityParameter>
</children>
</entityConsumer>
@@ -185,8 +186,9 @@
</dependency>
<children>
<entityParameter>
- <name>containerName_param</name>
+ <name>ContainerName_param</name>
<valueProcess>%aditoprj%/entity/Productprice_entity/entityfields/keywordpricelists/children/containername_param/valueProcess.js</valueProcess>
+ <expose v="false" />
</entityParameter>
</children>
</entityConsumer>
diff --git a/entity/SalesprojectCompetition_entity/SalesprojectCompetition_entity.aod b/entity/SalesprojectCompetition_entity/SalesprojectCompetition_entity.aod
index cab3c0a17f..f74ccc8803 100644
--- a/entity/SalesprojectCompetition_entity/SalesprojectCompetition_entity.aod
+++ b/entity/SalesprojectCompetition_entity/SalesprojectCompetition_entity.aod
@@ -36,7 +36,7 @@
<entityField>
<name>STATUS</name>
<title>State</title>
- <consumer>KeywordState</consumer>
+ <consumer>KeywordStates</consumer>
<mandatory v="true" />
</entityField>
<entityParameter>
@@ -89,7 +89,7 @@
<dependency>
<name>dependency</name>
<entityName>Organisation_entity</entityName>
- <fieldName>Organisation</fieldName>
+ <fieldName>Organisations</fieldName>
</dependency>
<children>
<entityParameter>
@@ -119,19 +119,19 @@
</dependency>
<children>
<entityParameter>
- <name>containerName_param</name>
+ <name>ContainerName_param</name>
<valueProcess>%aditoprj%/entity/SalesprojectCompetition_entity/entityfields/keywordwonlost/children/containername_param/valueProcess.js</valueProcess>
- <documentation>%aditoprj%/entity/SalesprojectCompetition_entity/entityfields/keywordwonlost/children/containername_param/documentation.adoc</documentation>
+ <expose v="false" />
</entityParameter>
</children>
</entityConsumer>
<entityField>
<name>PHASE</name>
<title>Phase</title>
- <consumer>KeywordPhase</consumer>
+ <consumer>KeywordPhases</consumer>
</entityField>
<entityConsumer>
- <name>KeywordPrice_Politics</name>
+ <name>KeywordPricePolitics</name>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
<name>dependency</name>
@@ -140,13 +140,14 @@
</dependency>
<children>
<entityParameter>
- <name>containerName_param</name>
- <valueProcess>%aditoprj%/entity/SalesprojectCompetition_entity/entityfields/keywordprice_politics/children/containername_param/valueProcess.js</valueProcess>
+ <name>ContainerName_param</name>
+ <valueProcess>%aditoprj%/entity/SalesprojectCompetition_entity/entityfields/keywordpricepolitics/children/containername_param/valueProcess.js</valueProcess>
+ <expose v="false" />
</entityParameter>
</children>
</entityConsumer>
<entityConsumer>
- <name>KeywordWeakness</name>
+ <name>KeywordWeaknesses</name>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
<name>dependency</name>
@@ -155,13 +156,14 @@
</dependency>
<children>
<entityParameter>
- <name>containerName_param</name>
- <valueProcess>%aditoprj%/entity/SalesprojectCompetition_entity/entityfields/keywordweakness/children/containername_param/valueProcess.js</valueProcess>
+ <name>ContainerName_param</name>
+ <valueProcess>%aditoprj%/entity/SalesprojectCompetition_entity/entityfields/keywordweaknesses/children/containername_param/valueProcess.js</valueProcess>
+ <expose v="false" />
</entityParameter>
</children>
</entityConsumer>
<entityConsumer>
- <name>KeywordStrenght</name>
+ <name>KeywordStrenghts</name>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
<name>dependency</name>
@@ -170,13 +172,14 @@
</dependency>
<children>
<entityParameter>
- <name>containerName_param</name>
- <valueProcess>%aditoprj%/entity/SalesprojectCompetition_entity/entityfields/keywordstrenght/children/containername_param/valueProcess.js</valueProcess>
+ <name>ContainerName_param</name>
+ <valueProcess>%aditoprj%/entity/SalesprojectCompetition_entity/entityfields/keywordstrenghts/children/containername_param/valueProcess.js</valueProcess>
+ <expose v="false" />
</entityParameter>
</children>
</entityConsumer>
<entityConsumer>
- <name>KeywordPhase</name>
+ <name>KeywordPhases</name>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
<name>dependency</name>
@@ -185,13 +188,14 @@
</dependency>
<children>
<entityParameter>
- <name>containerName_param</name>
- <valueProcess>%aditoprj%/entity/SalesprojectCompetition_entity/entityfields/keywordphase/children/containername_param/valueProcess.js</valueProcess>
+ <name>ContainerName_param</name>
+ <valueProcess>%aditoprj%/entity/SalesprojectCompetition_entity/entityfields/keywordphases/children/containername_param/valueProcess.js</valueProcess>
+ <expose v="false" />
</entityParameter>
</children>
</entityConsumer>
<entityConsumer>
- <name>KeywordState</name>
+ <name>KeywordStates</name>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
<name>dependency</name>
@@ -200,8 +204,9 @@
</dependency>
<children>
<entityParameter>
- <name>containerName_param</name>
- <valueProcess>%aditoprj%/entity/SalesprojectCompetition_entity/entityfields/keywordstate/children/containername_param/valueProcess.js</valueProcess>
+ <name>ContainerName_param</name>
+ <valueProcess>%aditoprj%/entity/SalesprojectCompetition_entity/entityfields/keywordstates/children/containername_param/valueProcess.js</valueProcess>
+ <expose v="false" />
</entityParameter>
</children>
</entityConsumer>
@@ -216,16 +221,19 @@
</dependency>
<children>
<entityParameter>
- <name>objectType_param</name>
- <valueProcess>%aditoprj%/entity/SalesprojectCompetition_entity/entityfields/attributes/children/objecttype_param/valueProcess.js</valueProcess>
+ <name>FilteredAttributeIds_param</name>
+ <valueProcess>%aditoprj%/entity/SalesprojectCompetition_entity/entityfields/attributes/children/filteredattributeids_param/valueProcess.js</valueProcess>
+ <expose v="false" />
</entityParameter>
<entityParameter>
- <name>objectRowId_param</name>
+ <name>ObjectRowId_param</name>
<valueProcess>%aditoprj%/entity/SalesprojectCompetition_entity/entityfields/attributes/children/objectrowid_param/valueProcess.js</valueProcess>
+ <expose v="false" />
</entityParameter>
<entityParameter>
- <name>filteredAttributeIds_param</name>
- <valueProcess>%aditoprj%/entity/SalesprojectCompetition_entity/entityfields/attributes/children/filteredattributeids_param/valueProcess.js</valueProcess>
+ <name>ObjectType_param</name>
+ <valueProcess>%aditoprj%/entity/SalesprojectCompetition_entity/entityfields/attributes/children/objecttype_param/valueProcess.js</valueProcess>
+ <expose v="false" />
</entityParameter>
</children>
</entityConsumer>
diff --git a/entity/SalesprojectCompetition_entity/entityfields/attributes/children/objectrowid_param/valueProcess.js b/entity/SalesprojectCompetition_entity/entityfields/attributes/children/objectrowid_param/valueProcess.js
index ef0d5bcac5..3cb68cac61 100644
--- a/entity/SalesprojectCompetition_entity/entityfields/attributes/children/objectrowid_param/valueProcess.js
+++ b/entity/SalesprojectCompetition_entity/entityfields/attributes/children/objectrowid_param/valueProcess.js
@@ -1,4 +1,4 @@
import("system.vars");
import("system.result");
-result.string(vars.get("$field.CONTACT_ID"));
\ No newline at end of file
+result.string(vars.get("$field.CONTACT_ID"));
diff --git a/entity/SalesprojectCompetition_entity/entityfields/attributes/children/objecttype_param/valueProcess.js b/entity/SalesprojectCompetition_entity/entityfields/attributes/children/objecttype_param/valueProcess.js
index 9e359dfbd0..41202c0153 100644
--- a/entity/SalesprojectCompetition_entity/entityfields/attributes/children/objecttype_param/valueProcess.js
+++ b/entity/SalesprojectCompetition_entity/entityfields/attributes/children/objecttype_param/valueProcess.js
@@ -1,3 +1,3 @@
import("system.result");
-result.string("Organisation");
\ No newline at end of file
+result.string("Organisation");
diff --git a/entity/Salesproject_entity/entityfields/keywordphase/children/containername_param/valueProcess.js b/entity/SalesprojectCompetition_entity/entityfields/keywordphases/children/containername_param/valueProcess.js
similarity index 60%
rename from entity/Salesproject_entity/entityfields/keywordphase/children/containername_param/valueProcess.js
rename to entity/SalesprojectCompetition_entity/entityfields/keywordphases/children/containername_param/valueProcess.js
index 0fda06efff..d74e92060b 100644
--- a/entity/Salesproject_entity/entityfields/keywordphase/children/containername_param/valueProcess.js
+++ b/entity/SalesprojectCompetition_entity/entityfields/keywordphases/children/containername_param/valueProcess.js
@@ -2,4 +2,4 @@ import("system.result");
import("Keyword_lib");
import("KeywordRegistry_basic");
-result.string($KeywordRegistry.salesprojectPhase());
\ No newline at end of file
+result.string($KeywordRegistry.salesprojectPhase());
diff --git a/entity/SalesprojectCompetition_entity/entityfields/keywordprice_politics/children/containername_param/valueProcess.js b/entity/SalesprojectCompetition_entity/entityfields/keywordprice_politics/children/containername_param/valueProcess.js
deleted file mode 100644
index a76a727534..0000000000
--- a/entity/SalesprojectCompetition_entity/entityfields/keywordprice_politics/children/containername_param/valueProcess.js
+++ /dev/null
@@ -1,5 +0,0 @@
-import("system.result");
-import("Keyword_lib");
-import("KeywordRegistry_basic");
-
-result.string($KeywordRegistry.salesprojectPricePolitics());
\ No newline at end of file
diff --git a/entity/SalesprojectCompetition_entity/entityfields/keywordpricepolitics/children/containername_param/valueProcess.js b/entity/SalesprojectCompetition_entity/entityfields/keywordpricepolitics/children/containername_param/valueProcess.js
new file mode 100644
index 0000000000..8ddda74390
--- /dev/null
+++ b/entity/SalesprojectCompetition_entity/entityfields/keywordpricepolitics/children/containername_param/valueProcess.js
@@ -0,0 +1,5 @@
+import("system.result");
+import("Keyword_lib");
+import("KeywordRegistry_basic");
+
+result.string($KeywordRegistry.salesprojectPricePolitics());
diff --git a/entity/SalesprojectCompetition_entity/entityfields/keywordstate/children/containername_param/valueProcess.js b/entity/SalesprojectCompetition_entity/entityfields/keywordstate/children/containername_param/valueProcess.js
deleted file mode 100644
index 542db3e9e7..0000000000
--- a/entity/SalesprojectCompetition_entity/entityfields/keywordstate/children/containername_param/valueProcess.js
+++ /dev/null
@@ -1,5 +0,0 @@
-import("system.result");
-import("Keyword_lib");
-import("KeywordRegistry_basic");
-
-result.string($KeywordRegistry.salesprojectCompetitionState());
\ No newline at end of file
diff --git a/entity/SalesprojectCompetition_entity/entityfields/keywordstates/children/containername_param/valueProcess.js b/entity/SalesprojectCompetition_entity/entityfields/keywordstates/children/containername_param/valueProcess.js
new file mode 100644
index 0000000000..d86b5c3b6f
--- /dev/null
+++ b/entity/SalesprojectCompetition_entity/entityfields/keywordstates/children/containername_param/valueProcess.js
@@ -0,0 +1,5 @@
+import("system.result");
+import("Keyword_lib");
+import("KeywordRegistry_basic");
+
+result.string($KeywordRegistry.salesprojectCompetitionState());
diff --git a/entity/SalesprojectCompetition_entity/entityfields/keywordstrenght/children/containername_param/valueProcess.js b/entity/SalesprojectCompetition_entity/entityfields/keywordstrenght/children/containername_param/valueProcess.js
deleted file mode 100644
index cae1ead387..0000000000
--- a/entity/SalesprojectCompetition_entity/entityfields/keywordstrenght/children/containername_param/valueProcess.js
+++ /dev/null
@@ -1,5 +0,0 @@
-import("system.result");
-import("Keyword_lib");
-import("KeywordRegistry_basic");
-
-result.string($KeywordRegistry.salesprojectStrenght());
\ No newline at end of file
diff --git a/entity/SalesprojectCompetition_entity/entityfields/keywordstrenghts/children/containername_param/valueProcess.js b/entity/SalesprojectCompetition_entity/entityfields/keywordstrenghts/children/containername_param/valueProcess.js
new file mode 100644
index 0000000000..b71211967e
--- /dev/null
+++ b/entity/SalesprojectCompetition_entity/entityfields/keywordstrenghts/children/containername_param/valueProcess.js
@@ -0,0 +1,5 @@
+import("system.result");
+import("Keyword_lib");
+import("KeywordRegistry_basic");
+
+result.string($KeywordRegistry.salesprojectStrenght());
diff --git a/entity/SalesprojectCompetition_entity/entityfields/keywordweakness/children/containername_param/valueProcess.js b/entity/SalesprojectCompetition_entity/entityfields/keywordweaknesses/children/containername_param/valueProcess.js
similarity index 90%
rename from entity/SalesprojectCompetition_entity/entityfields/keywordweakness/children/containername_param/valueProcess.js
rename to entity/SalesprojectCompetition_entity/entityfields/keywordweaknesses/children/containername_param/valueProcess.js
index 1f3ec844e7..3cfb460e6a 100644
--- a/entity/SalesprojectCompetition_entity/entityfields/keywordweakness/children/containername_param/valueProcess.js
+++ b/entity/SalesprojectCompetition_entity/entityfields/keywordweaknesses/children/containername_param/valueProcess.js
@@ -3,4 +3,4 @@ import("Keyword_lib");
import("KeywordRegistry_basic");
var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.salesprojectWeakness(), "ORGANISATION.WEAKNESS");
-result.string(sql);
\ No newline at end of file
+result.string(sql);
diff --git a/entity/SalesprojectForecast_entity/SalesprojectForecast_entity.aod b/entity/SalesprojectForecast_entity/SalesprojectForecast_entity.aod
index 0d0c695825..becd248bbd 100644
--- a/entity/SalesprojectForecast_entity/SalesprojectForecast_entity.aod
+++ b/entity/SalesprojectForecast_entity/SalesprojectForecast_entity.aod
@@ -75,9 +75,9 @@
</dependency>
<children>
<entityParameter>
- <name>containerName_param</name>
+ <name>ContainerName_param</name>
<valueProcess>%aditoprj%/entity/SalesprojectForecast_entity/entityfields/keywordproductgroupcodes/children/containername_param/valueProcess.js</valueProcess>
- <documentation>%aditoprj%/entity/SalesprojectForecast_entity/entityfields/keywordproductgroupcodes/children/containername_param/documentation.adoc</documentation>
+ <expose v="false" />
</entityParameter>
</children>
</entityConsumer>
diff --git a/entity/SalesprojectForecast_entity/entityfields/keywordproductgroupcodes/children/containername_param/documentation.adoc b/entity/SalesprojectForecast_entity/entityfields/keywordproductgroupcodes/children/containername_param/documentation.adoc
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/entity/SalesprojectForecast_entity/entityfields/keywordproductgroupcodes/children/containername_param/valueProcess.js b/entity/SalesprojectForecast_entity/entityfields/keywordproductgroupcodes/children/containername_param/valueProcess.js
index 0881ceab58..e0b3a6dd6b 100644
--- a/entity/SalesprojectForecast_entity/entityfields/keywordproductgroupcodes/children/containername_param/valueProcess.js
+++ b/entity/SalesprojectForecast_entity/entityfields/keywordproductgroupcodes/children/containername_param/valueProcess.js
@@ -2,4 +2,4 @@ import("system.result");
import("Keyword_lib");
import("KeywordRegistry_basic");
-result.string($KeywordRegistry.productGroupcode());
\ No newline at end of file
+result.string($KeywordRegistry.productGroupcode());
diff --git a/entity/SalesprojectMember_entity/SalesprojectMember_entity.aod b/entity/SalesprojectMember_entity/SalesprojectMember_entity.aod
index bac19d2e22..62534b1cb4 100644
--- a/entity/SalesprojectMember_entity/SalesprojectMember_entity.aod
+++ b/entity/SalesprojectMember_entity/SalesprojectMember_entity.aod
@@ -98,7 +98,7 @@
<children>
<entityParameter>
<name>ContactId_param</name>
- <valueProcess>%aditoprj%/entity/SalesprojectMember_entity/entityfields/currentcontact/children/ContactId_param/valueProcess.js</valueProcess>
+ <valueProcess>%aditoprj%/entity/SalesprojectMember_entity/entityfields/currentcontact/children/contactid_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
</entityConsumer>
@@ -148,8 +148,9 @@ TODO: intuitive möglichkeit, auf dend Stand aus Relation zurückzusetzen... akt
</dependency>
<children>
<entityParameter>
- <name>containerName_param</name>
+ <name>ContainerName_param</name>
<valueProcess>%aditoprj%/entity/SalesprojectMember_entity/entityfields/keywordmemberroles/children/containername_param/valueProcess.js</valueProcess>
+ <expose v="false" />
</entityParameter>
</children>
</entityConsumer>
diff --git a/entity/SalesprojectMember_entity/entityfields/keywordmemberroles/children/containername_param/valueProcess.js b/entity/SalesprojectMember_entity/entityfields/keywordmemberroles/children/containername_param/valueProcess.js
index 7042000352..038f4a4295 100644
--- a/entity/SalesprojectMember_entity/entityfields/keywordmemberroles/children/containername_param/valueProcess.js
+++ b/entity/SalesprojectMember_entity/entityfields/keywordmemberroles/children/containername_param/valueProcess.js
@@ -2,4 +2,4 @@ import("system.result");
import("Keyword_lib");
import("KeywordRegistry_basic");
-result.string($KeywordRegistry.salesprojectMemberRole());
\ No newline at end of file
+result.string($KeywordRegistry.salesprojectMemberRole());
diff --git a/entity/SalesprojectSource_entity/SalesprojectSource_entity.aod b/entity/SalesprojectSource_entity/SalesprojectSource_entity.aod
index aba4431737..6d2e516983 100644
--- a/entity/SalesprojectSource_entity/SalesprojectSource_entity.aod
+++ b/entity/SalesprojectSource_entity/SalesprojectSource_entity.aod
@@ -68,8 +68,9 @@
</dependency>
<children>
<entityParameter>
- <name>containerName_param</name>
+ <name>ContainerName_param</name>
<valueProcess>%aditoprj%/entity/SalesprojectSource_entity/entityfields/keywordsources/children/containername_param/valueProcess.js</valueProcess>
+ <expose v="false" />
</entityParameter>
</children>
</entityConsumer>
diff --git a/entity/SalesprojectSource_entity/entityfields/keywordsources/children/containername_param/valueProcess.js b/entity/SalesprojectSource_entity/entityfields/keywordsources/children/containername_param/valueProcess.js
index c2806676a5..0647d1069c 100644
--- a/entity/SalesprojectSource_entity/entityfields/keywordsources/children/containername_param/valueProcess.js
+++ b/entity/SalesprojectSource_entity/entityfields/keywordsources/children/containername_param/valueProcess.js
@@ -2,4 +2,4 @@ import("system.result");
import("Keyword_lib");
import("KeywordRegistry_basic");
-result.string($KeywordRegistry.salesprojectSource());
\ No newline at end of file
+result.string($KeywordRegistry.salesprojectSource());
diff --git a/entity/Salesproject_entity/Salesproject_entity.aod b/entity/Salesproject_entity/Salesproject_entity.aod
index 692da6ce1c..ce9f78b180 100644
--- a/entity/Salesproject_entity/Salesproject_entity.aod
+++ b/entity/Salesproject_entity/Salesproject_entity.aod
@@ -39,7 +39,7 @@
<entityField>
<name>PHASE</name>
<title>Phase</title>
- <consumer>KeywordPhase</consumer>
+ <consumer>KeywordPhases</consumer>
<mandatory v="true" />
</entityField>
<entityField>
@@ -78,7 +78,7 @@
<entityField>
<name>STATE</name>
<title>Status</title>
- <consumer>KeywordState</consumer>
+ <consumer>KeywordStates</consumer>
<mandatory v="true" />
</entityField>
<entityField>
@@ -364,13 +364,15 @@
</dependency>
<children>
<entityParameter>
- <name>containerName_param</name>
+ <name>ContainerName_param</name>
+ <title></title>
<valueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/keywordprobabilties/children/containername_param/valueProcess.js</valueProcess>
+ <expose v="false" />
</entityParameter>
</children>
</entityConsumer>
<entityConsumer>
- <name>KeywordState</name>
+ <name>KeywordStates</name>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
<name>dependency</name>
@@ -379,13 +381,14 @@
</dependency>
<children>
<entityParameter>
- <name>containerName_param</name>
- <valueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/keywordstate/children/containername_param/valueProcess.js</valueProcess>
+ <name>ContainerName_param</name>
+ <valueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/keywordstates/children/containername_param/valueProcess.js</valueProcess>
+ <expose v="false" />
</entityParameter>
</children>
</entityConsumer>
<entityConsumer>
- <name>KeywordPhase</name>
+ <name>KeywordPhases</name>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
<name>dependency</name>
@@ -394,8 +397,9 @@
</dependency>
<children>
<entityParameter>
- <name>containerName_param</name>
- <valueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/keywordphase/children/containername_param/valueProcess.js</valueProcess>
+ <name>ContainerName_param</name>
+ <valueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/keywordphases/children/containername_param/valueProcess.js</valueProcess>
+ <expose v="false" />
</entityParameter>
</children>
</entityConsumer>
diff --git a/entity/Salesproject_entity/entityfields/keywordphases/children/containername_param/valueProcess.js b/entity/Salesproject_entity/entityfields/keywordphases/children/containername_param/valueProcess.js
new file mode 100644
index 0000000000..d74e92060b
--- /dev/null
+++ b/entity/Salesproject_entity/entityfields/keywordphases/children/containername_param/valueProcess.js
@@ -0,0 +1,5 @@
+import("system.result");
+import("Keyword_lib");
+import("KeywordRegistry_basic");
+
+result.string($KeywordRegistry.salesprojectPhase());
diff --git a/entity/Salesproject_entity/entityfields/keywordprobabilties/children/containername_param/valueProcess.js b/entity/Salesproject_entity/entityfields/keywordprobabilties/children/containername_param/valueProcess.js
index 6ca842dd15..ac59463181 100644
--- a/entity/Salesproject_entity/entityfields/keywordprobabilties/children/containername_param/valueProcess.js
+++ b/entity/Salesproject_entity/entityfields/keywordprobabilties/children/containername_param/valueProcess.js
@@ -2,4 +2,4 @@ import("system.result");
import("Keyword_lib");
import("KeywordRegistry_basic");
-result.string($KeywordRegistry.salesprojectProbability());
\ No newline at end of file
+result.string($KeywordRegistry.salesprojectProbability());
diff --git a/entity/Salesproject_entity/entityfields/keywordstate/children/containername_param/valueProcess.js b/entity/Salesproject_entity/entityfields/keywordstate/children/containername_param/valueProcess.js
deleted file mode 100644
index 9604353462..0000000000
--- a/entity/Salesproject_entity/entityfields/keywordstate/children/containername_param/valueProcess.js
+++ /dev/null
@@ -1,5 +0,0 @@
-import("system.result");
-import("Keyword_lib");
-import("KeywordRegistry_basic");
-
-result.string($KeywordRegistry.salesprojectState());
\ No newline at end of file
diff --git a/entity/Salesproject_entity/entityfields/keywordstates/children/containername_param/valueProcess.js b/entity/Salesproject_entity/entityfields/keywordstates/children/containername_param/valueProcess.js
new file mode 100644
index 0000000000..b81ba69778
--- /dev/null
+++ b/entity/Salesproject_entity/entityfields/keywordstates/children/containername_param/valueProcess.js
@@ -0,0 +1,5 @@
+import("system.result");
+import("Keyword_lib");
+import("KeywordRegistry_basic");
+
+result.string($KeywordRegistry.salesprojectState());
diff --git a/entity/Salesproject_entity/entityfields/newactivity/tooltipProcess.js b/entity/Salesproject_entity/entityfields/newactivity/tooltipProcess.js
index 2cdf4480a4..c71e677c22 100644
--- a/entity/Salesproject_entity/entityfields/newactivity/tooltipProcess.js
+++ b/entity/Salesproject_entity/entityfields/newactivity/tooltipProcess.js
@@ -1,4 +1,4 @@
-import("system.translate");
-import("system.result");
-
+import("system.translate");
+import("system.result");
+
result.string(translate.text("New activity"));
\ No newline at end of file
diff --git a/entity/Stock_entity/Stock_entity.aod b/entity/Stock_entity/Stock_entity.aod
index 2fc3e2fa98..e4d16494ed 100644
--- a/entity/Stock_entity/Stock_entity.aod
+++ b/entity/Stock_entity/Stock_entity.aod
@@ -55,13 +55,13 @@
<entityDependency>
<name>aa9264c8-2c96-4a7a-94c7-e38bc0ae7df3</name>
<entityName>Product_entity</entityName>
- <fieldName>Stock</fieldName>
+ <fieldName>Stocks</fieldName>
<isConsumer v="false" />
</entityDependency>
<entityDependency>
<name>e6168337-2f0b-4135-be16-1a4fd1c2ff65</name>
<entityName>Product_entity</entityName>
- <fieldName>StockCount</fieldName>
+ <fieldName>StockCounts</fieldName>
<isConsumer v="false" />
</entityDependency>
</dependencies>
@@ -102,8 +102,9 @@
</dependency>
<children>
<entityParameter>
- <name>containerName_param</name>
+ <name>ContainerName_param</name>
<valueProcess>%aditoprj%/entity/Stock_entity/entityfields/keywordwarehouses/children/containername_param/valueProcess.js</valueProcess>
+ <expose v="false" />
</entityParameter>
</children>
</entityConsumer>
diff --git a/entity/Stock_entity/entityfields/keywordwarehouses/children/containername_param/valueProcess.js b/entity/Stock_entity/entityfields/keywordwarehouses/children/containername_param/valueProcess.js
index 96b4ada951..9442a9d980 100644
--- a/entity/Stock_entity/entityfields/keywordwarehouses/children/containername_param/valueProcess.js
+++ b/entity/Stock_entity/entityfields/keywordwarehouses/children/containername_param/valueProcess.js
@@ -2,4 +2,4 @@ import("system.result");
import("Keyword_lib");
import("KeywordRegistry_basic");
-result.string($KeywordRegistry.stockWarehouse());
\ No newline at end of file
+result.string($KeywordRegistry.stockWarehouse());
diff --git a/entity/Task_entity/Task_entity.aod b/entity/Task_entity/Task_entity.aod
index 126a3c2ccd..ad7e7a42a0 100644
--- a/entity/Task_entity/Task_entity.aod
+++ b/entity/Task_entity/Task_entity.aod
@@ -38,7 +38,7 @@
<entityField>
<name>PRIORITY</name>
<title>priority</title>
- <consumer>KeywordPriority</consumer>
+ <consumer>KeywordPriorities</consumer>
<mandatory v="true" />
<groupable v="true" />
<valueProcess>%aditoprj%/entity/Task_entity/entityfields/priority/valueProcess.js</valueProcess>
@@ -154,8 +154,9 @@
</dependency>
<children>
<entityParameter>
- <name>containerName_param</name>
+ <name>ContainerName_param</name>
<valueProcess>%aditoprj%/entity/Task_entity/entityfields/keywordstates/children/containername_param/valueProcess.js</valueProcess>
+ <expose v="false" />
</entityParameter>
</children>
</entityConsumer>
@@ -169,8 +170,9 @@
</dependency>
<children>
<entityParameter>
- <name>containerName_param</name>
+ <name>ContainerName_param</name>
<valueProcess>%aditoprj%/entity/Task_entity/entityfields/keywordtypes/children/containername_param/valueProcess.js</valueProcess>
+ <expose v="false" />
</entityParameter>
</children>
</entityConsumer>
@@ -181,17 +183,20 @@
<dependency>
<name>dependency</name>
<entityName>ModuleTree_entity</entityName>
- <fieldName>TreeProvider</fieldName>
+ <fieldName>TreeProviders</fieldName>
</dependency>
<children>
<entityParameter>
- <name>ID</name>
- <valueProcess>%aditoprj%/entity/Task_entity/entityfields/moduletrees/children/id/valueProcess.js</valueProcess>
- <description>PARAMETER</description>
+ <name>ID_param</name>
+ <valueProcess>%aditoprj%/entity/Task_entity/entityfields/moduletrees/children/id_param/valueProcess.js</valueProcess>
+ <expose v="false" />
+ <mandatory v="false" />
</entityParameter>
<entityParameter>
- <name>ContextName</name>
- <valueProcess>%aditoprj%/entity/Task_entity/entityfields/moduletrees/children/contextname/valueProcess.js</valueProcess>
+ <name>ContextName_param</name>
+ <valueProcess>%aditoprj%/entity/Task_entity/entityfields/moduletrees/children/contextname_param/valueProcess.js</valueProcess>
+ <expose v="false" />
+ <mandatory v="false" />
</entityParameter>
</children>
</entityConsumer>
@@ -243,7 +248,7 @@
<description>PARAMETER</description>
</entityParameter>
<entityConsumer>
- <name>KeywordPriority</name>
+ <name>KeywordPriorities</name>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
<name>dependency</name>
@@ -252,8 +257,9 @@
</dependency>
<children>
<entityParameter>
- <name>containerName_param</name>
- <valueProcess>%aditoprj%/entity/Task_entity/entityfields/keywordpriority/children/containername_param/valueProcess.js</valueProcess>
+ <name>ContainerName_param</name>
+ <valueProcess>%aditoprj%/entity/Task_entity/entityfields/keywordpriorities/children/containername_param/valueProcess.js</valueProcess>
+ <expose v="false" />
</entityParameter>
</children>
</entityConsumer>
diff --git a/entity/Task_entity/afterOperatingState.js b/entity/Task_entity/afterOperatingState.js
index 3ecca0b8c1..86428a9e4f 100644
--- a/entity/Task_entity/afterOperatingState.js
+++ b/entity/Task_entity/afterOperatingState.js
@@ -1,15 +1,15 @@
-import("system.util");
-import("system.db");
-import("system.neon");
-import("system.vars");
-import("Context_lib");
-
-if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW
- && vars.exists("$param.RowId_param") && vars.get("$param.RowId_param")
- && vars.exists("$param.ObjectId_param") && vars.get("$param.ObjectId_param"))
-{
- neon.addRecord(null, "Links", {
- "OBJECT_TYPE" : vars.get("$param.ObjectId_param"),
- "OBJECT_ROWID" : vars.get("$param.RowId_param")
- });
+import("system.util");
+import("system.db");
+import("system.neon");
+import("system.vars");
+import("Context_lib");
+
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW
+ && vars.exists("$param.RowId_param") && vars.get("$param.RowId_param")
+ && vars.exists("$param.ObjectId_param") && vars.get("$param.ObjectId_param"))
+{
+ neon.addRecord(null, "Links", {
+ "OBJECT_TYPE" : vars.get("$param.ObjectId_param"),
+ "OBJECT_ROWID" : vars.get("$param.RowId_param")
+ });
}
\ No newline at end of file
diff --git a/entity/Attribute_entity/entityfields/keywordattributetype/children/containername_param/valueProcess.js b/entity/Task_entity/entityfields/keywordpriorities/children/containername_param/valueProcess.js
similarity index 63%
rename from entity/Attribute_entity/entityfields/keywordattributetype/children/containername_param/valueProcess.js
rename to entity/Task_entity/entityfields/keywordpriorities/children/containername_param/valueProcess.js
index dc6dfca332..c021b9c4f2 100644
--- a/entity/Attribute_entity/entityfields/keywordattributetype/children/containername_param/valueProcess.js
+++ b/entity/Task_entity/entityfields/keywordpriorities/children/containername_param/valueProcess.js
@@ -2,4 +2,4 @@ import("system.result");
import("Keyword_lib");
import("KeywordRegistry_basic");
-result.string($KeywordRegistry.attributeType());
\ No newline at end of file
+result.string($KeywordRegistry.taskPriority());
diff --git a/entity/Task_entity/entityfields/keywordstates/children/containername_param/valueProcess.js b/entity/Task_entity/entityfields/keywordstates/children/containername_param/valueProcess.js
index 729ee3d188..8590e504f0 100644
--- a/entity/Task_entity/entityfields/keywordstates/children/containername_param/valueProcess.js
+++ b/entity/Task_entity/entityfields/keywordstates/children/containername_param/valueProcess.js
@@ -2,4 +2,4 @@ import("system.result");
import("Keyword_lib");
import("KeywordRegistry_basic");
-result.string($KeywordRegistry.taskStatus());
\ No newline at end of file
+result.string($KeywordRegistry.taskStatus());
diff --git a/entity/Task_entity/entityfields/keywordtypes/children/containername_param/valueProcess.js b/entity/Task_entity/entityfields/keywordtypes/children/containername_param/valueProcess.js
index 308d10e964..b139734c3e 100644
--- a/entity/Task_entity/entityfields/keywordtypes/children/containername_param/valueProcess.js
+++ b/entity/Task_entity/entityfields/keywordtypes/children/containername_param/valueProcess.js
@@ -2,4 +2,4 @@ import("system.result");
import("Keyword_lib");
import("KeywordRegistry_basic");
-result.string($KeywordRegistry.taskType());
\ No newline at end of file
+result.string($KeywordRegistry.taskType());
diff --git a/entity/Task_entity/entityfields/moduletrees/children/contextname/documentation.adoc b/entity/Task_entity/entityfields/moduletrees/children/contextname/documentation.adoc
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/entity/Task_entity/entityfields/moduletrees/children/contextname/valueProcess.js b/entity/Task_entity/entityfields/moduletrees/children/contextname_param/valueProcess.js
similarity index 100%
rename from entity/Task_entity/entityfields/moduletrees/children/contextname/valueProcess.js
rename to entity/Task_entity/entityfields/moduletrees/children/contextname_param/valueProcess.js
diff --git a/entity/Task_entity/entityfields/moduletrees/children/id/valueProcess.js b/entity/Task_entity/entityfields/moduletrees/children/id_param/valueProcess.js
similarity index 100%
rename from entity/Task_entity/entityfields/moduletrees/children/id/valueProcess.js
rename to entity/Task_entity/entityfields/moduletrees/children/id_param/valueProcess.js
diff --git a/entity/Task_entity/entityfields/newactivity/tooltipProcess.js b/entity/Task_entity/entityfields/newactivity/tooltipProcess.js
index 2cdf4480a4..c71e677c22 100644
--- a/entity/Task_entity/entityfields/newactivity/tooltipProcess.js
+++ b/entity/Task_entity/entityfields/newactivity/tooltipProcess.js
@@ -1,4 +1,4 @@
-import("system.translate");
-import("system.result");
-
+import("system.translate");
+import("system.result");
+
result.string(translate.text("New activity"));
\ No newline at end of file
diff --git a/entity/Turnover_entity/Turnover_entity.aod b/entity/Turnover_entity/Turnover_entity.aod
index 0fdd436343..ef2ca81529 100644
--- a/entity/Turnover_entity/Turnover_entity.aod
+++ b/entity/Turnover_entity/Turnover_entity.aod
@@ -51,7 +51,7 @@
<description>PARAMETER</description>
</entityParameter>
<entityProvider>
- <name>FilteredTurnover</name>
+ <name>FilteredTurnovers</name>
<fieldType>DEPENDENCY_IN</fieldType>
<children>
<entityParameter>
diff --git a/neonView/ActivityDetail_view/ActivityDetail_view.aod b/neonView/ActivityDetail_view/ActivityDetail_view.aod
index 3409dd7107..8f868d95ab 100644
--- a/neonView/ActivityDetail_view/ActivityDetail_view.aod
+++ b/neonView/ActivityDetail_view/ActivityDetail_view.aod
@@ -10,7 +10,7 @@
</layout>
<children>
<genericViewTemplate>
- <name>OfferDetail_template</name>
+ <name>OfferInfo</name>
<editMode v="false" />
<showDrawer v="false" />
<entityField>#ENTITY</entityField>
diff --git a/neonView/ActivityEdit_view/ActivityEdit_view.aod b/neonView/ActivityEdit_view/ActivityEdit_view.aod
index bf43d84f21..87d9a877e0 100644
--- a/neonView/ActivityEdit_view/ActivityEdit_view.aod
+++ b/neonView/ActivityEdit_view/ActivityEdit_view.aod
@@ -12,7 +12,7 @@
</layout>
<children>
<genericViewTemplate>
- <name>Edit_template</name>
+ <name>Edit</name>
<editMode v="true" />
<entityField>#ENTITY</entityField>
<fields>
diff --git a/neonView/ActivityFilter_view/ActivityFilter_view.aod b/neonView/ActivityFilter_view/ActivityFilter_view.aod
index 804d4a1e67..7ba6d9910c 100644
--- a/neonView/ActivityFilter_view/ActivityFilter_view.aod
+++ b/neonView/ActivityFilter_view/ActivityFilter_view.aod
@@ -56,7 +56,7 @@
</layout>
<children>
<timelineViewTemplate>
- <name>TimelineFilter_template</name>
+ <name>ActivitiesTimeline</name>
<dateField>ENTRYDATE</dateField>
<titleField>SUBJECT_DETAILS</titleField>
<descriptionField>INFO</descriptionField>
@@ -64,7 +64,7 @@
<entityField>#ENTITY</entityField>
</timelineViewTemplate>
<tableViewTemplate>
- <name>table_template</name>
+ <name>ActivitiesTable</name>
<entityField>#ENTITY</entityField>
<columns>
<neonTableColumn>
@@ -90,7 +90,7 @@
</columns>
</tableViewTemplate>
<treetableViewTemplate>
- <name>Treetable_template</name>
+ <name>ActivitiesTreetable</name>
<titleField>SUBJECT</titleField>
<descriptionField>INFO</descriptionField>
<iconField>#IMAGE</iconField>
diff --git a/neonView/ActivityLinkFilter_view/ActivityLinkFilter_view.aod b/neonView/ActivityLinkFilter_view/ActivityLinkFilter_view.aod
index d7491b7ecf..ac53a5312a 100644
--- a/neonView/ActivityLinkFilter_view/ActivityLinkFilter_view.aod
+++ b/neonView/ActivityLinkFilter_view/ActivityLinkFilter_view.aod
@@ -10,7 +10,7 @@
</layout>
<children>
<tableViewTemplate>
- <name>ActivityLinkFilter_template</name>
+ <name>Objects</name>
<autoNewRow v="true" />
<entityField>#ENTITY</entityField>
<columns>
diff --git a/neonView/ActivityLinkPreview_view/ActivityLinkPreview_view.aod b/neonView/ActivityLinkPreview_view/ActivityLinkPreview_view.aod
index 64fab27c81..64977bdef4 100644
--- a/neonView/ActivityLinkPreview_view/ActivityLinkPreview_view.aod
+++ b/neonView/ActivityLinkPreview_view/ActivityLinkPreview_view.aod
@@ -9,7 +9,7 @@
</layout>
<children>
<genericViewTemplate>
- <name>linkData</name>
+ <name>Links</name>
<entityField>#ENTITY</entityField>
<fields>
<entityFieldLink>
diff --git a/neonView/ActivityPreview_view/ActivityPreview_view.aod b/neonView/ActivityPreview_view/ActivityPreview_view.aod
index d66ba53d9b..f75f507b82 100644
--- a/neonView/ActivityPreview_view/ActivityPreview_view.aod
+++ b/neonView/ActivityPreview_view/ActivityPreview_view.aod
@@ -9,7 +9,7 @@
</layout>
<children>
<cardViewTemplate>
- <name>Card_template</name>
+ <name>Header</name>
<iconField>ICON</iconField>
<titleField>SUBJECT</titleField>
<descriptionField>ENTRYDATE</descriptionField>
@@ -17,7 +17,7 @@
<entityField>#ENTITY</entityField>
</cardViewTemplate>
<genericViewTemplate>
- <name>ActivityInfo_template</name>
+ <name>Info</name>
<showDrawer v="true" />
<entityField>#ENTITY</entityField>
<fields>
diff --git a/neonView/ActivityTimeline_view/ActivityTimeline_view.aod b/neonView/ActivityTimeline_view/ActivityTimeline_view.aod
index 1ae9389487..0fcfc440b3 100644
--- a/neonView/ActivityTimeline_view/ActivityTimeline_view.aod
+++ b/neonView/ActivityTimeline_view/ActivityTimeline_view.aod
@@ -9,7 +9,7 @@
</layout>
<children>
<timelineViewTemplate>
- <name>Timeline_template</name>
+ <name>Activities</name>
<dateField>ENTRYDATE</dateField>
<titleField>SUBJECT_DETAILS</titleField>
<descriptionField>INFO</descriptionField>
diff --git a/neonView/AddressEdit_view/AddressEdit_view.aod b/neonView/AddressEdit_view/AddressEdit_view.aod
index 74be246944..93637ca8d7 100644
--- a/neonView/AddressEdit_view/AddressEdit_view.aod
+++ b/neonView/AddressEdit_view/AddressEdit_view.aod
@@ -9,7 +9,7 @@
</layout>
<children>
<genericViewTemplate>
- <name>Generic_template</name>
+ <name>Edit</name>
<showDrawer v="true" />
<entityField>#ENTITY</entityField>
<fields>
diff --git a/neonView/AddressFilter_view/AddressFilter_view.aod b/neonView/AddressFilter_view/AddressFilter_view.aod
index 4c33eb1e10..aa87932420 100644
--- a/neonView/AddressFilter_view/AddressFilter_view.aod
+++ b/neonView/AddressFilter_view/AddressFilter_view.aod
@@ -10,7 +10,7 @@
</layout>
<children>
<tableViewTemplate>
- <name>Table_template</name>
+ <name>Addresses</name>
<entityField>#ENTITY</entityField>
<columns>
<neonTableColumn>
diff --git a/neonView/AddressList_view/AddressList_view.aod b/neonView/AddressList_view/AddressList_view.aod
index ab11f3f168..02ba773919 100644
--- a/neonView/AddressList_view/AddressList_view.aod
+++ b/neonView/AddressList_view/AddressList_view.aod
@@ -10,7 +10,7 @@
</layout>
<children>
<titledListViewTemplate>
- <name>TitledList_template</name>
+ <name>Addresses</name>
<highlightingField>IS_STANDARD</highlightingField>
<entityField>#ENTITY</entityField>
<columns>
diff --git a/neonView/AdressMultiEdit_view/AdressMultiEdit_view.aod b/neonView/AdressMultiEdit_view/AdressMultiEdit_view.aod
index e343aeea66..c809fb7987 100644
--- a/neonView/AdressMultiEdit_view/AdressMultiEdit_view.aod
+++ b/neonView/AdressMultiEdit_view/AdressMultiEdit_view.aod
@@ -9,7 +9,7 @@
</layout>
<children>
<genericMultipleViewTemplate>
- <name>GenericMultiple_template</name>
+ <name>MultipleEdit</name>
<entityField>#ENTITY</entityField>
<columns>
<neonTableColumn>
diff --git a/neonView/AnyContactLookup_view/AnyContactLookup_view.aod b/neonView/AnyContactLookup_view/AnyContactLookup_view.aod
index c6ca766c71..c79be24e0e 100644
--- a/neonView/AnyContactLookup_view/AnyContactLookup_view.aod
+++ b/neonView/AnyContactLookup_view/AnyContactLookup_view.aod
@@ -9,7 +9,7 @@
</layout>
<children>
<tableViewTemplate>
- <name>relationLookupList_template</name>
+ <name>Relations</name>
<entityField>#ENTITY</entityField>
<columns>
<neonTableColumn>
diff --git a/neonView/AppointmentEdit_view/AppointmentEdit_view.aod b/neonView/AppointmentEdit_view/AppointmentEdit_view.aod
index 81d642c40d..4261115e36 100644
--- a/neonView/AppointmentEdit_view/AppointmentEdit_view.aod
+++ b/neonView/AppointmentEdit_view/AppointmentEdit_view.aod
@@ -10,7 +10,7 @@
</layout>
<children>
<appointmentEditViewTemplate>
- <name>AppointmentEditTemplate</name>
+ <name>Edit</name>
<summaryField>SUMMARY</summaryField>
<descriptionField>DESCRIPTION</descriptionField>
<beginField>BEGIN</beginField>
diff --git a/neonView/AppointmentPreview_view/AppointmentPreview_view.aod b/neonView/AppointmentPreview_view/AppointmentPreview_view.aod
index e01251e96f..bcb316222d 100644
--- a/neonView/AppointmentPreview_view/AppointmentPreview_view.aod
+++ b/neonView/AppointmentPreview_view/AppointmentPreview_view.aod
@@ -10,7 +10,7 @@
</layout>
<children>
<appointmentPreviewViewTemplate>
- <name>AppointmentPreviewTemplate</name>
+ <name>Appointments</name>
<summaryField>SUMMARY</summaryField>
<descriptionField>DESCRIPTION</descriptionField>
<beginField>BEGIN</beginField>
diff --git a/neonView/AttributeEdit_view/AttributeEdit_view.aod b/neonView/AttributeEdit_view/AttributeEdit_view.aod
index 510c41d637..4cb7fc75e4 100644
--- a/neonView/AttributeEdit_view/AttributeEdit_view.aod
+++ b/neonView/AttributeEdit_view/AttributeEdit_view.aod
@@ -9,7 +9,7 @@
</layout>
<children>
<genericViewTemplate>
- <name>AttrEdit_template</name>
+ <name>Edit</name>
<editMode v="true" />
<entityField>#ENTITY</entityField>
<fields>
diff --git a/neonView/AttributeFilter_view/AttributeFilter_view.aod b/neonView/AttributeFilter_view/AttributeFilter_view.aod
index 08bcb8f5ec..18ecb2acf9 100644
--- a/neonView/AttributeFilter_view/AttributeFilter_view.aod
+++ b/neonView/AttributeFilter_view/AttributeFilter_view.aod
@@ -11,7 +11,7 @@
</layout>
<children>
<treetableViewTemplate>
- <name>Treetable_template</name>
+ <name>AttributesTreetable</name>
<parentField>ATTRIBUTE_PARENT_ID</parentField>
<favoriteActionGroup1>AttributeActions</favoriteActionGroup1>
<titleField>ATTRIBUTE_NAME</titleField>
@@ -19,7 +19,7 @@
<entityField>#ENTITY</entityField>
</treetableViewTemplate>
<tableViewTemplate>
- <name>Table_template</name>
+ <name>AttributesTable</name>
<entityField>#ENTITY</entityField>
<columns>
<neonTableColumn>
diff --git a/neonView/AttributePreview_view/AttributePreview_view.aod b/neonView/AttributePreview_view/AttributePreview_view.aod
index 4ebba8e503..71780be9b2 100644
--- a/neonView/AttributePreview_view/AttributePreview_view.aod
+++ b/neonView/AttributePreview_view/AttributePreview_view.aod
@@ -9,13 +9,13 @@
</layout>
<children>
<cardViewTemplate>
- <name>Attr_template</name>
+ <name>Head</name>
<titleField>ATTRIBUTE_NAME</titleField>
<subtitleField>ATTRIBUTE_TYPE</subtitleField>
<entityField>#ENTITY</entityField>
</cardViewTemplate>
<genericViewTemplate>
- <name>Generic</name>
+ <name>Info</name>
<showDrawer v="true" />
<entityField>#ENTITY</entityField>
<title></title>
diff --git a/neonView/AttributeRelationEdit_view/AttributeRelationEdit_view.aod b/neonView/AttributeRelationEdit_view/AttributeRelationEdit_view.aod
index 4efbd08f92..6f811c93d2 100644
--- a/neonView/AttributeRelationEdit_view/AttributeRelationEdit_view.aod
+++ b/neonView/AttributeRelationEdit_view/AttributeRelationEdit_view.aod
@@ -9,7 +9,7 @@
</layout>
<children>
<genericMultipleViewTemplate>
- <name>MultiEdit</name>
+ <name>MultipleEdit</name>
<entityField>#ENTITY</entityField>
<columns>
<neonTableColumn>
diff --git a/neonView/AttributeRelationFilter_view/AttributeRelationFilter_view.aod b/neonView/AttributeRelationFilter_view/AttributeRelationFilter_view.aod
index 4af75c78d4..5ae7277d33 100644
--- a/neonView/AttributeRelationFilter_view/AttributeRelationFilter_view.aod
+++ b/neonView/AttributeRelationFilter_view/AttributeRelationFilter_view.aod
@@ -11,7 +11,7 @@
</layout>
<children>
<tableViewTemplate>
- <name>Table</name>
+ <name>RelationsTable</name>
<autoNewRow v="true" />
<entityField>#ENTITY</entityField>
<columns>
@@ -26,7 +26,7 @@
</columns>
</tableViewTemplate>
<treetableViewTemplate>
- <name>Tree</name>
+ <name>RelationsTreetable</name>
<parentField>ATTRIBUTE_PARENT_ID</parentField>
<titleField>AB_ATTRIBUTE_ID</titleField>
<descriptionField>ATTRIBUTERELATION_VALUE</descriptionField>
diff --git a/neonView/AttributeRelationPreviewList/AttributeRelationPreviewList.aod b/neonView/AttributeRelationPreviewList/AttributeRelationPreviewList.aod
index 2429f48f5b..140920fae8 100644
--- a/neonView/AttributeRelationPreviewList/AttributeRelationPreviewList.aod
+++ b/neonView/AttributeRelationPreviewList/AttributeRelationPreviewList.aod
@@ -9,7 +9,7 @@
</layout>
<children>
<titledListViewTemplate>
- <name>attributes</name>
+ <name>Relations</name>
<entityField>#ENTITY</entityField>
<columns>
<neonTableColumn>
diff --git a/neonView/AttributeTree_view/AttributeTree_view.aod b/neonView/AttributeTree_view/AttributeTree_view.aod
index b1bb94f448..609401d8e7 100644
--- a/neonView/AttributeTree_view/AttributeTree_view.aod
+++ b/neonView/AttributeTree_view/AttributeTree_view.aod
@@ -9,7 +9,7 @@
</layout>
<children>
<treetableViewTemplate>
- <name>Treetable</name>
+ <name>Attributes</name>
<parentField>ATTRIBUTE_PARENT_ID</parentField>
<titleField>ATTRIBUTE_NAME</titleField>
<descriptionField>ATTRIBUTE_TYPE</descriptionField>
diff --git a/neonView/AttributeUsageFilter_view/AttributeUsageFilter_view.aod b/neonView/AttributeUsageFilter_view/AttributeUsageFilter_view.aod
index 15c3fd3b95..54f2216404 100644
--- a/neonView/AttributeUsageFilter_view/AttributeUsageFilter_view.aod
+++ b/neonView/AttributeUsageFilter_view/AttributeUsageFilter_view.aod
@@ -10,7 +10,7 @@
</layout>
<children>
<tableViewTemplate>
- <name>UsageTable_template</name>
+ <name>Usages</name>
<autoNewRow v="true" />
<entityField>#ENTITY</entityField>
<columns>
diff --git a/neonView/AttributeUsageMultiEdit_view/AttributeUsageMultiEdit_view.aod b/neonView/AttributeUsageMultiEdit_view/AttributeUsageMultiEdit_view.aod
index 37108cc107..6df948ba82 100644
--- a/neonView/AttributeUsageMultiEdit_view/AttributeUsageMultiEdit_view.aod
+++ b/neonView/AttributeUsageMultiEdit_view/AttributeUsageMultiEdit_view.aod
@@ -9,7 +9,7 @@
</layout>
<children>
<genericMultipleViewTemplate>
- <name>UsageEdit_template</name>
+ <name>MultipleEdit</name>
<entityField>#ENTITY</entityField>
<columns>
<neonTableColumn>
diff --git a/neonView/CommunicationEdit_view/CommunicationEdit_view.aod b/neonView/CommunicationEdit_view/CommunicationEdit_view.aod
index d1994e867c..ef1c9f29b7 100644
--- a/neonView/CommunicationEdit_view/CommunicationEdit_view.aod
+++ b/neonView/CommunicationEdit_view/CommunicationEdit_view.aod
@@ -9,7 +9,7 @@
</layout>
<children>
<genericViewTemplate>
- <name>Generic_template</name>
+ <name>Edit</name>
<entityField>#ENTITY</entityField>
<fields>
<entityFieldLink>
diff --git a/neonView/CommunicationFilter_view/CommunicationFilter_view.aod b/neonView/CommunicationFilter_view/CommunicationFilter_view.aod
index 75f9f952b9..f2c25b1000 100644
--- a/neonView/CommunicationFilter_view/CommunicationFilter_view.aod
+++ b/neonView/CommunicationFilter_view/CommunicationFilter_view.aod
@@ -10,7 +10,7 @@
</layout>
<children>
<tableViewTemplate>
- <name>Table_template</name>
+ <name>Communications</name>
<entityField>#ENTITY</entityField>
<columns>
<neonTableColumn>
diff --git a/neonView/CommunicationList_view/CommunicationList_view.aod b/neonView/CommunicationList_view/CommunicationList_view.aod
index 83862dcc00..55a25ba558 100644
--- a/neonView/CommunicationList_view/CommunicationList_view.aod
+++ b/neonView/CommunicationList_view/CommunicationList_view.aod
@@ -9,7 +9,7 @@
</layout>
<children>
<titledListViewTemplate>
- <name>TitledList_template</name>
+ <name>Communications</name>
<highlightingField>IS_STANDARD</highlightingField>
<entityField>#ENTITY</entityField>
<columns>
diff --git a/neonView/CommunicationMultiEdit_view/CommunicationMultiEdit_view.aod b/neonView/CommunicationMultiEdit_view/CommunicationMultiEdit_view.aod
index b75bc136ec..92befc338f 100644
--- a/neonView/CommunicationMultiEdit_view/CommunicationMultiEdit_view.aod
+++ b/neonView/CommunicationMultiEdit_view/CommunicationMultiEdit_view.aod
@@ -9,7 +9,7 @@
</layout>
<children>
<genericMultipleViewTemplate>
- <name>GenericMultiple_template</name>
+ <name>MultipleEdit</name>
<entityField>#ENTITY</entityField>
<columns>
<neonTableColumn>
diff --git a/neonView/ContextLookup_view/ContextLookup_view.aod b/neonView/ContextLookup_view/ContextLookup_view.aod
index 71d36233d4..168e81c530 100644
--- a/neonView/ContextLookup_view/ContextLookup_view.aod
+++ b/neonView/ContextLookup_view/ContextLookup_view.aod
@@ -9,7 +9,7 @@
</layout>
<children>
<tableViewTemplate>
- <name>contexts</name>
+ <name>Contexts</name>
<entityField>#ENTITY</entityField>
<columns>
<neonTableColumn>
diff --git a/neonView/ContractEdit_view/ContractEdit_view.aod b/neonView/ContractEdit_view/ContractEdit_view.aod
index 1332afb97c..bb0778925d 100644
--- a/neonView/ContractEdit_view/ContractEdit_view.aod
+++ b/neonView/ContractEdit_view/ContractEdit_view.aod
@@ -9,7 +9,7 @@
</layout>
<children>
<genericViewTemplate>
- <name>Generic</name>
+ <name>Edit</name>
<editMode v="true" />
<entityField>#ENTITY</entityField>
<fields>
diff --git a/neonView/ContractFilter_view/ContractFilter_view.aod b/neonView/ContractFilter_view/ContractFilter_view.aod
index ed39ce4202..b8ad46e1ed 100644
--- a/neonView/ContractFilter_view/ContractFilter_view.aod
+++ b/neonView/ContractFilter_view/ContractFilter_view.aod
@@ -31,7 +31,7 @@
</layout>
<children>
<tableViewTemplate>
- <name>Table_template</name>
+ <name>Contracts</name>
<entityField>#ENTITY</entityField>
<columns>
<neonTableColumn>
diff --git a/neonView/ContractPreview_view/ContractPreview_view.aod b/neonView/ContractPreview_view/ContractPreview_view.aod
index 804d7114af..83643ff5f0 100644
--- a/neonView/ContractPreview_view/ContractPreview_view.aod
+++ b/neonView/ContractPreview_view/ContractPreview_view.aod
@@ -9,14 +9,14 @@
</layout>
<children>
<cardViewTemplate>
- <name>ContractHeader_template</name>
+ <name>Header</name>
<iconField>IMAGE</iconField>
<titleField>CONTRACTCODE_DISPLAY_fieldGroup</titleField>
<descriptionField>CONTACT_ID</descriptionField>
<entityField>#ENTITY</entityField>
</cardViewTemplate>
<genericViewTemplate>
- <name>ContractInfo_template</name>
+ <name>Details</name>
<showDrawer v="true" />
<drawerCaption>Details</drawerCaption>
<entityField>#ENTITY</entityField>
@@ -44,7 +44,7 @@
</fields>
</genericViewTemplate>
<genericViewTemplate>
- <name>ContractDescription_template</name>
+ <name>Info</name>
<showDrawer v="true" />
<drawerCaption>Further informations</drawerCaption>
<entityField>#ENTITY</entityField>
diff --git a/neonView/CountriesPreview_view/CountriesPreview_view.aod b/neonView/CountriesPreview_view/CountriesPreview_view.aod
index 9c96c4f1e8..ec4d97c042 100644
--- a/neonView/CountriesPreview_view/CountriesPreview_view.aod
+++ b/neonView/CountriesPreview_view/CountriesPreview_view.aod
@@ -9,14 +9,14 @@
</layout>
<children>
<cardViewTemplate>
- <name>basicdata_card_template</name>
+ <name>Header</name>
<iconField>FLAG</iconField>
<titleField>NAME_TRANSLATED</titleField>
<descriptionField>ISO2</descriptionField>
<entityField>#ENTITY</entityField>
</cardViewTemplate>
<genericViewTemplate>
- <name>Generic</name>
+ <name>Info</name>
<editMode v="false" />
<showDrawer v="false" />
<entityField>#ENTITY</entityField>
diff --git a/neonView/CountriesTable_view/CountriesTable_view.aod b/neonView/CountriesTable_view/CountriesTable_view.aod
index 463226fd16..483072f918 100644
--- a/neonView/CountriesTable_view/CountriesTable_view.aod
+++ b/neonView/CountriesTable_view/CountriesTable_view.aod
@@ -9,7 +9,7 @@
</layout>
<children>
<tableViewTemplate>
- <name>Table</name>
+ <name>Countries</name>
<entityField>#ENTITY</entityField>
<columns>
<neonTableColumn>
diff --git a/neonView/DefaultLookup_view/DefaultLookup_view.aod b/neonView/DefaultLookup_view/DefaultLookup_view.aod
index 8f437165f6..7bbd869c39 100644
--- a/neonView/DefaultLookup_view/DefaultLookup_view.aod
+++ b/neonView/DefaultLookup_view/DefaultLookup_view.aod
@@ -9,7 +9,7 @@
</layout>
<children>
<listViewTemplate>
- <name>ListTemplate</name>
+ <name>DefaultList</name>
<entityField>#ENTITY</entityField>
</listViewTemplate>
</children>
diff --git a/neonView/DocumentEdit_view/DocumentEdit_view.aod b/neonView/DocumentEdit_view/DocumentEdit_view.aod
index af265987d1..d9ec8e2eff 100644
--- a/neonView/DocumentEdit_view/DocumentEdit_view.aod
+++ b/neonView/DocumentEdit_view/DocumentEdit_view.aod
@@ -9,7 +9,7 @@
</layout>
<children>
<genericViewTemplate>
- <name>DocumentGeneric_template</name>
+ <name>Edit</name>
<editMode v="true" />
<entityField>#ENTITY</entityField>
<fields>
diff --git a/neonView/DocumentFilter_view/DocumentFilter_view.aod b/neonView/DocumentFilter_view/DocumentFilter_view.aod
index b0b20b24fc..2ffa7885c6 100644
--- a/neonView/DocumentFilter_view/DocumentFilter_view.aod
+++ b/neonView/DocumentFilter_view/DocumentFilter_view.aod
@@ -10,7 +10,7 @@
</layout>
<children>
<tableViewTemplate>
- <name>Table_template</name>
+ <name>Documents</name>
<favoriteActionGroup1>Document_actions</favoriteActionGroup1>
<entityField>#ENTITY</entityField>
<columns>
diff --git a/neonView/DocumentList_view/DocumentList_view.aod b/neonView/DocumentList_view/DocumentList_view.aod
index cd69801e19..3cec5ca4c7 100644
--- a/neonView/DocumentList_view/DocumentList_view.aod
+++ b/neonView/DocumentList_view/DocumentList_view.aod
@@ -10,7 +10,7 @@
</layout>
<children>
<actionListViewTemplate>
- <name>ActionList_template</name>
+ <name>Actions</name>
<titleField>NAME</titleField>
<descriptionField>DESCRIPTION</descriptionField>
<iconField>ICON</iconField>
diff --git a/neonView/DocumentPreview_view/DocumentPreview_view.aod b/neonView/DocumentPreview_view/DocumentPreview_view.aod
index dd5ea73a51..83d58bbe2b 100644
--- a/neonView/DocumentPreview_view/DocumentPreview_view.aod
+++ b/neonView/DocumentPreview_view/DocumentPreview_view.aod
@@ -9,7 +9,7 @@
</layout>
<children>
<cardViewTemplate>
- <name>DocumentPreview_card</name>
+ <name>Head</name>
<iconField>PREVIEW_IMAGE</iconField>
<titleField>NAME</titleField>
<descriptionField>DESCRIPTION</descriptionField>
@@ -17,7 +17,7 @@
<entityField>#ENTITY</entityField>
</cardViewTemplate>
<genericViewTemplate>
- <name>DocumentPreview_generic</name>
+ <name>Info</name>
<editMode v="false" />
<showDrawer v="true" />
<entityField>#ENTITY</entityField>
diff --git a/neonView/FacebookTimeline_view/FacebookTimeline_view.aod b/neonView/FacebookTimeline_view/FacebookTimeline_view.aod
index f040811474..49a680672c 100644
--- a/neonView/FacebookTimeline_view/FacebookTimeline_view.aod
+++ b/neonView/FacebookTimeline_view/FacebookTimeline_view.aod
@@ -61,7 +61,7 @@
</layout>
<children>
<webContentViewTemplate>
- <name>Facebook_TIMELINE_TEMPLATE</name>
+ <name>Timeline</name>
<entityField>FACEBOOK_TIMELINE</entityField>
</webContentViewTemplate>
</children>
diff --git a/neonView/KeywordAttributeEdit_view/KeywordAttributeEdit_view.aod b/neonView/KeywordAttributeEdit_view/KeywordAttributeEdit_view.aod
index 69c0e3fca0..7143d9b146 100644
--- a/neonView/KeywordAttributeEdit_view/KeywordAttributeEdit_view.aod
+++ b/neonView/KeywordAttributeEdit_view/KeywordAttributeEdit_view.aod
@@ -9,7 +9,7 @@
</layout>
<children>
<genericViewTemplate>
- <name>mainGeneric</name>
+ <name>Edit</name>
<editMode v="true" />
<entityField>#ENTITY</entityField>
<fields>
diff --git a/neonView/KeywordAttributeFilter_view/KeywordAttributeFilter_view.aod b/neonView/KeywordAttributeFilter_view/KeywordAttributeFilter_view.aod
index 629a4295a1..38a2f04dce 100644
--- a/neonView/KeywordAttributeFilter_view/KeywordAttributeFilter_view.aod
+++ b/neonView/KeywordAttributeFilter_view/KeywordAttributeFilter_view.aod
@@ -10,7 +10,7 @@
</layout>
<children>
<tableViewTemplate>
- <name>table</name>
+ <name>Attributes</name>
<autoNewRow v="true" />
<entityField>#ENTITY</entityField>
<columns>
diff --git a/neonView/KeywordAttributeRelationRows_view/KeywordAttributeRelationRows_view.aod b/neonView/KeywordAttributeRelationRows_view/KeywordAttributeRelationRows_view.aod
index 617f416bf4..ba0e4b1643 100644
--- a/neonView/KeywordAttributeRelationRows_view/KeywordAttributeRelationRows_view.aod
+++ b/neonView/KeywordAttributeRelationRows_view/KeywordAttributeRelationRows_view.aod
@@ -10,7 +10,7 @@
</layout>
<children>
<tableViewTemplate>
- <name>main</name>
+ <name>Relations</name>
<autoNewRow v="true" />
<entityField>#ENTITY</entityField>
<columns>
diff --git a/neonView/KeywordEntryEdit_view/KeywordEntryEdit_view.aod b/neonView/KeywordEntryEdit_view/KeywordEntryEdit_view.aod
index 90a553cbf1..b9eb4775cd 100644
--- a/neonView/KeywordEntryEdit_view/KeywordEntryEdit_view.aod
+++ b/neonView/KeywordEntryEdit_view/KeywordEntryEdit_view.aod
@@ -9,7 +9,7 @@
</layout>
<children>
<genericViewTemplate>
- <name>mainData</name>
+ <name>Edit</name>
<editMode v="true" />
<entityField>#ENTITY</entityField>
<fields>
diff --git a/neonView/KeywordEntryFilter_view/KeywordEntryFilter_view.aod b/neonView/KeywordEntryFilter_view/KeywordEntryFilter_view.aod
index 107d221157..f4475555e5 100644
--- a/neonView/KeywordEntryFilter_view/KeywordEntryFilter_view.aod
+++ b/neonView/KeywordEntryFilter_view/KeywordEntryFilter_view.aod
@@ -10,7 +10,7 @@
</layout>
<children>
<tableViewTemplate>
- <name>table</name>
+ <name>EntriesTable</name>
<entityField>#ENTITY</entityField>
<title></title>
<columns>
@@ -41,7 +41,7 @@
</columns>
</tableViewTemplate>
<treetableViewTemplate>
- <name>treeTable</name>
+ <name>EntriesTreetable</name>
<titleField>TITLE</titleField>
<descriptionField>KEYID</descriptionField>
<entityField>#ENTITY</entityField>
diff --git a/neonView/KeywordEntryPreview_view/KeywordEntryPreview_view.aod b/neonView/KeywordEntryPreview_view/KeywordEntryPreview_view.aod
index 81e59a0f9d..b3a9be781f 100644
--- a/neonView/KeywordEntryPreview_view/KeywordEntryPreview_view.aod
+++ b/neonView/KeywordEntryPreview_view/KeywordEntryPreview_view.aod
@@ -9,14 +9,14 @@
</layout>
<children>
<cardViewTemplate>
- <name>card</name>
+ <name>Header</name>
<titleField>TITLE</titleField>
<subtitleField>CONTAINER</subtitleField>
<descriptionField>KEYID</descriptionField>
<entityField>#ENTITY</entityField>
</cardViewTemplate>
<genericViewTemplate>
- <name>data</name>
+ <name>Info</name>
<showDrawer v="true" />
<entityField>#ENTITY</entityField>
<title></title>
diff --git a/neonView/ModuleTree_view/ModuleTree_view.aod b/neonView/ModuleTree_view/ModuleTree_view.aod
index 255c830a3d..6e4933f25b 100644
--- a/neonView/ModuleTree_view/ModuleTree_view.aod
+++ b/neonView/ModuleTree_view/ModuleTree_view.aod
@@ -10,7 +10,7 @@
</layout>
<children>
<treetableViewTemplate>
- <name>Treetable</name>
+ <name>Modules</name>
<parentField>PARENT_ID</parentField>
<favoriteActionGroup3></favoriteActionGroup3>
<titleField>TITLE</titleField>
diff --git a/neonView/ObjectLookup_view/ObjectLookup_view.aod b/neonView/ObjectLookup_view/ObjectLookup_view.aod
index b6116c46e2..982340c8c1 100644
--- a/neonView/ObjectLookup_view/ObjectLookup_view.aod
+++ b/neonView/ObjectLookup_view/ObjectLookup_view.aod
@@ -9,7 +9,7 @@
</layout>
<children>
<tableViewTemplate>
- <name>objects</name>
+ <name>Objects</name>
<entityField>#ENTITY</entityField>
<columns>
<neonTableColumn>
diff --git a/neonView/ObjectRelationEdit_view/ObjectRelationEdit_view.aod b/neonView/ObjectRelationEdit_view/ObjectRelationEdit_view.aod
index e5313525dd..a780ec9250 100644
--- a/neonView/ObjectRelationEdit_view/ObjectRelationEdit_view.aod
+++ b/neonView/ObjectRelationEdit_view/ObjectRelationEdit_view.aod
@@ -9,7 +9,7 @@
</layout>
<children>
<genericViewTemplate>
- <name>Objects</name>
+ <name>Edit</name>
<editMode v="true" />
<entityField>#ENTITY</entityField>
<fields>
diff --git a/neonView/ObjectRelationPreview_view/ObjectRelationPreview_view.aod b/neonView/ObjectRelationPreview_view/ObjectRelationPreview_view.aod
index 2d823012ed..c5d691f838 100644
--- a/neonView/ObjectRelationPreview_view/ObjectRelationPreview_view.aod
+++ b/neonView/ObjectRelationPreview_view/ObjectRelationPreview_view.aod
@@ -9,7 +9,7 @@
</layout>
<children>
<genericViewTemplate>
- <name>Object</name>
+ <name>Objects</name>
<entityField>#ENTITY</entityField>
<title>Object</title>
<fields>
diff --git a/neonView/ObjectRelationTree_view/ObjectRelationTree_view.aod b/neonView/ObjectRelationTree_view/ObjectRelationTree_view.aod
index e85a4964fb..73deb26445 100644
--- a/neonView/ObjectRelationTree_view/ObjectRelationTree_view.aod
+++ b/neonView/ObjectRelationTree_view/ObjectRelationTree_view.aod
@@ -9,7 +9,7 @@
</layout>
<children>
<treetableViewTemplate>
- <name>objectRelations</name>
+ <name>ObjectRelations</name>
<entityField>#ENTITY</entityField>
</treetableViewTemplate>
</children>
diff --git a/neonView/OfferDetail_view/OfferDetail_view.aod b/neonView/OfferDetail_view/OfferDetail_view.aod
index 2f5c466e65..56bff7179c 100644
--- a/neonView/OfferDetail_view/OfferDetail_view.aod
+++ b/neonView/OfferDetail_view/OfferDetail_view.aod
@@ -10,7 +10,7 @@
</layout>
<children>
<genericViewTemplate>
- <name>OfferDetail_template</name>
+ <name>Details</name>
<showDrawer v="true" />
<drawerCaption>Detail</drawerCaption>
<entityField>#ENTITY</entityField>
diff --git a/neonView/OfferEdit_view/OfferEdit_view.aod b/neonView/OfferEdit_view/OfferEdit_view.aod
index ca229cc9d3..6aa17c0dd3 100644
--- a/neonView/OfferEdit_view/OfferEdit_view.aod
+++ b/neonView/OfferEdit_view/OfferEdit_view.aod
@@ -12,7 +12,7 @@
</layout>
<children>
<genericViewTemplate>
- <name>OfferEdit_generic</name>
+ <name>Edit</name>
<editMode v="true" />
<entityField>#ENTITY</entityField>
<fields>
diff --git a/neonView/OfferFilter_view/OfferFilter_view.aod b/neonView/OfferFilter_view/OfferFilter_view.aod
index 1bb8a3b058..e2b01d35fe 100644
--- a/neonView/OfferFilter_view/OfferFilter_view.aod
+++ b/neonView/OfferFilter_view/OfferFilter_view.aod
@@ -50,7 +50,7 @@
</layout>
<children>
<tableViewTemplate>
- <name>OfferFilter_template</name>
+ <name>Offers</name>
<entityField>#ENTITY</entityField>
<columns>
<neonTableColumn>
diff --git a/neonView/OfferPreview_view/OfferPreview_view.aod b/neonView/OfferPreview_view/OfferPreview_view.aod
index 557da913e4..360b681417 100644
--- a/neonView/OfferPreview_view/OfferPreview_view.aod
+++ b/neonView/OfferPreview_view/OfferPreview_view.aod
@@ -9,7 +9,7 @@
</layout>
<children>
<cardViewTemplate>
- <name>OfferHeader_template</name>
+ <name>Header</name>
<iconField>IMAGE</iconField>
<titleField>Offer_OfferCode_VersNr_fieldgroup</titleField>
<descriptionField>CONTACT_ID</descriptionField>
@@ -17,7 +17,7 @@
<entityField>#ENTITY</entityField>
</cardViewTemplate>
<genericViewTemplate>
- <name>OfferInfo_template</name>
+ <name>Details</name>
<editMode v="false" />
<showDrawer v="true" />
<drawerCaption>Details</drawerCaption>
@@ -46,7 +46,7 @@
</fields>
</genericViewTemplate>
<genericViewTemplate>
- <name>OfferPrice_template</name>
+ <name>Prices</name>
<showDrawer v="true" />
<drawerCaption>Prices</drawerCaption>
<entityField>#ENTITY</entityField>
@@ -70,7 +70,7 @@
</fields>
</genericViewTemplate>
<genericViewTemplate>
- <name>Offer_generic</name>
+ <name>Info</name>
<showDrawer v="true" />
<entityField>#ENTITY</entityField>
<fields>
diff --git a/neonView/OfferitemFilter_view/OfferitemFilter_view.aod b/neonView/OfferitemFilter_view/OfferitemFilter_view.aod
index 9590a86985..bd3ad7c05f 100644
--- a/neonView/OfferitemFilter_view/OfferitemFilter_view.aod
+++ b/neonView/OfferitemFilter_view/OfferitemFilter_view.aod
@@ -10,7 +10,7 @@
</layout>
<children>
<tableViewTemplate>
- <name>OfferitemFilter_table</name>
+ <name>Offeritems</name>
<autoNewRow v="true" />
<entityField>#ENTITY</entityField>
<columns>
diff --git a/neonView/OfferitemMultiEdit_view/OfferitemMultiEdit_view.aod b/neonView/OfferitemMultiEdit_view/OfferitemMultiEdit_view.aod
index 8d494baa95..cc0d44ea40 100644
--- a/neonView/OfferitemMultiEdit_view/OfferitemMultiEdit_view.aod
+++ b/neonView/OfferitemMultiEdit_view/OfferitemMultiEdit_view.aod
@@ -9,7 +9,7 @@
</layout>
<children>
<genericMultipleViewTemplate>
- <name>OfferitemData</name>
+ <name>MultipleEdit</name>
<autoNewRow v="true" />
<entityField>#ENTITY</entityField>
<columns>
diff --git a/neonView/OfferitemPreview_view/OfferitemPreview_view.aod b/neonView/OfferitemPreview_view/OfferitemPreview_view.aod
index 0346e38139..23612067af 100644
--- a/neonView/OfferitemPreview_view/OfferitemPreview_view.aod
+++ b/neonView/OfferitemPreview_view/OfferitemPreview_view.aod
@@ -9,13 +9,13 @@
</layout>
<children>
<cardViewTemplate>
- <name>OfferitemPreview_header</name>
+ <name>Header</name>
<iconField>IMAGE</iconField>
<titleField>ITEMNAME</titleField>
<entityField>#ENTITY</entityField>
</cardViewTemplate>
<genericViewTemplate>
- <name>Offeritem_generic</name>
+ <name>Info</name>
<showDrawer v="true" />
<entityField>#ENTITY</entityField>
<fields>
diff --git a/neonView/Options1_View/Options1_View.aod b/neonView/Options1_View/Options1_View.aod
index 669aac39c3..a670bda68e 100644
--- a/neonView/Options1_View/Options1_View.aod
+++ b/neonView/Options1_View/Options1_View.aod
@@ -10,7 +10,7 @@
</layout>
<children>
<genericViewTemplate>
- <name>Generic</name>
+ <name>Options</name>
<showDrawer v="true" />
<drawerCaption></drawerCaption>
<entityField>#ENTITY</entityField>
diff --git a/neonView/Options2_View/Options2_View.aod b/neonView/Options2_View/Options2_View.aod
index 0b91054217..a49940dfd7 100644
--- a/neonView/Options2_View/Options2_View.aod
+++ b/neonView/Options2_View/Options2_View.aod
@@ -10,7 +10,7 @@
</layout>
<children>
<genericViewTemplate>
- <name>Generic</name>
+ <name>Options</name>
<showDrawer v="true" />
<entityField>#ENTITY</entityField>
<fields>
diff --git a/neonView/OrderEdit_view/OrderEdit_view.aod b/neonView/OrderEdit_view/OrderEdit_view.aod
index dfd1bd1b47..23f63cd45c 100644
--- a/neonView/OrderEdit_view/OrderEdit_view.aod
+++ b/neonView/OrderEdit_view/OrderEdit_view.aod
@@ -12,7 +12,7 @@
</layout>
<children>
<genericViewTemplate>
- <name>OrderEdit_generic</name>
+ <name>Edit</name>
<editMode v="true" />
<entityField>#ENTITY</entityField>
<fields>
diff --git a/neonView/OrderFilter_view/OrderFilter_view.aod b/neonView/OrderFilter_view/OrderFilter_view.aod
index 8759414296..b351b465e4 100644
--- a/neonView/OrderFilter_view/OrderFilter_view.aod
+++ b/neonView/OrderFilter_view/OrderFilter_view.aod
@@ -50,7 +50,7 @@
</layout>
<children>
<tableViewTemplate>
- <name>OrderFilter_template</name>
+ <name>Orders</name>
<entityField>#ENTITY</entityField>
<columns>
<neonTableColumn>
diff --git a/neonView/OrderPreview_view/OrderPreview_view.aod b/neonView/OrderPreview_view/OrderPreview_view.aod
index 80e86b5307..1806c6b61c 100644
--- a/neonView/OrderPreview_view/OrderPreview_view.aod
+++ b/neonView/OrderPreview_view/OrderPreview_view.aod
@@ -9,7 +9,7 @@
</layout>
<children>
<cardViewTemplate>
- <name>OrderHeader_template</name>
+ <name>Header</name>
<iconField>IMAGE</iconField>
<titleField>Order_OrderCode_VersNr_fieldgroup</titleField>
<descriptionField>CONTACT_ID</descriptionField>
@@ -17,7 +17,7 @@
<entityField>#ENTITY</entityField>
</cardViewTemplate>
<genericViewTemplate>
- <name>OrderInfo_template</name>
+ <name>Details</name>
<editMode v="false" />
<showDrawer v="true" />
<drawerCaption>Details</drawerCaption>
@@ -38,7 +38,7 @@
</fields>
</genericViewTemplate>
<genericViewTemplate>
- <name>OrderPrice_template</name>
+ <name>Prices</name>
<showDrawer v="true" />
<drawerCaption>Prices</drawerCaption>
<entityField>#ENTITY</entityField>
@@ -62,7 +62,7 @@
</fields>
</genericViewTemplate>
<genericViewTemplate>
- <name>Order_generic</name>
+ <name>Info</name>
<showDrawer v="true" />
<entityField>#ENTITY</entityField>
<fields>
diff --git a/neonView/OrderitemFilter_view/OrderitemFilter_view.aod b/neonView/OrderitemFilter_view/OrderitemFilter_view.aod
index 63409f66ae..e5d4b353d1 100644
--- a/neonView/OrderitemFilter_view/OrderitemFilter_view.aod
+++ b/neonView/OrderitemFilter_view/OrderitemFilter_view.aod
@@ -10,7 +10,7 @@
</layout>
<children>
<tableViewTemplate>
- <name>OrderitemFilter_table</name>
+ <name>Orderitems</name>
<autoNewRow v="true" />
<entityField>#ENTITY</entityField>
<columns>
diff --git a/neonView/OrderitemMultiEdit_view/OrderitemMultiEdit_view.aod b/neonView/OrderitemMultiEdit_view/OrderitemMultiEdit_view.aod
index 3102dd60c9..e4547bd22d 100644
--- a/neonView/OrderitemMultiEdit_view/OrderitemMultiEdit_view.aod
+++ b/neonView/OrderitemMultiEdit_view/OrderitemMultiEdit_view.aod
@@ -9,7 +9,7 @@
</layout>
<children>
<genericMultipleViewTemplate>
- <name>OrderitemData</name>
+ <name>MultipleEdit</name>
<autoNewRow v="true" />
<entityField>#ENTITY</entityField>
<columns>
diff --git a/neonView/OrderitemPreview_view/OrderitemPreview_view.aod b/neonView/OrderitemPreview_view/OrderitemPreview_view.aod
index f0a175961c..4aec996c99 100644
--- a/neonView/OrderitemPreview_view/OrderitemPreview_view.aod
+++ b/neonView/OrderitemPreview_view/OrderitemPreview_view.aod
@@ -9,14 +9,14 @@
</layout>
<children>
<cardViewTemplate>
- <name>OrderitemPreview_header</name>
+ <name>Header</name>
<iconField>IMAGE</iconField>
<titleField>ITEMNAME</titleField>
<descriptionField>INFO</descriptionField>
<entityField>#ENTITY</entityField>
</cardViewTemplate>
<genericViewTemplate>
- <name>Orderitem_generic</name>
+ <name>Info</name>
<showDrawer v="true" />
<entityField>#ENTITY</entityField>
<fields>
diff --git a/neonView/OrganisationEditDefaults_view/OrganisationEditDefaults_view.aod b/neonView/OrganisationEditDefaults_view/OrganisationEditDefaults_view.aod
index 4c660f02d4..5cfe3f84cd 100644
--- a/neonView/OrganisationEditDefaults_view/OrganisationEditDefaults_view.aod
+++ b/neonView/OrganisationEditDefaults_view/OrganisationEditDefaults_view.aod
@@ -9,7 +9,7 @@
</layout>
<children>
<genericViewTemplate>
- <name>EditDefaults_template</name>
+ <name>Edit</name>
<editMode v="true" />
<entityField>#ENTITY</entityField>
<fields>
diff --git a/neonView/OrganisationEdit_view/OrganisationEdit_view.aod b/neonView/OrganisationEdit_view/OrganisationEdit_view.aod
index 3663da4437..e9d3939a7a 100644
--- a/neonView/OrganisationEdit_view/OrganisationEdit_view.aod
+++ b/neonView/OrganisationEdit_view/OrganisationEdit_view.aod
@@ -12,7 +12,7 @@
</layout>
<children>
<genericViewTemplate>
- <name>Edit_template</name>
+ <name>Edit</name>
<editMode v="true" />
<entityField>#ENTITY</entityField>
<fields>
diff --git a/neonView/OrganisationFilter_view/OrganisationFilter_view.aod b/neonView/OrganisationFilter_view/OrganisationFilter_view.aod
index a8f5cd47c2..2fd381072d 100644
--- a/neonView/OrganisationFilter_view/OrganisationFilter_view.aod
+++ b/neonView/OrganisationFilter_view/OrganisationFilter_view.aod
@@ -31,7 +31,7 @@
</layout>
<children>
<tableViewTemplate>
- <name>Table_template</name>
+ <name>Organisations</name>
<entityField>#ENTITY</entityField>
<columns>
<neonTableColumn>
diff --git a/neonView/OrganisationLookup_view/OrganisationLookup_view.aod b/neonView/OrganisationLookup_view/OrganisationLookup_view.aod
index d51544e0e9..18d8a20c7a 100644
--- a/neonView/OrganisationLookup_view/OrganisationLookup_view.aod
+++ b/neonView/OrganisationLookup_view/OrganisationLookup_view.aod
@@ -9,7 +9,7 @@
</layout>
<children>
<tableViewTemplate>
- <name>orgLookupList_template</name>
+ <name>Organisations</name>
<entityField>#ENTITY</entityField>
<columns>
<neonTableColumn>
diff --git a/neonView/OrganisationMain_view/OrganisationMain_view.aod b/neonView/OrganisationMain_view/OrganisationMain_view.aod
index 2afa737463..60d239311a 100644
--- a/neonView/OrganisationMain_view/OrganisationMain_view.aod
+++ b/neonView/OrganisationMain_view/OrganisationMain_view.aod
@@ -22,7 +22,7 @@
</neonViewReference>
<neonViewReference>
<name>c10533a6-d185-4b13-84ee-53a468544c03</name>
- <entityField>Contacts</entityField>
+ <entityField>Contact</entityField>
<view>PersonSimpleList_view</view>
</neonViewReference>
<neonViewReference>
diff --git a/neonView/OrganisationPreview_view/OrganisationPreview_view.aod b/neonView/OrganisationPreview_view/OrganisationPreview_view.aod
index 834aef029e..6c81fc9cd8 100644
--- a/neonView/OrganisationPreview_view/OrganisationPreview_view.aod
+++ b/neonView/OrganisationPreview_view/OrganisationPreview_view.aod
@@ -9,7 +9,7 @@
</layout>
<children>
<cardViewTemplate>
- <name>BasicCard_template</name>
+ <name>Header</name>
<iconField>IMAGE</iconField>
<titleField>NAME</titleField>
<descriptionField>CUSTOMERCODE_DISPLAY_fieldGroup</descriptionField>
@@ -27,7 +27,7 @@
<view>AddressList_view</view>
</neonViewReference>
<genericViewTemplate>
- <name>OrgInfo_template</name>
+ <name>Info</name>
<showDrawer v="true" />
<entityField>#ENTITY</entityField>
<fields>
diff --git a/neonView/PersonDetail_view/PersonDetail_view.aod b/neonView/PersonDetail_view/PersonDetail_view.aod
index bce9f6a15f..e57b00a46a 100644
--- a/neonView/PersonDetail_view/PersonDetail_view.aod
+++ b/neonView/PersonDetail_view/PersonDetail_view.aod
@@ -10,7 +10,7 @@
</layout>
<children>
<genericViewTemplate>
- <name>PersInfo_template</name>
+ <name>Details</name>
<entityField>#ENTITY</entityField>
<fields>
<entityFieldLink>
diff --git a/neonView/PersonEditDefaults_view/PersonEditDefaults_view.aod b/neonView/PersonEditDefaults_view/PersonEditDefaults_view.aod
index 7add841fec..d03b94432e 100644
--- a/neonView/PersonEditDefaults_view/PersonEditDefaults_view.aod
+++ b/neonView/PersonEditDefaults_view/PersonEditDefaults_view.aod
@@ -9,7 +9,7 @@
</layout>
<children>
<genericViewTemplate>
- <name>EditPersDefaults_template</name>
+ <name>Edit</name>
<editMode v="true" />
<entityField>#ENTITY</entityField>
<fields>
diff --git a/neonView/PersonEdit_view/PersonEdit_view.aod b/neonView/PersonEdit_view/PersonEdit_view.aod
index ead84cbbd1..aadb5625ac 100644
--- a/neonView/PersonEdit_view/PersonEdit_view.aod
+++ b/neonView/PersonEdit_view/PersonEdit_view.aod
@@ -12,7 +12,7 @@
</layout>
<children>
<genericViewTemplate>
- <name>PersEdit_template</name>
+ <name>Edit</name>
<editMode v="true" />
<showDrawer v="false" />
<entityField>#ENTITY</entityField>
diff --git a/neonView/PersonFilter_view/PersonFilter_view.aod b/neonView/PersonFilter_view/PersonFilter_view.aod
index 3ae4694d9b..b013eb79ea 100644
--- a/neonView/PersonFilter_view/PersonFilter_view.aod
+++ b/neonView/PersonFilter_view/PersonFilter_view.aod
@@ -31,7 +31,7 @@
</layout>
<children>
<tableViewTemplate>
- <name>PersFilter_template</name>
+ <name>Persons</name>
<showHeader v="true" />
<entityField>#ENTITY</entityField>
<columns>
diff --git a/neonView/PersonLookup_view/PersonLookup_view.aod b/neonView/PersonLookup_view/PersonLookup_view.aod
index 4c71e4b72b..4cc36b6335 100644
--- a/neonView/PersonLookup_view/PersonLookup_view.aod
+++ b/neonView/PersonLookup_view/PersonLookup_view.aod
@@ -9,7 +9,7 @@
</layout>
<children>
<tableViewTemplate>
- <name>persLookupList_template</name>
+ <name>Persons</name>
<entityField>#ENTITY</entityField>
<columns>
<neonTableColumn>
diff --git a/neonView/PersonPreview_view/PersonPreview_view.aod b/neonView/PersonPreview_view/PersonPreview_view.aod
index 657b071091..c0b9aa5c9e 100644
--- a/neonView/PersonPreview_view/PersonPreview_view.aod
+++ b/neonView/PersonPreview_view/PersonPreview_view.aod
@@ -9,7 +9,7 @@
</layout>
<children>
<cardViewTemplate>
- <name>PersHeader_template</name>
+ <name>Header</name>
<iconField>IMAGE</iconField>
<titleField>FULL_NAME_fieldGroup</titleField>
<descriptionField>ORGANISATION_ID</descriptionField>
@@ -32,7 +32,7 @@
<view>AddressList_view</view>
</neonViewReference>
<genericViewTemplate>
- <name>PersInfo_template</name>
+ <name>Info</name>
<showDrawer v="true" />
<drawerCaption>weitere Informationen</drawerCaption>
<entityField>#ENTITY</entityField>
diff --git a/neonView/PersonSimpleList_view/PersonSimpleList_view.aod b/neonView/PersonSimpleList_view/PersonSimpleList_view.aod
index 03023d6a3a..23a4b86b30 100644
--- a/neonView/PersonSimpleList_view/PersonSimpleList_view.aod
+++ b/neonView/PersonSimpleList_view/PersonSimpleList_view.aod
@@ -9,7 +9,7 @@
</layout>
<children>
<tableViewTemplate>
- <name>persTable_template</name>
+ <name>Persons</name>
<entityField>#ENTITY</entityField>
<columns>
<neonTableColumn>
diff --git a/neonView/Prod2prodFilter_view/Prod2prodFilter_view.aod b/neonView/Prod2prodFilter_view/Prod2prodFilter_view.aod
index 4ed00e1c07..396e72b879 100644
--- a/neonView/Prod2prodFilter_view/Prod2prodFilter_view.aod
+++ b/neonView/Prod2prodFilter_view/Prod2prodFilter_view.aod
@@ -10,7 +10,7 @@
</layout>
<children>
<treetableViewTemplate>
- <name>partlist</name>
+ <name>Partlist</name>
<parentField>PARENTID</parentField>
<favoriteActionGroup1>alter</favoriteActionGroup1>
<titleField>PRODUCTCODE</titleField>
diff --git a/neonView/ProductDescription_view/ProductDescription_view.aod b/neonView/ProductDescription_view/ProductDescription_view.aod
index 1443c025a5..68ea0b04dd 100644
--- a/neonView/ProductDescription_view/ProductDescription_view.aod
+++ b/neonView/ProductDescription_view/ProductDescription_view.aod
@@ -10,7 +10,7 @@
</layout>
<children>
<genericViewTemplate>
- <name>ProductDescription_template</name>
+ <name>Info</name>
<showDrawer v="true" />
<drawerCaption>Description</drawerCaption>
<entityField>#ENTITY</entityField>
diff --git a/neonView/ProductEdit_view/ProductEdit_view.aod b/neonView/ProductEdit_view/ProductEdit_view.aod
index 41bf0883f2..2ccd248922 100644
--- a/neonView/ProductEdit_view/ProductEdit_view.aod
+++ b/neonView/ProductEdit_view/ProductEdit_view.aod
@@ -9,7 +9,7 @@
</layout>
<children>
<genericViewTemplate>
- <name>ProductEdit_generic</name>
+ <name>Edit</name>
<editMode v="true" />
<entityField>#ENTITY</entityField>
<fields>
diff --git a/neonView/ProductFilter_view/ProductFilter_view.aod b/neonView/ProductFilter_view/ProductFilter_view.aod
index 9a94df104c..ae5dc5a7ba 100644
--- a/neonView/ProductFilter_view/ProductFilter_view.aod
+++ b/neonView/ProductFilter_view/ProductFilter_view.aod
@@ -31,7 +31,7 @@
</layout>
<children>
<tableViewTemplate>
- <name>Table_template</name>
+ <name>Products</name>
<entityField>#ENTITY</entityField>
<columns>
<neonTableColumn>
diff --git a/neonView/ProductPreview_view/ProductPreview_view.aod b/neonView/ProductPreview_view/ProductPreview_view.aod
index 0c098ee2f5..af0a4e3c36 100644
--- a/neonView/ProductPreview_view/ProductPreview_view.aod
+++ b/neonView/ProductPreview_view/ProductPreview_view.aod
@@ -9,7 +9,7 @@
</layout>
<children>
<cardViewTemplate>
- <name>ProductHeader_template</name>
+ <name>Header</name>
<iconField>IMAGE</iconField>
<titleField>PRODUCTCODE</titleField>
<descriptionField>PRODUCTNAME</descriptionField>
@@ -17,7 +17,7 @@
<entityField>#ENTITY</entityField>
</cardViewTemplate>
<genericViewTemplate>
- <name>ProductInfo_template</name>
+ <name>Info</name>
<showDrawer v="true" />
<drawerCaption>Details</drawerCaption>
<entityField>#ENTITY</entityField>
@@ -49,7 +49,7 @@
</fields>
</genericViewTemplate>
<genericViewTemplate>
- <name>ProductPriceCurrent_template</name>
+ <name>ProductPriceCurrent</name>
<showDrawer v="true" />
<drawerCaption>Prices</drawerCaption>
<entityField>#ENTITY</entityField>
diff --git a/neonView/ProductpriceEdit_view/ProductpriceEdit_view.aod b/neonView/ProductpriceEdit_view/ProductpriceEdit_view.aod
index 867fcfc0b4..b1b22ede16 100644
--- a/neonView/ProductpriceEdit_view/ProductpriceEdit_view.aod
+++ b/neonView/ProductpriceEdit_view/ProductpriceEdit_view.aod
@@ -10,7 +10,7 @@
</layout>
<children>
<genericViewTemplate>
- <name>Productprice_generic</name>
+ <name>Edit</name>
<editMode v="true" />
<entityField>#ENTITY</entityField>
<fields>
diff --git a/neonView/ProductpriceFilter_view/ProductpriceFilter_view.aod b/neonView/ProductpriceFilter_view/ProductpriceFilter_view.aod
index 9044cb6adc..afa1bba8b0 100644
--- a/neonView/ProductpriceFilter_view/ProductpriceFilter_view.aod
+++ b/neonView/ProductpriceFilter_view/ProductpriceFilter_view.aod
@@ -10,7 +10,7 @@
</layout>
<children>
<tableViewTemplate>
- <name>Table_template</name>
+ <name>Prices</name>
<autoNewRow v="true" />
<entityField>#ENTITY</entityField>
<columns>
diff --git a/neonView/ProductpriceRelation_view/ProductpriceRelation_view.aod b/neonView/ProductpriceRelation_view/ProductpriceRelation_view.aod
index 7d0c287f85..5e6470cc38 100644
--- a/neonView/ProductpriceRelation_view/ProductpriceRelation_view.aod
+++ b/neonView/ProductpriceRelation_view/ProductpriceRelation_view.aod
@@ -9,7 +9,7 @@
</layout>
<children>
<tableViewTemplate>
- <name>Table_template</name>
+ <name>PriceRelations</name>
<autoNewRow v="true" />
<entityField>#ENTITY</entityField>
<columns>
diff --git a/neonView/SalesprojectClassificationEntryEdit_view/SalesprojectClassificationEntryEdit_view.aod b/neonView/SalesprojectClassificationEntryEdit_view/SalesprojectClassificationEntryEdit_view.aod
index 006ba7de60..6a8c90e4cc 100644
--- a/neonView/SalesprojectClassificationEntryEdit_view/SalesprojectClassificationEntryEdit_view.aod
+++ b/neonView/SalesprojectClassificationEntryEdit_view/SalesprojectClassificationEntryEdit_view.aod
@@ -9,7 +9,7 @@
</layout>
<children>
<genericViewTemplate>
- <name>SalesprojectClassificationEntryData_template</name>
+ <name>Edit</name>
<entityField>#ENTITY</entityField>
<fields>
<entityFieldLink>
diff --git a/neonView/SalesprojectClassificationEntryPreview_view/SalesprojectClassificationEntryPreview_view.aod b/neonView/SalesprojectClassificationEntryPreview_view/SalesprojectClassificationEntryPreview_view.aod
index 8ad3101fd7..d71591095d 100644
--- a/neonView/SalesprojectClassificationEntryPreview_view/SalesprojectClassificationEntryPreview_view.aod
+++ b/neonView/SalesprojectClassificationEntryPreview_view/SalesprojectClassificationEntryPreview_view.aod
@@ -10,7 +10,7 @@
</layout>
<children>
<titledListViewTemplate>
- <name>SalesprojectClassificationEntryData_template</name>
+ <name>Info</name>
<entityField>#ENTITY</entityField>
<columns>
<neonTableColumn>
diff --git a/neonView/SalesprojectClassificationFilter_view/SalesprojectClassificationFilter_view.aod b/neonView/SalesprojectClassificationFilter_view/SalesprojectClassificationFilter_view.aod
index 6ca2bfd6a6..06753041a8 100644
--- a/neonView/SalesprojectClassificationFilter_view/SalesprojectClassificationFilter_view.aod
+++ b/neonView/SalesprojectClassificationFilter_view/SalesprojectClassificationFilter_view.aod
@@ -9,7 +9,7 @@
</layout>
<children>
<tableViewTemplate>
- <name>SalesprojectClassificationData_template</name>
+ <name>Classifications</name>
<entityField>#ENTITY</entityField>
<columns>
<neonTableColumn>
diff --git a/neonView/SalesprojectClassificationPreview_view/SalesprojectClassificationPreview_view.aod b/neonView/SalesprojectClassificationPreview_view/SalesprojectClassificationPreview_view.aod
index eb623b4fad..e5e95d8c62 100644
--- a/neonView/SalesprojectClassificationPreview_view/SalesprojectClassificationPreview_view.aod
+++ b/neonView/SalesprojectClassificationPreview_view/SalesprojectClassificationPreview_view.aod
@@ -9,7 +9,7 @@
</layout>
<children>
<genericViewTemplate>
- <name>rfff</name>
+ <name>Info</name>
<entityField>#ENTITY</entityField>
<fields>
<entityFieldLink>
diff --git a/neonView/SalesprojectCompetitionEdit_view/SalesprojectCompetitionEdit_view.aod b/neonView/SalesprojectCompetitionEdit_view/SalesprojectCompetitionEdit_view.aod
index 858a5b2477..2537d585dd 100644
--- a/neonView/SalesprojectCompetitionEdit_view/SalesprojectCompetitionEdit_view.aod
+++ b/neonView/SalesprojectCompetitionEdit_view/SalesprojectCompetitionEdit_view.aod
@@ -9,7 +9,7 @@
</layout>
<children>
<genericViewTemplate>
- <name>SalesprojectCompetitionEdit_template</name>
+ <name>Edit</name>
<editMode v="true" />
<entityField>#ENTITY</entityField>
<fields>
diff --git a/neonView/SalesprojectCompetitionFilter_view/SalesprojectCompetitionFilter_view.aod b/neonView/SalesprojectCompetitionFilter_view/SalesprojectCompetitionFilter_view.aod
index 2e038d4228..216b398b5d 100644
--- a/neonView/SalesprojectCompetitionFilter_view/SalesprojectCompetitionFilter_view.aod
+++ b/neonView/SalesprojectCompetitionFilter_view/SalesprojectCompetitionFilter_view.aod
@@ -10,7 +10,7 @@
</layout>
<children>
<tableViewTemplate>
- <name>SalesprojectCompetitionFilter_template</name>
+ <name>Competitions</name>
<autoNewRow v="true" />
<entityField>#ENTITY</entityField>
<columns>
diff --git a/neonView/SalesprojectCompetitionPreview_view/SalesprojectCompetitionPreview_view.aod b/neonView/SalesprojectCompetitionPreview_view/SalesprojectCompetitionPreview_view.aod
index a75b6dbedd..55f2387848 100644
--- a/neonView/SalesprojectCompetitionPreview_view/SalesprojectCompetitionPreview_view.aod
+++ b/neonView/SalesprojectCompetitionPreview_view/SalesprojectCompetitionPreview_view.aod
@@ -9,13 +9,13 @@
</layout>
<children>
<cardViewTemplate>
- <name>SalesprojectCompetitionHeader_template</name>
+ <name>Header</name>
<titleField>CONTACT_ID</titleField>
<descriptionField>INFO</descriptionField>
<entityField>#ENTITY</entityField>
</cardViewTemplate>
<genericViewTemplate>
- <name>SalesprojectCompetitionInfo_template</name>
+ <name>Info</name>
<entityField>#ENTITY</entityField>
<fields>
<entityFieldLink>
diff --git a/neonView/SalesprojectCycleEdit_view/SalesprojectCycleEdit_view.aod b/neonView/SalesprojectCycleEdit_view/SalesprojectCycleEdit_view.aod
index c678f05e9a..9ffceb4a51 100644
--- a/neonView/SalesprojectCycleEdit_view/SalesprojectCycleEdit_view.aod
+++ b/neonView/SalesprojectCycleEdit_view/SalesprojectCycleEdit_view.aod
@@ -9,7 +9,7 @@
</layout>
<children>
<genericViewTemplate>
- <name>SalesprojectCycleEdit_template</name>
+ <name>Edit</name>
<editMode v="true" />
<entityField>#ENTITY</entityField>
<fields>
diff --git a/neonView/SalesprojectCycleFilter_view/SalesprojectCycleFilter_view.aod b/neonView/SalesprojectCycleFilter_view/SalesprojectCycleFilter_view.aod
index 2a7d1b5ab9..f0836de850 100644
--- a/neonView/SalesprojectCycleFilter_view/SalesprojectCycleFilter_view.aod
+++ b/neonView/SalesprojectCycleFilter_view/SalesprojectCycleFilter_view.aod
@@ -10,7 +10,7 @@
</layout>
<children>
<tableViewTemplate>
- <name>SalesprojectCycleFilter_template</name>
+ <name>Cycles</name>
<autoNewRow v="true" />
<entityField>#ENTITY</entityField>
<columns>
diff --git a/neonView/SalesprojectCyclePreview_view/SalesprojectCyclePreview_view.aod b/neonView/SalesprojectCyclePreview_view/SalesprojectCyclePreview_view.aod
index d8ed26196d..be4768faf2 100644
--- a/neonView/SalesprojectCyclePreview_view/SalesprojectCyclePreview_view.aod
+++ b/neonView/SalesprojectCyclePreview_view/SalesprojectCyclePreview_view.aod
@@ -9,13 +9,13 @@
</layout>
<children>
<cardViewTemplate>
- <name>SalesprojectCycleHeader_template</name>
+ <name>Header</name>
<titleField>VALUE</titleField>
<descriptionField>DATE_START</descriptionField>
<entityField>#ENTITY</entityField>
</cardViewTemplate>
<genericViewTemplate>
- <name>SalesprojectForecastInfo_template</name>
+ <name>Info</name>
<entityField>#ENTITY</entityField>
<fields>
<entityFieldLink>
diff --git a/neonView/SalesprojectEdit_view/SalesprojectEdit_view.aod b/neonView/SalesprojectEdit_view/SalesprojectEdit_view.aod
index 5e0a05ce09..f817929387 100644
--- a/neonView/SalesprojectEdit_view/SalesprojectEdit_view.aod
+++ b/neonView/SalesprojectEdit_view/SalesprojectEdit_view.aod
@@ -12,7 +12,7 @@
</layout>
<children>
<genericViewTemplate>
- <name>SalesprojectEdit_template</name>
+ <name>Edit</name>
<editMode v="true" />
<entityField>#ENTITY</entityField>
<fields>
diff --git a/neonView/SalesprojectFilter_view/SalesprojectFilter_view.aod b/neonView/SalesprojectFilter_view/SalesprojectFilter_view.aod
index 2181c73016..593405a051 100644
--- a/neonView/SalesprojectFilter_view/SalesprojectFilter_view.aod
+++ b/neonView/SalesprojectFilter_view/SalesprojectFilter_view.aod
@@ -50,7 +50,7 @@
</layout>
<children>
<tableViewTemplate>
- <name>SalesprojectFilter_table</name>
+ <name>Salesprojects</name>
<entityField>#ENTITY</entityField>
<title></title>
<columns>
diff --git a/neonView/SalesprojectForecastEdit_view/SalesprojectForecastEdit_view.aod b/neonView/SalesprojectForecastEdit_view/SalesprojectForecastEdit_view.aod
index 073a35f6fd..ace0a07528 100644
--- a/neonView/SalesprojectForecastEdit_view/SalesprojectForecastEdit_view.aod
+++ b/neonView/SalesprojectForecastEdit_view/SalesprojectForecastEdit_view.aod
@@ -9,7 +9,7 @@
</layout>
<children>
<genericViewTemplate>
- <name>SalesprojectForecastEdit_template</name>
+ <name>Edit</name>
<editMode v="true" />
<entityField>#ENTITY</entityField>
<fields>
diff --git a/neonView/SalesprojectForecastFilter_view/SalesprojectForecastFilter_view.aod b/neonView/SalesprojectForecastFilter_view/SalesprojectForecastFilter_view.aod
index 5ba261bf7b..0c71d3c8eb 100644
--- a/neonView/SalesprojectForecastFilter_view/SalesprojectForecastFilter_view.aod
+++ b/neonView/SalesprojectForecastFilter_view/SalesprojectForecastFilter_view.aod
@@ -10,7 +10,7 @@
</layout>
<children>
<tableViewTemplate>
- <name>SalesprojectForecastFilter_template</name>
+ <name>Forecasts</name>
<entityField>#ENTITY</entityField>
<columns>
<neonTableColumn>
diff --git a/neonView/SalesprojectForecastPreview_view/SalesprojectForecastPreview_view.aod b/neonView/SalesprojectForecastPreview_view/SalesprojectForecastPreview_view.aod
index 54966c16db..e4833d7143 100644
--- a/neonView/SalesprojectForecastPreview_view/SalesprojectForecastPreview_view.aod
+++ b/neonView/SalesprojectForecastPreview_view/SalesprojectForecastPreview_view.aod
@@ -9,13 +9,13 @@
</layout>
<children>
<cardViewTemplate>
- <name>SalesprojectForecastHeader_template</name>
+ <name>Header</name>
<titleField>TYPE</titleField>
<descriptionField>DATE_START</descriptionField>
<entityField>#ENTITY</entityField>
</cardViewTemplate>
<genericViewTemplate>
- <name>SalesprojectForecastInfo_template</name>
+ <name>Info</name>
<entityField>#ENTITY</entityField>
<fields>
<entityFieldLink>
diff --git a/neonView/SalesprojectMemberEdit_view/SalesprojectMemberEdit_view.aod b/neonView/SalesprojectMemberEdit_view/SalesprojectMemberEdit_view.aod
index 879bdb7cd7..755141ad8a 100644
--- a/neonView/SalesprojectMemberEdit_view/SalesprojectMemberEdit_view.aod
+++ b/neonView/SalesprojectMemberEdit_view/SalesprojectMemberEdit_view.aod
@@ -9,7 +9,7 @@
</layout>
<children>
<genericViewTemplate>
- <name>SalesprojectMemberEdit_template</name>
+ <name>Edit</name>
<editMode v="true" />
<entityField>#ENTITY</entityField>
<fields>
diff --git a/neonView/SalesprojectMemberFilter_view/SalesprojectMemberFilter_view.aod b/neonView/SalesprojectMemberFilter_view/SalesprojectMemberFilter_view.aod
index 325028978d..169043149e 100644
--- a/neonView/SalesprojectMemberFilter_view/SalesprojectMemberFilter_view.aod
+++ b/neonView/SalesprojectMemberFilter_view/SalesprojectMemberFilter_view.aod
@@ -10,7 +10,7 @@
</layout>
<children>
<tableViewTemplate>
- <name>SalesprojectMemberFilter_template</name>
+ <name>Members</name>
<entityField>#ENTITY</entityField>
<columns>
<neonTableColumn>
diff --git a/neonView/SalesprojectMemberPreview_view/SalesprojectMemberPreview_view.aod b/neonView/SalesprojectMemberPreview_view/SalesprojectMemberPreview_view.aod
index dc49402900..f048677fa8 100644
--- a/neonView/SalesprojectMemberPreview_view/SalesprojectMemberPreview_view.aod
+++ b/neonView/SalesprojectMemberPreview_view/SalesprojectMemberPreview_view.aod
@@ -9,7 +9,7 @@
</layout>
<children>
<cardViewTemplate>
- <name>SalesprojectMemberHeader_template</name>
+ <name>Header</name>
<titleField>CONTACT_ID</titleField>
<descriptionField>SALESPROJECT_ROLE</descriptionField>
<entityField>#ENTITY</entityField>
diff --git a/neonView/SalesprojectPreview_view/SalesprojectPreview_view.aod b/neonView/SalesprojectPreview_view/SalesprojectPreview_view.aod
index f4c24b28ee..9067095183 100644
--- a/neonView/SalesprojectPreview_view/SalesprojectPreview_view.aod
+++ b/neonView/SalesprojectPreview_view/SalesprojectPreview_view.aod
@@ -9,7 +9,7 @@
</layout>
<children>
<cardViewTemplate>
- <name>SalesprojectPreview_template</name>
+ <name>Head</name>
<iconField>IMAGE</iconField>
<titleField>PROJECTTITLE</titleField>
<descriptionField>PROJECTCODE</descriptionField>
@@ -17,7 +17,7 @@
<entityField>#ENTITY</entityField>
</cardViewTemplate>
<genericViewTemplate>
- <name>SalesprojectInfo_template</name>
+ <name>Details</name>
<showDrawer v="true" />
<drawerCaption>Details</drawerCaption>
<entityField>#ENTITY</entityField>
@@ -57,7 +57,7 @@
</fields>
</genericViewTemplate>
<genericViewTemplate>
- <name>SalesprojectDescription_template</name>
+ <name>Info</name>
<showDrawer v="true" />
<drawerCaption>Further informations</drawerCaption>
<entityField>#ENTITY</entityField>
@@ -74,7 +74,7 @@
<view>DocumentList_view</view>
</neonViewReference>
<scoreCardViewTemplate>
- <name>SalesprojectScore_template</name>
+ <name>AdditionalInfo</name>
<entityField>#ENTITY</entityField>
<fields>
<entityFieldLink>
diff --git a/neonView/SalesprojectSourceEdit_view/SalesprojectSourceEdit_view.aod b/neonView/SalesprojectSourceEdit_view/SalesprojectSourceEdit_view.aod
index a137793544..0630e05a80 100644
--- a/neonView/SalesprojectSourceEdit_view/SalesprojectSourceEdit_view.aod
+++ b/neonView/SalesprojectSourceEdit_view/SalesprojectSourceEdit_view.aod
@@ -9,7 +9,7 @@
</layout>
<children>
<genericViewTemplate>
- <name>SalesprojectSourceEdit_template</name>
+ <name>Edit</name>
<editMode v="true" />
<entityField>#ENTITY</entityField>
<fields>
diff --git a/neonView/SalesprojectSourceFilter_view/SalesprojectSourceFilter_view.aod b/neonView/SalesprojectSourceFilter_view/SalesprojectSourceFilter_view.aod
index cde4a6d650..d2ac9aae0d 100644
--- a/neonView/SalesprojectSourceFilter_view/SalesprojectSourceFilter_view.aod
+++ b/neonView/SalesprojectSourceFilter_view/SalesprojectSourceFilter_view.aod
@@ -10,7 +10,7 @@
</layout>
<children>
<tableViewTemplate>
- <name>SalesprojectSourceFilter_template</name>
+ <name>Entries</name>
<entityField>#ENTITY</entityField>
<columns>
<neonTableColumn>
diff --git a/neonView/SalesprojectSourcePreview_view/SalesprojectSourcePreview_view.aod b/neonView/SalesprojectSourcePreview_view/SalesprojectSourcePreview_view.aod
index 296012a2a8..32f84523f1 100644
--- a/neonView/SalesprojectSourcePreview_view/SalesprojectSourcePreview_view.aod
+++ b/neonView/SalesprojectSourcePreview_view/SalesprojectSourcePreview_view.aod
@@ -9,13 +9,13 @@
</layout>
<children>
<cardViewTemplate>
- <name>SalesprojectSourceHeader_template</name>
+ <name>Header</name>
<titleField>SOURCE</titleField>
<descriptionField>ENTRYDATE</descriptionField>
<entityField>#ENTITY</entityField>
</cardViewTemplate>
<genericViewTemplate>
- <name>SalesprojectSourceInfo_template</name>
+ <name>Info</name>
<entityField>#ENTITY</entityField>
<fields>
<entityFieldLink>
diff --git a/neonView/TwitterTimeline_view/TwitterTimeline_view.aod b/neonView/TwitterTimeline_view/TwitterTimeline_view.aod
index 25c658f82a..6763318663 100644
--- a/neonView/TwitterTimeline_view/TwitterTimeline_view.aod
+++ b/neonView/TwitterTimeline_view/TwitterTimeline_view.aod
@@ -61,7 +61,7 @@
</layout>
<children>
<webContentViewTemplate>
- <name>TIMELINE_TEMPLATE</name>
+ <name>Timeline</name>
<entityField>TWITTER_TIMELINE</entityField>
</webContentViewTemplate>
</children>
--
GitLab