Skip to content
Snippets Groups Projects
Commit 2c73e0b8 authored by Sebastian Listl's avatar Sebastian Listl :speech_balloon:
Browse files

Merge branch 'sales_1086441FixTurnoverInitFilterProcess' into '2021.1'

[Projekt: xRM-Sales][TicketNr.: 1086441][Exception beim Öffnen einer Firma]

See merge request xrm/basic!1230
parents c9767aed 4a41b36b
No related branches found
No related tags found
No related merge requests found
......@@ -1323,7 +1323,7 @@
<children>
<entityParameter>
<name>ContactIds_param</name>
<valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/turnovers/children/contactid_param/valueProcess.js</valueProcess>
<valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/turnovers/children/contactids_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
</entityConsumer>
......
import("system.vars");
import("system.result");
result.string(vars.get("$field.CONTACTID"));
\ No newline at end of file
result.string(JSON.stringify([vars.get("$field.CONTACTID")]));
\ No newline at end of file
......@@ -6,8 +6,8 @@ import("Keyword_lib");
import("KeywordRegistry_basic");
import("system.result");
var contactIds = vars.get("$param.ContactIds_param");
var salesprojectId = vars.get("$param.SalesprojectIdDynamicChart_param");
var contactIds = vars.exists("$param.ContactIds_param") ? vars.get("$param.ContactIds_param") : false;
var salesprojectId = vars.exists("$param.SalesprojectIdDynamicChart_param") ? vars.get("$param.SalesprojectIdDynamicChart_param") : false;
if(contactIds || salesprojectId)
{
......
......@@ -10,6 +10,8 @@ var cols = ["TITLE", "DESCRIPTION", "COND", "CONTEXT", "AUTOPROBABILITY"];
salesprojectPhaseDefs.forEach(function([checklistId, phase, description, autoprobability]){
let filterCond = "{\"entity\":\"Salesproject_entity\",\"filter\":{\"type\":\"group\",\"operator\":\"AND\",\"childs\":[{\"type\":\"row\",\"name\":\"PHASE\",\"operator\":\"EQUAL\",\"value\":\"" + KeywordUtils.getViewValue($KeywordRegistry.salesprojectPhase(), phase) + "\",\"key\":\"" + phase + "\",\"contenttype\":\"TEXT\"}]}}";
description = description || translate.text("Checklist"); //avoid null values
let vals = [description, description, filterCond, "Salesproject", autoprobability];
let cond = newWhere("CHECKLIST.CHECKLISTID", checklistId).toString();
updates.push([table, cols, null, vals, cond]);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment