Merge branch 'sales_2001122_activity_advertising_offer_order_creation' into '2021.2.0'

[Projekt: xRM-Sales][TicketNr.: 2001122][Beleg im Angebot anlegen wirft Fehler]

See merge request xrm/basic!1348

entity/Activity_entity/Activity_entity.aod

@@ -746,6 +746,7 @@
       <name>advertising_id</name>
       <title>Advertising material</title>
       <linkedContext>Advertising</linkedContext>
+      <stateProcess>%aditoprj%/entity/Activity_entity/entityfields/advertising_id/stateProcess.js</stateProcess>
       <valueProcess>%aditoprj%/entity/Activity_entity/entityfields/advertising_id/valueProcess.js</valueProcess>
       <displayValueProcess>%aditoprj%/entity/Activity_entity/entityfields/advertising_id/displayValueProcess.js</displayValueProcess>
     </entityField>

entity/Activity_entity/entityfields/advertising_id/stateProcess.js

+import("system.result");
+import("system.neon");
+import("system.vars");
+
+var state = neon.COMPONENTSTATE_INVISIBLE;
+if(vars.get("$this.value"))
+{
+    state = neon.COMPONENTSTATE_AUTO;
+}
+result.string(state);

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

@@ -4,13 +4,13 @@ import("system.vars");
 //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" + ".ISOLANGUAGE"] = vars.getString("$field.ISOLANGUAGE") || "";
+fieldparams["$field" + ".OFFER_ID"] = vars.getString("$field.OFFER_ID") || "";
+fieldparams["$field" + ".CURRENCY"] = vars.getString("$field.CURRENCY") || "";
 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") || "";
+fieldparams["$field" + ".DELIVERYADDRESS"] = vars.getString("$field.ADDRESS") || "";
+fieldparams["$field" + ".OBJECT_TYPE"] = vars.getString("$field.OBJECT_TYPE") || "";
+fieldparams["$field" + ".OBJECT_ROWID"] = vars.getString("$field.OBJECT_ROWID") || "";
+fieldparams["$field" + ".DISCOUNT"] = vars.getString("$field.DISCOUNT") || "";
 
 result.string(JSON.stringify(fieldparams));
\ No newline at end of file

entity/Order_entity/entityfields/object_rowid/displayValueProcess.js

@@ -4,8 +4,11 @@ import("system.db");
 import("system.result");
 import("Context_lib");
 
-if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && !vars.get("$field.OBJECT_ROWID")) {
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && !vars.get("$field.OBJECT_ROWID"))
+{
     result.string("");
-} else if (vars.exists("$field.OBJECT_TYPE") && vars.get("$field.OBJECT_TYPE")) {
+}
+else if (vars.exists("$field.OBJECT_TYPE") && vars.get("$field.OBJECT_TYPE"))
+{
     result.string(ContextUtils.getTitleByContext(vars.get("$field.OBJECT_TYPE"), vars.get("$field.OBJECT_ROWID")));
 }
\ No newline at end of file

entity/Order_entity/entityfields/object_type/displayValueProcess.js

@@ -3,8 +3,11 @@ import("system.neon");
 import("system.vars");
 import("system.project");
 
-if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && !vars.get("$field.OBJECT_TYPE")) {
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && !vars.get("$field.OBJECT_TYPE"))
+{
     result.string("");
-} else if (vars.exists("$field.OBJECT_TYPE") && vars.get("$field.OBJECT_TYPE")) {
+}
+else if (vars.exists("$field.OBJECT_TYPE") && vars.get("$field.OBJECT_TYPE"))
+{
     result.string(project.getDataModel(project.DATAMODEL_KIND_CONTEXT, vars.get("$field.OBJECT_TYPE"))[1]);
 }