From a18a886508aa989a0f0931b829c8fc23423baaa4 Mon Sep 17 00:00:00 2001
From: "S.Listl" <S.Listl@SLISTL.aditosoftware.local>
Date: Mon, 16 Dec 2019 13:36:54 +0100
Subject: [PATCH] CampaignAnalyses TotalCosts fix
---
.../entityfields/fixcosts/valueProcess.js | 2 +-
.../entityfields/variablecosts/valueProcess.js | 2 +-
.../KeywordEntry_entity/recordcontainers/db/conditionProcess.js | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/entity/CampaignAnalysis_entity/entityfields/fixcosts/valueProcess.js b/entity/CampaignAnalysis_entity/entityfields/fixcosts/valueProcess.js
index ab128c2bf1..e05ac739ea 100644
--- a/entity/CampaignAnalysis_entity/entityfields/fixcosts/valueProcess.js
+++ b/entity/CampaignAnalysis_entity/entityfields/fixcosts/valueProcess.js
@@ -6,4 +6,4 @@ result.string(newSelect("sum(NET)")
.from("CAMPAIGNCOST")
.whereIfSet("CAMPAIGNCOST.CAMPAIGN_ID", "$param.CampaignId_param")
.and("CAMPAIGNSTEP_ID is null")
- .cell());
\ No newline at end of file
+ .cell() || 0);
\ No newline at end of file
diff --git a/entity/CampaignAnalysis_entity/entityfields/variablecosts/valueProcess.js b/entity/CampaignAnalysis_entity/entityfields/variablecosts/valueProcess.js
index 9ab2aa6361..f194cb46e7 100644
--- a/entity/CampaignAnalysis_entity/entityfields/variablecosts/valueProcess.js
+++ b/entity/CampaignAnalysis_entity/entityfields/variablecosts/valueProcess.js
@@ -6,4 +6,4 @@ result.string(newSelect("sum(NET)")
.from("CAMPAIGNCOST")
.whereIfSet("CAMPAIGNCOST.CAMPAIGN_ID", "$param.CampaignId_param")
.and("CAMPAIGNSTEP_ID is not null")
- .cell());
\ No newline at end of file
+ .cell() || 0);
\ No newline at end of file
diff --git a/entity/KeywordEntry_entity/recordcontainers/db/conditionProcess.js b/entity/KeywordEntry_entity/recordcontainers/db/conditionProcess.js
index a7b1817d14..68666406b4 100644
--- a/entity/KeywordEntry_entity/recordcontainers/db/conditionProcess.js
+++ b/entity/KeywordEntry_entity/recordcontainers/db/conditionProcess.js
@@ -11,7 +11,7 @@ if (vars.get("$param.OnlyActives_param") == "true")
}
if (vars.exists("$param.ExcludedKeyIdsSubquery_param") && vars.get("$param.ExcludedKeyIdsSubquery_param"))
- cond.and("AB_KEYWORD_ENTRY.KEYID", "(" + vars.get("$param.ExcludedKeyIdsSubquery_param") + ")", "not in ?");
+ cond.and("AB_KEYWORD_ENTRY.KEYID not in (" + vars.get("$param.ExcludedKeyIdsSubquery_param") + ")");
if (vars.getString("$param.WhitelistIds_param"))
{
--
GitLab