diff --git a/.aditoprj/project.version b/.aditoprj/project.version
index 130d81ee8cc736d8dcd127ac4821de5144823dec..9b538911487dd21f237ddb543a61f843acbd167d 100644
--- a/.aditoprj/project.version
+++ b/.aditoprj/project.version
@@ -1,3 +1,3 @@
#This file is generated by ADITO designer. Do NOT delete or modify!
-#Tue Jun 12 10:14:49 CEST 2018
-version=5.1.2
+#Mon Nov 26 09:04:53 CET 2018
+version=5.1.3
diff --git a/entity/Address_entity/Address_entity.aod b/entity/Address_entity/Address_entity.aod
index 0441cdc175d48d35d26f56342a759a724d79afd9..bf7d04e0669d68101bf089f17b92416ee792afab 100644
--- a/entity/Address_entity/Address_entity.aod
+++ b/entity/Address_entity/Address_entity.aod
@@ -1,20 +1,19 @@
<?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.0.4" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.0.4">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.0.5" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.0.5">
<name>Address_entity</name>
<title>Addresses</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
- <alias>Data_alias</alias>
- <conditionProcess>%aditoprj%/entity/Address_entity/conditionProcess.js</conditionProcess>
<grantCreateProcess>%aditoprj%/entity/Address_entity/grantCreateProcess.js</grantCreateProcess>
<grantDeleteProcess>%aditoprj%/entity/Address_entity/grantDeleteProcess.js</grantDeleteProcess>
<recordContainerType>DB</recordContainerType>
- <caption>Addresses</caption>
+ <alias>Data_alias</alias>
+ <conditionProcess>%aditoprj%/entity/Address_entity/conditionProcess.js</conditionProcess>
<entityFields>
<entityField>
<name>ADDRESS</name>
+ <title>Address</title>
<tableName>ADDRESS</tableName>
<columnName>ADDRESS</columnName>
- <caption>Address</caption>
<stateProcess>%aditoprj%/entity/Address_entity/entityfields/address/stateProcess.js</stateProcess>
</entityField>
<entityField>
@@ -36,31 +35,31 @@
</entityField>
<entityField>
<name>ADDR_TYPE</name>
+ <title>Addresstype</title>
<tableName>ADDRESS</tableName>
<columnName>ADDR_TYPE</columnName>
- <caption>Addresstype</caption>
<possibleItemsProcess>%aditoprj%/entity/Address_entity/entityfields/addr_type/possibleItemsProcess.js</possibleItemsProcess>
<stateProcess>%aditoprj%/entity/Address_entity/entityfields/addr_type/stateProcess.js</stateProcess>
</entityField>
<entityField>
<name>BUILDINGNO</name>
+ <title>House number</title>
<tableName>ADDRESS</tableName>
<columnName>BUILDINGNO</columnName>
- <caption>House number</caption>
<stateProcess>%aditoprj%/entity/Address_entity/entityfields/buildingno/stateProcess.js</stateProcess>
</entityField>
<entityField>
<name>CITY</name>
+ <title>City</title>
<tableName>ADDRESS</tableName>
<columnName>CITY</columnName>
- <caption>City</caption>
<stateProcess>%aditoprj%/entity/Address_entity/entityfields/city/stateProcess.js</stateProcess>
</entityField>
<entityField>
<name>COUNTRY</name>
+ <title>Country</title>
<tableName>ADDRESS</tableName>
<columnName>COUNTRY</columnName>
- <caption>Country</caption>
<possibleItemsProcess>%aditoprj%/entity/Address_entity/entityfields/country/possibleItemsProcess.js</possibleItemsProcess>
<stateProcess>%aditoprj%/entity/Address_entity/entityfields/country/stateProcess.js</stateProcess>
<valueProcess>%aditoprj%/entity/Address_entity/entityfields/country/valueProcess.js</valueProcess>
@@ -79,16 +78,16 @@
</entityField>
<entityField>
<name>DISTRICT</name>
+ <title>District</title>
<tableName>ADDRESS</tableName>
<columnName>DISTRICT</columnName>
- <caption>District</caption>
<stateProcess>%aditoprj%/entity/Address_entity/entityfields/district/stateProcess.js</stateProcess>
</entityField>
<entityField>
<name>REGION</name>
+ <title>Region</title>
<tableName>ADDRESS</tableName>
<columnName>REGION</columnName>
- <caption>Region</caption>
<stateProcess>%aditoprj%/entity/Address_entity/entityfields/region/stateProcess.js</stateProcess>
</entityField>
<entityField>
@@ -99,9 +98,9 @@
</entityField>
<entityField>
<name>STATE</name>
+ <title>State</title>
<tableName>ADDRESS</tableName>
<columnName>STATE</columnName>
- <caption>State</caption>
<stateProcess>%aditoprj%/entity/Address_entity/entityfields/state/stateProcess.js</stateProcess>
</entityField>
<entityField>
@@ -118,9 +117,9 @@
</entityField>
<entityField>
<name>ZIP</name>
+ <title>postcode</title>
<tableName>ADDRESS</tableName>
<columnName>ZIP</columnName>
- <caption>postcode</caption>
<stateProcess>%aditoprj%/entity/Address_entity/entityfields/zip/stateProcess.js</stateProcess>
</entityField>
<entityIncomingField>
@@ -165,7 +164,7 @@
</entityParameter>
<entityField>
<name>IS_STANDARD</name>
- <caption>Standard</caption>
+ <title>Standard</title>
<contentType>BOOLEAN</contentType>
<possibleItemsProcess>%aditoprj%/entity/Address_entity/entityfields/is_standard/possibleItemsProcess.js</possibleItemsProcess>
<valueProcess>%aditoprj%/entity/Address_entity/entityfields/is_standard/valueProcess.js</valueProcess>
diff --git a/entity/Appointment_entity/Appointment_entity.aod b/entity/Appointment_entity/Appointment_entity.aod
index 769ec9f9a57c597ab9ecda8cf70326db0c9da2c8..ba5e554f0f9b4187a40fd003c4dc971096d5faec 100644
--- a/entity/Appointment_entity/Appointment_entity.aod
+++ b/entity/Appointment_entity/Appointment_entity.aod
@@ -1,174 +1,173 @@
-<?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.0.4" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.0.4">
- <name>Appointment_entity</name>
- <title>Termin</title>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <alias>Data_alias</alias>
- <jDitoRecordAlias>Data_alias</jDitoRecordAlias>
- <fields>
- <element>UID</element>
- <element>BACKGROUNDCOLOR</element>
- <element>FONTCOLOR</element>
- <element>ATTENDEESLENGTH</element>
- <element>STARTDATE</element>
- <element>ENDDATE</element>
- <element>SUMMARY</element>
- <element>ORGANIZER</element>
- <element>ATTENDEES</element>
- <element>STATUS</element>
- <element>LINKS</element>
- <element>DESCRIPTION</element>
- <element>LOCATION</element>
- <element>ICON</element>
- <element>CLASSIFICATION</element>
- <element>TRANSPARENCY</element>
- <element>CATEGORIES</element>
- <element>REMINDER</element>
- <element>RRULE</element>
- <element>RECURRENCEID</element>
- <element>SAFESCOPEFIELD</element>
- <element>MASTERBEGIN</element>
- <element>MASTEREND</element>
- </fields>
- <contentProcess>%aditoprj%/entity/Appointment_entity/contentProcess.js</contentProcess>
- <onInsert>%aditoprj%/entity/Appointment_entity/onInsert.js</onInsert>
- <onUpdate>%aditoprj%/entity/Appointment_entity/onUpdate.js</onUpdate>
- <onDelete>%aditoprj%/entity/Appointment_entity/onDelete.js</onDelete>
- <recordContainerType>JDITO</recordContainerType>
- <caption>Termin</caption>
- <entityFields>
- <entityField>
- <name>SUMMARY</name>
- <fieldName>SUMMARY</fieldName>
- <caption>Betreff</caption>
- <valueProcess>%aditoprj%/entity/Appointment_entity/entityfields/summary/valueProcess.js</valueProcess>
- </entityField>
- <entityParameter>
- <name>entry</name>
- <expose v="true" />
- <description>PARAMETER</description>
- </entityParameter>
- <entityField>
- <name>DESCRIPTION</name>
- <fieldName>DESCRIPTION</fieldName>
- </entityField>
- <entityField>
- <name>CLASSIFICATION</name>
- <fieldName>CLASSIFICATION</fieldName>
- <possibleItemsProcess>%aditoprj%/entity/Appointment_entity/entityfields/classification/possibleItemsProcess.js</possibleItemsProcess>
- <valueProcess>%aditoprj%/entity/Appointment_entity/entityfields/classification/valueProcess.js</valueProcess>
- </entityField>
- <entityField>
- <name>BEGIN</name>
- <fieldName>STARTDATE</fieldName>
- <selectionMode>SINGLE</selectionMode>
- <valueProcess>%aditoprj%/entity/Appointment_entity/entityfields/begin/valueProcess.js</valueProcess>
- </entityField>
- <entityField>
- <name>END</name>
- <fieldName>ENDDATE</fieldName>
- <valueProcess>%aditoprj%/entity/Appointment_entity/entityfields/end/valueProcess.js</valueProcess>
- </entityField>
- <entityFieldGroup>
- <name>STARTEND</name>
- <valueProcess>%aditoprj%/entity/Appointment_entity/entityfields/startend/valueProcess.js</valueProcess>
- <description>FIELDGROUP</description>
- <fields>
- <element>BEGIN</element>
- <element>END</element>
- </fields>
- </entityFieldGroup>
- <entityField>
- <name>STATUS</name>
- <fieldName>STATUS</fieldName>
- <possibleItemsProcess>%aditoprj%/entity/Appointment_entity/entityfields/status/possibleItemsProcess.js</possibleItemsProcess>
- </entityField>
- <entityField>
- <name>LOCATION</name>
- <fieldName>LOCATION</fieldName>
- </entityField>
- <entityField>
- <name>REMINDER_CHECK</name>
- </entityField>
- <entityField>
- <name>REMINDER</name>
- <fieldName>REMINDER</fieldName>
- </entityField>
- <entityField>
- <name>CATEGORIES</name>
- <fieldName>CATEGORIES</fieldName>
- <possibleItemsProcess>%aditoprj%/entity/Appointment_entity/entityfields/categories/possibleItemsProcess.js</possibleItemsProcess>
- <newItemsAllowed v="true" />
- <valueProcess>%aditoprj%/entity/Appointment_entity/entityfields/categories/valueProcess.js</valueProcess>
- </entityField>
- <entityField>
- <name>ATTENDEES</name>
- <fieldName>ATTENDEES</fieldName>
- <possibleItemsProcess>%aditoprj%/entity/Appointment_entity/entityfields/attendees/possibleItemsProcess.js</possibleItemsProcess>
- </entityField>
- <entityField>
- <name>TRANSPARENCY</name>
- <fieldName>TRANSPARENCY</fieldName>
- </entityField>
- <entityActionGroup>
- <name>PartStatActionGroup</name>
- <children>
- <entityActionField>
- <name>accept</name>
- <fieldType>ACTION</fieldType>
- <onActionProcess>%aditoprj%/entity/Appointment_entity/entityfields/partstatactiongroup/children/accept/onActionProcess.js</onActionProcess>
- <actionOrder v="0" />
- <caption>zusagen</caption>
- <iconId>VAADIN:CHECK</iconId>
- </entityActionField>
- <entityActionField>
- <name>decline</name>
- <fieldType>ACTION</fieldType>
- <description></description>
- <onActionProcess>%aditoprj%/entity/Appointment_entity/entityfields/partstatactiongroup/children/decline/onActionProcess.js</onActionProcess>
- <caption>absagen</caption>
- <iconId>VAADIN:CLOSE</iconId>
- </entityActionField>
- <entityActionField>
- <name>tentative</name>
- <fieldType>ACTION</fieldType>
- <onActionProcess>%aditoprj%/entity/Appointment_entity/entityfields/partstatactiongroup/children/tentative/onActionProcess.js</onActionProcess>
- <caption>vielleicht</caption>
- <iconId>VAADIN:QUESTION</iconId>
- </entityActionField>
- </children>
- </entityActionGroup>
- <entityIncomingField>
- <name>#INCOMING</name>
- </entityIncomingField>
- <entityParameter>
- <name>masterEntry</name>
- <expose v="true" />
- <description>PARAMETER</description>
- </entityParameter>
- <entityField>
- <name>ORGANIZER</name>
- <fieldName>ORGANIZER</fieldName>
- </entityField>
- <entityField>
- <name>RRULE</name>
- <fieldName>RRULE</fieldName>
- </entityField>
- <entityField>
- <name>RECURRENCEID</name>
- <fieldName>RECURRENCEID</fieldName>
- </entityField>
- <entityField>
- <name>SAFESCOPEFIELD</name>
- <fieldName>SAFESCOPEFIELD</fieldName>
- </entityField>
- <entityField>
- <name>MASTERBEGIN</name>
- <fieldName>MASTERBEGIN</fieldName>
- </entityField>
- <entityField>
- <name>MASTEREND</name>
- <fieldName>MASTEREND</fieldName>
- </entityField>
- </entityFields>
-</entity>
+<?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.0.5" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.0.5">
+ <name>Appointment_entity</name>
+ <title>Termin</title>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <recordContainerType>JDITO</recordContainerType>
+ <alias>Data_alias</alias>
+ <jDitoRecordAlias>Data_alias</jDitoRecordAlias>
+ <fields>
+ <element>UID</element>
+ <element>BACKGROUNDCOLOR</element>
+ <element>FONTCOLOR</element>
+ <element>ATTENDEESLENGTH</element>
+ <element>STARTDATE</element>
+ <element>ENDDATE</element>
+ <element>SUMMARY</element>
+ <element>ORGANIZER</element>
+ <element>ATTENDEES</element>
+ <element>STATUS</element>
+ <element>LINKS</element>
+ <element>DESCRIPTION</element>
+ <element>LOCATION</element>
+ <element>ICON</element>
+ <element>CLASSIFICATION</element>
+ <element>TRANSPARENCY</element>
+ <element>CATEGORIES</element>
+ <element>REMINDER</element>
+ <element>RRULE</element>
+ <element>RECURRENCEID</element>
+ <element>SAFESCOPEFIELD</element>
+ <element>MASTERBEGIN</element>
+ <element>MASTEREND</element>
+ </fields>
+ <contentProcess>%aditoprj%/entity/Appointment_entity/contentProcess.js</contentProcess>
+ <onInsert>%aditoprj%/entity/Appointment_entity/onInsert.js</onInsert>
+ <onUpdate>%aditoprj%/entity/Appointment_entity/onUpdate.js</onUpdate>
+ <onDelete>%aditoprj%/entity/Appointment_entity/onDelete.js</onDelete>
+ <entityFields>
+ <entityField>
+ <name>SUMMARY</name>
+ <title>Betreff</title>
+ <fieldName>SUMMARY</fieldName>
+ <valueProcess>%aditoprj%/entity/Appointment_entity/entityfields/summary/valueProcess.js</valueProcess>
+ </entityField>
+ <entityParameter>
+ <name>entry</name>
+ <expose v="true" />
+ <description>PARAMETER</description>
+ </entityParameter>
+ <entityField>
+ <name>DESCRIPTION</name>
+ <fieldName>DESCRIPTION</fieldName>
+ </entityField>
+ <entityField>
+ <name>CLASSIFICATION</name>
+ <fieldName>CLASSIFICATION</fieldName>
+ <possibleItemsProcess>%aditoprj%/entity/Appointment_entity/entityfields/classification/possibleItemsProcess.js</possibleItemsProcess>
+ <valueProcess>%aditoprj%/entity/Appointment_entity/entityfields/classification/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>BEGIN</name>
+ <fieldName>STARTDATE</fieldName>
+ <selectionMode>SINGLE</selectionMode>
+ <valueProcess>%aditoprj%/entity/Appointment_entity/entityfields/begin/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>END</name>
+ <fieldName>ENDDATE</fieldName>
+ <valueProcess>%aditoprj%/entity/Appointment_entity/entityfields/end/valueProcess.js</valueProcess>
+ </entityField>
+ <entityFieldGroup>
+ <name>STARTEND</name>
+ <valueProcess>%aditoprj%/entity/Appointment_entity/entityfields/startend/valueProcess.js</valueProcess>
+ <description>FIELDGROUP</description>
+ <fields>
+ <element>BEGIN</element>
+ <element>END</element>
+ </fields>
+ </entityFieldGroup>
+ <entityField>
+ <name>STATUS</name>
+ <fieldName>STATUS</fieldName>
+ <possibleItemsProcess>%aditoprj%/entity/Appointment_entity/entityfields/status/possibleItemsProcess.js</possibleItemsProcess>
+ </entityField>
+ <entityField>
+ <name>LOCATION</name>
+ <fieldName>LOCATION</fieldName>
+ </entityField>
+ <entityField>
+ <name>REMINDER_CHECK</name>
+ </entityField>
+ <entityField>
+ <name>REMINDER</name>
+ <fieldName>REMINDER</fieldName>
+ </entityField>
+ <entityField>
+ <name>CATEGORIES</name>
+ <fieldName>CATEGORIES</fieldName>
+ <possibleItemsProcess>%aditoprj%/entity/Appointment_entity/entityfields/categories/possibleItemsProcess.js</possibleItemsProcess>
+ <newItemsAllowed v="true" />
+ <valueProcess>%aditoprj%/entity/Appointment_entity/entityfields/categories/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>ATTENDEES</name>
+ <fieldName>ATTENDEES</fieldName>
+ <possibleItemsProcess>%aditoprj%/entity/Appointment_entity/entityfields/attendees/possibleItemsProcess.js</possibleItemsProcess>
+ </entityField>
+ <entityField>
+ <name>TRANSPARENCY</name>
+ <fieldName>TRANSPARENCY</fieldName>
+ </entityField>
+ <entityActionGroup>
+ <name>PartStatActionGroup</name>
+ <children>
+ <entityActionField>
+ <name>accept</name>
+ <fieldType>ACTION</fieldType>
+ <title>zusagen</title>
+ <onActionProcess>%aditoprj%/entity/Appointment_entity/entityfields/partstatactiongroup/children/accept/onActionProcess.js</onActionProcess>
+ <actionOrder v="0" />
+ <iconId>VAADIN:CHECK</iconId>
+ </entityActionField>
+ <entityActionField>
+ <name>decline</name>
+ <fieldType>ACTION</fieldType>
+ <title>absagen</title>
+ <description></description>
+ <onActionProcess>%aditoprj%/entity/Appointment_entity/entityfields/partstatactiongroup/children/decline/onActionProcess.js</onActionProcess>
+ <iconId>VAADIN:CLOSE</iconId>
+ </entityActionField>
+ <entityActionField>
+ <name>tentative</name>
+ <fieldType>ACTION</fieldType>
+ <title>vielleicht</title>
+ <onActionProcess>%aditoprj%/entity/Appointment_entity/entityfields/partstatactiongroup/children/tentative/onActionProcess.js</onActionProcess>
+ <iconId>VAADIN:QUESTION</iconId>
+ </entityActionField>
+ </children>
+ </entityActionGroup>
+ <entityIncomingField>
+ <name>#INCOMING</name>
+ </entityIncomingField>
+ <entityParameter>
+ <name>masterEntry</name>
+ <expose v="true" />
+ <description>PARAMETER</description>
+ </entityParameter>
+ <entityField>
+ <name>ORGANIZER</name>
+ <fieldName>ORGANIZER</fieldName>
+ </entityField>
+ <entityField>
+ <name>RRULE</name>
+ <fieldName>RRULE</fieldName>
+ </entityField>
+ <entityField>
+ <name>RECURRENCEID</name>
+ <fieldName>RECURRENCEID</fieldName>
+ </entityField>
+ <entityField>
+ <name>SAFESCOPEFIELD</name>
+ <fieldName>SAFESCOPEFIELD</fieldName>
+ </entityField>
+ <entityField>
+ <name>MASTERBEGIN</name>
+ <fieldName>MASTERBEGIN</fieldName>
+ </entityField>
+ <entityField>
+ <name>MASTEREND</name>
+ <fieldName>MASTEREND</fieldName>
+ </entityField>
+ </entityFields>
+</entity>
diff --git a/entity/Comm_entity/Comm_entity.aod b/entity/Comm_entity/Comm_entity.aod
index 7441cfe350ac876895a30a000ae9d33185f74c4c..23cfac0ecb0204daf4dc5fa99eaf02951dfdb3fb 100644
--- a/entity/Comm_entity/Comm_entity.aod
+++ b/entity/Comm_entity/Comm_entity.aod
@@ -1,19 +1,18 @@
<?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.0.4" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.0.4">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.0.5" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.0.5">
<name>Comm_entity</name>
<title>Communication</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
+ <recordContainerType>DB</recordContainerType>
<alias>Data_alias</alias>
<conditionProcess>%aditoprj%/entity/Comm_entity/conditionProcess.js</conditionProcess>
<orderClauseProcess>%aditoprj%/entity/Comm_entity/orderClauseProcess.js</orderClauseProcess>
- <recordContainerType>DB</recordContainerType>
- <caption>Communication</caption>
<entityFields>
<entityField>
<name>ADDR</name>
+ <title>${COMM_ADDRESS}</title>
<tableName>COMM</tableName>
<columnName>ADDR</columnName>
- <caption>${COMM_ADDRESS}</caption>
<contentTypeProcess>%aditoprj%/entity/Comm_entity/entityfields/addr/contentTypeProcess.js</contentTypeProcess>
<onValidation>%aditoprj%/entity/Comm_entity/entityfields/addr/onValidation.js</onValidation>
</entityField>
@@ -37,9 +36,9 @@
</entityField>
<entityField>
<name>MEDIUM_ID</name>
+ <title>Medium</title>
<tableName>COMM</tableName>
<columnName>MEDIUM_ID</columnName>
- <caption>Medium</caption>
<possibleItemsProcess>%aditoprj%/entity/Comm_entity/entityfields/medium_id/possibleItemsProcess.js</possibleItemsProcess>
<valueProcess>%aditoprj%/entity/Comm_entity/entityfields/medium_id/valueProcess.js</valueProcess>
</entityField>
diff --git a/entity/Contract_entity/Contract_entity.aod b/entity/Contract_entity/Contract_entity.aod
index 473b4389fb8e0d35d5e94c527c73317825fc7e8e..82ee5a9c621a8d4be3727114c367b560e92f694f 100644
--- a/entity/Contract_entity/Contract_entity.aod
+++ b/entity/Contract_entity/Contract_entity.aod
@@ -1,11 +1,10 @@
<?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.0.4" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.0.4">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.0.5" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.0.5">
<name>Contract_entity</name>
<title>Contract</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/Contract_entity/documentation.adoc</documentation>
<recordContainerType>DB</recordContainerType>
- <caption>Contract</caption>
<iconId>VAADIN:FORM</iconId>
<alias>Data_alias</alias>
<conditionProcess>%aditoprj%/entity/Contract_entity/conditionProcess.js</conditionProcess>
@@ -16,7 +15,6 @@
<title>Contract number</title>
<tableName>CONTRACT</tableName>
<columnName>CONTRACTCODE</columnName>
- <caption>Contract number</caption>
<onValidation>%aditoprj%/entity/Contract_entity/entityfields/contractcode/onValidation.js</onValidation>
</entityField>
<entityField>
@@ -25,7 +23,6 @@
<title>Next due date</title>
<tableName>CONTRACT</tableName>
<columnName>CONTRACTDUE</columnName>
- <caption>Next due date</caption>
<contentType>DATE</contentType>
<resolution>DAY</resolution>
<onValidation>%aditoprj%/entity/Contract_entity/entityfields/contractdue/onValidation.js</onValidation>
@@ -36,7 +33,6 @@
<title>Contract expiry date</title>
<tableName>CONTRACT</tableName>
<columnName>CONTRACTEND</columnName>
- <caption>Contract expiry date</caption>
<contentType>DATE</contentType>
<resolution>DAY</resolution>
<onValidation>%aditoprj%/entity/Contract_entity/entityfields/contractend/onValidation.js</onValidation>
@@ -54,7 +50,6 @@
<title>Contract start date</title>
<tableName>CONTRACT</tableName>
<columnName>CONTRACTSTART</columnName>
- <caption>Contract start date</caption>
<contentType>DATE</contentType>
<resolution>DAY</resolution>
<onValidation>%aditoprj%/entity/Contract_entity/entityfields/contractstart/onValidation.js</onValidation>
@@ -65,7 +60,6 @@
<title>${CONTRACT_STATUS}</title>
<tableName>CONTRACT</tableName>
<columnName>CONTRACTSTATUS</columnName>
- <caption>${CONTRACT_STATUS}</caption>
<possibleItemsProcess>%aditoprj%/entity/Contract_entity/entityfields/contractstatus/possibleItemsProcess.js</possibleItemsProcess>
</entityField>
<entityField>
@@ -73,7 +67,6 @@
<title>Type of contract</title>
<tableName>CONTRACT</tableName>
<columnName>CONTRACTTYPE</columnName>
- <caption>Type of contract</caption>
<possibleItemsProcess>%aditoprj%/entity/Contract_entity/entityfields/contracttype/possibleItemsProcess.js</possibleItemsProcess>
</entityField>
<entityField>
@@ -97,7 +90,6 @@
<title>Payment method</title>
<tableName>CONTRACT</tableName>
<columnName>PAYMENT</columnName>
- <caption>Payment method</caption>
<mandatory v="true" />
<possibleItemsProcess>%aditoprj%/entity/Contract_entity/entityfields/payment/possibleItemsProcess.js</possibleItemsProcess>
</entityField>
@@ -107,7 +99,6 @@
<title>Contact / Company</title>
<tableName>CONTRACT</tableName>
<columnName>RELATION_ID</columnName>
- <caption>Contact / Company</caption>
<linkedContextProcess>%aditoprj%/entity/Contract_entity/entityfields/relation_id/linkedContextProcess.js</linkedContextProcess>
<mandatory v="true" />
<outgoingField>ContractOrg_dfo</outgoingField>
@@ -119,7 +110,6 @@
<title>Description</title>
<tableName>CONTRACT</tableName>
<columnName>REMARK</columnName>
- <caption>Description</caption>
<contentType>LONG_TEXT</contentType>
</entityField>
<entityField>
diff --git a/entity/Countries_Entity/Countries_Entity.aod b/entity/Countries_Entity/Countries_Entity.aod
index f9778cb9e1d98bd905af70b406ce7406451674c2..63b4cf1132ef6022afc33a78aebe617bffb74ec6 100644
--- a/entity/Countries_Entity/Countries_Entity.aod
+++ b/entity/Countries_Entity/Countries_Entity.aod
@@ -1,40 +1,39 @@
<?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.0.4" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.0.4">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.0.5" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.0.5">
<name>Countries_Entity</name>
<title>Countries</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
- <alias>Data_alias</alias>
<recordContainerType>DB</recordContainerType>
- <caption>Countries</caption>
- <captionProcess>%aditoprj%/entity/Countries_Entity/captionProcess.js</captionProcess>
<iconId>VAADIN:FLAG</iconId>
+ <titleProcess>%aditoprj%/entity/Countries_Entity/titleProcess.js</titleProcess>
+ <alias>Data_alias</alias>
<entityFields>
<entityIncomingField>
<name>#INCOMING</name>
</entityIncomingField>
<entityField>
<name>ISO2</name>
+ <title>ISO2 Code</title>
<tableName>COUNTRYINFO</tableName>
<columnName>ISO2</columnName>
- <caption>ISO2 Code</caption>
</entityField>
<entityField>
<name>ISO3</name>
+ <title>ISO3 Code</title>
<tableName>COUNTRYINFO</tableName>
<columnName>ISO3</columnName>
- <caption>ISO3 Code</caption>
</entityField>
<entityField>
<name>NAME</name>
+ <title>Name</title>
<tableName>COUNTRYINFO</tableName>
<columnName>NAME_DE</columnName>
- <caption>Name</caption>
</entityField>
<entityField>
<name>COUNTRYCODE</name>
+ <title>Country Code</title>
<tableName>COUNTRYINFO</tableName>
<columnName>DIALPREFIX</columnName>
- <caption>Country Code</caption>
</entityField>
<entityField>
<name>KEYWORD_KEY</name>
@@ -72,60 +71,60 @@
</entityParameter>
<entityField>
<name>ADDRFORMAT</name>
+ <title>Adress format</title>
<tableName>COUNTRYINFO</tableName>
<columnName>ADDRFORMAT</columnName>
- <caption>Adress format</caption>
</entityField>
<entityField>
<name>CURRENCYCODE</name>
+ <title>Currency</title>
<tableName>COUNTRYINFO</tableName>
<columnName>CURRENCYCODE</columnName>
- <caption>Currency</caption>
</entityField>
<entityField>
<name>DEFAULTLANGUAGE</name>
+ <title>Language</title>
<tableName>COUNTRYINFO</tableName>
<columnName>DEFAULTLANGUAGE</columnName>
- <caption>Language</caption>
</entityField>
<entityField>
<name>DIALPREFIX</name>
+ <title>Country code</title>
<tableName>COUNTRYINFO</tableName>
<columnName>DIALPREFIX</columnName>
- <caption>Country code</caption>
</entityField>
<entityField>
<name>EUMEMBER</name>
+ <title>EU Member</title>
<tableName>COUNTRYINFO</tableName>
<columnName>EUMEMBER</columnName>
- <caption>EU Member</caption>
<contentType>TEXT</contentType>
</entityField>
<entityField>
<name>EUROZONE</name>
+ <title>Euro zone</title>
<tableName>COUNTRYINFO</tableName>
<columnName>EUROZONE</columnName>
- <caption>Euro zone</caption>
<contentType>TEXT</contentType>
</entityField>
<entityField>
<name>FLAGICON</name>
+ <title>Flag</title>
<tableName>COUNTRYINFO</tableName>
<columnName>FLAGICON</columnName>
- <caption>Flag</caption>
<contentType>IMAGE</contentType>
</entityField>
<entityField>
<name>POBOXNAME</name>
+ <title>PO-box name</title>
<tableName>COUNTRYINFO</tableName>
<columnName>POBOXNAME</columnName>
- <caption>PO-box name</caption>
</entityField>
<entityField>
<name>ZIP_EXISTS</name>
+ <title>Zip exists</title>
<tableName>COUNTRYINFO</tableName>
<columnName>ZIP_EXISTS</columnName>
- <caption>Zip exists</caption>
<contentType>TEXT</contentType>
</entityField>
</entityFields>
diff --git a/entity/Countries_Entity/captionProcess.js b/entity/Countries_Entity/titleProcess.js
similarity index 100%
rename from entity/Countries_Entity/captionProcess.js
rename to entity/Countries_Entity/titleProcess.js
diff --git a/entity/Document_entity/Document_entity.aod b/entity/Document_entity/Document_entity.aod
index d13fd870d73963389cb4e43531a032746547adde..587d70e3db260c5353b1014b27c2e52aed754cfd 100644
--- a/entity/Document_entity/Document_entity.aod
+++ b/entity/Document_entity/Document_entity.aod
@@ -1,16 +1,18 @@
<?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.0.4" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.0.4">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.0.5" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.0.5">
<name>Document_entity</name>
<title>Document</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
<recordContainerType>JDITO</recordContainerType>
- <caption>Document</caption>
<iconId>VAADIN:FILE</iconId>
<jDitoRecordAlias>_____SYSTEMALIAS</jDitoRecordAlias>
<fields>
<element>UID</element>
<element>FILENAME</element>
- <element>UPLOAD</element>
+ <element>FILESIZE</element>
+ <element>EDIT_DATE</element>
+ <element>PREVIEW</element>
+ <element>FILETYPE</element>
</fields>
<contentProcess>%aditoprj%/entity/Document_entity/contentProcess.js</contentProcess>
<onInsert>%aditoprj%/entity/Document_entity/onInsert.js</onInsert>
@@ -21,26 +23,30 @@
</entityIncomingField>
<entityField>
<name>NAME</name>
+ <title>Dateiname</title>
<fieldName>FILENAME</fieldName>
- <caption>Dateiname</caption>
<valueProcess>%aditoprj%/entity/Document_entity/entityfields/name/valueProcess.js</valueProcess>
</entityField>
<entityField>
<name>TYPE</name>
- <caption>Dateityp</caption>
+ <title>Dateityp</title>
+ <fieldName>FILETYPE</fieldName>
</entityField>
<entityField>
<name>SIZE</name>
- <caption>Dateigröße</caption>
+ <title>Dateigröße</title>
+ <fieldName>FILESIZE</fieldName>
</entityField>
<entityField>
- <name>DATE_NEW</name>
- <caption>Datum</caption>
+ <name>DATE_EDIT</name>
+ <title>Datum</title>
+ <fieldName>EDIT_DATE</fieldName>
<contentType>DATE</contentType>
</entityField>
<entityField>
<name>PREVIEW</name>
- <caption>Vorschau</caption>
+ <title>Vorschau</title>
+ <fieldName>PREVIEW</fieldName>
<contentType>IMAGE</contentType>
<state>READONLY</state>
</entityField>
@@ -58,17 +64,17 @@
</entityIncomingField>
<entityField>
<name>BINDATA_UPLOAD</name>
- <fieldName>UPLOAD</fieldName>
- <caption>Datei</caption>
+ <title>Datei</title>
<contentType>FILE</contentType>
<defaultAction>%aditoprj%/entity/Document_entity/entityfields/bindata_upload/defaultAction.js</defaultAction>
</entityField>
<entityActionGroup>
- <name>myActions</name>
+ <name>Document_actions</name>
<children>
<entityActionField>
- <name>downloadAction</name>
+ <name>downloadFilesAction</name>
<fieldType>ACTION</fieldType>
+ <onActionProcess>%aditoprj%/entity/Document_entity/entityfields/document_actions/children/downloadfilesaction/onActionProcess.js</onActionProcess>
<iconId>VAADIN:DOWNLOAD</iconId>
</entityActionField>
</children>
diff --git a/entity/Document_entity/contentProcess.js b/entity/Document_entity/contentProcess.js
index a5a8e9e1090631debca790599e7b29dcf6fa8c9f..0c280e38b4e05c6925c3d80bea2dab2be321fb23 100644
--- a/entity/Document_entity/contentProcess.js
+++ b/entity/Document_entity/contentProcess.js
@@ -12,6 +12,14 @@ if(vars.exists("$param.AssignmentTable_param") &&
var assignmentRowId = vars.get("$param.AssignmentRowId_param");
var alias = db.getCurrentAlias();
- //logging.log("contentProcess -> table: " + assignmentTable + " name: " + assignmentName + " id: " + assignmentRowId);
- //logging.log(db.getBinaryMetadata(assignmentTable, assignmentName, assignmentRowId, false, alias));
+ var tab = [];
+ metadata = db.getBinaryMetadata(assignmentTable, assignmentName, assignmentRowId, false, alias);
+
+ // going through the metadata and push the data into the result array. get the bindata via db.getBinaryContent()
+ for( var i = 0; i < metadata.length; i++)
+ {
+ tab.push( [metadata[i].id, metadata[i].filename, metadata[i].size, metadata[i].edit, metadata[i].preview, metadata[i].mimetype]);
+ }
+
+ result.object(tab);
}
diff --git a/entity/Document_entity/entityfields/document_actions/children/downloadfilesaction/onActionProcess.js b/entity/Document_entity/entityfields/document_actions/children/downloadfilesaction/onActionProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..872aa053d0900f254e4092b0021798653d9db296
--- /dev/null
+++ b/entity/Document_entity/entityfields/document_actions/children/downloadfilesaction/onActionProcess.js
@@ -0,0 +1,6 @@
+import("system.result");
+import("system.db");
+import("system.logging");
+import("system.vars");
+
+//logging.log(db.getBinaryContent(vars.get("$local.idvalue"), null));
\ No newline at end of file
diff --git a/entity/Document_entity/onInsert.js b/entity/Document_entity/onInsert.js
index 120dccd76d38d59419791d393f6246fd0a3adc65..456dd89531343481a6874dfafbf453889472d841 100644
--- a/entity/Document_entity/onInsert.js
+++ b/entity/Document_entity/onInsert.js
@@ -9,5 +9,4 @@ var bindata = vars.get("$field.BINDATA_UPLOAD");
var filename = vars.get("$field.NAME");
var alias = db.getCurrentAlias();
-//logging.log("onInsert -> table: " + assignmentTable + " name: " + assignmentName + " id: " + assignmentRowId + " filename: " + filename);
-//db.insertBinary(assignmentTable, assignmentName, assignmentRowId, "", bindata, filename, "", "", alias);
+db.insertBinary(assignmentTable, assignmentName, assignmentRowId, "", bindata, filename, "", "", alias);
diff --git a/entity/Gender_keyword/Gender_keyword.aod b/entity/Gender_keyword/Gender_keyword.aod
index 4f487bf216e65e2c3c9073aeb28478971e9c2800..da12017a20fdc2e45525db92ea3bc5fae3561f94 100644
--- a/entity/Gender_keyword/Gender_keyword.aod
+++ b/entity/Gender_keyword/Gender_keyword.aod
@@ -1,15 +1,15 @@
<?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.0.4" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.0.4">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.0.5" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.0.5">
<name>Gender_keyword</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
+ <recordContainerType>JDITO</recordContainerType>
+ <titleProcess>%aditoprj%/entity/Gender_keyword/titleProcess.js</titleProcess>
<jDitoRecordAlias>Data_alias</jDitoRecordAlias>
<fields>
<element>uid</element>
<element>value</element>
</fields>
<contentProcess>%aditoprj%/entity/Gender_keyword/contentProcess.js</contentProcess>
- <recordContainerType>JDITO</recordContainerType>
- <captionProcess>%aditoprj%/entity/Gender_keyword/captionProcess.js</captionProcess>
<entityFields>
<entityField>
<name>UID</name>
diff --git a/entity/Gender_keyword/captionProcess.js b/entity/Gender_keyword/titleProcess.js
similarity index 100%
rename from entity/Gender_keyword/captionProcess.js
rename to entity/Gender_keyword/titleProcess.js
diff --git a/entity/History_entity/History_entity.aod b/entity/History_entity/History_entity.aod
index 702d6d49425a40f9af456e4c2bd35945d13a45ad..ee8acf62800ccc5794a7c77dc87f838bf9450d7f 100644
--- a/entity/History_entity/History_entity.aod
+++ b/entity/History_entity/History_entity.aod
@@ -1,10 +1,9 @@
<?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.0.4" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.0.4">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.0.5" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.0.5">
<name>History_entity</name>
<title>History</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
<recordContainerType>DB</recordContainerType>
- <caption>History</caption>
<iconId>NEON:HISTORY</iconId>
<imageProcess>%aditoprj%/entity/History_entity/imageProcess.js</imageProcess>
<alias>Data_alias</alias>
diff --git a/entity/Offer_entity/Offer_entity.aod b/entity/Offer_entity/Offer_entity.aod
index 80b0a931de78f73137cb7c566456a5db46c8eb70..d159a36c18531a46cfa2bbf9f4ae93895ea75c3a 100644
--- a/entity/Offer_entity/Offer_entity.aod
+++ b/entity/Offer_entity/Offer_entity.aod
@@ -1,12 +1,11 @@
<?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.0.4" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.0.4">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.0.5" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.0.5">
<name>Offer_entity</name>
<title>Offer</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
<grantUpdateProcess>%aditoprj%/entity/Offer_entity/grantUpdateProcess.js</grantUpdateProcess>
<grantDeleteProcess>%aditoprj%/entity/Offer_entity/grantDeleteProcess.js</grantDeleteProcess>
<recordContainerType>DB</recordContainerType>
- <caption>Offer</caption>
<alias>Data_alias</alias>
<conditionProcess>%aditoprj%/entity/Offer_entity/conditionProcess.js</conditionProcess>
<onDBDelete>%aditoprj%/entity/Offer_entity/onDBDelete.js</onDBDelete>
@@ -19,7 +18,6 @@
<title>Currency</title>
<tableName>OFFER</tableName>
<columnName>CURRENCY</columnName>
- <caption>Currency</caption>
<possibleItemsProcess>%aditoprj%/entity/Offer_entity/entityfields/currency/possibleItemsProcess.js</possibleItemsProcess>
</entityField>
<entityField>
@@ -42,7 +40,6 @@
<title>Offer number</title>
<tableName>OFFER</tableName>
<columnName>OFFERCODE</columnName>
- <caption>Offer number</caption>
<state>READONLY</state>
<valueProcess>%aditoprj%/entity/Offer_entity/entityfields/offercode/valueProcess.js</valueProcess>
<onValidation>%aditoprj%/entity/Offer_entity/entityfields/offercode/onValidation.js</onValidation>
@@ -52,7 +49,6 @@
<title>Date</title>
<tableName>OFFER</tableName>
<columnName>OFFERDATE</columnName>
- <caption>Date</caption>
<contentType>DATE</contentType>
<resolution>DAY</resolution>
<mandatory v="true" />
@@ -69,7 +65,6 @@
<title>Probability</title>
<tableName>OFFER</tableName>
<columnName>PROBABILITY</columnName>
- <caption>Probability</caption>
<possibleItemsProcess>%aditoprj%/entity/Offer_entity/entityfields/probability/possibleItemsProcess.js</possibleItemsProcess>
</entityField>
<entityField>
@@ -77,7 +72,6 @@
<title>Contact / Company</title>
<tableName>OFFER</tableName>
<columnName>RELATION_ID</columnName>
- <caption>Contact / Company</caption>
<mandatory v="true" />
<onValueChange>%aditoprj%/entity/Offer_entity/entityfields/relation_id/onValueChange.js</onValueChange>
</entityField>
@@ -86,14 +80,12 @@
<title>Salesproject</title>
<tableName>OFFER</tableName>
<columnName>SALESPROJECT_ID</columnName>
- <caption>Salesproject</caption>
</entityField>
<entityField>
<name>STATUS</name>
<title>Status</title>
<tableName>OFFER</tableName>
<columnName>STATUS</columnName>
- <caption>Status</caption>
<possibleItemsProcess>%aditoprj%/entity/Offer_entity/entityfields/status/possibleItemsProcess.js</possibleItemsProcess>
</entityField>
<entityField>
@@ -113,7 +105,6 @@
<title>Total VAT</title>
<tableName>OFFER</tableName>
<columnName>VAT</columnName>
- <caption>Total VAT</caption>
<state>READONLY</state>
</entityField>
<entityField>
@@ -126,7 +117,6 @@
<title>Header text</title>
<tableName>OFFER</tableName>
<columnName>HEADER</columnName>
- <caption>Header text</caption>
<valueProcess>%aditoprj%/entity/Offer_entity/entityfields/header/valueProcess.js</valueProcess>
</entityField>
<entityField>
@@ -134,14 +124,12 @@
<title>Footer text</title>
<tableName>OFFER</tableName>
<columnName>FOOTER</columnName>
- <caption>Footer text</caption>
</entityField>
<entityOutgoingField>
<name>OfferOfferitem_dfo</name>
<title>Offeritems</title>
<fieldType>DEPENDENCY_OUT</fieldType>
<description></description>
- <caption>Offeritems</caption>
<dependency>
<name>dependency</name>
<entityName>Offeritem_entity</entityName>
@@ -182,14 +170,12 @@
<fieldType>ACTION</fieldType>
<title>New offer version</title>
<onActionProcess>%aditoprj%/entity/Offer_entity/entityfields/newofferversion/onActionProcess.js</onActionProcess>
- <caption>New offer version</caption>
</entityActionField>
<entityField>
<name>NET</name>
<title>Total net</title>
<tableName>OFFER</tableName>
<columnName>NET</columnName>
- <caption>Total net</caption>
<state>READONLY</state>
<valueProcess>%aditoprj%/entity/Offer_entity/entityfields/net/valueProcess.js</valueProcess>
<fieldIdProcess>%aditoprj%/entity/Offer_entity/entityfields/net/fieldIdProcess.js</fieldIdProcess>
@@ -197,7 +183,6 @@
<entityField>
<name>TotalGross</name>
<title>Total gross</title>
- <caption>Total gross</caption>
<state>READONLY</state>
<valueProcess>%aditoprj%/entity/Offer_entity/entityfields/totalgross/valueProcess.js</valueProcess>
</entityField>
@@ -225,7 +210,6 @@
<title>Language</title>
<tableName>OFFER</tableName>
<columnName>LANGUAGE</columnName>
- <caption>Language</caption>
<mandatory v="true" />
<outgoingField></outgoingField>
<possibleItemsProcess>%aditoprj%/entity/Offer_entity/entityfields/language/possibleItemsProcess.js</possibleItemsProcess>
@@ -235,7 +219,6 @@
<fieldType>ACTION</fieldType>
<title>Copy offer</title>
<onActionProcess>%aditoprj%/entity/Offer_entity/entityfields/newoffer/onActionProcess.js</onActionProcess>
- <caption>Copy offer</caption>
</entityActionField>
<entityField>
<name>VERSNR</name>
diff --git a/entity/Offeritem_entity/Offeritem_entity.aod b/entity/Offeritem_entity/Offeritem_entity.aod
index d5aa9a670e2c5ff650d4d6c0ad23205b1d9e787f..f9636b1e8709caf576c908bcba3680a4458bf93e 100644
--- a/entity/Offeritem_entity/Offeritem_entity.aod
+++ b/entity/Offeritem_entity/Offeritem_entity.aod
@@ -1,5 +1,5 @@
<?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.0.4" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.0.4">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.0.5" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.0.5">
<name>Offeritem_entity</name>
<title>Offeritem</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
@@ -7,7 +7,6 @@
<grantUpdateProcess>%aditoprj%/entity/Offeritem_entity/grantUpdateProcess.js</grantUpdateProcess>
<grantDeleteProcess>%aditoprj%/entity/Offeritem_entity/grantDeleteProcess.js</grantDeleteProcess>
<recordContainerType>DB</recordContainerType>
- <caption>Offeritem</caption>
<afterOperatingState>%aditoprj%/entity/Offeritem_entity/afterOperatingState.js</afterOperatingState>
<alias>Data_alias</alias>
<conditionProcess>%aditoprj%/entity/Offeritem_entity/conditionProcess.js</conditionProcess>
@@ -53,7 +52,6 @@
<title>Description</title>
<tableName>OFFERITEM</tableName>
<columnName>DESCRIPTION</columnName>
- <caption>Description</caption>
<contentType>LONG_TEXT</contentType>
</entityField>
<entityField>
@@ -61,14 +59,12 @@
<title>Discount</title>
<tableName>OFFERITEM</tableName>
<columnName>DISCOUNT</columnName>
- <caption>Discount</caption>
</entityField>
<entityField>
<name>GROUPCODEID</name>
<title>Commodity group</title>
<tableName>OFFERITEM</tableName>
<columnName>GROUPCODEID</columnName>
- <caption>Commodity group</caption>
<possibleItemsProcess>%aditoprj%/entity/Offeritem_entity/entityfields/groupcodeid/possibleItemsProcess.js</possibleItemsProcess>
<state>READONLY</state>
</entityField>
@@ -77,14 +73,12 @@
<title>Designation</title>
<tableName>OFFERITEM</tableName>
<columnName>ITEMNAME</columnName>
- <caption>Designation</caption>
</entityField>
<entityField>
<name>ITEMPOSITION</name>
<title>Position</title>
<tableName>OFFERITEM</tableName>
<columnName>ITEMPOSITION</columnName>
- <caption>Position</caption>
<state>READONLY</state>
<valueProcess>%aditoprj%/entity/Offeritem_entity/entityfields/itemposition/valueProcess.js</valueProcess>
<onValidation>%aditoprj%/entity/Offeritem_entity/entityfields/itemposition/onValidation.js</onValidation>
@@ -111,7 +105,6 @@
<title>Optional</title>
<tableName>OFFERITEM</tableName>
<columnName>OPTIONAL</columnName>
- <caption>Optional</caption>
<contentType>BOOLEAN</contentType>
<possibleItemsProcess>%aditoprj%/entity/Offeritem_entity/entityfields/optional/possibleItemsProcess.js</possibleItemsProcess>
<valueProcess>%aditoprj%/entity/Offeritem_entity/entityfields/optional/valueProcess.js</valueProcess>
@@ -121,14 +114,12 @@
<title>Unit price</title>
<tableName>OFFERITEM</tableName>
<columnName>PRICE</columnName>
- <caption>Unit price</caption>
</entityField>
<entityField>
<name>PRODUCT_ID</name>
<title>Article</title>
<tableName>OFFERITEM</tableName>
<columnName>PRODUCT_ID</columnName>
- <caption>Article</caption>
<possibleItemsProcess>%aditoprj%/entity/Offeritem_entity/entityfields/product_id/possibleItemsProcess.js</possibleItemsProcess>
<onValidation>%aditoprj%/entity/Offeritem_entity/entityfields/product_id/onValidation.js</onValidation>
<onValueChange>%aditoprj%/entity/Offeritem_entity/entityfields/product_id/onValueChange.js</onValueChange>
@@ -138,7 +129,6 @@
<title>Quantity</title>
<tableName>OFFERITEM</tableName>
<columnName>QUANTITY</columnName>
- <caption>Quantity</caption>
<valueProcess>%aditoprj%/entity/Offeritem_entity/entityfields/quantity/valueProcess.js</valueProcess>
<onValidation>%aditoprj%/entity/Offeritem_entity/entityfields/quantity/onValidation.js</onValidation>
<onValueChange>%aditoprj%/entity/Offeritem_entity/entityfields/quantity/onValueChange.js</onValueChange>
@@ -148,7 +138,6 @@
<title>Unit</title>
<tableName>OFFERITEM</tableName>
<columnName>UNIT</columnName>
- <caption>Unit</caption>
<possibleItemsProcess>%aditoprj%/entity/Offeritem_entity/entityfields/unit/possibleItemsProcess.js</possibleItemsProcess>
</entityField>
<entityField>
@@ -168,7 +157,6 @@
<title>VAT</title>
<tableName>OFFERITEM</tableName>
<columnName>VAT</columnName>
- <caption>VAT</caption>
<state>AUTO</state>
</entityField>
<entityParameter>
@@ -193,7 +181,6 @@
<entityField>
<name>TotalPrice</name>
<title>Sum</title>
- <caption>Sum</caption>
<contentType>NUMBER</contentType>
<outputFormat>#,##0.00</outputFormat>
<state>READONLY</state>
diff --git a/entity/Options_Entity/Options_Entity.aod b/entity/Options_Entity/Options_Entity.aod
index 3712683649290ce89c0daff0f3803bfec96b3362..f8d421028a63c010f42c71b505d8700a9b88b2ca 100644
--- a/entity/Options_Entity/Options_Entity.aod
+++ b/entity/Options_Entity/Options_Entity.aod
@@ -1,9 +1,11 @@
<?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.0.4" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.0.4">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.0.5" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.0.5">
<name>Options_Entity</name>
<title>Options</title>
<description></description>
<majorModelMode>DISTRIBUTED</majorModelMode>
+ <recordContainerType>JDITO</recordContainerType>
+ <iconId>VAADIN:WRENCH</iconId>
<jDitoRecordAlias>_____SYSTEMALIAS</jDitoRecordAlias>
<fields>
<element>UID</element>
@@ -13,34 +15,31 @@
<element>O4</element>
</fields>
<contentProcess>%aditoprj%/entity/Options_Entity/contentProcess.js</contentProcess>
- <recordContainerType>JDITO</recordContainerType>
- <caption>Options</caption>
- <iconId>VAADIN:WRENCH</iconId>
<entityFields>
<entityIncomingField>
<name>#INCOMING</name>
</entityIncomingField>
<entityField>
<name>Option1</name>
+ <title>Option1</title>
<fieldName>O1</fieldName>
- <caption>Option1</caption>
</entityField>
<entityField>
<name>Option2</name>
+ <title>Option2</title>
<fieldName>O2</fieldName>
- <caption>Option2</caption>
<contentType>NUMBER</contentType>
</entityField>
<entityField>
<name>Option3</name>
+ <title>Option3</title>
<fieldName>O3</fieldName>
- <caption>Option3</caption>
<contentType>DATE</contentType>
</entityField>
<entityField>
<name>Option4</name>
+ <title>Option4</title>
<fieldName>O4</fieldName>
- <caption>Option4</caption>
<contentType>PASSWORD</contentType>
</entityField>
<entityField>
diff --git a/entity/Org_entity/Org_entity.aod b/entity/Org_entity/Org_entity.aod
index a8890c00fe8fd49ee1a1e4d2f58f052cd3f14317..8b96fda307d53b9b41dd07e0daa0f26fc5119920 100644
--- a/entity/Org_entity/Org_entity.aod
+++ b/entity/Org_entity/Org_entity.aod
@@ -1,5 +1,5 @@
<?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.0.4" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.0.4">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.0.5" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.0.5">
<name>Org_entity</name>
<title>Company</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
diff --git a/entity/Pers_entity/Pers_entity.aod b/entity/Pers_entity/Pers_entity.aod
index a429694f353c5f4d2140f0cbed479d380a4b060b..b9ad55a7ef331c6febd3f03705b16f3566f6ef80 100644
--- a/entity/Pers_entity/Pers_entity.aod
+++ b/entity/Pers_entity/Pers_entity.aod
@@ -1,5 +1,5 @@
<?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.0.4" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.0.4">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.0.5" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.0.5">
<name>Pers_entity</name>
<title>Contact</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
@@ -38,10 +38,9 @@
</entityField>
<entityField>
<name>FIRSTNAME</name>
- <title>Firstname</title>
+ <title></title>
<tableName>PERS</tableName>
<columnName>FIRSTNAME</columnName>
- <caption></caption>
</entityField>
<entityField>
<name>GENDER</name>
@@ -71,10 +70,9 @@
</entityField>
<entityField>
<name>SALUTATION</name>
- <title>Salutation</title>
+ <title></title>
<tableName>PERS</tableName>
<columnName>SALUTATION</columnName>
- <caption></caption>
</entityField>
<entityField>
<name>TITLE</name>
@@ -102,7 +100,7 @@
</entityField>
<entityField>
<name>PREVIEWTITLE</name>
- <caption></caption>
+ <title></title>
<valueProcess>%aditoprj%/entity/Pers_entity/entityfields/previewtitle/valueProcess.js</valueProcess>
</entityField>
<entityParameter>
@@ -167,9 +165,9 @@
</entityField>
<entityField>
<name>ORG_ID</name>
+ <title></title>
<tableName>RELATION</tableName>
<columnName>ORG_ID</columnName>
- <caption></caption>
<valueProcess>%aditoprj%/entity/Pers_entity/entityfields/org_id/valueProcess.js</valueProcess>
<onValueChange>%aditoprj%/entity/Pers_entity/entityfields/org_id/onValueChange.js</onValueChange>
</entityField>
diff --git a/entity/Prod2prod_entity/Prod2prod_entity.aod b/entity/Prod2prod_entity/Prod2prod_entity.aod
index 798dde9f9bf64cca74260b8f3f692601eab89bce..5966912c271c770f8c6f9f04cb4b9bfc3f8e9a5b 100644
--- a/entity/Prod2prod_entity/Prod2prod_entity.aod
+++ b/entity/Prod2prod_entity/Prod2prod_entity.aod
@@ -1,5 +1,5 @@
<?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.0.4" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.0.4">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.0.5" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.0.5">
<name>Prod2prod_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<externalOpenAction>%aditoprj%/entity/Prod2prod_entity/externalOpenAction.js</externalOpenAction>
@@ -60,7 +60,6 @@
<tableName></tableName>
<columnName></columnName>
<fieldName>OPTIONAL</fieldName>
- <caption>Optional</caption>
<contentType>BOOLEAN</contentType>
<possibleItemsProcess>%aditoprj%/entity/Prod2prod_entity/entityfields/optional/possibleItemsProcess.js</possibleItemsProcess>
<valueProcess>%aditoprj%/entity/Prod2prod_entity/entityfields/optional/valueProcess.js</valueProcess>
@@ -78,7 +77,6 @@
<tableName></tableName>
<columnName></columnName>
<fieldName>QUANTITY</fieldName>
- <caption>Quantity</caption>
<valueProcess>%aditoprj%/entity/Prod2prod_entity/entityfields/quantity/valueProcess.js</valueProcess>
</entityField>
<entityField>
@@ -87,7 +85,6 @@
<tableName></tableName>
<columnName></columnName>
<fieldName>SOURCE_ID</fieldName>
- <caption>Product</caption>
<possibleItemsProcess>%aditoprj%/entity/Prod2prod_entity/entityfields/source_id/possibleItemsProcess.js</possibleItemsProcess>
<onValidation>%aditoprj%/entity/Prod2prod_entity/entityfields/source_id/onValidation.js</onValidation>
</entityField>
@@ -97,7 +94,6 @@
<tableName></tableName>
<columnName></columnName>
<fieldName>TAKEPRICE</fieldName>
- <caption>Price</caption>
<contentType>BOOLEAN</contentType>
<possibleItemsProcess>%aditoprj%/entity/Prod2prod_entity/entityfields/takeprice/possibleItemsProcess.js</possibleItemsProcess>
</entityField>
@@ -123,7 +119,6 @@
<name>PARENTID</name>
<title>Parent</title>
<fieldName>PARENTID</fieldName>
- <caption>Parent</caption>
</entityField>
<entityField>
<name>PROD2PRODID</name>
diff --git a/entity/Product_entity/Product_entity.aod b/entity/Product_entity/Product_entity.aod
index fe1c17de711e36a0357c55ef6e518af10b0e95dd..439bbabafd0959b155035cc79d979774c422fcfe 100644
--- a/entity/Product_entity/Product_entity.aod
+++ b/entity/Product_entity/Product_entity.aod
@@ -1,10 +1,9 @@
<?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.0.4" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.0.4">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.0.5" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.0.5">
<name>Product_entity</name>
<title>Product</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
<recordContainerType>DB</recordContainerType>
- <caption>Product</caption>
<iconId>VAADIN:HAMMER</iconId>
<alias>Data_alias</alias>
<orderClauseProcess>%aditoprj%/entity/Product_entity/orderClauseProcess.js</orderClauseProcess>
@@ -16,7 +15,6 @@
<title>Advertising material</title>
<tableName>PRODUCT</tableName>
<columnName>ADVERTISING</columnName>
- <caption>Advertising material</caption>
<contentType>BOOLEAN</contentType>
<possibleItemsProcess>%aditoprj%/entity/Product_entity/entityfields/advertising/possibleItemsProcess.js</possibleItemsProcess>
<valueProcess>%aditoprj%/entity/Product_entity/entityfields/advertising/valueProcess.js</valueProcess>
@@ -42,7 +40,6 @@
<title>Product group</title>
<tableName>PRODUCT</tableName>
<columnName>GROUPCODEID</columnName>
- <caption>Product group</caption>
<mandatory v="true" />
<possibleItemsProcess>%aditoprj%/entity/Product_entity/entityfields/groupcodeid/possibleItemsProcess.js</possibleItemsProcess>
</entityField>
@@ -51,7 +48,6 @@
<title>Min. stock</title>
<tableName>PRODUCT</tableName>
<columnName>MINSTOCK</columnName>
- <caption>Min. stock</caption>
<contentType>NUMBER</contentType>
<outputFormat>#,##0.##</outputFormat>
</entityField>
@@ -60,7 +56,6 @@
<title>Developer</title>
<tableName>PRODUCT</tableName>
<columnName>ORG_ID</columnName>
- <caption>Developer</caption>
<valueProcess>%aditoprj%/entity/Product_entity/entityfields/org_id/valueProcess.js</valueProcess>
</entityField>
<entityField>
@@ -68,7 +63,6 @@
<title>Product number</title>
<tableName>PRODUCT</tableName>
<columnName>PRODUCTCODE</columnName>
- <caption>Product number</caption>
<mandatory v="true" />
<onValidation>%aditoprj%/entity/Product_entity/entityfields/productcode/onValidation.js</onValidation>
</entityField>
@@ -83,7 +77,6 @@
<title>Product name</title>
<tableName>PRODUCT</tableName>
<columnName>PRODUCTNAME</columnName>
- <caption>Product name</caption>
<mandatory v="true" />
</entityField>
<entityField>
@@ -96,7 +89,6 @@
<title>Active</title>
<tableName>PRODUCT</tableName>
<columnName>STATUS</columnName>
- <caption>Active</caption>
<contentType>BOOLEAN</contentType>
<possibleItemsProcess>%aditoprj%/entity/Product_entity/entityfields/status/possibleItemsProcess.js</possibleItemsProcess>
<valueProcess>%aditoprj%/entity/Product_entity/entityfields/status/valueProcess.js</valueProcess>
@@ -106,7 +98,6 @@
<title>Unit</title>
<tableName>PRODUCT</tableName>
<columnName>UNIT</columnName>
- <caption>Unit</caption>
<mandatory v="true" />
<possibleItemsProcess>%aditoprj%/entity/Product_entity/entityfields/unit/possibleItemsProcess.js</possibleItemsProcess>
</entityField>
@@ -154,7 +145,6 @@
<name>ProductProductprice_dfo</name>
<title>Price list</title>
<fieldType>DEPENDENCY_OUT</fieldType>
- <caption>Price list</caption>
<dependency>
<name>dependency</name>
<entityName>Productprice_entity</entityName>
@@ -183,7 +173,6 @@
<name>ProductStock_dfo</name>
<title>Stock</title>
<fieldType>DEPENDENCY_OUT</fieldType>
- <caption>Stock</caption>
<selectionMode>SINGLE</selectionMode>
<dependency>
<name>dependency</name>
@@ -206,7 +195,6 @@
<name>ProductStockCount_dfo</name>
<title>Stock</title>
<fieldType>DEPENDENCY_OUT</fieldType>
- <caption>Stock</caption>
<state>READONLY</state>
<dependency>
<name>dependency</name>
@@ -242,7 +230,6 @@
<name>ProductProd2prod_dfo</name>
<title>Parts list</title>
<fieldType>DEPENDENCY_OUT</fieldType>
- <caption>Parts list</caption>
<dependency>
<name>dependency</name>
<entityName>Prod2prod_entity</entityName>
diff --git a/entity/Productprice_entity/Productprice_entity.aod b/entity/Productprice_entity/Productprice_entity.aod
index 3a214314d2811e3fafab803acac657ccad30f406..0897e500a76be11b22381413ef3a4c312199ea08 100644
--- a/entity/Productprice_entity/Productprice_entity.aod
+++ b/entity/Productprice_entity/Productprice_entity.aod
@@ -1,12 +1,11 @@
<?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.0.4" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.0.4">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.0.5" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.0.5">
<name>Productprice_entity</name>
<title>Price list</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/Productprice_entity/documentation.adoc</documentation>
<grantCreateProcess>%aditoprj%/entity/Productprice_entity/grantCreateProcess.js</grantCreateProcess>
<recordContainerType>DB</recordContainerType>
- <caption>Price list</caption>
<onValidation>%aditoprj%/entity/Productprice_entity/onValidation.js</onValidation>
<alias>Data_alias</alias>
<conditionProcess>%aditoprj%/entity/Productprice_entity/conditionProcess.js</conditionProcess>
@@ -18,7 +17,6 @@
<title>PP/SP</title>
<tableName>PRODUCTPRICE</tableName>
<columnName>BUYSELL</columnName>
- <caption>PP/SP</caption>
<mandatory v="true" />
<mandatoryProcess>%aditoprj%/entity/Productprice_entity/entityfields/buysell/mandatoryProcess.js</mandatoryProcess>
<possibleItemsProcess>%aditoprj%/entity/Productprice_entity/entityfields/buysell/possibleItemsProcess.js</possibleItemsProcess>
@@ -29,7 +27,6 @@
<title>Currency</title>
<tableName>PRODUCTPRICE</tableName>
<columnName>CURRENCY</columnName>
- <caption>Currency</caption>
<mandatory v="true" />
<possibleItemsProcess>%aditoprj%/entity/Productprice_entity/entityfields/currency/possibleItemsProcess.js</possibleItemsProcess>
</entityField>
@@ -54,7 +51,6 @@
<title>From no. of units</title>
<tableName>PRODUCTPRICE</tableName>
<columnName>FROMQUANTITY</columnName>
- <caption>From no. of units</caption>
<contentType>TEXT</contentType>
<outputFormat>#,##0</outputFormat>
<mandatory v="true" />
@@ -66,7 +62,6 @@
<title>Price</title>
<tableName>PRODUCTPRICE</tableName>
<columnName>PRICE</columnName>
- <caption>Price</caption>
<contentType>TEXT</contentType>
<outputFormat>#,##0.00</outputFormat>
<mandatory v="true" />
@@ -82,7 +77,6 @@
<title>Product</title>
<tableName>PRODUCTPRICE</tableName>
<columnName>PRODUCT_ID</columnName>
- <caption>Product</caption>
<linkedContext>Product_context</linkedContext>
<mandatory v="false" />
<outgoingField>ProductpriceProduct_dfo</outgoingField>
@@ -96,7 +90,6 @@
<title>Company</title>
<tableName>PRODUCTPRICE</tableName>
<columnName>RELATION_ID</columnName>
- <caption>Company</caption>
<valueProcess>%aditoprj%/entity/Productprice_entity/entityfields/relation_id/valueProcess.js</valueProcess>
</entityField>
<entityField>
@@ -116,7 +109,6 @@
<title>Valid from</title>
<tableName>PRODUCTPRICE</tableName>
<columnName>VALID_FROM</columnName>
- <caption>Valid from</caption>
<contentType>DATE</contentType>
<resolution>DAY</resolution>
<mandatory v="true" />
@@ -127,7 +119,6 @@
<title>Valid until</title>
<tableName>PRODUCTPRICE</tableName>
<columnName>VALID_TO</columnName>
- <caption>Valid until</caption>
<contentType>DATE</contentType>
<resolution>DAY</resolution>
<onValidation>%aditoprj%/entity/Productprice_entity/entityfields/valid_to/onValidation.js</onValidation>
@@ -137,7 +128,6 @@
<title>VAT</title>
<tableName>PRODUCTPRICE</tableName>
<columnName>VAT</columnName>
- <caption>VAT</caption>
<contentType>TEXT</contentType>
<outputFormat>#,##0.00</outputFormat>
<mandatory v="true" />
@@ -148,11 +138,10 @@
<title>Price list</title>
<tableName>PRODUCTPRICE</tableName>
<columnName>PRICELIST</columnName>
- <caption>Price list</caption>
- <captionProcess>%aditoprj%/entity/Productprice_entity/entityfields/pricelist/captionProcess.js</captionProcess>
<possibleItemsProcess>%aditoprj%/entity/Productprice_entity/entityfields/pricelist/possibleItemsProcess.js</possibleItemsProcess>
<state>AUTO</state>
<stateProcess>%aditoprj%/entity/Productprice_entity/entityfields/pricelist/stateProcess.js</stateProcess>
+ <titleProcess>%aditoprj%/entity/Productprice_entity/entityfields/pricelist/titleProcess.js</titleProcess>
<valueProcess>%aditoprj%/entity/Productprice_entity/entityfields/pricelist/valueProcess.js</valueProcess>
<onValidation>%aditoprj%/entity/Productprice_entity/entityfields/pricelist/onValidation.js</onValidation>
</entityField>
@@ -184,7 +173,6 @@
<entityField>
<name>PRODUCT_GROUPCODEID</name>
<title>Product group</title>
- <caption>Product group</caption>
<possibleItemsProcess>%aditoprj%/entity/Productprice_entity/entityfields/product_groupcodeid/possibleItemsProcess.js</possibleItemsProcess>
</entityField>
<entityIncomingField>
@@ -241,7 +229,6 @@
<entityField>
<name>currentPurchasePrice</name>
<title>Curr. purchase price</title>
- <caption>Curr. purchase price</caption>
<contentType>NUMBER</contentType>
<outputFormat>#,##0.00 €</outputFormat>
<valueProcess>%aditoprj%/entity/Productprice_entity/entityfields/currentpurchaseprice/valueProcess.js</valueProcess>
@@ -249,7 +236,6 @@
<entityField>
<name>currentSalesPrice</name>
<title>Curr. sales price</title>
- <caption>Curr. sales price</caption>
<contentType>NUMBER</contentType>
<outputFormat>#,##0.00 €</outputFormat>
<valueProcess>%aditoprj%/entity/Productprice_entity/entityfields/currentsalesprice/valueProcess.js</valueProcess>
diff --git a/entity/Productprice_entity/entityfields/pricelist/captionProcess.js b/entity/Productprice_entity/entityfields/pricelist/titleProcess.js
similarity index 100%
rename from entity/Productprice_entity/entityfields/pricelist/captionProcess.js
rename to entity/Productprice_entity/entityfields/pricelist/titleProcess.js
diff --git a/entity/SalesprojectCompetition_entity/SalesprojectCompetition_entity.aod b/entity/SalesprojectCompetition_entity/SalesprojectCompetition_entity.aod
index 995dfc78f8457754fc14b757ff255d005b064dae..0de0f5401f69dfe8848a4cfb57b8ebdb73bfabd3 100644
--- a/entity/SalesprojectCompetition_entity/SalesprojectCompetition_entity.aod
+++ b/entity/SalesprojectCompetition_entity/SalesprojectCompetition_entity.aod
@@ -1,5 +1,5 @@
<?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.0.4" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.0.4">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.0.5" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.0.5">
<name>SalesprojectCompetition_entity</name>
<title>Competition</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
diff --git a/entity/SalesprojectCycle_entity/SalesprojectCycle_entity.aod b/entity/SalesprojectCycle_entity/SalesprojectCycle_entity.aod
index 9befac9617426bb9818265e19b258bda0daf9b73..51b53d98a112a0b88574f3bd3c08c79c58f875d8 100644
--- a/entity/SalesprojectCycle_entity/SalesprojectCycle_entity.aod
+++ b/entity/SalesprojectCycle_entity/SalesprojectCycle_entity.aod
@@ -1,10 +1,9 @@
<?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.0.4" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.0.4">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.0.5" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.0.5">
<name>SalesprojectCycle_entity</name>
<title>Milestones</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
<recordContainerType>DB</recordContainerType>
- <caption>Milestones</caption>
<alias>Data_alias</alias>
<conditionProcess>%aditoprj%/entity/SalesprojectCycle_entity/conditionProcess.js</conditionProcess>
<entityFields>
diff --git a/entity/SalesprojectForecast_entity/SalesprojectForecast_entity.aod b/entity/SalesprojectForecast_entity/SalesprojectForecast_entity.aod
index 666bbcb198e15c9da1498631a18a2a02f3579408..c6b385a63bed72063d4a56dc9c9d792a16e12001 100644
--- a/entity/SalesprojectForecast_entity/SalesprojectForecast_entity.aod
+++ b/entity/SalesprojectForecast_entity/SalesprojectForecast_entity.aod
@@ -1,10 +1,9 @@
<?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.0.4" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.0.4">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.0.5" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.0.5">
<name>SalesprojectForecast_entity</name>
<title>Forecast</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
<recordContainerType>DB</recordContainerType>
- <caption>Forecast</caption>
<alias>Data_alias</alias>
<conditionProcess>%aditoprj%/entity/SalesprojectForecast_entity/conditionProcess.js</conditionProcess>
<entityFields>
diff --git a/entity/SalesprojectMember_entity/SalesprojectMember_entity.aod b/entity/SalesprojectMember_entity/SalesprojectMember_entity.aod
index 40e0785330b051575356075b28fe32515e680153..3a5b580d26fb0e039170d78d907cc767317b88f9 100644
--- a/entity/SalesprojectMember_entity/SalesprojectMember_entity.aod
+++ b/entity/SalesprojectMember_entity/SalesprojectMember_entity.aod
@@ -1,10 +1,9 @@
<?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.0.4" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.0.4">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.0.5" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.0.5">
<name>SalesprojectMember_entity</name>
<title>Member</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
<recordContainerType>DB</recordContainerType>
- <caption>Member</caption>
<alias>Data_alias</alias>
<fromClauseProcess>%aditoprj%/entity/SalesprojectMember_entity/fromClauseProcess.js</fromClauseProcess>
<conditionProcess>%aditoprj%/entity/SalesprojectMember_entity/conditionProcess.js</conditionProcess>
diff --git a/entity/SalesprojectSource_entity/SalesprojectSource_entity.aod b/entity/SalesprojectSource_entity/SalesprojectSource_entity.aod
index 38e1fb0491845fd12fcbd343569b282aa2eb65b8..c6c0a56443a4c66d46c255d3484351cfe2e1eae2 100644
--- a/entity/SalesprojectSource_entity/SalesprojectSource_entity.aod
+++ b/entity/SalesprojectSource_entity/SalesprojectSource_entity.aod
@@ -1,10 +1,9 @@
<?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.0.4" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.0.4">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.0.5" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.0.5">
<name>SalesprojectSource_entity</name>
<title>Source</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
<recordContainerType>DB</recordContainerType>
- <caption>Source</caption>
<alias>Data_alias</alias>
<conditionProcess>%aditoprj%/entity/SalesprojectSource_entity/conditionProcess.js</conditionProcess>
<entityFields>
diff --git a/entity/Salesproject_entity/Salesproject_entity.aod b/entity/Salesproject_entity/Salesproject_entity.aod
index 91fa179c02f31386c04e75c8c5fbb2d44f319364..bbdaf5a29a0b50477fc38fc05ed0260aed742509 100644
--- a/entity/Salesproject_entity/Salesproject_entity.aod
+++ b/entity/Salesproject_entity/Salesproject_entity.aod
@@ -1,10 +1,9 @@
<?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.0.4" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.0.4">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.0.5" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.0.5">
<name>Salesproject_entity</name>
<title>Salesproject</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
<recordContainerType>DB</recordContainerType>
- <caption>Salesproject</caption>
<iconId>VAADIN:FILTER</iconId>
<alias>Data_alias</alias>
<onDBInsert>%aditoprj%/entity/Salesproject_entity/onDBInsert.js</onDBInsert>
@@ -146,9 +145,8 @@
<entityFieldGroup>
<name>PROBABILITY_DISPLAY_fieldGroup</name>
<valueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/probability_display_fieldgroup/valueProcess.js</valueProcess>
- <title>Probability</title>
+ <title></title>
<description>FIELDGROUP</description>
- <caption></caption>
<fields>
<element>PROBABILITY</element>
</fields>
@@ -166,7 +164,6 @@
<name>SalesprojectSource_dfo</name>
<title>Source</title>
<fieldType>DEPENDENCY_OUT</fieldType>
- <caption>Source</caption>
<dependency>
<name>dependency</name>
<entityName>SalesprojectSource_entity</entityName>
@@ -184,7 +181,6 @@
<name>SalesprojectCycle_dfo</name>
<title>Milestone</title>
<fieldType>DEPENDENCY_OUT</fieldType>
- <caption>Milestone</caption>
<dependency>
<name>dependency</name>
<entityName>SalesprojectCycle_entity</entityName>
@@ -202,7 +198,6 @@
<name>SalesprojectForecast_dfo</name>
<title>Forecast</title>
<fieldType>DEPENDENCY_OUT</fieldType>
- <caption>Forecast</caption>
<dependency>
<name>dependency</name>
<entityName>SalesprojectForecast_entity</entityName>
@@ -220,7 +215,6 @@
<name>SalesprojectCompetition_dfo</name>
<title>Competition</title>
<fieldType>DEPENDENCY_OUT</fieldType>
- <caption>Competition</caption>
<dependency>
<name>dependency</name>
<entityName>SalesprojectCompetition_entity</entityName>
@@ -238,7 +232,6 @@
<name>SalesprojectOffer_dfo</name>
<title>Offer</title>
<fieldType>DEPENDENCY_OUT</fieldType>
- <caption>Offer</caption>
<dependency>
<name>dependency</name>
<entityName>Offer_entity</entityName>
@@ -256,7 +249,6 @@
<name>SalesprojectHistory_dfo</name>
<title>History</title>
<fieldType>DEPENDENCY_OUT</fieldType>
- <caption>History</caption>
<dependency>
<name>dependency</name>
<entityName>History_entity</entityName>
@@ -272,9 +264,8 @@
</entityOutgoingField>
<entityOutgoingField>
<name>SalesprojectMember_dfo</name>
- <title>Project member</title>
+ <title></title>
<fieldType>DEPENDENCY_OUT</fieldType>
- <caption></caption>
<dependency>
<name>dependency</name>
<entityName>SalesprojectMember_entity</entityName>
diff --git a/entity/Social_entity/Social_entity.aod b/entity/Social_entity/Social_entity.aod
index 4b500fab944187cb9e8fd43ded8a56f35b2d75b8..0739a48bde749e2d272cbf0f8cd7c910421159c2 100644
--- a/entity/Social_entity/Social_entity.aod
+++ b/entity/Social_entity/Social_entity.aod
@@ -1,16 +1,15 @@
<?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.0.4" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.0.4">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.0.5" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.0.5">
<name>Social_entity</name>
- <title>Social</title>
+ <title>Social Media</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
+ <recordContainerType>NONE</recordContainerType>
<indexGroup></indexGroup>
<patternExtensionProcess></patternExtensionProcess>
<fields>
<element>UID</element>
</fields>
<contentProcess>%aditoprj%/entity/Social_entity/contentProcess.js</contentProcess>
- <recordContainerType>NONE</recordContainerType>
- <caption>Social Media</caption>
<entityFields>
<entityField>
<name>TWITTER_TIMELINE</name>
diff --git a/entity/Stock_entity/Stock_entity.aod b/entity/Stock_entity/Stock_entity.aod
index 969b97e4ddb8af326fc186de1ccb82b26464db1e..918140f62110b5d809333a1b3a4c7f677f4ee9d3 100644
--- a/entity/Stock_entity/Stock_entity.aod
+++ b/entity/Stock_entity/Stock_entity.aod
@@ -1,10 +1,9 @@
<?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.0.4" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.0.4">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.0.5" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.0.5">
<name>Stock_entity</name>
<title>Stock</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
<recordContainerType>DB</recordContainerType>
- <caption>Stock</caption>
<alias>Data_alias</alias>
<conditionProcess>%aditoprj%/entity/Stock_entity/conditionProcess.js</conditionProcess>
<orderClauseProcess>%aditoprj%/entity/Stock_entity/orderClauseProcess.js</orderClauseProcess>
@@ -30,7 +29,6 @@
<title>Date</title>
<tableName>STOCK</tableName>
<columnName>ENTRYDATE</columnName>
- <caption>Date</caption>
<contentType>DATE</contentType>
<resolution>DAY</resolution>
<mandatory v="true" />
@@ -41,7 +39,6 @@
<title>I / O</title>
<tableName>STOCK</tableName>
<columnName>IN_OUT</columnName>
- <caption>I / O</caption>
<contentType>TEXT</contentType>
<mandatory v="true" />
<possibleItemsProcess>%aditoprj%/entity/Stock_entity/entityfields/in_out/possibleItemsProcess.js</possibleItemsProcess>
@@ -57,7 +54,6 @@
<title>Quantity</title>
<tableName>STOCK</tableName>
<columnName>QUANTITY</columnName>
- <caption>Quantity</caption>
<contentType>TEXT</contentType>
<outputFormat>#.##0</outputFormat>
<mandatory v="true" />
@@ -67,7 +63,6 @@
<title>Reference</title>
<tableName>STOCK</tableName>
<columnName>REFNUMBER</columnName>
- <caption>Reference</caption>
</entityField>
<entityField>
<name>STOCKID</name>
@@ -92,7 +87,6 @@
<title>Warehouse</title>
<tableName>STOCK</tableName>
<columnName>WAREHOUSE</columnName>
- <caption>Warehouse</caption>
<mandatory v="true" />
<possibleItemsProcess>%aditoprj%/entity/Stock_entity/entityfields/warehouse/possibleItemsProcess.js</possibleItemsProcess>
</entityField>
@@ -122,7 +116,6 @@
<entityField>
<name>STOCKCOUNT</name>
<title>Stock</title>
- <caption>Stock</caption>
<state>READONLY</state>
<valueProcess>%aditoprj%/entity/Stock_entity/entityfields/stockcount/valueProcess.js</valueProcess>
</entityField>
diff --git a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
index c13dae8f9cd2f08a10e524855e18113913dd1f96..2dde0b17d5e779e8bffb30d15051d4aa3b60aa3d 100644
--- a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
+++ b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
@@ -969,9 +969,6 @@
<entry>
<key>Copy offer</key>
</entry>
- <entry>
- <key>Documents</key>
- </entry>
<entry>
<key>Vers. no.</key>
</entry>
diff --git a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
index 8df6141f5806f289396c671a1a7a312ae9adfe9a..8746e03e15760988e524eceecc4e5393c8ec5594 100644
--- a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
+++ b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
@@ -1247,9 +1247,6 @@
<key>Copy offer</key>
<value>Angebot kopieren</value>
</entry>
- <entry>
- <key>Documents</key>
- </entry>
<entry>
<key>Vers. no.</key>
<value>Vers.-Nr.</value>
diff --git a/neonView/AddressFilter_view/AddressFilter_view.aod b/neonView/AddressFilter_view/AddressFilter_view.aod
index 7dee8657190dd52d97135d8930d09a38ae6078bf..b3af2c824bafc56035167770b69d2f753b2e7b4b 100644
--- a/neonView/AddressFilter_view/AddressFilter_view.aod
+++ b/neonView/AddressFilter_view/AddressFilter_view.aod
@@ -2,6 +2,7 @@
<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.0.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.0.0">
<name>AddressFilter_view</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
+ <filterable v="true" />
<layout>
<boxLayout>
<name>layout</name>
diff --git a/neonView/CommFilter_view/CommFilter_view.aod b/neonView/CommFilter_view/CommFilter_view.aod
index aebca82cc56e090995d2022d9ca310b6f3411a16..f11c8a3a8c64b7138deb7b349cb193154d4ce50b 100644
--- a/neonView/CommFilter_view/CommFilter_view.aod
+++ b/neonView/CommFilter_view/CommFilter_view.aod
@@ -2,6 +2,7 @@
<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.0.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.0.0">
<name>CommFilter_view</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
+ <filterable v="true" />
<layout>
<boxLayout>
<name>layout</name>
diff --git a/neonView/ContractFilter_view/ContractFilter_view.aod b/neonView/ContractFilter_view/ContractFilter_view.aod
index ed763f0e58bd15c10ccfaf7c4a101d5fe1333ddb..5f0a30167c72fb44f0e34d363f01db8c4ec0cd05 100644
--- a/neonView/ContractFilter_view/ContractFilter_view.aod
+++ b/neonView/ContractFilter_view/ContractFilter_view.aod
@@ -2,6 +2,7 @@
<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.0.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.0.0">
<name>ContractFilter_view</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
+ <filterable v="true" />
<layout>
<boxLayout>
<name>layout</name>
diff --git a/neonView/DocumentFilter_view/DocumentFilter_view.aod b/neonView/DocumentFilter_view/DocumentFilter_view.aod
index d808ca261f6ba8496dae471cb0852f6155779af5..689aec42ef54daddb4a5206bab390fc146875a79 100644
--- a/neonView/DocumentFilter_view/DocumentFilter_view.aod
+++ b/neonView/DocumentFilter_view/DocumentFilter_view.aod
@@ -2,6 +2,7 @@
<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.0.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.0.0">
<name>DocumentFilter_view</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
+ <filterable v="true" />
<layout>
<groupLayout>
<name>layout</name>
@@ -10,7 +11,7 @@
<children>
<tableViewTemplate>
<name>Table_template</name>
- <favoriteActionGroup1>myActions</favoriteActionGroup1>
+ <favoriteActionGroup1>Document_actions</favoriteActionGroup1>
<entityField>#ENTITY</entityField>
<columns>
<neonTableColumn>
@@ -33,7 +34,7 @@
</neonTableColumn>
<neonTableColumn>
<name>a533d8a1-ae5e-434d-8254-415586af26ed</name>
- <entityField>DATE_NEW</entityField>
+ <entityField>DATE_EDIT</entityField>
<width v="75" />
<expandRatio v="100" />
</neonTableColumn>
diff --git a/neonView/HistoryFilter_view/HistoryFilter_view.aod b/neonView/HistoryFilter_view/HistoryFilter_view.aod
index 94f06583463f0f6d47b6ff429e1cb970d904bcb4..3e71372d91e666ba40d930dc7b3441d75d151ad8 100644
--- a/neonView/HistoryFilter_view/HistoryFilter_view.aod
+++ b/neonView/HistoryFilter_view/HistoryFilter_view.aod
@@ -2,6 +2,7 @@
<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.0.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.0.0">
<name>HistoryFilter_view</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
+ <filterable v="true" />
<layout>
<groupLayout>
<name>layout</name>
diff --git a/neonView/OfferFilter_view/OfferFilter_view.aod b/neonView/OfferFilter_view/OfferFilter_view.aod
index 5eeaf48f1d954c11d3a76696d1acbe360948609b..19d5fb2f7aeda60db12370be9147ae8436030df5 100644
--- a/neonView/OfferFilter_view/OfferFilter_view.aod
+++ b/neonView/OfferFilter_view/OfferFilter_view.aod
@@ -2,6 +2,7 @@
<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.0.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.0.0">
<name>OfferFilter_view</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
+ <filterable v="true" />
<layout>
<boxLayout>
<name>layout</name>
diff --git a/neonView/OfferitemFilter_view/OfferitemFilter_view.aod b/neonView/OfferitemFilter_view/OfferitemFilter_view.aod
index 481f23266f24a2ec1e102aec6645739475d23e7e..36db04ff02cc541f0984cab9e59c44279d9caf22 100644
--- a/neonView/OfferitemFilter_view/OfferitemFilter_view.aod
+++ b/neonView/OfferitemFilter_view/OfferitemFilter_view.aod
@@ -2,6 +2,7 @@
<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.0.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.0.0">
<name>OfferitemFilter_view</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
+ <filterable v="true" />
<layout>
<boxLayout>
<name>layout</name>
diff --git a/neonView/OrgFilter_view/OrgFilter_view.aod b/neonView/OrgFilter_view/OrgFilter_view.aod
index c582d6d1735065281c18cf9352a00600fd47c715..72ba21489e573d7c57d7dd344c99363c31278c5b 100644
--- a/neonView/OrgFilter_view/OrgFilter_view.aod
+++ b/neonView/OrgFilter_view/OrgFilter_view.aod
@@ -2,6 +2,7 @@
<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.0.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.0.0">
<name>OrgFilter_view</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
+ <filterable v="true" />
<layout>
<boxLayout>
<name>layout</name>
diff --git a/neonView/PersFilter_view/PersFilter_view.aod b/neonView/PersFilter_view/PersFilter_view.aod
index 2d635744c55f4e26b67eae66c912841281720a53..c915575d5176688e471d31dcd4f728b060544659 100644
--- a/neonView/PersFilter_view/PersFilter_view.aod
+++ b/neonView/PersFilter_view/PersFilter_view.aod
@@ -2,6 +2,7 @@
<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.0.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.0.0">
<name>PersFilter_view</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
+ <filterable v="true" />
<dashletConfigurations>
<neonDashletConfiguration>
<name>MyContactsDashlet</name>
diff --git a/neonView/Prod2prodFilter_view/Prod2prodFilter_view.aod b/neonView/Prod2prodFilter_view/Prod2prodFilter_view.aod
index a4e266e16d92bb2a27fe804336588d3aaa32e2f7..b7a1105b1e8daed148155b53b9d00fc3bb80e22c 100644
--- a/neonView/Prod2prodFilter_view/Prod2prodFilter_view.aod
+++ b/neonView/Prod2prodFilter_view/Prod2prodFilter_view.aod
@@ -2,6 +2,7 @@
<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.0.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.0.0">
<name>Prod2prodFilter_view</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
+ <filterable v="true" />
<layout>
<boxLayout>
<name>layout</name>
diff --git a/neonView/ProductFilter_view/ProductFilter_view.aod b/neonView/ProductFilter_view/ProductFilter_view.aod
index 0707b56301c52a1a110a56bf13ed26c4ebcfdac1..d6a0e442f070f749d09fd0fc16281762eb2d15e8 100644
--- a/neonView/ProductFilter_view/ProductFilter_view.aod
+++ b/neonView/ProductFilter_view/ProductFilter_view.aod
@@ -2,6 +2,7 @@
<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.0.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.0.0">
<name>ProductFilter_view</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
+ <filterable v="true" />
<layout>
<boxLayout>
<name>layout</name>
diff --git a/neonView/ProductpriceFilter_view/ProductpriceFilter_view.aod b/neonView/ProductpriceFilter_view/ProductpriceFilter_view.aod
index 96f22def03c732f18052ddd63f262f037c0b3ded..872fcf91be10a43f907f55fabc9c9633d72a292b 100644
--- a/neonView/ProductpriceFilter_view/ProductpriceFilter_view.aod
+++ b/neonView/ProductpriceFilter_view/ProductpriceFilter_view.aod
@@ -3,6 +3,7 @@
<name>ProductpriceFilter_view</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<quickAdd v="false" />
+ <filterable v="true" />
<layout>
<boxLayout>
<name>layout</name>
diff --git a/neonView/SalesprojectCompetitionFilter_view/SalesprojectCompetitionFilter_view.aod b/neonView/SalesprojectCompetitionFilter_view/SalesprojectCompetitionFilter_view.aod
index 110ae4d07d9b244f29cbe69ddcf60807866e01c6..11ae73d3e11e261ac99ec903c590947e567e8e9b 100644
--- a/neonView/SalesprojectCompetitionFilter_view/SalesprojectCompetitionFilter_view.aod
+++ b/neonView/SalesprojectCompetitionFilter_view/SalesprojectCompetitionFilter_view.aod
@@ -2,6 +2,7 @@
<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.0.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.0.0">
<name>SalesprojectCompetitionFilter_view</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
+ <filterable v="true" />
<layout>
<boxLayout>
<name>layout</name>
diff --git a/neonView/SalesprojectCycleFilter_view/SalesprojectCycleFilter_view.aod b/neonView/SalesprojectCycleFilter_view/SalesprojectCycleFilter_view.aod
index b79086200accc3afe4beb42cce9a56349b444f43..0e640fea74fbaef62f5488de76b9d3d87beb1cd9 100644
--- a/neonView/SalesprojectCycleFilter_view/SalesprojectCycleFilter_view.aod
+++ b/neonView/SalesprojectCycleFilter_view/SalesprojectCycleFilter_view.aod
@@ -2,6 +2,7 @@
<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.0.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.0.0">
<name>SalesprojectCycleFilter_view</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
+ <filterable v="true" />
<layout>
<boxLayout>
<name>layout</name>
diff --git a/neonView/SalesprojectFilter_view/SalesprojectFilter_view.aod b/neonView/SalesprojectFilter_view/SalesprojectFilter_view.aod
index bf2e8d40d23327d53be910136d3b902220d2adb8..22e7fa5a4f6e88dadf33348500f378f795b4a762 100644
--- a/neonView/SalesprojectFilter_view/SalesprojectFilter_view.aod
+++ b/neonView/SalesprojectFilter_view/SalesprojectFilter_view.aod
@@ -2,6 +2,7 @@
<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.0.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.0.0">
<name>SalesprojectFilter_view</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
+ <filterable v="true" />
<layout>
<boxLayout>
<name>layout</name>
diff --git a/neonView/SalesprojectForecastFilter_entity/SalesprojectForecastFilter_entity.aod b/neonView/SalesprojectForecastFilter_entity/SalesprojectForecastFilter_entity.aod
index 5fa1da6804418c62ea724109ce90150efe4fe0b1..9d41178e004a5ba3dadd5ba64f25ac326d21da94 100644
--- a/neonView/SalesprojectForecastFilter_entity/SalesprojectForecastFilter_entity.aod
+++ b/neonView/SalesprojectForecastFilter_entity/SalesprojectForecastFilter_entity.aod
@@ -2,6 +2,7 @@
<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.0.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.0.0">
<name>SalesprojectForecastFilter_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
+ <filterable v="true" />
<layout>
<boxLayout>
<name>layout</name>
diff --git a/neonView/SalesprojectMemberFilter_view/SalesprojectMemberFilter_view.aod b/neonView/SalesprojectMemberFilter_view/SalesprojectMemberFilter_view.aod
index d35e9aed4e5cad8506c409178127ffb8e734b30c..d0a832d21d459eb9d50e3dc13e3e913229e6afe7 100644
--- a/neonView/SalesprojectMemberFilter_view/SalesprojectMemberFilter_view.aod
+++ b/neonView/SalesprojectMemberFilter_view/SalesprojectMemberFilter_view.aod
@@ -2,6 +2,7 @@
<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.0.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.0.0">
<name>SalesprojectMemberFilter_view</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
+ <filterable v="true" />
<layout>
<boxLayout>
<name>layout</name>
diff --git a/neonView/SalesprojectSourceFilter_view/SalesprojectSourceFilter_view.aod b/neonView/SalesprojectSourceFilter_view/SalesprojectSourceFilter_view.aod
index 8a62d4466b37fb3ec5471b210ae9f47043748c15..eb6277b6bfc4363b0882aba6cc35754ded635b4e 100644
--- a/neonView/SalesprojectSourceFilter_view/SalesprojectSourceFilter_view.aod
+++ b/neonView/SalesprojectSourceFilter_view/SalesprojectSourceFilter_view.aod
@@ -2,6 +2,7 @@
<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.0.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.0.0">
<name>SalesprojectSourceFilter_view</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
+ <filterable v="true" />
<layout>
<boxLayout>
<name>layout</name>
diff --git a/neonView/StockFilter_view/StockFilter_view.aod b/neonView/StockFilter_view/StockFilter_view.aod
index cfd4529e65414b0d92003f7d995b40a9e67da496..e97a211ccdb572b323cb438cd7281e36be4d3183 100644
--- a/neonView/StockFilter_view/StockFilter_view.aod
+++ b/neonView/StockFilter_view/StockFilter_view.aod
@@ -2,6 +2,7 @@
<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.0.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.0.0">
<name>StockFilter_view</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
+ <filterable v="true" />
<layout>
<boxLayout>
<name>layout</name>
diff --git a/preferences/_____PREFERENCES_PROJECT/_____PREFERENCES_PROJECT.aod b/preferences/_____PREFERENCES_PROJECT/_____PREFERENCES_PROJECT.aod
index 6342decac506717ea22a8355652f8a4fde3f4c99..473ef689d837b86aee98b7cd8c0d4c1ef1f4c727 100644
--- a/preferences/_____PREFERENCES_PROJECT/_____PREFERENCES_PROJECT.aod
+++ b/preferences/_____PREFERENCES_PROJECT/_____PREFERENCES_PROJECT.aod
@@ -2,7 +2,7 @@
<preferences xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="3.0.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/preferences/3.0.1">
<name>_____PREFERENCES_PROJECT</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
- <projectName>xRM-Basic</projectName>
+ <projectName>xRM-Basic5</projectName>
<jditoMaxContentSize v="57671680" />
<calendarCategoriesEvent>
<entry>