diff --git a/entity/Activity_entity/Activity_entity.aod b/entity/Activity_entity/Activity_entity.aod
index c8deb1c8db7281f66222b175d0ee9da6cb367def..f0024a83bf8b842a582d39049682a1086d667fec 100644
--- a/entity/Activity_entity/Activity_entity.aod
+++ b/entity/Activity_entity/Activity_entity.aod
@@ -19,6 +19,7 @@
<title>Entrydate</title>
<contentType>DATE</contentType>
<resolution>DAY</resolution>
+ <outputFormat>dd.MM.yyyy</outputFormat>
<mandatory v="true" />
<valueProcess>%aditoprj%/entity/Activity_entity/entityfields/entrydate/valueProcess.js</valueProcess>
</entityField>
@@ -151,7 +152,7 @@
</entityParameter>
<entityConsumer>
<name>Links</name>
- <title>Verknüpfungen</title>
+ <title>Connections</title>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
<name>dependency</name>
@@ -258,7 +259,7 @@
</entityField>
<entityConsumer>
<name>ModuleTrees</name>
- <title>Baum</title>
+ <title>Tree</title>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
<name>dependency</name>
@@ -279,16 +280,16 @@
<entityActionField>
<name>newActivity_action</name>
<fieldType>ACTION</fieldType>
- <title>Neue Aktivität</title>
+ <title>New activity</title>
<onActionProcess>%aditoprj%/entity/Activity_entity/entityfields/newactivity_action/onActionProcess.js</onActionProcess>
- <iconId>VAADIN:PLUS</iconId>
+ <iconId>NEON:HISTORY</iconId>
</entityActionField>
<entityActionField>
<name>newTask_action</name>
<fieldType>ACTION</fieldType>
- <title>Neue Aufgabe</title>
+ <title>New task</title>
<onActionProcess>%aditoprj%/entity/Activity_entity/entityfields/newtask_action/onActionProcess.js</onActionProcess>
- <iconId>VAADIN:PLUS</iconId>
+ <iconId>VAADIN:TASKS</iconId>
</entityActionField>
<entityParameter>
<name>ParentId_param</name>
diff --git a/entity/Contract_entity/Contract_entity.aod b/entity/Contract_entity/Contract_entity.aod
index 06b6c814bcd645ef6bf7c946bab0a1698a8f501d..366d5e798f081f072d9940cf4f628a1ee1e05100 100644
--- a/entity/Contract_entity/Contract_entity.aod
+++ b/entity/Contract_entity/Contract_entity.aod
@@ -23,6 +23,7 @@
<title>Next due date</title>
<contentType>DATE</contentType>
<resolution>DAY</resolution>
+ <outputFormat>dd.MM.yyyy</outputFormat>
<onValidation>%aditoprj%/entity/Contract_entity/entityfields/contractdue/onValidation.js</onValidation>
</entityField>
<entityField>
@@ -31,6 +32,7 @@
<title>Contract expiry date</title>
<contentType>DATE</contentType>
<resolution>DAY</resolution>
+ <outputFormat>dd.MM.yyyy</outputFormat>
<onValidation>%aditoprj%/entity/Contract_entity/entityfields/contractend/onValidation.js</onValidation>
<onValueChange>%aditoprj%/entity/Contract_entity/entityfields/contractend/onValueChange.js</onValueChange>
</entityField>
@@ -45,6 +47,7 @@
<title>Contract start date</title>
<contentType>DATE</contentType>
<resolution>DAY</resolution>
+ <outputFormat>dd.MM.yyyy</outputFormat>
<onValidation>%aditoprj%/entity/Contract_entity/entityfields/contractstart/onValidation.js</onValidation>
<onValueChange>%aditoprj%/entity/Contract_entity/entityfields/contractstart/onValueChange.js</onValueChange>
</entityField>
diff --git a/entity/Document_entity/Document_entity.aod b/entity/Document_entity/Document_entity.aod
index cefdd4bdbb06f909dbcb10356eac9669ace50d3c..210404deb6e4c33919febb3b8d565869f6887468 100644
--- a/entity/Document_entity/Document_entity.aod
+++ b/entity/Document_entity/Document_entity.aod
@@ -20,26 +20,27 @@
</entityProvider>
<entityField>
<name>NAME</name>
- <title>Dateiname</title>
+ <title>Filename</title>
<mandatory v="true" />
<state>AUTO</state>
</entityField>
<entityField>
<name>TYPE</name>
- <title>Dateityp</title>
+ <title>Filetype</title>
<state>READONLY</state>
</entityField>
<entityField>
<name>SIZE</name>
- <title>Dateigröße</title>
+ <title>Filesize</title>
<contentType>FILESIZE</contentType>
<state>READONLY</state>
</entityField>
<entityField>
<name>DATE_EDIT</name>
- <title>Datum</title>
+ <title>Date</title>
<contentType>DATE</contentType>
<resolution>MINUTE</resolution>
+ <outputFormat>dd.MM.yyyy HH:mm:ss</outputFormat>
<state>READONLY</state>
</entityField>
<entityField>
diff --git a/entity/Offer_entity/Offer_entity.aod b/entity/Offer_entity/Offer_entity.aod
index af308c2990e728ddaee76fe71d8c866b425d9687..f6f21582c8d3a20e7a4c19e40bae8ff182494fc7 100644
--- a/entity/Offer_entity/Offer_entity.aod
+++ b/entity/Offer_entity/Offer_entity.aod
@@ -31,6 +31,7 @@
<title>Creation date</title>
<contentType>DATE</contentType>
<resolution>DAY</resolution>
+ <outputFormat>dd.MM.yyyy</outputFormat>
<mandatory v="true" />
<valueProcess>%aditoprj%/entity/Offer_entity/entityfields/offerdate/valueProcess.js</valueProcess>
</entityField>
diff --git a/entity/Order_entity/Order_entity.aod b/entity/Order_entity/Order_entity.aod
index cf2282fb925fadbd380034305763903ce0d66283..7f15d48fa9d854c7fb7d10315dae9aa55e2d4a26 100644
--- a/entity/Order_entity/Order_entity.aod
+++ b/entity/Order_entity/Order_entity.aod
@@ -31,6 +31,7 @@
<title>Creation date</title>
<contentType>DATE</contentType>
<resolution>DAY</resolution>
+ <outputFormat>dd.MM.yyyy</outputFormat>
<mandatory v="true" />
<valueProcess>%aditoprj%/entity/Order_entity/entityfields/salesorderdate/valueProcess.js</valueProcess>
</entityField>
diff --git a/entity/Person_entity/Person_entity.aod b/entity/Person_entity/Person_entity.aod
index be0db2e3cb78f950af2cdb228ed3a9a1d13d1c73..bd05c9fadc079133368f2a9e8f0b3c55b8bf0cbc 100644
--- a/entity/Person_entity/Person_entity.aod
+++ b/entity/Person_entity/Person_entity.aod
@@ -15,6 +15,7 @@
<title>Date of birth</title>
<contentType>DATE</contentType>
<resolution>DAY</resolution>
+ <outputFormat>dd.MM.yyyy</outputFormat>
</entityField>
<entityField>
<name>FIRSTNAME</name>
diff --git a/entity/Productprice_entity/Productprice_entity.aod b/entity/Productprice_entity/Productprice_entity.aod
index 2d02541216829cd9f4b6410658dd2239e70bca4b..5a38013798e0d3ee07dc4ffad661a4a803fb34cd 100644
--- a/entity/Productprice_entity/Productprice_entity.aod
+++ b/entity/Productprice_entity/Productprice_entity.aod
@@ -60,6 +60,7 @@
<title>Valid from</title>
<contentType>DATE</contentType>
<resolution>DAY</resolution>
+ <outputFormat>dd.MM.yyyy</outputFormat>
<mandatory v="true" />
<valueProcess>%aditoprj%/entity/Productprice_entity/entityfields/valid_from/valueProcess.js</valueProcess>
<onValidation>%aditoprj%/entity/Productprice_entity/entityfields/valid_from/onValidation.js</onValidation>
@@ -69,6 +70,7 @@
<title>Valid until</title>
<contentType>DATE</contentType>
<resolution>DAY</resolution>
+ <outputFormat>dd.MM.yyyy</outputFormat>
<onValidation>%aditoprj%/entity/Productprice_entity/entityfields/valid_to/onValidation.js</onValidation>
</entityField>
<entityField>
diff --git a/entity/SalesprojectCompetition_entity/SalesprojectCompetition_entity.aod b/entity/SalesprojectCompetition_entity/SalesprojectCompetition_entity.aod
index 0fdd5ef9d4212c2d106e47918bef84c24fa6c4df..d7defd58150a99916a8751c000b8d1337b4e4c90 100644
--- a/entity/SalesprojectCompetition_entity/SalesprojectCompetition_entity.aod
+++ b/entity/SalesprojectCompetition_entity/SalesprojectCompetition_entity.aod
@@ -13,6 +13,7 @@
<title>Excreted</title>
<contentType>DATE</contentType>
<resolution>DAY</resolution>
+ <outputFormat>dd.MM.yyyy</outputFormat>
</entityField>
<entityField>
<name>INFO</name>
diff --git a/entity/SalesprojectCycle_entity/SalesprojectCycle_entity.aod b/entity/SalesprojectCycle_entity/SalesprojectCycle_entity.aod
index efe3d96a259014e1d298227f1d953da093d56c8d..86237f6e8636a7673196886a0e894cbc8540e0e3 100644
--- a/entity/SalesprojectCycle_entity/SalesprojectCycle_entity.aod
+++ b/entity/SalesprojectCycle_entity/SalesprojectCycle_entity.aod
@@ -13,6 +13,7 @@
<title>End date</title>
<contentType>DATE</contentType>
<resolution>DAY</resolution>
+ <outputFormat>dd.MM.yyyy</outputFormat>
<searchable v="true" />
</entityField>
<entityField>
@@ -20,6 +21,7 @@
<title>Date</title>
<contentType>DATE</contentType>
<resolution>DAY</resolution>
+ <outputFormat>dd.MM.yyyy</outputFormat>
</entityField>
<entityField>
<name>SALESPROJECT_CYCLEID</name>
diff --git a/entity/SalesprojectForecast_entity/SalesprojectForecast_entity.aod b/entity/SalesprojectForecast_entity/SalesprojectForecast_entity.aod
index 93bbe23ab87c45b974b1ae2a50e494fda67896f0..ac4410f847cf7bf4dae8f02f88799ea7ddb3d476 100644
--- a/entity/SalesprojectForecast_entity/SalesprojectForecast_entity.aod
+++ b/entity/SalesprojectForecast_entity/SalesprojectForecast_entity.aod
@@ -13,6 +13,7 @@
<title>Planned</title>
<contentType>DATE</contentType>
<resolution>DAY</resolution>
+ <outputFormat>dd.MM.yyyy</outputFormat>
</entityField>
<entityField>
<name>GROUPCODE</name>
diff --git a/entity/SalesprojectSource_entity/SalesprojectSource_entity.aod b/entity/SalesprojectSource_entity/SalesprojectSource_entity.aod
index 63774cba86c602cea3ea1ac99c03442e4d7b5433..ec08058c7701b5acf988f119331d09b85db9239d 100644
--- a/entity/SalesprojectSource_entity/SalesprojectSource_entity.aod
+++ b/entity/SalesprojectSource_entity/SalesprojectSource_entity.aod
@@ -39,6 +39,7 @@
<title>Date</title>
<contentType>DATE</contentType>
<resolution>DAY</resolution>
+ <outputFormat>dd.MM.yyyy</outputFormat>
</entityField>
<entityField>
<name>INFO</name>
diff --git a/entity/Salesproject_entity/Salesproject_entity.aod b/entity/Salesproject_entity/Salesproject_entity.aod
index b2c19d80712bae3de9b5aef884aae34844f2b462..550a25b68ca86e3248fe0d4ba3d30dd80f1d113e 100644
--- a/entity/Salesproject_entity/Salesproject_entity.aod
+++ b/entity/Salesproject_entity/Salesproject_entity.aod
@@ -29,6 +29,7 @@
<title>Rollout</title>
<contentType>DATE</contentType>
<resolution>DAY</resolution>
+ <outputFormat>dd.MM.yyyy</outputFormat>
<valueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/enddate/valueProcess.js</valueProcess>
</entityField>
<entityField>
@@ -70,6 +71,7 @@
<title>Project start</title>
<contentType>DATE</contentType>
<resolution>DAY</resolution>
+ <outputFormat>dd.MM.yyyy</outputFormat>
<mandatory v="true" />
<valueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/startdate/valueProcess.js</valueProcess>
</entityField>
diff --git a/entity/Stock_entity/Stock_entity.aod b/entity/Stock_entity/Stock_entity.aod
index eca4ca8d10fb94cac460c04649583e2ad5ffb4dc..884e87652393a9fedb2087f9d50a16feaf304372 100644
--- a/entity/Stock_entity/Stock_entity.aod
+++ b/entity/Stock_entity/Stock_entity.aod
@@ -11,6 +11,7 @@
<title>Date</title>
<contentType>DATE</contentType>
<resolution>DAY</resolution>
+ <outputFormat>dd.MM.yyyy</outputFormat>
<mandatory v="true" />
<valueProcess>%aditoprj%/entity/Stock_entity/entityfields/entrydate/valueProcess.js</valueProcess>
</entityField>
diff --git a/entity/Task_entity/Task_entity.aod b/entity/Task_entity/Task_entity.aod
index 6d6d162fac3d22fe9840dd9053d305d2b6797eed..a959133c142642f6c7df649fab3b589254e3df0d 100644
--- a/entity/Task_entity/Task_entity.aod
+++ b/entity/Task_entity/Task_entity.aod
@@ -60,6 +60,7 @@
<title>start date</title>
<contentType>DATE</contentType>
<resolution>DAY</resolution>
+ <outputFormat>dd.MM.yyyy</outputFormat>
<groupable v="true" />
<valueProcess>%aditoprj%/entity/Task_entity/entityfields/start_date/valueProcess.js</valueProcess>
<onValidation>%aditoprj%/entity/Task_entity/entityfields/start_date/onValidation.js</onValidation>
@@ -69,6 +70,7 @@
<title>maturity date</title>
<contentType>DATE</contentType>
<resolution>DAY</resolution>
+ <outputFormat>dd.MM.yyyy</outputFormat>
<valueProcess>%aditoprj%/entity/Task_entity/entityfields/maturity_date/valueProcess.js</valueProcess>
<onValidation>%aditoprj%/entity/Task_entity/entityfields/maturity_date/onValidation.js</onValidation>
</entityField>
@@ -173,7 +175,7 @@
</entityConsumer>
<entityConsumer>
<name>ModuleTrees</name>
- <title>Baum</title>
+ <title>Tree</title>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
<name>dependency</name>
@@ -215,16 +217,16 @@
<entityActionField>
<name>newActivity_action</name>
<fieldType>ACTION</fieldType>
- <title>Neue Aktivität</title>
+ <title>New activity</title>
<onActionProcess>%aditoprj%/entity/Task_entity/entityfields/newactivity_action/onActionProcess.js</onActionProcess>
- <iconId>VAADIN:PLUS</iconId>
+ <iconId>NEON:HISTORY</iconId>
</entityActionField>
<entityActionField>
<name>newTask_action</name>
<fieldType>ACTION</fieldType>
- <title>Neue Aufgabe</title>
+ <title>New task</title>
<onActionProcess>%aditoprj%/entity/Task_entity/entityfields/newtask_action/onActionProcess.js</onActionProcess>
- <iconId>VAADIN:PLUS</iconId>
+ <iconId>VAADIN:TASKS</iconId>
</entityActionField>
<entityParameter>
<name>RowId_param</name>
diff --git a/entity/Timetracking_entity/Timetracking_entity.aod b/entity/Timetracking_entity/Timetracking_entity.aod
index afb6fc572e29e8edde87c78277992f26aae13946..e4c846e28376cc90cabcc2f97b85e32f4929a6df 100644
--- a/entity/Timetracking_entity/Timetracking_entity.aod
+++ b/entity/Timetracking_entity/Timetracking_entity.aod
@@ -48,6 +48,7 @@
<title>Date</title>
<contentType>DATE</contentType>
<resolution>DAY</resolution>
+ <outputFormat>dd.MM.yyyy</outputFormat>
<mandatory v="true" />
<valueProcess>%aditoprj%/entity/Timetracking_entity/entityfields/date/valueProcess.js</valueProcess>
</entityField>
diff --git a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
index f143950a67e8e8b0c25f8d38865c2e9b9bc43c6b..84ba642f70c11dcdddb2c7d132039f7f0ed297b5 100644
--- a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
+++ b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
@@ -2541,6 +2541,15 @@
<entry>
<key>${SALESPROJECT_NEGOTIATION}</key>
</entry>
+ <entry>
+ <key>Filesize</key>
+ </entry>
+ <entry>
+ <key>Filename</key>
+ </entry>
+ <entry>
+ <key>Filetype</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 c4aea4ea12caa9d6c663ba31c4eedbc17ec0ca5a..572ab2905869eb16961b792377d5d537208e9227 100644
--- a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
+++ b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
@@ -62,6 +62,10 @@
<key>${SALESPROJECT_NEGOTIATION}</key>
<value>Negotiation</value>
</entry>
+ <entry>
+ <key>Filename</key>
+ <value>Dateiname</value>
+ </entry>
<entry>
<key>Male</key>
<value>Männlich</value>
@@ -1004,6 +1008,10 @@
<key>Show all offers</key>
<value>Alle Angebote anzeigen</value>
</entry>
+ <entry>
+ <key>Filetype</key>
+ <value>Dateityp</value>
+ </entry>
<entry>
<key>child of</key>
<value>Kind von</value>
@@ -1012,6 +1020,10 @@
<key>Products</key>
<value>Produkte</value>
</entry>
+ <entry>
+ <key>Filesize</key>
+ <value>Dateigrösse</value>
+ </entry>
<entry>
<key>Industry 1</key>
<value>Branche 1</value>
@@ -1404,7 +1416,7 @@
</entry>
<entry>
<key>New activity</key>
- <value>Aktivität erstellen</value>
+ <value>Neue Aktivität</value>
</entry>
<entry>
<key>July</key>
@@ -2837,6 +2849,7 @@
</entry>
<entry>
<key>Tree</key>
+ <value>Baum</value>
</entry>
<entry>
<key>100%</key>
diff --git a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
index c1df1b38efaf640d6bff8e5aab2c687be4961556..c572b4d55ac4821daf82208c3acd7adf317cc25b 100644
--- a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
+++ b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
@@ -17,7 +17,6 @@
</entry>
<entry>
<key>Activity</key>
- <value></value>
</entry>
<entry>
<key>Name</key>
@@ -69,7 +68,6 @@
</entry>
<entry>
<key>Activities</key>
- <value></value>
</entry>
<entry>
<key>Female</key>
@@ -752,7 +750,6 @@
</entry>
<entry>
<key>Offer report</key>
- <value></value>
</entry>
<entry>
<key>New offer</key>
@@ -2571,6 +2568,18 @@
<key>${SALESPROJECT_NEGOTIATION}</key>
<value>Negotiation</value>
</entry>
+ <entry>
+ <key>Filesize</key>
+ </entry>
+ <entry>
+ <key>Filename</key>
+ </entry>
+ <entry>
+ <key>Filetype</key>
+ </entry>
+ <entry>
+ <key>Entrydate (Month)</key>
+ </entry>
</keyValueMap>
<font name="Dialog" style="0" size="11" />
</language>
diff --git a/neonView/ActivityDetail_view/ActivityDetail_view.aod b/neonView/ActivityDetail_view/ActivityDetail_view.aod
index 5c1f702b4d3c5bfd08ee3174cf04c44329c6dc64..3409dd71072b0365b04e4a66f649950932adbe10 100644
--- a/neonView/ActivityDetail_view/ActivityDetail_view.aod
+++ b/neonView/ActivityDetail_view/ActivityDetail_view.aod
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.0.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.0.1">
<name>ActivityDetail_view</name>
- <title>Beschreibung</title>
+ <title>Description</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
<layout>
<boxLayout>