diff --git a/entity/Salesproject_entity/entityfields/phase/onValueChange.js b/entity/Salesproject_entity/entityfields/phase/onValueChange.js index 4fbd8be4825302fe3dff5a594409614a6ae1f40f..0406f7bfe870ce6bc5cee88b9bd3eeb1b55a1c1b 100644 --- a/entity/Salesproject_entity/entityfields/phase/onValueChange.js +++ b/entity/Salesproject_entity/entityfields/phase/onValueChange.js @@ -2,12 +2,8 @@ import("Sql_lib"); import("system.neon"); import("system.vars"); -var currPobab = parseInt( - newSelect("SALESPROJECT.PROBABILITY") - .from("SALESPROJECT") - .where("SALESPROJECT.SALESPROJECTID", vars.get("$field.SALESPROJECTID")) - .cell() -); +var currPobab = parseInt(vars.get("$field.PROBABILITY")); + var autoProbab = parseInt( newSelect("SALESPROJECTPHASEDEFINITION.AUTOPROBABILITY") .from("SALESPROJECTPHASEDEFINITION") @@ -15,11 +11,18 @@ var autoProbab = parseInt( .cell() ); -if(isNaN(autoProbab) || autoProbab < currPobab) +var value; +if(isNaN(autoProbab) && isNaN(currPobab)) { - neon.setFieldValue("$field.PROBABILITY", currPobab); + value = ""; +} +else if(isNaN(autoProbab) || autoProbab < currPobab) +{ + value = currPobab; } else { - neon.setFieldValue("$field.PROBABILITY", autoProbab); + value = autoProbab; } + +neon.setFieldValue("$field.PROBABILITY", value); \ No newline at end of file