Merge branch 'sales_2001809_2001802' into '2021.2'

[Projekt: xRM-Sales][TicketNr.: 2001809][TicketNr.: 2001802]

See merge request xrm/basic!1460

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>

aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/advertisingitem/entityfields/product_id/customproperties/translate4log/property.js

+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

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" />

entity/AdvertisingItem_entity/entityfields/advertising_id/stateProcess.js

+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

entity/AdvertisingItem_entity/recordcontainers/db/recordfieldmappings/advertising_id.displayvalue/expression.js

+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

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();

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>

neonView/AdvertisingTestEdit_view/AdvertisingTestEdit_view.aod

-<?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>