diff --git a/aliasDefinition/Data_alias/Data_alias.aod b/aliasDefinition/Data_alias/Data_alias.aod
index 81553a33b943d7fecf78316911a297471b9d1fd7..77ff068e8e1c869f02f818e815c42b8ff6c47638 100644
--- a/aliasDefinition/Data_alias/Data_alias.aod
+++ b/aliasDefinition/Data_alias/Data_alias.aod
@@ -21959,7 +21959,7 @@
<isUnique v="true" />
<index v="true" />
<documentation></documentation>
- <title></title>
+ <title>Advertisingitem Id</title>
<description></description>
</entityFieldDb>
<entityFieldDb>
@@ -22064,8 +22064,20 @@
<isUnique v="false" />
<index v="true" />
<documentation></documentation>
- <title></title>
+ <title>Product</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ <customJDitoProperty>
+ <name>translate4Log</name>
+ <global v="false" />
+ <property>%aditoprj%/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/advertisingitem/entityfields/product_id/customproperties/translate4log/property.js</property>
+ </customJDitoProperty>
+ </customProperties>
</entityFieldDb>
<entityFieldDb>
<name>USER_EDIT</name>
@@ -22103,7 +22115,7 @@
<customStringProperty>
<name>keyword</name>
<global v="false" />
- <property>KeywordDelivery</property>
+ <property>AdvertisingDelivery</property>
</customStringProperty>
</customProperties>
</entityFieldDb>
@@ -22166,8 +22178,27 @@
<isUnique v="false" />
<index v="true" />
<documentation></documentation>
- <title></title>
+ <title>Advertising Id</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="false" />
+ </customBooleanProperty>
+ <customStringProperty>
+ <name>tableRef</name>
+ <global v="false" />
+ <property>ADVERTISING</property>
+ </customStringProperty>
+ </customProperties>
+ <dependencies>
+ <entityDependency>
+ <name>97a6bdfd-09ba-4e3a-9d87-1c6ba0ddd0cd</name>
+ <entityName>ADVERTISING</entityName>
+ <fieldName>ADVERTISINGID</fieldName>
+ </entityDependency>
+ </dependencies>
</entityFieldDb>
<entityFieldDb>
<name>DATE_NEW</name>
@@ -22224,7 +22255,7 @@
<description></description>
<auditSyncConfig>
<name>auditSyncConfig</name>
- <auditMode v="0" />
+ <auditMode v="2" />
<syncActive v="false" />
<syncComplete v="true" />
<syncDirection v="1" />
@@ -22242,8 +22273,20 @@
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
- <title></title>
+ <title>Currency</title>
<description></description>
+ <customProperties>
+ <customStringProperty>
+ <name>keyword</name>
+ <global v="false" />
+ <property>Currency</property>
+ </customStringProperty>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
<entityFieldDb>
<name>STATUS</name>
@@ -22256,8 +22299,20 @@
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
- <title></title>
+ <title>Status</title>
<description></description>
+ <customProperties>
+ <customStringProperty>
+ <name>keyword</name>
+ <global v="false" />
+ <property>AdvertisingStatus</property>
+ </customStringProperty>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
<entityFieldDb>
<name>RESPONSIBLE_ID</name>
@@ -22270,8 +22325,20 @@
<isUnique v="false" />
<index v="true" />
<documentation></documentation>
- <title></title>
+ <title>Responsible</title>
<description></description>
+ <customProperties>
+ <customJDitoProperty>
+ <name>translate4Log</name>
+ <global v="false" />
+ <property>%aditoprj%/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/advertising/entityfields/responsible_id/customproperties/translate4log/property.js</property>
+ </customJDitoProperty>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
<entityFieldDb>
<name>DATE_EDIT</name>
@@ -22298,8 +22365,20 @@
<isUnique v="false" />
<index v="true" />
<documentation></documentation>
- <title></title>
+ <title>Contact</title>
<description></description>
+ <customProperties>
+ <customJDitoProperty>
+ <name>translate4Log</name>
+ <global v="false" />
+ <property>%aditoprj%/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/advertising/entityfields/contact_id/customproperties/translate4log/property.js</property>
+ </customJDitoProperty>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
<entityFieldDb>
<name>ADVERTISINGID</name>
@@ -22312,7 +22391,7 @@
<isUnique v="true" />
<index v="true" />
<documentation></documentation>
- <title></title>
+ <title>Advertising Id</title>
<description></description>
</entityFieldDb>
<entityFieldDb>
diff --git a/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/advertisingitem/entityfields/product_id/customproperties/translate4log/property.js b/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/advertisingitem/entityfields/product_id/customproperties/translate4log/property.js
new file mode 100644
index 0000000000000000000000000000000000000000..8c5388fc40d30bd21e52ee2577833c68b8180225
--- /dev/null
+++ b/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/advertisingitem/entityfields/product_id/customproperties/translate4log/property.js
@@ -0,0 +1,11 @@
+import("system.result");
+import("Loghistory_lib");
+import("Sql_lib");
+
+var params = Translate4LogParams.load();
+var res = newSelect("PRODUCT.PRODUCTNAME")
+ .from("PRODUCT")
+ .whereIfSet("PRODUCT.PRODUCTID", params.value)
+ .cell();
+
+result.string(res);
\ No newline at end of file
diff --git a/entity/AdvertisingItem_entity/AdvertisingItem_entity.aod b/entity/AdvertisingItem_entity/AdvertisingItem_entity.aod
index aa1f2ac81227ebcf9ecfaa9bc41cb95b15674ec6..36f2c6a32b7ac269256871976cf25f2680ed8069 100644
--- a/entity/AdvertisingItem_entity/AdvertisingItem_entity.aod
+++ b/entity/AdvertisingItem_entity/AdvertisingItem_entity.aod
@@ -138,6 +138,10 @@
</entityConsumer>
<entityField>
<name>ADVERTISING_ID</name>
+ <consumer>Advertisings</consumer>
+ <linkedContext>Advertising</linkedContext>
+ <state>INVISIBLE</state>
+ <stateProcess>%aditoprj%/entity/AdvertisingItem_entity/entityfields/advertising_id/stateProcess.js</stateProcess>
<valueProcess>%aditoprj%/entity/AdvertisingItem_entity/entityfields/advertising_id/valueProcess.js</valueProcess>
</entityField>
<entityField>
@@ -227,6 +231,14 @@
<name>OnlyDigital_param</name>
<expose v="true" />
</entityParameter>
+ <entityConsumer>
+ <name>Advertisings</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Advertising_entity</entityName>
+ <fieldName>BasicInfoAdvertising</fieldName>
+ </dependency>
+ </entityConsumer>
</entityFields>
<recordContainers>
<dbRecordContainer>
@@ -320,10 +332,14 @@
<name>PRODUCT_ID.displayValue</name>
<expression>%aditoprj%/entity/AdvertisingItem_entity/recordcontainers/db/recordfieldmappings/product_id.displayvalue/expression.js</expression>
</dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>ADVERTISING_ID.displayValue</name>
+ <expression>%aditoprj%/entity/AdvertisingItem_entity/recordcontainers/db/recordfieldmappings/advertising_id.displayvalue/expression.js</expression>
+ </dbRecordFieldMapping>
</recordFieldMappings>
<linkInformation>
<linkInformation>
- <name>e6f871fb-ef1c-4637-9a22-b09fedddc4e5</name>
+ <name>9106a4fa-500e-42a7-9a12-29f34e39d415</name>
<tableName>ADVERTISINGITEM</tableName>
<primaryKey>ADVERTISINGITEMID</primaryKey>
<isUIDTable v="true" />
diff --git a/entity/AdvertisingItem_entity/entityfields/advertising_id/stateProcess.js b/entity/AdvertisingItem_entity/entityfields/advertising_id/stateProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..f083b9a2158e600b973908a42fbe2d5b31ee664c
--- /dev/null
+++ b/entity/AdvertisingItem_entity/entityfields/advertising_id/stateProcess.js
@@ -0,0 +1,8 @@
+import("system.neon");
+import("system.result");
+import("system.vars");
+
+if(vars.exists("$sys.parententity") && vars.get("$sys.parententity") != "Advertising_entity")
+{
+ result.string(neon.COMPONENTSTATE_READONLY);
+}
\ No newline at end of file
diff --git a/entity/AdvertisingItem_entity/recordcontainers/db/recordfieldmappings/advertising_id.displayvalue/expression.js b/entity/AdvertisingItem_entity/recordcontainers/db/recordfieldmappings/advertising_id.displayvalue/expression.js
new file mode 100644
index 0000000000000000000000000000000000000000..9e0d13bfc29dadf1cc199119edec93214abe1e9f
--- /dev/null
+++ b/entity/AdvertisingItem_entity/recordcontainers/db/recordfieldmappings/advertising_id.displayvalue/expression.js
@@ -0,0 +1,13 @@
+import("Sql_lib");
+import("system.datetime");
+import("system.logging");
+import("KeywordRegistry_basic");
+import("system.result");
+import("Keyword_lib");
+import("system.translate");
+
+var sqlMask = new SqlMaskingUtils();
+var sql = sqlMask.concatenate(["'" + translate.text("Advertising") + "'", " ' | ' ", "("
+ + KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.advertisingStatus(), "ADVERTISING.STATUS") + ")"]);
+
+result.string(sql);
\ No newline at end of file
diff --git a/entity/LogHistory_entity/recordcontainers/jdito/contentProcess.js b/entity/LogHistory_entity/recordcontainers/jdito/contentProcess.js
index a5ea37fe7824a0151d27ed9092a286d03c6d1992..301b71565d5da6bb94e1fe01e0d9515e55714eb0 100644
--- a/entity/LogHistory_entity/recordcontainers/jdito/contentProcess.js
+++ b/entity/LogHistory_entity/recordcontainers/jdito/contentProcess.js
@@ -88,7 +88,6 @@ function _groupData(pData)
//converts the very dynamic talbeName-condition to a SqlBuilder
function _getTableNameCondition()
{
-
var tableNamesList = JSON.parse(vars.getString("$param.tablenames_param"));
var tableNameCond = newWhere();
diff --git a/neonView/AdvertisingItemFilter_view/AdvertisingItemFilter_view.aod b/neonView/AdvertisingItemFilter_view/AdvertisingItemFilter_view.aod
index 7c05fd6bd41f9f1d9d43067281eb1862f3217714..bca3120650c430358c0db22166dedc6cebbc56b9 100644
--- a/neonView/AdvertisingItemFilter_view/AdvertisingItemFilter_view.aod
+++ b/neonView/AdvertisingItemFilter_view/AdvertisingItemFilter_view.aod
@@ -11,6 +11,10 @@
<tableViewTemplate>
<name>table</name>
<columns>
+ <neonTableColumn>
+ <name>5d8159ed-3d3c-477c-9775-ff125f80901b</name>
+ <entityField>ADVERTISING_ID</entityField>
+ </neonTableColumn>
<neonTableColumn>
<name>a7894166-f880-477a-afd5-58fd982cdb5f</name>
<entityField>ITEMPOSITION</entityField>
diff --git a/neonView/AdvertisingTestEdit_view/AdvertisingTestEdit_view.aod b/neonView/AdvertisingTestEdit_view/AdvertisingTestEdit_view.aod
deleted file mode 100644
index f959c261c1e2565c446652967632725ecdb92abc..0000000000000000000000000000000000000000
--- a/neonView/AdvertisingTestEdit_view/AdvertisingTestEdit_view.aod
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.8">
- <name>AdvertisingTestEdit_view</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <size>SMALL</size>
- <layout>
- <boxLayout>
- <name>layout</name>
- </boxLayout>
- </layout>
- <children>
- <genericViewTemplate>
- <name>generic</name>
- <hideEmptyFields v="false" />
- <fields>
- <entityFieldLink>
- <name>20f249cd-946b-4be6-8e08-61aa5ba14081</name>
- </entityFieldLink>
- <entityFieldLink>
- <name>89e1f432-32bd-4dd7-af8a-12db57e4ae77</name>
- </entityFieldLink>
- <entityFieldLink>
- <name>be36cae9-7dba-4686-8624-3a0d64064112</name>
- </entityFieldLink>
- </fields>
- </genericViewTemplate>
- </children>
-</neonView>