Merge branch '1070393_AngebotBelegLieferbedingungZahlungskondition' into 'master'

[Projekt: Entwicklung - Pool][TicketNr.: 1070393][In Angebot und Beleg werden...

See merge request xrm/basic!517

entity/Offer_entity/entityfields/deliveryterms/valueProcess.js

@@ -11,7 +11,7 @@ if (vars.exists("$param.OfferDeliveryTerm_param") && vars.get("$param.OfferDeliv
 {
     result.string(vars.get("$param.OfferDeliveryTerm_param"));
 } 
-else if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
+else if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.get("$this.value") == null && vars.get("$field.CONTACT_ID"))
 {
     var presetValue = "";
     var contactIds = ContactUtils.getPersOrgIds(vars.getString("$field.CONTACT_ID"))

entity/Offer_entity/entityfields/paymentterms/valueProcess.js

@@ -11,7 +11,7 @@ if (vars.exists("$param.OfferPaymentTerm_param") && vars.get("$param.OfferPaymen
 {
     result.string(vars.get("$param.OfferPaymentTerm_param"));
 }
-else if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
+else if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.get("$this.value") == null && vars.get("$field.CONTACT_ID"))
 {
     var presetValue = "";
     var contactIds = ContactUtils.getPersOrgIds(vars.getString("$field.CONTACT_ID"))

entity/Order_entity/entityfields/deliveryterms/valueProcess.js

@@ -9,7 +9,7 @@ import("Contact_lib");
 
 
 
-if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.get("$this.value") == null)
+if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.get("$this.value") == null && vars.get("$field.CONTACT_ID"))
 {
     var presetValue = "";
     var contactIds = ContactUtils.getPersOrgIds(vars.getString("$field.CONTACT_ID"));

entity/Order_entity/entityfields/paymentterms/valueProcess.js

@@ -7,23 +7,23 @@ import("system.result");
 import("system.vars");
 import("Attribute_lib");
 
-if (vars.get("$this.value") == null) {
-    if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.get("$this.value") == null)
+
+if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.get("$this.value") == null && vars.get("$field.CONTACT_ID"))
+{
+    var presetValue = "";
+    var contactIds = ContactUtils.getPersOrgIds(vars.getString("$field.CONTACT_ID"));
+    if (contactIds.length >= 3 && contactIds[2])
     {
-        var presetValue = "";
-        var contactIds = ContactUtils.getPersOrgIds(vars.getString("$field.CONTACT_ID"));
-        if (contactIds.length >= 3 && contactIds[2])
-        {
-            var orgContactId = ContactUtils.getOrgContactId(contactIds[2]);
-            if (orgContactId)
-            { 
-                presetValue = new AttributeRelationQuery(orgContactId, $AttributeRegistry.paymentTerm()).getSingleAttributeValue();
-            }
+        var orgContactId = ContactUtils.getOrgContactId(contactIds[2]);
+        if (orgContactId)
+        { 
+            presetValue = new AttributeRelationQuery(orgContactId, $AttributeRegistry.paymentTerm()).getSingleAttributeValue();
         }
-
-        if (presetValue)
-            result.string(presetValue);
-        else
-            result.string(KeywordUtils.getFirst($KeywordRegistry.paymentTerm()));
     }
+
+    if (presetValue)
+        result.string(presetValue);
+    else
+        result.string(KeywordUtils.getFirst($KeywordRegistry.paymentTerm()));
 }
+