diff --git a/aliasDefinition/_____SYSTEMALIAS/_____SYSTEMALIAS.aod b/aliasDefinition/_____SYSTEMALIAS/_____SYSTEMALIAS.aod
index 5203479895dfe3fc038912256877e49c31669aa3..000cdc7705df39624244bcc953f2c1dd51448d86 100644
--- a/aliasDefinition/_____SYSTEMALIAS/_____SYSTEMALIAS.aod
+++ b/aliasDefinition/_____SYSTEMALIAS/_____SYSTEMALIAS.aod
@@ -1712,7 +1712,7 @@
<entityDb>
<name>ASYS_PERMISSIONSET</name>
<dbName></dbName>
- <idColumn>PERMISSIONSETID</idColumn>
+ <idColumn>ASYS_PERMISSIONSETID</idColumn>
<idGeneratorType v="0" />
<idGeneratorInterval v="1" />
<documentation></documentation>
@@ -1816,7 +1816,7 @@
<entityDb>
<name>ASYS_PERMISSIONACTION</name>
<dbName></dbName>
- <idColumn>PERMISSIONACTIONID</idColumn>
+ <idColumn>ASYS_PERMISSIONACTIONID</idColumn>
<idGeneratorType v="0" />
<idGeneratorInterval v="1" />
<documentation></documentation>
diff --git a/entity/Activity_entity/Activity_entity.aod b/entity/Activity_entity/Activity_entity.aod
index 0d0a112f0c5bf19ba9ee893659b494b388606b3b..d4c06eaeedeef0b7f545ecd501cc99da61458769 100644
--- a/entity/Activity_entity/Activity_entity.aod
+++ b/entity/Activity_entity/Activity_entity.aod
@@ -488,11 +488,6 @@
<entityName>Appointment_entity</entityName>
<fieldName>LinkedAppointments</fieldName>
</dependency>
- <children>
- <entityParameter>
- <name>LinkedObjectId_param</name>
- </entityParameter>
- </children>
</entityConsumer>
<entityActionField>
<name>newSupportticket</name>
diff --git a/entity/Activity_entity/entityfields/attributes/children/objectrowid_param/code.js b/entity/Activity_entity/entityfields/attributes/children/objectrowid_param/code.js
deleted file mode 100644
index a8267b62060b4bd30cedaba4713f4421a6e6f9ff..0000000000000000000000000000000000000000
--- a/entity/Activity_entity/entityfields/attributes/children/objectrowid_param/code.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import("system.vars");
-import("system.result");
-
-result.string(vars.get("$field.ACTIVITYID"));
\ No newline at end of file
diff --git a/entity/Activity_entity/entityfields/attributes/children/objecttype_param/code.js b/entity/Activity_entity/entityfields/attributes/children/objecttype_param/code.js
deleted file mode 100644
index 008915f61deac19ccdd40fff81701de63eb3b6a2..0000000000000000000000000000000000000000
--- a/entity/Activity_entity/entityfields/attributes/children/objecttype_param/code.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import("system.result");
-import("Context_lib");
-
-result.string(ContextUtils.getCurrentContextId());
\ No newline at end of file
diff --git a/entity/Activity_entity/entityfields/keywordcategory/children/containername_param/valueProcess.js b/entity/Activity_entity/entityfields/keywordcategory/children/containername_param/valueProcess.js
deleted file mode 100644
index 7b43ff2f6bef70bf04cd150c46dd7d9f921cf5d0..0000000000000000000000000000000000000000
--- a/entity/Activity_entity/entityfields/keywordcategory/children/containername_param/valueProcess.js
+++ /dev/null
@@ -1,5 +0,0 @@
-import("system.result");
-import("Keyword_lib");
-import("KeywordRegistry_basic");
-
-result.string($KeywordRegistry.activityCategory());
\ No newline at end of file
diff --git a/entity/Activity_entity/entityfields/link/children/activityid_param/valueProcess.js b/entity/Activity_entity/entityfields/link/children/activityid_param/valueProcess.js
deleted file mode 100644
index a8267b62060b4bd30cedaba4713f4421a6e6f9ff..0000000000000000000000000000000000000000
--- a/entity/Activity_entity/entityfields/link/children/activityid_param/valueProcess.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import("system.vars");
-import("system.result");
-
-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/valueProcess.js
deleted file mode 100644
index 109d9bf5c8ea2825f9da796529721deab9a96d9f..0000000000000000000000000000000000000000
--- a/entity/Activity_entity/entityfields/moduletrees/children/contextname/valueProcess.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import("system.result");
-
-result.string("Activity");
\ No newline at end of file
diff --git a/entity/Activity_entity/entityfields/newmail/onActionProcess.js b/entity/Activity_entity/entityfields/newmail/onActionProcess.js
deleted file mode 100644
index 097887a005788a6f5cc554e228879456082c4f21..0000000000000000000000000000000000000000
--- a/entity/Activity_entity/entityfields/newmail/onActionProcess.js
+++ /dev/null
@@ -1,14 +0,0 @@
-import("system.db");
-import("system.vars");
-import("system.neon");
-import("KeywordRegistry_basic");
-
-
-var params = {
- "DocumentTemplateType_param" : $KeywordRegistry.documentTemplateType$mail()
-}
-
-//neon.openContext("DocumentTemplate", "DocumentTemplateFilterSmall_view", null, neon.OPERATINGSTATE_SEARCH, params);
-//neon.openContext("DocumentTemplate", "DocumentTemplateFilterSmall_view", null, null, null, params);
-neon.openContext("DocumentTemplate", null, null, neon.OPERATINGSTATE_SEARCH, params);
-
diff --git a/entity/AddressValidation_entity/entityfields/cityvalidatior/children/type_param/valueProcess.js b/entity/AddressValidation_entity/entityfields/cityvalidatior/children/type_param/valueProcess.js
deleted file mode 100644
index 07a8e649c2c8a47b00f727a51543e5e695d7a7f5..0000000000000000000000000000000000000000
--- a/entity/AddressValidation_entity/entityfields/cityvalidatior/children/type_param/valueProcess.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import("WsValidation_lib");
-import("system.result");
-
-result.string(AddressValidationType.get().TYPE_CITY_NOMINATIM.key);
\ No newline at end of file
diff --git a/entity/AddressValidation_entity/entityfields/zipvalidator/children/type_param/valueProcess.js b/entity/AddressValidation_entity/entityfields/zipvalidator/children/type_param/valueProcess.js
deleted file mode 100644
index fda16aa510156d5a9e059f1cb3a19ea1e72ef61e..0000000000000000000000000000000000000000
--- a/entity/AddressValidation_entity/entityfields/zipvalidator/children/type_param/valueProcess.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import("WsValidation_lib");
-import("system.result");
-
-result.string(AddressValidationType.get().TYPE_ZIP_NOMINATIM.key);
\ No newline at end of file
diff --git a/entity/Address_entity/Address_entity.aod b/entity/Address_entity/Address_entity.aod
index 5e6122b2767b55c3ccc21429bfe61a9fe01d84d7..a8fab2595e8795a739e854e715f1669bbd0477ac 100644
--- a/entity/Address_entity/Address_entity.aod
+++ b/entity/Address_entity/Address_entity.aod
@@ -451,6 +451,7 @@
</entityField>
<entityProvider>
<name>QuickEntryAdresses</name>
+ <documentation>%aditoprj%/entity/Address_entity/entityfields/quickentryadresses/documentation.adoc</documentation>
<dependencies>
<entityDependency>
<name>d677a301-2038-4ccd-baa1-5f986e290564</name>
diff --git a/entity/Address_entity/conditionProcess.js b/entity/Address_entity/conditionProcess.js
deleted file mode 100644
index 2a2a40bad76b7c7bf6a7845b81df92b5cfa85ee2..0000000000000000000000000000000000000000
--- a/entity/Address_entity/conditionProcess.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import("Sql_lib");
-import("system.db");
-import("system.result");
-
-//TODO: use a preparedCondition (.build instead of .toString) when available #1030812 #1034026
-result.string(newWhereIfSet("ADDRESS.CONTACT_ID", "$param.ContactId_param").toString());
diff --git a/entity/Address_entity/entityfields/keywordaddresstype/children/containername_param/valueProcess.js b/entity/Address_entity/entityfields/keywordaddresstype/children/containername_param/valueProcess.js
deleted file mode 100644
index 167d3dc35f38110620b4eb5e6004b4c4454578f2..0000000000000000000000000000000000000000
--- a/entity/Address_entity/entityfields/keywordaddresstype/children/containername_param/valueProcess.js
+++ /dev/null
@@ -1,5 +0,0 @@
-import("system.result");
-import("Keyword_lib");
-import("KeywordRegistry_basic");
-
-result.string($KeywordRegistry.addressType());
\ No newline at end of file
diff --git a/entity/Address_entity/entityfields/orgaddresses/children/contacttype_param/code.js b/entity/Address_entity/entityfields/orgaddresses/children/contacttype_param/code.js
deleted file mode 100644
index 85a095aeb8aaaff00b627db260104e8790cb3a03..0000000000000000000000000000000000000000
--- a/entity/Address_entity/entityfields/orgaddresses/children/contacttype_param/code.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import("system.result");
-
-result.object(1);
\ No newline at end of file
diff --git a/entity/Address_entity/entityfields/persaddresses/children/contacttype_param/code.js b/entity/Address_entity/entityfields/persaddresses/children/contacttype_param/code.js
deleted file mode 100644
index ee2a3d7dfb188a0e175b68c1cf815af5842aa34f..0000000000000000000000000000000000000000
--- a/entity/Address_entity/entityfields/persaddresses/children/contacttype_param/code.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import("system.result");
-
-result.object(2);
\ No newline at end of file
diff --git a/entity/Address_entity/entityfields/quickentryadresses/documentation.adoc b/entity/Address_entity/entityfields/quickentryadresses/documentation.adoc
new file mode 100644
index 0000000000000000000000000000000000000000..02f8ddcf3a0a317172962c6c7eafaaa7f7a86c12
--- /dev/null
+++ b/entity/Address_entity/entityfields/quickentryadresses/documentation.adoc
@@ -0,0 +1,3 @@
+= QuickEntry_entity - Addresses
+
+Provides all addresses for QuickEntry
\ No newline at end of file
diff --git a/entity/Address_entity/recordcontainers/childgroup/affectedIds.js b/entity/Address_entity/recordcontainers/childgroup/affectedIds.js
deleted file mode 100644
index cd9ce4eca596f562519fd3e40d69d57afad64c62..0000000000000000000000000000000000000000
--- a/entity/Address_entity/recordcontainers/childgroup/affectedIds.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import("system.vars");
-import("system.result");
-
-result.object([vars.getString("$local.idvalue")]);
\ No newline at end of file
diff --git a/entity/Address_entity/recordcontainers/childgroup/query.js b/entity/Address_entity/recordcontainers/childgroup/query.js
deleted file mode 100644
index c0ba9e3c53936a0e77923eb3d126c5ac144cea1d..0000000000000000000000000000000000000000
--- a/entity/Address_entity/recordcontainers/childgroup/query.js
+++ /dev/null
@@ -1,22 +0,0 @@
-import("Sql_lib");
-import("system.db");
-import("system.result");
-import("system.vars");
-
-var affectedIds;
-if (vars.exists("$local.idvalue")) {
- affectedIds = vars.get("$local.idvalue");
-}
-
-var addressSelect = newSelect("ADDRESS.ADDRESSID as \"_uid_\", \n\
- ADDRESS.ADDRESSID, \n\
- ADDRESS.ZIP as ZIP, \n\
- ADDRESS.CITY as CITY, \n\
- ADDRESS.COUNTRY, \n\
- ADDRESS.ADDRESS, \n\
- ADDRESS.BUILDINGNO")
- .from("ADDRESS")
- .whereIfSet("ADDRESS.ADDRESSID", affectedIds, SqlBuilder.IN())
- .orderBy("ADDRESS.ADDRESSID")
-
-result.string(addressSelect.toString("1=2"));
\ No newline at end of file
diff --git a/entity/AnyContact_entity/AnyContact_entity.aod b/entity/AnyContact_entity/AnyContact_entity.aod
index 174d18bdf2e02d632566658b9ce602aacf9d7388..764fffc4fd77721dcdae4ec59576865446464b97 100644
--- a/entity/AnyContact_entity/AnyContact_entity.aod
+++ b/entity/AnyContact_entity/AnyContact_entity.aod
@@ -107,7 +107,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>
diff --git a/entity/AnyContact_entity/entityfields/contacts/children/contactid_param/valueProcess.js b/entity/AnyContact_entity/entityfields/contacts/children/contactid_param/valueProcess.js
deleted file mode 100644
index 7b6137b4d105e9ba592cf8ef6e796fb838a32b09..0000000000000000000000000000000000000000
--- a/entity/AnyContact_entity/entityfields/contacts/children/contactid_param/valueProcess.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import("system.vars");
-import("system.result");
-
-result.string(vars.get("$field.CONTACTID"));
\ No newline at end of file
diff --git a/entity/AnyContact_entity/entityfields/contacttype/valueProcess.js b/entity/AnyContact_entity/entityfields/contacttype/valueProcess.js
deleted file mode 100644
index 1974bb4d5a7c88145de2d44d53a22c00ece7aab3..0000000000000000000000000000000000000000
--- a/entity/AnyContact_entity/entityfields/contacttype/valueProcess.js
+++ /dev/null
@@ -1,5 +0,0 @@
-import("system.result");
-import("system.vars");
-import("Contact_lib")
-
-result.object(ContactUtils.getContactType(vars.get("$field.CONTACTID"), vars.get("$field.PERSON_ID"), vars.get("$field.ORGANISATION_ID")));
\ No newline at end of file
diff --git a/entity/AnyContact_entity/entityfields/date_edit/valueProcess.js b/entity/AnyContact_entity/entityfields/date_edit/valueProcess.js
deleted file mode 100644
index 710ac8a06a9911f82ff222c7d9d231846ca93fb2..0000000000000000000000000000000000000000
--- a/entity/AnyContact_entity/entityfields/date_edit/valueProcess.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import("system.vars");
-import("system.result");
-import("system.neon");
-
-if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT)
- result.string(vars.getString("$sys.date"));
\ No newline at end of file
diff --git a/entity/AnyContact_entity/entityfields/date_new/valueProcess.js b/entity/AnyContact_entity/entityfields/date_new/valueProcess.js
deleted file mode 100644
index 3a0d59096cd2de39b6098f1ed95af580dcebfce0..0000000000000000000000000000000000000000
--- a/entity/AnyContact_entity/entityfields/date_new/valueProcess.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import("system.vars");
-import("system.result");
-import("system.neon");
-
-if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
- result.string(vars.getString("$sys.date"));
\ No newline at end of file
diff --git a/entity/AnyContact_entity/entityfields/user_edit/valueProcess.js b/entity/AnyContact_entity/entityfields/user_edit/valueProcess.js
deleted file mode 100644
index 1581e18d9763043ae602b98658f87cb0a3b0c967..0000000000000000000000000000000000000000
--- a/entity/AnyContact_entity/entityfields/user_edit/valueProcess.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import("system.vars");
-import("system.result");
-import("system.neon");
-
-if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT)
- result.string(vars.getString("$sys.user"));
\ No newline at end of file
diff --git a/entity/AnyContact_entity/entityfields/user_new/valueProcess.js b/entity/AnyContact_entity/entityfields/user_new/valueProcess.js
deleted file mode 100644
index 7c566863b493d778b72dea7d8822f6a59333e77d..0000000000000000000000000000000000000000
--- a/entity/AnyContact_entity/entityfields/user_new/valueProcess.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import("system.vars");
-import("system.result");
-import("system.neon");
-
-if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
- result.string(vars.getString("$sys.user"));
\ No newline at end of file
diff --git a/entity/AnyContact_entity/entityfields/withprivat_param/valueProcess.js b/entity/AnyContact_entity/entityfields/withprivat_param/valueProcess.js
deleted file mode 100644
index 755662df1632264e94e6a4d766bb65ead50a553d..0000000000000000000000000000000000000000
--- a/entity/AnyContact_entity/entityfields/withprivat_param/valueProcess.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import("system.result");
-
-result.string("0")
\ No newline at end of file
diff --git a/entity/Appointment_entity/Appointment_entity.aod b/entity/Appointment_entity/Appointment_entity.aod
index a88c2b6e6d636b7e7c8b39c6815377002469eb4f..28c70af66100db91d5c2b61eea6d9ff584fb5832 100644
--- a/entity/Appointment_entity/Appointment_entity.aod
+++ b/entity/Appointment_entity/Appointment_entity.aod
@@ -288,9 +288,6 @@
<jDitoRecordFieldMapping>
<name>STATUS.value</name>
</jDitoRecordFieldMapping>
- <jDitoRecordFieldMapping>
- <name>LINKS.value</name>
- </jDitoRecordFieldMapping>
<jDitoRecordFieldMapping>
<name>DESCRIPTION.value</name>
</jDitoRecordFieldMapping>
diff --git a/entity/Appointment_entity/recordcontainers/jdito/contentProcess.js b/entity/Appointment_entity/recordcontainers/jdito/contentProcess.js
index 1537137ac8ec8fb412f232a80567dcafa4a93a5e..7e8972a145953d11163f3fccc1879487dea6e31b 100644
--- a/entity/Appointment_entity/recordcontainers/jdito/contentProcess.js
+++ b/entity/Appointment_entity/recordcontainers/jdito/contentProcess.js
@@ -107,8 +107,7 @@ function buildEntry(pEntry, pMasterentry)
organizer,
owner,
attendees,
- status,
- links,
+ status,
description,
location,
'',
diff --git a/entity/Contract_entity/Contract_entity.aod b/entity/Contract_entity/Contract_entity.aod
index 6bb015cb39a37b2b6a4ebc1fb28fbb225534cf58..51dab19fa4733bd1cf91075fa059b823317b0a96 100644
--- a/entity/Contract_entity/Contract_entity.aod
+++ b/entity/Contract_entity/Contract_entity.aod
@@ -490,14 +490,6 @@
<name>CONTACT_PERSON_ID.value</name>
<recordfield>CONTACT.PERSON_ID</recordfield>
</dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>PERSON_FIRSTNAME.value</name>
- <recordfield>PERSON.FIRSTNAME</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>PERSON_LASTNAME.value</name>
- <recordfield>PERSON.LASTNAME</recordfield>
- </dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>PAYMENT.displayValue</name>
<expression>%aditoprj%/entity/Contract_entity/recordcontainers/db/recordfieldmappings/payment.displayvalue/expression.js</expression>
@@ -553,10 +545,6 @@
<name>CONTRACTCODE</name>
<indexFieldType>TEXT_PLAIN</indexFieldType>
</indexRecordFieldMapping>
- <indexRecordFieldMapping>
- <name>CUSTOMERCODE</name>
- <indexFieldType>TEXT_PLAIN</indexFieldType>
- </indexRecordFieldMapping>
<indexRecordFieldMapping>
<name>CONTACT_ORG_ID.value</name>
<indexFieldType>STRING</indexFieldType>
diff --git a/entity/Contract_entity/recordcontainers/index/query.js b/entity/Contract_entity/recordcontainers/index/query.js
index b0797ceb1fba98977f0b70822229f384ba7eeed6..0b7612604a0518ed4437906473ea5f0caf38e248 100644
--- a/entity/Contract_entity/recordcontainers/index/query.js
+++ b/entity/Contract_entity/recordcontainers/index/query.js
@@ -13,7 +13,6 @@ var querySelect = newSelect("CONTRACTID " //as "_uid_"
+ ", " + sqlHelper.concat(["ORGANISATION.NAME", "'| " + translate.text("Type of contract") + ":'",
KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.contractType(), "CONTRACTTYPE")]) //as "_description_"
+ ", CONTRACTCODE "
- + ", CUSTOMERCODE "
+ ", CONTACT.ORGANISATION_ID" //as CONTACT_ORG_ID
+ ", ORGANISATION.NAME" //as "CONTACT_ORG_ID.displayValue"
+ ", CONTRACT.CONTACT_ID")
diff --git a/entity/Notification_entity/Notification_entity.aod b/entity/Notification_entity/Notification_entity.aod
index 32689181066c4c089b9cb02d88ba84063f371310..a3dad29fd35c166e1bed11548b79bff253145df2 100644
--- a/entity/Notification_entity/Notification_entity.aod
+++ b/entity/Notification_entity/Notification_entity.aod
@@ -253,12 +253,6 @@
<name>ICON.value</name>
<recordfield>ASYS_NOTIFICATIONCONTENTS.ICON_INFO</recordfield>
</dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>CALCULATEDPRIORITY.value</name>
- <recordfield>ASYS_NOTIFICATIONCONTENTS.FORCEDPRIORITY</recordfield>
- <isFilterable v="true" />
- <isLookupFilter v="true" />
- </dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>RESOLVEDPRIORITY.value</name>
<recordfield>ASYS_NOTIFICATIONS.RESOLVEDPRIORITY</recordfield>
diff --git a/entity/Offer_entity/Offer_entity.aod b/entity/Offer_entity/Offer_entity.aod
index 0968837cb500a102196278911944e12c5390f590..48fe414838b8a3bfa78d78a7a57e768a8f82aa26 100644
--- a/entity/Offer_entity/Offer_entity.aod
+++ b/entity/Offer_entity/Offer_entity.aod
@@ -1286,10 +1286,6 @@
<name>OFFERCODE.value</name>
<indexFieldType>STRING</indexFieldType>
</indexRecordFieldMapping>
- <indexRecordFieldMapping>
- <name>CUSTOMERCODE.value</name>
- <indexFieldType>STRING</indexFieldType>
- </indexRecordFieldMapping>
<indexRecordFieldMapping>
<name>CONTACT_ID.value</name>
<indexFieldType>STRING</indexFieldType>
diff --git a/entity/Offer_entity/recordcontainers/index/query.js b/entity/Offer_entity/recordcontainers/index/query.js
index 608db62da009bb4eb785ecbd14c9f10f8dbb351d..6026dd62b0e7e82195b1597e9907f011545ce07f 100644
--- a/entity/Offer_entity/recordcontainers/index/query.js
+++ b/entity/Offer_entity/recordcontainers/index/query.js
@@ -13,7 +13,6 @@ var querySelect = newSelect("OFFER.OFFERID " // as "_uid_",
+ ", " + sqlHelper.concat([sqlHelper.cast("OFFER.OFFERCODE", SQLTYPES.CHAR, 10), KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.offerStatus(), "OFFER.STATUS")], " | ") //as "_title_"
+ ", " + sqlHelper.concat(["ORGANISATION.NAME", "'| " + translate.text("Description") + ":'", sqlHelper.castLob("OFFER.INFO", 250)]) // as "_description_"
+ ", OFFER.OFFERCODE"
- + ", ORGANISATION.CUSTOMERCODE "
+ ", OFFER.CONTACT_ID "
+ ", CONTACT.ORGANISATION_ID " // as CONTACT_ORG_ID
+ ", ORGANISATION.NAME") // as "CONTACT_ORG_ID.displayValue"
diff --git a/entity/Order_entity/Order_entity.aod b/entity/Order_entity/Order_entity.aod
index 6bec26be42531a4a59b275c0674feb1be0099d62..2c8082ea9ffdf2565a44890ffea392bdef4f298d 100644
--- a/entity/Order_entity/Order_entity.aod
+++ b/entity/Order_entity/Order_entity.aod
@@ -1217,10 +1217,6 @@
<name>SALESORDERCODE.value</name>
<indexFieldType>STRING</indexFieldType>
</indexRecordFieldMapping>
- <indexRecordFieldMapping>
- <name>CUSTOMERCODE.value</name>
- <indexFieldType>STRING</indexFieldType>
- </indexRecordFieldMapping>
<indexRecordFieldMapping>
<name>CONTACT_ID.value</name>
<indexFieldType>STRING</indexFieldType>
diff --git a/entity/Order_entity/recordcontainers/index/query.js b/entity/Order_entity/recordcontainers/index/query.js
index 63f49bc6ea56f4a5754372cdd2184319f5a2c519..f0f600b464a18cfbe610b23dbd3889337d28dc15 100644
--- a/entity/Order_entity/recordcontainers/index/query.js
+++ b/entity/Order_entity/recordcontainers/index/query.js
@@ -12,7 +12,6 @@ var querySelect = newSelect("SALESORDERID " // as "_uid_"
+ ", " + sqlHelper.concat([sqlHelper.cast("SALESORDERCODE", SQLTYPES.CHAR, 10)], " | ") // as "_title_"
+ ", " + sqlHelper.concat(["ORGANISATION.NAME"], " | ") // as "_description_"
+ ", SALESORDERCODE"
- + ", CUSTOMERCODE"
+ ", SALESORDER.CONTACT_ID"
+ ", CONTACT.ORGANISATION_ID " //as CONTACT_ORG_ID
+ ", ORGANISATION.NAME ") //as "CONTACT_ORG_ID.displayValue"
diff --git a/entity/Person_entity/Person_entity.aod b/entity/Person_entity/Person_entity.aod
index 446f310d7bc96179cfbcae4721156500e1110b61..61aa30e669c5d98bfa405cc9fb26e8848dfa290c 100644
--- a/entity/Person_entity/Person_entity.aod
+++ b/entity/Person_entity/Person_entity.aod
@@ -1490,10 +1490,6 @@
<isFilterable v="true" />
<filtertype>EXTENDED</filtertype>
</consumerMapping>
- <dbRecordFieldMapping>
- <name>OrganisationContactId.value</name>
- <expression>%aditoprj%/entity/Person_entity/recordcontainers/db/recordfieldmappings/organisationcontactid.value/expression.js</expression>
- </dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>ORGANISATION_CONTACTID.value</name>
<expression>%aditoprj%/entity/Person_entity/recordcontainers/db/recordfieldmappings/organisation_contactid.value/expression.js</expression>
diff --git a/entity/Person_entity/recordcontainers/db/recordfieldmappings/organisationcontactid.value/expression.js b/entity/Person_entity/recordcontainers/db/recordfieldmappings/organisationcontactid.value/expression.js
deleted file mode 100644
index 56d6932fbb4a5a6202133f0da069a1cf3243a4a6..0000000000000000000000000000000000000000
--- a/entity/Person_entity/recordcontainers/db/recordfieldmappings/organisationcontactid.value/expression.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import("system.result");
-import("Sql_lib");
-
-result.string("(select CONTACTID from CONTACT orgContact where PERSON_ID is null and ORGANISATION.ORGANISATIONID = orgContact.ORGANISATION_ID)");
\ No newline at end of file
diff --git a/entity/SalesprojectSource_entity/SalesprojectSource_entity.aod b/entity/SalesprojectSource_entity/SalesprojectSource_entity.aod
index e1b1ae86aa099b9a04db9c5c87bdac18327e69e5..7480acbbffe1ba2eab7426d9778cf3aa20b5ae3a 100644
--- a/entity/SalesprojectSource_entity/SalesprojectSource_entity.aod
+++ b/entity/SalesprojectSource_entity/SalesprojectSource_entity.aod
@@ -110,10 +110,6 @@
<name>SALESPROJECT_ID.value</name>
<recordfield>SALESPROJECT_TOUCHPOINT.SALESPROJECT_ID</recordfield>
</dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>SOURCE.displayValue</name>
- <expression>%aditoprj%/entity/SalesprojectSource_entity/recordcontainers/db/recordfieldmappings/source.displayvalue/expression.js</expression>
- </dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>INFO.value</name>
<recordfield>SALESPROJECT_TOUCHPOINT.INFO</recordfield>
diff --git a/entity/SalesprojectSource_entity/recordcontainers/db/recordfieldmappings/source.displayvalue/expression.js b/entity/SalesprojectSource_entity/recordcontainers/db/recordfieldmappings/source.displayvalue/expression.js
deleted file mode 100644
index 9c2c59e5d23fee5e9c0318ba05d33739a47af82e..0000000000000000000000000000000000000000
--- a/entity/SalesprojectSource_entity/recordcontainers/db/recordfieldmappings/source.displayvalue/expression.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import("system.result");
-import("Keyword_lib");
-import("KeywordRegistry_basic");
-
-var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.salesprojectSource(), "SALESPROJECT_TOUCHPOINT.TOUCHPOINT");
-result.string(sql);