Merge branch 'sales_1081719_FixUsePriceConditionsOfOrgOfContact' into '2021.1'

[Projekt: xRM-Sales][TicketNr.: 1081719][Angebot Preiskondition wird nicht...

See merge request xrm/basic!1058

process/Advertising_lib/process.js

@@ -190,18 +190,8 @@ AdvertisingUtils.getProductObject = function(pProductId, pAdvertisingId, pQuanti
     
         var curr = (advInfo[0]) ? advInfo[0] : "";
         var contactid = (advInfo[1]) ? advInfo[1] : "";
-        var orgContactId = contactid;
+        var orgContactId = ContactUtils.getOrganisationContactId(contactid);
         
-        if(ContactUtils.getContactTypeByContactId(orgContactId) == 3)
-        { 
-            orgContactId = newSelect("CONTACT.CONTACTID")
-            .from("CONTACT")
-            .where("CONTACT.PERSON_ID is null")
-            .and("CONTACT.ORGANISATION_ID", newSelect("CONTACT.ORGANISATION_ID")
-                .from("CONTACT")
-                .where("CONTACT.CONTACTID", orgContactId).cell())
-            .cell();
-        }
         var pricelist = new AttributeRelationQuery(orgContactId, $AttributeRegistry.pricelist()).getSingleAttributeValue() || "";
     
         var PriceListFilter = {

process/Product_lib/process.js

+import("Contact_lib");
 import("OfferOrder_lib");
 import("system.neon");
 import("system.eMath");
@@ -206,6 +207,10 @@ ProductUtils.getProductDetails = function(pid, pPriceListFilter, pAdditionalProd
         {
             priceListFilter.relationId = "";
         }
+        else
+        {
+            priceListFilter.relationId = ContactUtils.getOrganisationContactId(priceListFilter.relationId);
+        }
         validPriceLists = true;
         var colsPricelistValid = ["validPP.PRODUCTPRICEID", "validPP.CONTACT_ID", "validPP.PRICELIST", "validPP.PRICE", "validPP.VAT"
                         , "validPP.VALID_FROM", "validPP.VALID_TO", "validPP.BUYSELL", "validPP.FROMQUANTITY", "validPP.CURRENCY"];