From e5ccd04a5c1bc43553df3709427b918aada167af Mon Sep 17 00:00:00 2001
From: Benjamin Ulrich <b.ulrich@adito.de>
Date: Wed, 16 Jun 2021 13:42:08 +0000
Subject: [PATCH] [Projekt: xRM-Sales][TicketNr.: 1081719][Angebot
Preiskondition wird nicht beachtet wenn Angebot an Kontaktperson einer Firma
addressiert ist]
---
process/Advertising_lib/process.js | 12 +-----------
process/Product_lib/process.js | 5 +++++
2 files changed, 6 insertions(+), 11 deletions(-)
diff --git a/process/Advertising_lib/process.js b/process/Advertising_lib/process.js
index 31a0c15798..48a52e115f 100644
--- a/process/Advertising_lib/process.js
+++ b/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 = {
diff --git a/process/Product_lib/process.js b/process/Product_lib/process.js
index 7b11b0791f..8f909b545f 100644
--- a/process/Product_lib/process.js
+++ b/process/Product_lib/process.js
@@ -1,3 +1,4 @@
+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"];
--
GitLab