From 336fa351646d9f73f2b5d35785d88da406a1a939 Mon Sep 17 00:00:00 2001
From: Johannes Hoermann <j.hoermann@adito.de>
Date: Fri, 26 Jul 2019 17:45:56 +0200
Subject: [PATCH] SOURCE -> TOUCHPOINT
---
.../generatedData/SALESPROJECT_SOURCE.xml | 36 +--
.../struct/create_salesproject_source.xml | 8 +-
aliasDefinition/Data_alias/Data_alias.aod | 217 ++++++++----------
.../SalesprojectSource_entity.aod | 34 +--
.../conditionProcess.js | 2 +-
.../entityfields/icon/valueProcess.js | 28 +--
.../valueProcess.js | 0
.../displayValueProcess.js | 12 +-
.../recordcontainers/db/conditionProcess.js | 2 +-
.../source.displayvalue/expression.js | 2 +-
.../touchpoint.displayvalue/expression.js | 6 +
11 files changed, 160 insertions(+), 187 deletions(-)
rename entity/SalesprojectSource_entity/entityfields/{salesproject_sourceid => salesproject_touchpointid}/valueProcess.js (100%)
rename entity/SalesprojectSource_entity/entityfields/{source => touchpoint}/displayValueProcess.js (77%)
create mode 100644 entity/SalesprojectSource_entity/recordcontainers/db/recordfieldmappings/touchpoint.displayvalue/expression.js
diff --git a/.liquibase/Data_alias/basic/_demoData/generatedData/SALESPROJECT_SOURCE.xml b/.liquibase/Data_alias/basic/_demoData/generatedData/SALESPROJECT_SOURCE.xml
index 234622c0aa6..8edcdac3a50 100644
--- a/.liquibase/Data_alias/basic/_demoData/generatedData/SALESPROJECT_SOURCE.xml
+++ b/.liquibase/Data_alias/basic/_demoData/generatedData/SALESPROJECT_SOURCE.xml
@@ -1,45 +1,45 @@
<?xml version="1.1" encoding="UTF-8" standalone="no"?>
<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
<changeSet author="autogenerated" id="a4a96fc2-81cb-41a6-ac45-e935fe7378db">
- <insert tableName="SALESPROJECT_SOURCE">
+ <insert tableName="SALESPROJECT_TOUCHPOINT">
<column name="ENTRYDATE" valueDate="2019-05-17T08:22:56"/>
<column name="INFO" value="Kontakt über die Webseite"/>
<column name="SALESPROJECT_ID" value="6d3d16cd-733e-41d1-ab6c-8a6cba63ba4a"/>
- <column name="SALESPROJECT_SOURCEID" value="2290111c-005b-4602-8adb-fb13844e065f"/>
- <column name="SOURCE" value="SALPROJSCOWNWEB"/>
+ <column name="SALESPROJECT_TOUCHPOINTID" value="2290111c-005b-4602-8adb-fb13844e065f"/>
+ <column name="TOUCHPOINT" value="SALPROJSCOWNWEB"/>
</insert>
- <insert tableName="SALESPROJECT_SOURCE">
+ <insert tableName="SALESPROJECT_TOUCHPOINT">
<column name="ENTRYDATE" valueDate="2019-05-17T08:23:27"/>
<column name="INFO" value="Besuch bei der Messe"/>
<column name="SALESPROJECT_ID" value="6d3d16cd-733e-41d1-ab6c-8a6cba63ba4a"/>
- <column name="SALESPROJECT_SOURCEID" value="a3e94450-561f-43a8-bdec-64b093056187"/>
- <column name="SOURCE" value="SALPROJSCFAIR"/>
+ <column name="SALESPROJECT_TOUCHPOINTID" value="a3e94450-561f-43a8-bdec-64b093056187"/>
+ <column name="TOUCHPOINT" value="SALPROJSCFAIR"/>
</insert>
- <insert tableName="SALESPROJECT_SOURCE">
+ <insert tableName="SALESPROJECT_TOUCHPOINT">
<column name="ENTRYDATE" valueDate="2019-03-12T01:00:00"/>
<column name="SALESPROJECT_ID" value="d422ad81-717f-42b0-bd64-fc892744aac7"/>
- <column name="SALESPROJECT_SOURCEID" value="d178bb9e-0b6f-4f61-ac5e-f29b14488185"/>
- <column name="SOURCE" value="SALPROJSCFAIR"/>
+ <column name="SALESPROJECT_TOUCHPOINTID" value="d178bb9e-0b6f-4f61-ac5e-f29b14488185"/>
+ <column name="TOUCHPOINT" value="SALPROJSCFAIR"/>
</insert>
- <insert tableName="SALESPROJECT_SOURCE">
+ <insert tableName="SALESPROJECT_TOUCHPOINT">
<column name="ENTRYDATE" valueDate="2019-03-25T01:00:00"/>
<column name="SALESPROJECT_ID" value="d422ad81-717f-42b0-bd64-fc892744aac7"/>
- <column name="SALESPROJECT_SOURCEID" value="f42c0831-5f10-4b32-af21-62b334fd21d7"/>
- <column name="SOURCE" value="SALPROJSCOWNWEB"/>
+ <column name="SALESPROJECT_TOUCHPOINTID" value="f42c0831-5f10-4b32-af21-62b334fd21d7"/>
+ <column name="TOUCHPOINT" value="SALPROJSCOWNWEB"/>
</insert>
- <insert tableName="SALESPROJECT_SOURCE">
+ <insert tableName="SALESPROJECT_TOUCHPOINT">
<column name="ENTRYDATE" valueDate="2019-05-23T10:19:16"/>
<column name="INFO" value="Die relevanten AP's waren am Stand. Hatten ein sehr produktives Gespräch."/>
<column name="SALESPROJECT_ID" value="438537db-0dc6-4aed-b1d1-813011baf88c"/>
- <column name="SALESPROJECT_SOURCEID" value="675253dd-0337-44c0-b230-71f030ee0246"/>
- <column name="SOURCE" value="SALPROJSCFAIR"/>
+ <column name="SALESPROJECT_TOUCHPOINTID" value="675253dd-0337-44c0-b230-71f030ee0246"/>
+ <column name="TOUCHPOINT" value="SALPROJSCFAIR"/>
</insert>
- <insert tableName="SALESPROJECT_SOURCE">
+ <insert tableName="SALESPROJECT_TOUCHPOINT">
<column name="ENTRYDATE" valueDate="2019-05-23T10:33:18"/>
<column name="INFO" value="Erster Kontakt mit uns."/>
<column name="SALESPROJECT_ID" value="438537db-0dc6-4aed-b1d1-813011baf88c"/>
- <column name="SALESPROJECT_SOURCEID" value="515ac173-4eab-4783-9c3f-e637c462f6b3"/>
- <column name="SOURCE" value="SALPROJSCOWNWEB"/>
+ <column name="SALESPROJECT_TOUCHPOINTID" value="515ac173-4eab-4783-9c3f-e637c462f6b3"/>
+ <column name="TOUCHPOINT" value="SALPROJSCOWNWEB"/>
</insert>
</changeSet>
</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/init/struct/create_salesproject_source.xml b/.liquibase/Data_alias/basic/init/struct/create_salesproject_source.xml
index c3c501035e8..771ed02dce4 100644
--- a/.liquibase/Data_alias/basic/init/struct/create_salesproject_source.xml
+++ b/.liquibase/Data_alias/basic/init/struct/create_salesproject_source.xml
@@ -1,9 +1,9 @@
<?xml version="1.1" encoding="UTF-8" standalone="no"?>
<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
<changeSet author="j.hoermann" id="806bee79-e178-4e35-9cb5-4bd9dc8ce6ae">
- <createTable tableName="SALESPROJECT_SOURCE">
- <column name="SALESPROJECT_SOURCEID" type="CHAR(36)">
- <constraints primaryKey="true" primaryKeyName="PK_SALESPROJECT_SOURCE_SALESPROJECT_SOURCEID"/>
+ <createTable tableName="SALESPROJECT_TOUCHPOINT">
+ <column name="SALESPROJECT_TOUCHPOINTID" type="CHAR(36)">
+ <constraints primaryKey="true" primaryKeyName="PK_SALESPROJECT_TOUCHPOINT_SALESPROJECT_TOUCHPOINTID"/>
</column>
<column name="ENTRYDATE" type="DATETIME"/>
@@ -11,7 +11,7 @@
<column name="SALESPROJECT_ID" type="CHAR(36)">
<constraints nullable="false"/>
</column>
- <column name="SOURCE" type="CHAR(36)"/>
+ <column name="TOUCHPOINT" type="CHAR(36)"/>
</createTable>
diff --git a/aliasDefinition/Data_alias/Data_alias.aod b/aliasDefinition/Data_alias/Data_alias.aod
index 1fe448e5fd9..0987b9d7461 100644
--- a/aliasDefinition/Data_alias/Data_alias.aod
+++ b/aliasDefinition/Data_alias/Data_alias.aod
@@ -3658,133 +3658,6 @@
</entityFieldDb>
</entityFields>
</entityDb>
- <entityDb>
- <name>SALESPROJECT_SOURCE</name>
- <dbName></dbName>
- <idColumn>SALESPROJECT_SOURCEID</idColumn>
- <idGeneratorType v="0" />
- <idGeneratorInterval v="1" />
- <title></title>
- <description></description>
- <auditSyncConfig>
- <name>auditSyncConfig</name>
- <auditMode v="2" />
- <syncActive v="false" />
- <syncComplete v="true" />
- <syncDirection v="1" />
- <syncIds></syncIds>
- </auditSyncConfig>
- <entityFields>
- <entityFieldDb>
- <name>SALESPROJECT_SOURCEID</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>Salesproject source Id</title>
- <description></description>
- </entityFieldDb>
- <entityFieldDb>
- <name>SOURCE</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>Touchpoint</title>
- <description></description>
- <customProperties>
- <customBooleanProperty>
- <name>log</name>
- <global v="false" />
- <property v="true" />
- </customBooleanProperty>
- <customStringProperty>
- <name>keyword</name>
- <global v="false" />
- <property>SalesprojectSource</property>
- </customStringProperty>
- </customProperties>
- </entityFieldDb>
- <entityFieldDb>
- <name>ENTRYDATE</name>
- <dbName></dbName>
- <primaryKey v="false" />
- <columnType v="93" />
- <size v="29" />
- <scale v="9" />
- <notNull v="false" />
- <isUnique v="false" />
- <index v="false" />
- <documentation></documentation>
- <title>Date</title>
- <description></description>
- <customProperties>
- <customBooleanProperty>
- <name>log</name>
- <global v="false" />
- <property v="true" />
- </customBooleanProperty>
- </customProperties>
- </entityFieldDb>
- <entityFieldDb>
- <name>INFO</name>
- <dbName></dbName>
- <primaryKey v="false" />
- <columnType v="2005" />
- <size v="2147483647" />
- <scale v="0" />
- <notNull v="false" />
- <isUnique v="false" />
- <index v="false" />
- <documentation></documentation>
- <title>Info</title>
- <description></description>
- <customProperties>
- <customBooleanProperty>
- <name>log</name>
- <global v="false" />
- <property v="true" />
- </customBooleanProperty>
- </customProperties>
- </entityFieldDb>
- <entityFieldDb>
- <name>SALESPROJECT_ID</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>Salesproject Id</title>
- <description></description>
- <customProperties>
- <customBooleanProperty>
- <name>log</name>
- <global v="false" />
- <property v="false" />
- </customBooleanProperty>
- <customStringProperty>
- <name>tableRef</name>
- <global v="false" />
- <property>SALESPROJECT</property>
- </customStringProperty>
- </customProperties>
- </entityFieldDb>
- </entityFields>
- </entityDb>
<entityDb>
<name>TIMETRACKING</name>
<dbName></dbName>
@@ -10721,6 +10594,96 @@
</entityFieldDb>
</entityFields>
</entityDb>
+ <entityDb>
+ <name>SALESPROJECT_TOUCHPOINT</name>
+ <dbName></dbName>
+ <idColumn>SALESPROJECT_TOUCHPOINTID</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>SALESPROJECT_TOUCHPOINTID</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>TOUCHPOINT</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>ENTRYDATE</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="93" />
+ <size v="29" />
+ <scale v="9" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>INFO</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="2005" />
+ <size v="2147483647" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>SALESPROJECT_ID</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>
+ </entityFields>
+ </entityDb>
</entities>
</entityGroup>
</aliasDefDb>
diff --git a/entity/SalesprojectSource_entity/SalesprojectSource_entity.aod b/entity/SalesprojectSource_entity/SalesprojectSource_entity.aod
index 79ca447c8b8..e83c243807a 100644
--- a/entity/SalesprojectSource_entity/SalesprojectSource_entity.aod
+++ b/entity/SalesprojectSource_entity/SalesprojectSource_entity.aod
@@ -48,15 +48,15 @@
<valueProcess>%aditoprj%/entity/SalesprojectSource_entity/entityfields/salesproject_id/valueProcess.js</valueProcess>
</entityField>
<entityField>
- <name>SALESPROJECT_SOURCEID</name>
- <valueProcess>%aditoprj%/entity/SalesprojectSource_entity/entityfields/salesproject_sourceid/valueProcess.js</valueProcess>
+ <name>SALESPROJECT_TOUCHPOINTID</name>
+ <valueProcess>%aditoprj%/entity/SalesprojectSource_entity/entityfields/salesproject_touchpointid/valueProcess.js</valueProcess>
</entityField>
<entityField>
- <name>SOURCE</name>
+ <name>TOUCHPOINT</name>
<title>Touchpoint</title>
<consumer>KeywordSources</consumer>
<mandatory v="true" />
- <displayValueProcess>%aditoprj%/entity/SalesprojectSource_entity/entityfields/source/displayValueProcess.js</displayValueProcess>
+ <displayValueProcess>%aditoprj%/entity/SalesprojectSource_entity/entityfields/touchpoint/displayValueProcess.js</displayValueProcess>
</entityField>
<entityConsumer>
<name>KeywordSources</name>
@@ -91,9 +91,9 @@
<conditionProcess>%aditoprj%/entity/SalesprojectSource_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
<linkInformation>
<linkInformation>
- <name>cbe646de-9bc8-4008-8a2f-41fa5728d85e</name>
- <tableName>SALESPROJECT_SOURCE</tableName>
- <primaryKey>SALESPROJECT_SOURCEID</primaryKey>
+ <name>d0f986d3-dae8-4266-b3e1-1e006d0367c7</name>
+ <tableName>SALESPROJECT_TOUCHPOINT</tableName>
+ <primaryKey>SALESPROJECT_TOUCHPOINTID</primaryKey>
<isUIDTable v="true" />
<readonly v="false" />
</linkInformation>
@@ -109,23 +109,27 @@
<recordfield>SALESPROJECT_SOURCE.SALESPROJECT_ID</recordfield>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
- <name>SALESPROJECT_SOURCEID.value</name>
- <recordfield>SALESPROJECT_SOURCE.SALESPROJECT_SOURCEID</recordfield>
+ <name>SOURCE.displayValue</name>
+ <expression>%aditoprj%/entity/SalesprojectSource_entity/recordcontainers/db/recordfieldmappings/source.displayvalue/expression.js</expression>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
- <name>SOURCE.value</name>
- <recordfield>SALESPROJECT_SOURCE.SOURCE</recordfield>
+ <name>INFO.value</name>
+ <recordfield>SALESPROJECT_SOURCE.INFO</recordfield>
<isFilterable v="true" />
</dbRecordFieldMapping>
<dbRecordFieldMapping>
- <name>SOURCE.displayValue</name>
- <expression>%aditoprj%/entity/SalesprojectSource_entity/recordcontainers/db/recordfieldmappings/source.displayvalue/expression.js</expression>
+ <name>TOUCHPOINT.displayValue</name>
+ <expression>%aditoprj%/entity/SalesprojectSource_entity/recordcontainers/db/recordfieldmappings/touchpoint.displayvalue/expression.js</expression>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
- <name>INFO.value</name>
- <recordfield>SALESPROJECT_SOURCE.INFO</recordfield>
+ <name>TOUCHPOINT.value</name>
+ <recordfield>SALESPROJECT_TOUCHPOINT.TOUCHPOINT</recordfield>
<isFilterable v="true" />
</dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>SALESPROJECT_TOUCHPOINTID.value</name>
+ <recordfield>SALESPROJECT_TOUCHPOINT.SALESPROJECT_TOUCHPOINTID</recordfield>
+ </dbRecordFieldMapping>
</recordFieldMappings>
</dbRecordContainer>
</recordContainers>
diff --git a/entity/SalesprojectSource_entity/conditionProcess.js b/entity/SalesprojectSource_entity/conditionProcess.js
index 073fed32ea8..fa1c8bc25f7 100644
--- a/entity/SalesprojectSource_entity/conditionProcess.js
+++ b/entity/SalesprojectSource_entity/conditionProcess.js
@@ -3,7 +3,7 @@ import("system.result");
import("Sql_lib");
var cond = new SqlCondition();
-cond.andPrepareVars("SALESPROJECT_SOURCE.SALESPROJECT_ID", "$param.SalesprojectId_param");
+cond.andPrepareVars("SALESPROJECT_TOUCHPOINT.SALESPROJECT_ID", "$param.SalesprojectId_param");
//TODO: use a preparedCondition when available #1030812 #1034026
result.string(db.translateCondition(cond.build("1 = 1")));
\ No newline at end of file
diff --git a/entity/SalesprojectSource_entity/entityfields/icon/valueProcess.js b/entity/SalesprojectSource_entity/entityfields/icon/valueProcess.js
index 860f5656a20..962b3f3541c 100644
--- a/entity/SalesprojectSource_entity/entityfields/icon/valueProcess.js
+++ b/entity/SalesprojectSource_entity/entityfields/icon/valueProcess.js
@@ -1,14 +1,14 @@
-import("system.vars");
-import("system.result");
-import("system.neon");
-import("Keyword_lib");
-import("KeywordRegistry_basic");
-
-var category = vars.getString("$field.SOURCE");
-var icon;
-if (category)
-{
- var keywordAttributes = KeywordUtils.getAttributeRelationsByKey(category, $KeywordRegistry.salesprojectSource())
- icon = keywordAttributes.defaultAvatarRepresentation;
- result.string(icon);
-}
+import("system.vars");
+import("system.result");
+import("system.neon");
+import("Keyword_lib");
+import("KeywordRegistry_basic");
+
+var category = vars.getString("$field.TOUCHPOINT");
+var icon;
+if (category)
+{
+ var keywordAttributes = KeywordUtils.getAttributeRelationsByKey(category, $KeywordRegistry.salesprojectSource())
+ icon = keywordAttributes.defaultAvatarRepresentation;
+ result.string(icon);
+}
diff --git a/entity/SalesprojectSource_entity/entityfields/salesproject_sourceid/valueProcess.js b/entity/SalesprojectSource_entity/entityfields/salesproject_touchpointid/valueProcess.js
similarity index 100%
rename from entity/SalesprojectSource_entity/entityfields/salesproject_sourceid/valueProcess.js
rename to entity/SalesprojectSource_entity/entityfields/salesproject_touchpointid/valueProcess.js
diff --git a/entity/SalesprojectSource_entity/entityfields/source/displayValueProcess.js b/entity/SalesprojectSource_entity/entityfields/touchpoint/displayValueProcess.js
similarity index 77%
rename from entity/SalesprojectSource_entity/entityfields/source/displayValueProcess.js
rename to entity/SalesprojectSource_entity/entityfields/touchpoint/displayValueProcess.js
index b3db4887929..bc070bc91f2 100644
--- a/entity/SalesprojectSource_entity/entityfields/source/displayValueProcess.js
+++ b/entity/SalesprojectSource_entity/entityfields/touchpoint/displayValueProcess.js
@@ -1,6 +1,6 @@
-import("system.result");
-import("system.vars");
-import("Keyword_lib");
-import("KeywordRegistry_basic");
-
-result.string(KeywordUtils.getViewValue($KeywordRegistry.salesprojectSource(), vars.get("$field.SOURCE")));
+import("system.result");
+import("system.vars");
+import("Keyword_lib");
+import("KeywordRegistry_basic");
+
+result.string(KeywordUtils.getViewValue($KeywordRegistry.salesprojectSource(), vars.get("$field.TOUCHPOINT")));
diff --git a/entity/SalesprojectSource_entity/recordcontainers/db/conditionProcess.js b/entity/SalesprojectSource_entity/recordcontainers/db/conditionProcess.js
index 073fed32ea8..fa1c8bc25f7 100644
--- a/entity/SalesprojectSource_entity/recordcontainers/db/conditionProcess.js
+++ b/entity/SalesprojectSource_entity/recordcontainers/db/conditionProcess.js
@@ -3,7 +3,7 @@ import("system.result");
import("Sql_lib");
var cond = new SqlCondition();
-cond.andPrepareVars("SALESPROJECT_SOURCE.SALESPROJECT_ID", "$param.SalesprojectId_param");
+cond.andPrepareVars("SALESPROJECT_TOUCHPOINT.SALESPROJECT_ID", "$param.SalesprojectId_param");
//TODO: use a preparedCondition when available #1030812 #1034026
result.string(db.translateCondition(cond.build("1 = 1")));
\ No newline at end of file
diff --git a/entity/SalesprojectSource_entity/recordcontainers/db/recordfieldmappings/source.displayvalue/expression.js b/entity/SalesprojectSource_entity/recordcontainers/db/recordfieldmappings/source.displayvalue/expression.js
index 78804de1594..9c2c59e5d23 100644
--- a/entity/SalesprojectSource_entity/recordcontainers/db/recordfieldmappings/source.displayvalue/expression.js
+++ b/entity/SalesprojectSource_entity/recordcontainers/db/recordfieldmappings/source.displayvalue/expression.js
@@ -2,5 +2,5 @@ import("system.result");
import("Keyword_lib");
import("KeywordRegistry_basic");
-var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.salesprojectSource(), "SALESPROJECT_SOURCE.SOURCE");
+var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.salesprojectSource(), "SALESPROJECT_TOUCHPOINT.TOUCHPOINT");
result.string(sql);
diff --git a/entity/SalesprojectSource_entity/recordcontainers/db/recordfieldmappings/touchpoint.displayvalue/expression.js b/entity/SalesprojectSource_entity/recordcontainers/db/recordfieldmappings/touchpoint.displayvalue/expression.js
new file mode 100644
index 00000000000..9c2c59e5d23
--- /dev/null
+++ b/entity/SalesprojectSource_entity/recordcontainers/db/recordfieldmappings/touchpoint.displayvalue/expression.js
@@ -0,0 +1,6 @@
+import("system.result");
+import("Keyword_lib");
+import("KeywordRegistry_basic");
+
+var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.salesprojectSource(), "SALESPROJECT_TOUCHPOINT.TOUCHPOINT");
+result.string(sql);
--
GitLab