diff --git a/entity/Offer_entity/Offer_entity.aod b/entity/Offer_entity/Offer_entity.aod index 42e32ee83e15e73020ad97172be1e34530fe1fb7..ff52a60e35baa21a25c026c374bfe31f801059e4 100644 --- a/entity/Offer_entity/Offer_entity.aod +++ b/entity/Offer_entity/Offer_entity.aod @@ -78,6 +78,7 @@ <title>Status</title> <consumer>KeywordOfferStates</consumer> <state>EDITABLE</state> + <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/status/valueProcess.js</valueProcess> <displayValueProcess>%aditoprj%/entity/Offer_entity/entityfields/status/displayValueProcess.js</displayValueProcess> </entityField> <entityField> diff --git a/entity/Offer_entity/entityfields/status/valueProcess.js b/entity/Offer_entity/entityfields/status/valueProcess.js new file mode 100644 index 0000000000000000000000000000000000000000..ea5cc54c968466314db57e5c44b01453da4ff861 --- /dev/null +++ b/entity/Offer_entity/entityfields/status/valueProcess.js @@ -0,0 +1,6 @@ +import("system.neon"); +import("system.vars"); +import("system.result"); + +if (vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_NEW && !vars.get("$this.value")) + result.string("25b0ac77-ef92-4809-802e-bb9d8782f865"); //Open \ No newline at end of file diff --git a/entity/SalesprojectMember_entity/SalesprojectMember_entity.aod b/entity/SalesprojectMember_entity/SalesprojectMember_entity.aod index c3eb99ba47e7650aee1aa15b0a8041597ab9a5f7..94831ab56859425d402f96d06a02b076ae682e80 100644 --- a/entity/SalesprojectMember_entity/SalesprojectMember_entity.aod +++ b/entity/SalesprojectMember_entity/SalesprojectMember_entity.aod @@ -13,6 +13,7 @@ <title>Person</title> <consumer>Contacts</consumer> <linkedContext>Person</linkedContext> + <mandatory v="true" /> </entityField> <entityField> <name>SALESPROJECT_ID</name> diff --git a/entity/Timetracking_entity/Timetracking_entity.aod b/entity/Timetracking_entity/Timetracking_entity.aod index 2030ef770a552d169b3996289c96c71cc605ace7..2ed0a5850b828c3e17503207bf87fe18c4cb5c9b 100644 --- a/entity/Timetracking_entity/Timetracking_entity.aod +++ b/entity/Timetracking_entity/Timetracking_entity.aod @@ -18,6 +18,7 @@ <title>Time</title> <contentType>TEXT</contentType> <mandatory v="true" /> + <titleProcess>%aditoprj%/entity/Timetracking_entity/entityfields/minutes/titleProcess.js</titleProcess> <displayValueProcess>%aditoprj%/entity/Timetracking_entity/entityfields/minutes/displayValueProcess.js</displayValueProcess> <onValidation>%aditoprj%/entity/Timetracking_entity/entityfields/minutes/onValidation.js</onValidation> </entityField> diff --git a/entity/Timetracking_entity/entityfields/minutes/titleProcess.js b/entity/Timetracking_entity/entityfields/minutes/titleProcess.js new file mode 100644 index 0000000000000000000000000000000000000000..c089b7246e8008c3b2c13874ed0f7b0cc8079cf1 --- /dev/null +++ b/entity/Timetracking_entity/entityfields/minutes/titleProcess.js @@ -0,0 +1,9 @@ +import("system.translate"); +import("system.result"); +import("system.neon"); +import("system.vars"); + +if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT || vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW) +{ + result.string(translate.text("Time in minutes")); +} \ No newline at end of file diff --git a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod index 8a08edeeb5723338923febf2b847c050c407dd1b..a4180005abf33e2e137473a648ae812f0bc81b8f 100644 --- a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod +++ b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod @@ -2574,6 +2574,12 @@ <entry> <key>${QUANTITY_LOWER_THAN_1}</key> </entry> + <entry> + <key>This combination of person and organisation does already exist and can not be created once more.</key> + </entry> + <entry> + <key>Time in minutes</key> + </entry> </keyValueMap> <font name="Dialog" style="0" size="11" /> <sqlModels> diff --git a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod index 08fc72b7af682a2b8e7d3fb895e3df9e79ce3e1d..7fe597e082837ddb2b81d0458214b8754ea5409c 100644 --- a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod +++ b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod @@ -3319,6 +3319,10 @@ <key>VAT in %</key> <value>UmsSt. in %</value> </entry> + <entry> + <key>Time in minutes</key> + <value>Zeit in Minuten</value> + </entry> </keyValueMap> <font name="Dialog" style="0" size="11" /> </language> diff --git a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod index 9007ab8c787f60f39a603e854244d64dc11511d7..eec3b184f0415897a52326ee214d832df7858939 100644 --- a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod +++ b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod @@ -2599,6 +2599,12 @@ <key>${QUANTITY_LOWER_THAN_1}</key> <value>Quantity should be greater than 0.</value> </entry> + <entry> + <key>This combination of person and organisation does already exist and can not be created once more.</key> + </entry> + <entry> + <key>Time in minutes</key> + </entry> </keyValueMap> <font name="Dialog" style="0" size="11" /> </language>