Merge branch 'sales_2000986_FixScanServiceErrors' into '2021.2.0'

[Projekt: xRM-Sales][TicketNr.: 2000986][ScanServices liefern zahlreiche Errors]

See merge request xrm/basic!1330

.aditoprj/ignoredScanServiceTasks.json

@@ -219,19 +219,19 @@
     {
       "target": "neonView/SalesprojectAnalysesPhases_view/SalesprojectAnalysesPhases_view.aod",
       "line": -1,
-      "description": "Dead Reference \"#EXTENSION.Phase_filterExtention.Phase_filterExtention#TEXT\" located in: PhaseFunnelChart/defaultGroupFields/#EXTENSION.Phase_filterExtention.Phase_filterExtention#TEXT [67]",
+      "description": "Dead Reference \"#EXTENSION.Phase_filter.Phase_filter#TEXT\" located in: PhaseFunnelChart/defaultGroupFields/#EXTENSION.Phase_filter.Phase_filter#TEXT [67]",
       "groupName": "nb-tasklist-error"
     },
     {
       "target": "neonView/SalesprojectAnalysesPhases_view/SalesprojectAnalysesPhases_view.aod",
       "line": -1,
-      "description": "Dead Reference \"#EXTENSION.Phase_filterExtention.Phase_filterExtention#TEXT\" located in: PhasePieChart/defaultGroupFields/#EXTENSION.Phase_filterExtention.Phase_filterExtention#TEXT [67]",
+      "description": "Dead Reference \"#EXTENSION.Phase_filter.Phase_filter#TEXT\" located in: PhasePieChart/defaultGroupFields/#EXTENSION.Phase_filter.Phase_filter#TEXT [67]",
       "groupName": "nb-tasklist-error"
     },
     {
       "target": "neonView/SalesprojectAnalysesPhases_view/SalesprojectAnalysesPhases_view.aod",
       "line": -1,
-      "description": "Dead Reference \"#EXTENSION.Phase_filterExtention.Phase_filterExtention#TEXT\" located in: PhasePyramidChart/defaultGroupFields/#EXTENSION.Phase_filterExtention.Phase_filterExtention#TEXT [67]",
+      "description": "Dead Reference \"#EXTENSION.Phase_filter.Phase_filter#TEXT\" located in: PhasePyramidChart/defaultGroupFields/#EXTENSION.Phase_filter.Phase_filter#TEXT [67]",
       "groupName": "nb-tasklist-error"
     },
     {
@@ -245,6 +245,42 @@
       "line": -1,
       "description": "Dead Reference \"#EXTENSION.Month.Month#NUMBER\" located in: dynamicChart/defaultGroupFields/#EXTENSION.Month.Month#NUMBER [67]",
       "groupName": "nb-tasklist-error"
+    },
+	{
+      "target": "neonView/TurnoverDynamicMultiDataChart_view/TurnoverDynamicMultiDataChart_view.aod",
+      "line": -1,
+      "description": "Dead Reference \"#EXTENSION.Month_filter.Month_filter#TEXT\" located in: ColumnChart/defaultGroupFields/#EXTENSION.Month_filter.Month_filter#TEXT [67]",
+      "groupName": "nb-tasklist-error"
+    },
+	{
+      "target": "neonView/TurnoverDynamicMultiDataChart_view/TurnoverDynamicMultiDataChart_view.aod",
+      "line": -1,
+      "description": "Dead Reference \"#EXTENSION.Month_filter.Month_filter#TEXT\" located in: LineChart/defaultGroupFields/#EXTENSION.Month_filter.Month_filter#TEXT [67]",
+      "groupName": "nb-tasklist-error"
+    },
+	{
+      "target": "neonView/TurnoverDynamicMultiDataChart_view/TurnoverDynamicMultiDataChart_view.aod",
+      "line": -1,
+      "description": "Dead Reference \"#EXTENSION.Month_filter.Month_filter#TEXT\" located in: AreaChart/defaultGroupFields/#EXTENSION.Month_filter.Month_filter#TEXT [67]",
+      "groupName": "nb-tasklist-error"
+    },
+	{
+      "target": "neonView/TurnoverDynamicMultiDataChart_view/TurnoverDynamicMultiDataChart_view.aod",
+      "line": -1,
+      "description": "Dead Reference \"#EXTENSION.Month_filter.Month_filter#TEXT\" located in: BarChart/defaultGroupFields/#EXTENSION.Month_filter.Month_filter#TEXT [67]",
+      "groupName": "nb-tasklist-error"
+    },
+	{
+      "target": "neonView/TurnoverDynamicMultiDataChart_view/TurnoverDynamicMultiDataChart_view.aod",
+      "line": -1,
+      "description": "Dead Reference \"#EXTENSION.Month_filter.Month_filter#TEXT\" located in: SplineChart/defaultGroupFields/#EXTENSION.Month_filter.Month_filter#TEXT [67]",
+      "groupName": "nb-tasklist-error"
+    },
+	{
+      "target": "neonView/TurnoverDynamicMultiDataChart_view/TurnoverDynamicMultiDataChart_view.aod",
+      "line": -1,
+      "description": "Dead Reference \"#EXTENSION.Month_filter.Month_filter#TEXT\" located in: TreeTable/defaultGroupFields/#EXTENSION.Month_filter.Month_filter#TEXT [67]",
+      "groupName": "nb-tasklist-error"
     }
   ]
 }
