diff --git a/entity/Offer_entity/entityfields/salesproject_id/stateProcess.js b/entity/Offer_entity/entityfields/salesproject_id/stateProcess.js index a88395a1cc7e5206b5396eba14e7dcf6c927214a..1a1eb537b9b727aa99c48fe7236750b5c19c8e5a 100644 --- a/entity/Offer_entity/entityfields/salesproject_id/stateProcess.js +++ b/entity/Offer_entity/entityfields/salesproject_id/stateProcess.js @@ -1,13 +1,19 @@ -import("system.neon"); -import("system.result"); -import("system.vars"); - - -switch (vars.get("$sys.recordstate")) -{ - case neon.OPERATINGSTATE_NEW: - result.object(neon.COMPONENTSTATE_EDITABLE); - break; - default: - result.object(neon.COMPONENTSTATE_READONLY); +import("system.logging"); +import("system.neon"); +import("system.result"); +import("system.vars"); +import("Entity_lib"); + + +switch (vars.get("$sys.recordstate")) +{ + case neon.OPERATINGSTATE_NEW: + //only EDITABLE if $field.CONTACT_ID is set + if(ProcessHandlingUtils.getOnValidationValue(vars.get("$field.CONTACT_ID"))) + result.object(neon.COMPONENTSTATE_EDITABLE); + else + result.object(neon.COMPONENTSTATE_READONLY); + break; + default: + result.object(neon.COMPONENTSTATE_READONLY); } \ No newline at end of file diff --git a/entity/Salesproject_entity/Salesproject_entity.aod b/entity/Salesproject_entity/Salesproject_entity.aod index 33b930ad5b4b27edff1459bc795b09af97632a92..b1499464e81d289a24eabf509113fdf0b114397f 100644 --- a/entity/Salesproject_entity/Salesproject_entity.aod +++ b/entity/Salesproject_entity/Salesproject_entity.aod @@ -70,6 +70,7 @@ <entityField> <name>SALESPROJECTID</name> <searchable v="false" /> + <state>AUTO</state> </entityField> <entityField> <name>STARTDATE</name> diff --git a/entity/Salesproject_entity/recordcontainers/db/conditionProcess.js b/entity/Salesproject_entity/recordcontainers/db/conditionProcess.js index a710bd959eee3a7e14ad7d19c1c04829d16730b0..49d846ad22819fbcb59e5dd83febe4a886c64412 100644 --- a/entity/Salesproject_entity/recordcontainers/db/conditionProcess.js +++ b/entity/Salesproject_entity/recordcontainers/db/conditionProcess.js @@ -4,9 +4,6 @@ import("system.result"); import("system.vars"); import("Sql_lib"); -logging.log("state: " + vars.get("$param.State_param")); -logging.log("contact: " + vars.get("$param.ContactId_param")); - if(vars.exists("$param.State_param") && vars.get("$param.State_param") && vars.exists("$param.ContactId_param") && vars.get("$param.ContactId_param")) { result.string(db.translateCondition( diff --git a/neonView/OfferitemFilter_view/OfferitemFilter_view.aod b/neonView/OfferitemFilter_view/OfferitemFilter_view.aod index faeaabafb0d244c85c432de22038a96857fe0c57..782aa68ca11efa22d05bcf1a3fba67d2720e4ac2 100644 --- a/neonView/OfferitemFilter_view/OfferitemFilter_view.aod +++ b/neonView/OfferitemFilter_view/OfferitemFilter_view.aod @@ -46,10 +46,6 @@ <name>89fd18d0-f6ee-4323-9277-464dee6da625</name> <entityField>OPTIONAL</entityField> </neonTableColumn> - <neonTableColumn> - <name>a31fd16c-4237-4cd9-a9de-2267f186d342</name> - <entityField>INFO</entityField> - </neonTableColumn> <neonTableColumn> <name>60a36c38-103f-4fdb-9e8a-b8fd6d441f14</name> <entityField>TotalPrice</entityField>