diff --git a/entity/ObjectRelation_entity/ObjectRelation_entity.aod b/entity/ObjectRelation_entity/ObjectRelation_entity.aod index ea978e28dcece7e06a9117086bdb7c3a4ec8240c..7962870d76d7b67f7f3d91d16bb3a4a301c3cc2d 100644 --- a/entity/ObjectRelation_entity/ObjectRelation_entity.aod +++ b/entity/ObjectRelation_entity/ObjectRelation_entity.aod @@ -338,6 +338,9 @@ <expose v="true" /> <description>PARAMETER</description> </entityParameter> + <entityField> + <name>EMPTY</name> + </entityField> </entityFields> <recordContainers> <dbRecordContainer> diff --git a/entity/Organisation_entity/entityfields/salesprojects/children/contactid_param/code.js b/entity/Organisation_entity/entityfields/salesprojects/children/contactid_param/code.js index fb6ae92cf587f31a05c8d4f9f1fb13316eeeb5f3..835140d0bee877176a6fd5a8e94460e5b5e776d1 100644 --- a/entity/Organisation_entity/entityfields/salesprojects/children/contactid_param/code.js +++ b/entity/Organisation_entity/entityfields/salesprojects/children/contactid_param/code.js @@ -1,3 +1,3 @@ import("system.vars"); import("system.result"); -result.string(vars.get("$field.ORGANISATION_ID")); \ No newline at end of file +result.string(vars.get("$field.ORGANISATIONID")); \ No newline at end of file diff --git a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod index c1176f5c6bffe36292736aef2f4ad1ee021a5249..bb50a0cfc5ae38837d03dbd597767fbd1009e531 100644 --- a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod +++ b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod @@ -2376,6 +2376,12 @@ <entry> <key>New task</key> </entry> + <entry> + <key>MyTasks</key> + </entry> + <entry> + <key>Show my tasks</key> + </entry> <entry> <key>the specified key has to be unique for that container but does already exist</key> </entry> diff --git a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod index b381ca9fae92674ee3c5c79f600ec03f9e0145ea..ae516de8b29040697890f44b499916e7ca0ed646 100644 --- a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod +++ b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod @@ -1691,9 +1691,11 @@ </entry> <entry> <key>Customer</key> + <value>Kunde</value> </entry> <entry> <key>Outgoing</key> + <value>ausgehend</value> </entry> <entry> <key>Paraguay</key> @@ -1866,6 +1868,7 @@ </entry> <entry> <key>${ORGTYPE_OTHER}</key> + <value>Sonstiges</value> </entry> <entry> <key>Haiti</key> @@ -1878,6 +1881,7 @@ </entry> <entry> <key>waiting</key> + <value>warten auf Rückmeldung</value> </entry> <entry> <key>American Samoa</key> @@ -1938,6 +1942,7 @@ </entry> <entry> <key>Incoming</key> + <value>eingehend</value> </entry> <entry> <key>Ghana</key> @@ -1989,6 +1994,7 @@ </entry> <entry> <key>Supplier</key> + <value>Lieferant</value> </entry> <entry> <key>Nigeria</key> @@ -2013,6 +2019,7 @@ </entry> <entry> <key>Prospect</key> + <value>Potenzieller Kunde</value> </entry> <entry> <key>Estonia</key> @@ -2043,6 +2050,7 @@ </entry> <entry> <key>new</key> + <value>neu</value> </entry> <entry> <key>Adviser</key> @@ -2373,6 +2381,7 @@ </entry> <entry> <key>Internal</key> + <value>intern</value> </entry> <entry> <key>Brunei Darussalam</key> @@ -2433,6 +2442,7 @@ </entry> <entry> <key>${GENDER_OTHER}</key> + <value>Divers</value> </entry> <entry> <key>Touchpoint</key> @@ -2483,6 +2493,7 @@ </entry> <entry> <key>in process</key> + <value>in Bearbeitung</value> </entry> <entry> <key>Saint Martin (French part)</key> @@ -2522,7 +2533,7 @@ </entry> <entry> <key>ended</key> - <value></value> + <value>abgeschlossen</value> </entry> <entry> <key>Saint Barthélemy</key> @@ -2745,6 +2756,14 @@ <key>New task</key> <value>Neue Aufgabe</value> </entry> + <entry> + <key>MyTasks</key> + <value>Meine Aufgaben</value> + </entry> + <entry> + <key>Show my tasks</key> + <value>Meine Aufgaben anzeigen</value> + </entry> <entry> <key>the specified key has to be unique for that container but does already exist</key> </entry> diff --git a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod index a90115e7eaa628e3d92aa480ea6cde9395841aa8..4c101a4c2c0ac238cf76b884496c4bd3ab3c1274 100644 --- a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod +++ b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod @@ -2400,6 +2400,12 @@ <entry> <key>New task</key> </entry> + <entry> + <key>MyTasks</key> + </entry> + <entry> + <key>Show my tasks</key> + </entry> <entry> <key>the specified key has to be unique for that container but does already exist</key> </entry> diff --git a/neonView/Object1RelationFilter_view/Object1RelationFilter_view.aod b/neonView/Object1RelationFilter_view/Object1RelationFilter_view.aod index 1c31750cce6f51087bcae6ac1302e01a7a56fd25..bd5d9de2901e7bcb490f61daef99819f696d9c1f 100644 --- a/neonView/Object1RelationFilter_view/Object1RelationFilter_view.aod +++ b/neonView/Object1RelationFilter_view/Object1RelationFilter_view.aod @@ -13,9 +13,13 @@ <entityField>#ENTITY</entityField> <columns> <neonTableColumn> - <name>c5fe708b-f406-4165-a9be-93fc1ed338df</name> + <name>9df2f22f-96ab-461e-af54-2dfdfa2de221</name> <entityField>OBJECT2_ROWID</entityField> </neonTableColumn> + <neonTableColumn> + <name>9df2f22f-96ab-461e-af54-2dfdfa7de221</name> + <entityField>EMPTY</entityField> + </neonTableColumn> </columns> </tableViewTemplate> </children> diff --git a/neonView/TaskFilter_view/TaskFilter_view.aod b/neonView/TaskFilter_view/TaskFilter_view.aod index 685009d266653d324a1b6368fe4d8d75aef30f93..8aec97e1e839ad21e9faa44c00b8e1d13a3d26d2 100644 --- a/neonView/TaskFilter_view/TaskFilter_view.aod +++ b/neonView/TaskFilter_view/TaskFilter_view.aod @@ -3,6 +3,23 @@ <name>TaskFilter_view</name> <majorModelMode>DISTRIBUTED</majorModelMode> <filterable v="true" /> + <dashletConfigurations> + <neonDashletConfiguration> + <name></name> + <title>MyTasks</title> + <description>Show my tasks</description> + <fragment>Task/filter</fragment> + <singleton v="true" /> + <requiresConfiguration v="false" /> + <icon>VAADIN:TASKS</icon> + <categories> + <neonDashletCategory> + <name>tasks</name> + <title>Tasks</title> + </neonDashletCategory> + </categories> + </neonDashletConfiguration> + </dashletConfigurations> <layout> <groupLayout> <name>layout</name>