\ No newline at end of file

.liquibase/Data_alias/basic/2021.1.3/changelog.xml

@@ -3,7 +3,6 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
     <include relativeToChangelogFile="true" file="defaultWeblinks/changelog.xml"/>
-    <include relativeToChangelogFile="true" file="Advertising/changelog.xml"/>
     <include relativeToChangelogFile="true" file="Checklist/changelog.xml"/>
     <include relativeToChangelogFile="true" file="Member/changelog.xml"/>
     <include relativeToChangelogFile="true" file="Salesproject/changelog.xml"/>

.liquibase/Data_alias/basic/2021.2.0/changelog.xml

@@ -3,6 +3,7 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
     <include relativeToChangelogFile="true" file="Duplicate/changelog.xml"/>
+    <include relativeToChangelogFile="true" file="Advertising/changelog.xml"/>
     <include relativeToChangelogFile="true" file="TopicTree/changelog.xml"/>
     <include relativeToChangelogFile="true" file="CampaignStep/changelog.xml"/>
     <include relativeToChangelogFile="true" file="Offer/changelog.xml"/>

entity/Activity_entity/Activity_entity.aod

@@ -749,13 +749,6 @@
       <valueProcess>%aditoprj%/entity/Activity_entity/entityfields/advertising_id/valueProcess.js</valueProcess>
       <displayValueProcess>%aditoprj%/entity/Activity_entity/entityfields/advertising_id/displayValueProcess.js</displayValueProcess>
     </entityField>
-    <entityConsumer>
-      <name>Objects</name>
-      <dependency>
-        <name>dependency</name>
-        <entityName>Object_entity</entityName>
-      </dependency>
-    </entityConsumer>
   </entityFields>
   <recordContainers>
     <dbRecordContainer>

entity/Offer_entity/entityfields/orders/children/copy_param/valueProcess.js

 import("system.result");
 import("system.vars");
 
-var fieldparams = 
-{
-    "$field.CONTACT_ID" : vars.getString("$field.CONTACT_ID") || "",
-    "$field.ISOLANGUAGE" : vars.getString("$field.ISOLANGUAGE") || "",
-    "$field.OFFER_ID" : vars.getString("$field.OFFERID") || "",
-    "$field.CURRENCY" : vars.getString("$field.CURRENCY") || "",
-    "$field.PAYMENTADDRESS" : vars.getString("$field.ADDRESS") || "",
-    "$field.DELIVERYADDRESS" : vars.getString("$field.ADDRESS") || "",
-    "$field.OBJECT_TYPE" : vars.getString("$field.OBJECT_TYPE") || "",
-    "$field.OBJECT_ROWID" : vars.getString("$field.OBJECT_ROWID") || "",
-    "$field.DISCOUNT" : vars.getString("$field.DISCOUNT") || ""
-};
+//the string concating is needed, because otherwise the Scan Services of the designer would mark the "missing" fields as erros
+var fieldparams = {};
+fieldparams["$field" + ".CONTACT_ID"] = vars.getString("$field.CONTACT_ID") || "";
+fieldparams["$field" + ".ISOLANGUAGE"] = vars.getString("$field.CONTACT_ID") || "";
+fieldparams["$field" + ".OFFER_ID"] = vars.getString("$field.CONTACT_ID") || "";
+fieldparams["$field" + ".CURRENCY"] = vars.getString("$field.CONTACT_ID") || "";
+fieldparams["$field" + ".PAYMENTADDRESS"] = vars.getString("$field.ADDRESS") || "";
+fieldparams["$field" + ".DELIVERYADDRESS"] = vars.getString("$field.CONTACT_ID") || "";
+fieldparams["$field" + ".OBJECT_TYPE"] = vars.getString("$field.CONTACT_ID") || "";
+fieldparams["$field" + ".OBJECT_ROWID"] = vars.getString("$field.CONTACT_ID") || "";
+fieldparams["$field" + ".DISCOUNT"] = vars.getString("$field.CONTACT_ID") || "";
 
 result.string(JSON.stringify(fieldparams));
\ No newline at end of file