diff --git a/entity/AnyContact_entity/AnyContact_entity.aod b/entity/AnyContact_entity/AnyContact_entity.aod
index 0225b4306b4df5b15ae8590d41a46ff85a0e2388..6c81f8f29875da8b6dbb621a3f151b48acd2458a 100644
--- a/entity/AnyContact_entity/AnyContact_entity.aod
+++ b/entity/AnyContact_entity/AnyContact_entity.aod
@@ -14,19 +14,19 @@
<entityDependency>
<name>5d8b421e-a234-4d03-bfec-ed01f464a54c</name>
<entityName>Contract_entity</entityName>
- <fieldName>Relations</fieldName>
+ <fieldName>AnyContacts</fieldName>
<isConsumer v="false" />
</entityDependency>
<entityDependency>
<name>94e4fa2c-7525-49f9-b933-353d200b829c</name>
<entityName>Offer_entity</entityName>
- <fieldName>Relations</fieldName>
+ <fieldName>AnyContacts</fieldName>
<isConsumer v="false" />
</entityDependency>
<entityDependency>
<name>f1f7d959-ecb5-4438-9762-fc11f1bc5334</name>
<entityName>Order_entity</entityName>
- <fieldName>Relations</fieldName>
+ <fieldName>AnyContacts</fieldName>
<isConsumer v="false" />
</entityDependency>
<entityDependency>
@@ -126,7 +126,6 @@
<description>Relation type. Value is based on the existance or non-existance of ORGANISATION_ID and PERSON_ID.
See ContactUtils.getRelationTypeByPersOrg for possible values</description>
<contentType>NUMBER</contentType>
- <valueProcess>%aditoprj%/entity/AnyContact_entity/entityfields/contactType/valueProcess.js</valueProcess>
</entityField>
<entityField>
<name>ORGANISATION_NAME</name>
@@ -144,7 +143,6 @@ See ContactUtils.getRelationTypeByPersOrg for possible values</description>
<name>PERSON_PICTURE</name>
<contentType>IMAGE</contentType>
<valueProcess>%aditoprj%/entity/AnyContact_entity/entityfields/person_picture/valueProcess.js</valueProcess>
- <displayValueProcess>%aditoprj%/entity/AnyContact_entity/entityfields/person_picture/displayValueProcess.js</displayValueProcess>
</entityField>
<entityField>
<name>STANDARD_EMAIL_COMMUNICATION</name>
@@ -182,12 +180,6 @@ See ContactUtils.getRelationTypeByPersOrg for possible values</description>
<fieldName>AnyContacts</fieldName>
<isConsumer v="false" />
</entityDependency>
- <entityDependency>
- <name>91db53ad-3748-4a24-8dba-11dc707c2d6b</name>
- <entityName>VisitPlanEntry_entity</entityName>
- <fieldName>AnyContacts</fieldName>
- <isConsumer v="false" />
- </entityDependency>
</dependencies>
<children>
<entityParameter>
diff --git a/entity/Appointment_entity/Appointment_entity.aod b/entity/Appointment_entity/Appointment_entity.aod
index 2263bc41f9406e83fa94547740adae1f85f22875..c3ecd02d3b71e4b8e81768e4404c742e4658065d 100644
--- a/entity/Appointment_entity/Appointment_entity.aod
+++ b/entity/Appointment_entity/Appointment_entity.aod
@@ -208,7 +208,7 @@
<entityDependency>
<name>74dea3cd-a528-4616-b468-cd27f3f1a795</name>
<entityName>Activity_entity</entityName>
- <fieldName>Appointments</fieldName>
+ <fieldName>LinkedAppointments</fieldName>
<isConsumer v="false" />
</entityDependency>
<entityDependency>
diff --git a/entity/CampaignAddParticipants_entity/CampaignAddParticipants_entity.aod b/entity/CampaignAddParticipants_entity/CampaignAddParticipants_entity.aod
index 9b0db2740d3d8520dc533f96de46c2360d4e76cd..f444655a0db2498546d96fcc6de269030b2cfe18 100644
--- a/entity/CampaignAddParticipants_entity/CampaignAddParticipants_entity.aod
+++ b/entity/CampaignAddParticipants_entity/CampaignAddParticipants_entity.aod
@@ -35,7 +35,6 @@
<consumer>CampaignStepConsumer</consumer>
<mandatory v="true" />
<state>EDITABLE</state>
- <valueProcess>%aditoprj%/entity/CampaignAddParticipants_entity/entityfields/campaignstep_id/valueProcess.js</valueProcess>
<displayValueProcess>%aditoprj%/entity/CampaignAddParticipants_entity/entityfields/campaignstep_id/displayValueProcess.js</displayValueProcess>
</entityField>
<entityField>
@@ -114,6 +113,7 @@
<title>Max participants</title>
<state>EDITABLE</state>
<valueProcess>%aditoprj%/entity/CampaignAddParticipants_entity/entityfields/campaignstepmaxparticipantcount/valueProcess.js</valueProcess>
+ <displayValueProcess>%aditoprj%/entity/CampaignAddParticipants_entity/entityfields/campaignstepmaxparticipantcount/displayValueProcess.js</displayValueProcess>
</entityField>
<entityField>
<name>isUpdate</name>
@@ -156,7 +156,6 @@
<jDitoRecordContainer>
<name>jdito</name>
<jDitoRecordAlias>Data_alias</jDitoRecordAlias>
- <contentProcess>%aditoprj%/entity/CampaignAddParticipants_entity/recordcontainers/jdito/contentProcess.js</contentProcess>
<recordFieldMappings>
<jDitoRecordFieldMapping>
<name>UID.value</name>
diff --git a/entity/CampaignAddParticipants_entity/entityfields/campaignstep_id/valueProcess.js b/entity/CampaignAddParticipants_entity/entityfields/campaignstep_id/valueProcess.js
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/entity/ClassificationGroupAnalyses_entity/ClassificationGroupAnalyses_entity.aod b/entity/ClassificationGroupAnalyses_entity/ClassificationGroupAnalyses_entity.aod
index d1f0dbe53b7500add62162907fdd2ac3085687c6..9adcf7e620bcd0ba4e8a7ba0d431f71d667e2790 100644
--- a/entity/ClassificationGroupAnalyses_entity/ClassificationGroupAnalyses_entity.aod
+++ b/entity/ClassificationGroupAnalyses_entity/ClassificationGroupAnalyses_entity.aod
@@ -34,12 +34,6 @@
<name>GroupAnalyses</name>
<documentation>%aditoprj%/entity/ClassificationGroupAnalyses_entity/entityfields/groupanalyses/documentation.adoc</documentation>
<dependencies>
- <entityDependency>
- <name>c20a7d8b-00ab-4edf-adf5-89fc94385e65</name>
- <entityName>Salesproject_entity</entityName>
- <fieldName>ClassificationGroupChart</fieldName>
- <isConsumer v="false" />
- </entityDependency>
<entityDependency>
<name>8dfbe502-aa7a-4514-aaed-a1decf2b4344</name>
<entityName>Salesproject_entity</entityName>
diff --git a/entity/Contract_entity/Contract_entity.aod b/entity/Contract_entity/Contract_entity.aod
index 5f71ffbe761ad1ef9bcb5f88a662ca7de8eba96c..761368c1b27b3788f10f813e5b4194b36ec17a78 100644
--- a/entity/Contract_entity/Contract_entity.aod
+++ b/entity/Contract_entity/Contract_entity.aod
@@ -574,8 +574,7 @@
<name>#DESCRIPTION</name>
</indexRecordMultilingualSystemFieldMapping>
<indexRecordFieldMapping>
- <name>CONTRACTCODE</name>
- <indexFieldType>TEXT_PLAIN</indexFieldType>
+ <name>CONTRACTCODE.value</name>
</indexRecordFieldMapping>
<indexRecordFieldMapping>
<name>CONTACT_ORG_ID.value</name>
diff --git a/entity/DocumentTemplate_entity/DocumentTemplate_entity.aod b/entity/DocumentTemplate_entity/DocumentTemplate_entity.aod
index 603c1beb15ddf0062a7875a67a87db54f06fbbac..30364015250cf82b7d67e503a49b224b36776cc9 100644
--- a/entity/DocumentTemplate_entity/DocumentTemplate_entity.aod
+++ b/entity/DocumentTemplate_entity/DocumentTemplate_entity.aod
@@ -233,12 +233,6 @@
<entityProvider>
<name>DocumentTemplateProvider</name>
<dependencies>
- <entityDependency>
- <name>e1c555c3-9e53-4ccf-962c-4bdd3c14bb16</name>
- <entityName>Offer_entity</entityName>
- <fieldName>DocumentTemplateText</fieldName>
- <isConsumer v="false" />
- </entityDependency>
<entityDependency>
<name>9c10883d-eb73-4587-b758-693a66367a4c</name>
<entityName>Offer_entity</entityName>
diff --git a/entity/Leadimport_entity/Leadimport_entity.aod b/entity/Leadimport_entity/Leadimport_entity.aod
index 2a7f3c136e932d149c30cacbbea99d35a182401d..1c31506735791c58e63291e6a9ff1713007a91e4 100644
--- a/entity/Leadimport_entity/Leadimport_entity.aod
+++ b/entity/Leadimport_entity/Leadimport_entity.aod
@@ -17,14 +17,6 @@
<entityFields>
<entityProvider>
<name>#PROVIDER</name>
- <dependencies>
- <entityDependency>
- <name>9433bb88-2330-4487-9e3a-fd864da9b8a9</name>
- <entityName>Object_entity</entityName>
- <fieldName>Leadimports</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
</entityProvider>
<entityField>
<name>NAME</name>
diff --git a/entity/ModuleTree_entity/ModuleTree_entity.aod b/entity/ModuleTree_entity/ModuleTree_entity.aod
index ab9da7cdc1540adb98732aff36ef415a46416aa0..e5153d2b70efc29acb0f529a8d1e6b7beebfb28a 100644
--- a/entity/ModuleTree_entity/ModuleTree_entity.aod
+++ b/entity/ModuleTree_entity/ModuleTree_entity.aod
@@ -4,6 +4,7 @@
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/ModuleTree_entity/documentation.adoc</documentation>
<title>History</title>
+ <recordContainer>jdito</recordContainer>
<entityFields>
<entityProvider>
<name>#PROVIDER</name>
diff --git a/entity/Offer_entity/Offer_entity.aod b/entity/Offer_entity/Offer_entity.aod
index 503b15b6fc08cb35221e4894087605bcf774da91..4ad1ad9d843d48ab7d2f483452b8514792ce0cb9 100644
--- a/entity/Offer_entity/Offer_entity.aod
+++ b/entity/Offer_entity/Offer_entity.aod
@@ -826,7 +826,6 @@
</entityParameter>
<entityField>
<name>chooseTEXHeader</name>
- <consumer>DocumentTemplateTex</consumer>
<stateProcess>%aditoprj%/entity/Offer_entity/entityfields/choosetexheader/stateProcess.js</stateProcess>
</entityField>
<entityConsumer>
@@ -1285,9 +1284,6 @@
<recordfield>OFFER.NET</recordfield>
<aggregateType>SUM</aggregateType>
</aggregateFieldDbMapping>
- <dbRecordFieldMapping>
- <name>COUNT.value</name>
- </dbRecordFieldMapping>
<aggregateFieldDbMapping>
<name>COUNT_aggregate.value</name>
<recordfield>OFFER.OFFER_ID</recordfield>
diff --git a/entity/PermissionCalendar_entity/PermissionCalendar_entity.aod b/entity/PermissionCalendar_entity/PermissionCalendar_entity.aod
index f7262ea6ca42d45194a1b8bd7b4de6e89a9192a2..621f1148b58110f184bfd8a44ee2da4eaf7e250b 100644
--- a/entity/PermissionCalendar_entity/PermissionCalendar_entity.aod
+++ b/entity/PermissionCalendar_entity/PermissionCalendar_entity.aod
@@ -56,7 +56,6 @@
<mandatoryProcess>%aditoprj%/entity/PermissionCalendar_entity/entityfields/permissiondealer_user_rowid/mandatoryProcess.js</mandatoryProcess>
<textInputAllowed v="false" />
<stateProcess>%aditoprj%/entity/PermissionCalendar_entity/entityfields/permissiondealer_user_rowid/stateProcess.js</stateProcess>
- <valueProcess>%aditoprj%/entity/PermissionCalendar_entity/entityfields/permissiondealer_user_rowid/valueProcess.js</valueProcess>
<displayValueProcess>%aditoprj%/entity/PermissionCalendar_entity/entityfields/permissiondealer_user_rowid/displayValueProcess.js</displayValueProcess>
<onValueChange>%aditoprj%/entity/PermissionCalendar_entity/entityfields/permissiondealer_user_rowid/onValueChange.js</onValueChange>
</entityField>
diff --git a/entity/PermissionDetail_entity/PermissionDetail_entity.aod b/entity/PermissionDetail_entity/PermissionDetail_entity.aod
index c9e7ee24436b3bd223260f9c8e1f1174187a2504..2a0b68e85498bd02583504d258c056fa655a830b 100644
--- a/entity/PermissionDetail_entity/PermissionDetail_entity.aod
+++ b/entity/PermissionDetail_entity/PermissionDetail_entity.aod
@@ -92,7 +92,7 @@
<entityDependency>
<name>b1a6483c-e7b1-4eb7-aa22-d0e9d0ef0b49</name>
<entityName>Role_entity</entityName>
- <fieldName>Permissions</fieldName>
+ <fieldName>TheirPermissions</fieldName>
<isConsumer v="false" />
</entityDependency>
<entityDependency>
diff --git a/entity/Person_entity/Person_entity.aod b/entity/Person_entity/Person_entity.aod
index 7a36776d4eba816767e6861c609ea559a92a4f0d..fee96dfc8b0539bf4715d78cea4a257176543b94 100644
--- a/entity/Person_entity/Person_entity.aod
+++ b/entity/Person_entity/Person_entity.aod
@@ -688,18 +688,6 @@
<entityProvider>
<name>Contacts</name>
<dependencies>
- <entityDependency>
- <name>e46dcd73-64a8-4b3e-b976-1b4643c54ebb</name>
- <entityName>CampaignStep_entity</entityName>
- <fieldName>ContactsConsumer</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>0b7a3dc8-854f-4a0b-9e1c-e6f7cd12d8f1</name>
- <entityName>DuplicatesDetails_entity</entityName>
- <fieldName>PersonsConsumer</fieldName>
- <isConsumer v="false" />
- </entityDependency>
<entityDependency>
<name>c98da62f-d6b2-4ddb-9101-92e9a60abdfb</name>
<entityName>VisitPlanEmployeeWeek_entity</entityName>