diff --git a/entity/AnyContact_entity/AnyContact_entity.aod b/entity/AnyContact_entity/AnyContact_entity.aod index 84782bfc766dc10250946fc6b079858ca9979a08..1c888503beae17f6bba39516c2a630aaf5dc5477 100644 --- a/entity/AnyContact_entity/AnyContact_entity.aod +++ b/entity/AnyContact_entity/AnyContact_entity.aod @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.22" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.22"> <name>AnyContact_entity</name> - <title>Contact</title> + <title>Contact or company</title> <majorModelMode>DISTRIBUTED</majorModelMode> <documentation>%aditoprj%/entity/AnyContact_entity/documentation.adoc</documentation> <contentTitleProcess>%aditoprj%/entity/AnyContact_entity/contentTitleProcess.js</contentTitleProcess> diff --git a/entity/Observation_entity/Observation_entity.aod b/entity/Observation_entity/Observation_entity.aod index 42aa711708f462f3261b1c663e7a67a14545e0b2..94c246c8b0020bd5deeac8479ed5aad7fbef0453 100644 --- a/entity/Observation_entity/Observation_entity.aod +++ b/entity/Observation_entity/Observation_entity.aod @@ -60,7 +60,6 @@ <stateProcess>%aditoprj%/entity/Observation_entity/entityfields/object_type/stateProcess.js</stateProcess> <valueProcess>%aditoprj%/entity/Observation_entity/entityfields/object_type/valueProcess.js</valueProcess> <displayValueProcess>%aditoprj%/entity/Observation_entity/entityfields/object_type/displayValueProcess.js</displayValueProcess> - <onValueChange>%aditoprj%/entity/Observation_entity/entityfields/object_type/onValueChange.js</onValueChange> </entityField> <entityField> <name>OBJECT_ID</name> @@ -142,6 +141,7 @@ <name>OBJECT_FIELD</name> <title>Fields</title> <contentType>TEXT</contentType> + <mandatory v="true" /> <dropDownProcess>%aditoprj%/entity/Observation_entity/entityfields/object_field/dropDownProcess.js</dropDownProcess> <selectionMode>MULTI</selectionMode> <stateProcess>%aditoprj%/entity/Observation_entity/entityfields/object_field/stateProcess.js</stateProcess> diff --git a/entity/Observation_entity/entityfields/object_type/onValueChange.js b/entity/Observation_entity/entityfields/object_type/onValueChange.js deleted file mode 100644 index 9bcd9261bdd4b363f261de9b5e1edad733a7b9ea..0000000000000000000000000000000000000000 --- a/entity/Observation_entity/entityfields/object_type/onValueChange.js +++ /dev/null @@ -1,6 +0,0 @@ -import("system.neon"); -import("Observation_lib"); -import("system.vars"); - -if (vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_NEW) - vars.set("$field.OBJECT_FIELD",null); \ No newline at end of file diff --git a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod index 9a4f38da38c46e25d25e39e3b4a6f9e5817a663c..66f7124eb4078a2142beea4a3724ce596e61b663 100644 --- a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod +++ b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod @@ -25,6 +25,10 @@ <entry> <key>Ticket was reopen by</key> </entry> + <entry> + <key>Contact or company</key> + <value>Kontakt oder Firma</value> + </entry> <entry> <key>You tried to change the status of a ticket from 'ended' to another status.</key> <value>Sie haben versucht den Status eines Tickets von 'abgeschlossen zu einem anderen Status zu ändern.</value>