From 9679bf23bae60669730f9d5681e1c9529573447f Mon Sep 17 00:00:00 2001
From: Mohamed Mansour <m.mansour@adito.de>
Date: Mon, 22 Jul 2019 17:34:27 +0200
Subject: [PATCH] =?UTF-8?q?fixed=20xmls=20from=20keyids=20to=20schl=C3=BCs?=
=?UTF-8?q?selw=C3=B6rter.=20Made=20stateprocess=20for=20dunning=20levels?=
=?UTF-8?q?=20and=20dates.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../2019.1.4/Salesorder/Salesorder_terms.xml | 17 +
.../Salesorder/create_ordertype_keyword.xml | 20 +-
.../2019.1.4/Salesorder/update_Salesorder.xml | 2 +
.../Data_alias/basic/2019.1.4/changelog.xml | 1 +
.../basic/init/struct/create_salesorder.xml | 2 -
aliasDefinition/Data_alias/Data_alias.aod | 56 +
.../KeywordEntry_entity.aod | 1244 +++++++++--------
entity/Order_entity/Order_entity.aod | 78 +-
.../presetlinks_param/valueProcess.js | 2 +-
.../currency/displayValueProcess.js | 6 +-
.../entityfields/currency/valueProcess.js | 20 +-
.../deliveryterms/displayValueProcess.js | 6 +
.../deliveryterms/valueProcess.js | 31 +
.../entityfields/dunningdate/stateProcess.js | 9 +
.../entityfields/dunninglevel/stateProcess.js | 9 +
.../containername_param/valueProcess.js | 4 +
.../containername_param/valueProcess.js | 4 +
.../entityfields/language/valueProcess.js | 17 +-
.../newactivity/onActionProcess.js | 3 +-
.../entityfields/newtask/onActionProcess.js | 3 +-
.../entityfields/ordertype/valueProcess.js | 26 +-
.../paymentterms/displayValueProcess.js | 6 +
.../entityfields/paymentterms/valueProcess.js | 31 +
.../salesorderdate/stateProcess.js | 9 +
.../presetlinks_param/valueProcess.js | 3 +-
.../recordcontainers/db/fromClauseProcess.js | 3 +-
.../recordcontainers/db/onDBDelete.js | 2 +-
neonView/OrderEdit_view/OrderEdit_view.aod | 206 +--
.../OrderPreview_view/OrderPreview_view.aod | 176 +--
process/KeywordRegistry_basic/process.js | 5 +
30 files changed, 1143 insertions(+), 858 deletions(-)
create mode 100644 .liquibase/Data_alias/basic/2019.1.4/Salesorder/Salesorder_terms.xml
create mode 100644 entity/Order_entity/entityfields/deliveryterms/displayValueProcess.js
create mode 100644 entity/Order_entity/entityfields/deliveryterms/valueProcess.js
create mode 100644 entity/Order_entity/entityfields/dunningdate/stateProcess.js
create mode 100644 entity/Order_entity/entityfields/dunninglevel/stateProcess.js
create mode 100644 entity/Order_entity/entityfields/keyworddeliveryterms/children/containername_param/valueProcess.js
create mode 100644 entity/Order_entity/entityfields/keywordpaymentterms/children/containername_param/valueProcess.js
create mode 100644 entity/Order_entity/entityfields/paymentterms/displayValueProcess.js
create mode 100644 entity/Order_entity/entityfields/paymentterms/valueProcess.js
create mode 100644 entity/Order_entity/entityfields/salesorderdate/stateProcess.js
diff --git a/.liquibase/Data_alias/basic/2019.1.4/Salesorder/Salesorder_terms.xml b/.liquibase/Data_alias/basic/2019.1.4/Salesorder/Salesorder_terms.xml
new file mode 100644
index 0000000000..533e63b2b5
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2019.1.4/Salesorder/Salesorder_terms.xml
@@ -0,0 +1,17 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+ <changeSet author="m.mansour" id="09de84ad-de1a-42f6-a403-6032480be850">
+ <addColumn tableName="SALESORDER">
+ <column name="PAYMENTTERMS" type="CHAR(36)"/>
+ </addColumn>
+ <addColumn tableName="SALESORDER">
+ <column name="DELIVERYTERMS" type="CHAR(36)"/>
+ </addColumn>
+ <addColumn tableName="SALESORDER">
+ <column name="DELIVERYADDRESS" type="NCLOB"/>
+ </addColumn>
+ <addColumn tableName="SALESORDER">
+ <column name="PAYMENTADDRESS" type="NCLOB"/>
+ </addColumn>
+ </changeSet>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/2019.1.4/Salesorder/create_ordertype_keyword.xml b/.liquibase/Data_alias/basic/2019.1.4/Salesorder/create_ordertype_keyword.xml
index 7074f406b0..3524b9219d 100644
--- a/.liquibase/Data_alias/basic/2019.1.4/Salesorder/create_ordertype_keyword.xml
+++ b/.liquibase/Data_alias/basic/2019.1.4/Salesorder/create_ordertype_keyword.xml
@@ -3,48 +3,48 @@
<changeSet author="m.mansour" id="e4e4d996-3739-449f-97fc-5d28489298d1">
<insert tableName="AB_KEYWORD_ENTRY">
<column name="AB_KEYWORD_ENTRYID" value="5e5524d7-c8be-4bd2-b9cf-1974d8c7a2f5"/>
- <column name="KEYID" value="f637db5d-9a20-48a2-862d-e1ab790f642a"/>
+ <column name="KEYID" value="ORDTYPECONF"/>
<column name="TITLE" value="Order confirmation"/>
<column name="CONTAINER" value="OrderType"/>
<column name="SORTING" valueNumeric="0"/>
<column name="ISACTIVE" valueNumeric="1"/>
- <column name="ISESSENTIAL" valueNumeric="0"/>
+ <column name="ISESSENTIAL" valueNumeric="1"/>
</insert>
<insert tableName="AB_KEYWORD_ENTRY">
<column name="AB_KEYWORD_ENTRYID" value="9882b909-b952-4f47-ac63-bb49f8c8eb6a"/>
- <column name="KEYID" value="238b6ab3-acf2-4cd1-a18e-3a31a49f3b96"/>
+ <column name="KEYID" value="ORDTYPENOTE"/>
<column name="TITLE" value="Delivery note"/>
<column name="CONTAINER" value="OrderType"/>
<column name="SORTING" valueNumeric="1"/>
<column name="ISACTIVE" valueNumeric="1"/>
- <column name="ISESSENTIAL" valueNumeric="0"/>
+ <column name="ISESSENTIAL" valueNumeric="1"/>
</insert>
<insert tableName="AB_KEYWORD_ENTRY">
<column name="AB_KEYWORD_ENTRYID" value="383aa333-cc14-4ea5-9baf-23aaa7d7ec4e"/>
- <column name="KEYID" value="0dd3762e-1194-4d18-b218-e9638603a2c7"/>
+ <column name="KEYID" value="ORDTYPEINVO"/>
<column name="TITLE" value="Invoice"/>
<column name="CONTAINER" value="OrderType"/>
<column name="SORTING" valueNumeric="2"/>
<column name="ISACTIVE" valueNumeric="1"/>
- <column name="ISESSENTIAL" valueNumeric="0"/>
+ <column name="ISESSENTIAL" valueNumeric="1"/>
</insert>
<insert tableName="AB_KEYWORD_ENTRY">
<column name="AB_KEYWORD_ENTRYID" value="0d9eab1f-8e07-4b0d-a92b-bdc6a5b3bd18"/>
- <column name="KEYID" value="623886cf-b2ce-4c55-b472-0c17980f7606"/>
+ <column name="KEYID" value="ORDTYPECRED"/>
<column name="TITLE" value="Credit"/>
<column name="CONTAINER" value="OrderType"/>
<column name="SORTING" valueNumeric="3"/>
<column name="ISACTIVE" valueNumeric="1"/>
- <column name="ISESSENTIAL" valueNumeric="0"/>
+ <column name="ISESSENTIAL" valueNumeric="1"/>
</insert>
<insert tableName="AB_KEYWORD_ENTRY">
<column name="AB_KEYWORD_ENTRYID" value="18abd018-4eb4-44ae-b0c0-0e63ad6286b1"/>
- <column name="KEYID" value="b982cd81-9389-4352-8031-116140e5e7ef"/>
+ <column name="KEYID" value="ORDTYPECANC"/>
<column name="TITLE" value="Cancellation"/>
<column name="CONTAINER" value="OrderType"/>
<column name="SORTING" valueNumeric="4"/>
<column name="ISACTIVE" valueNumeric="1"/>
- <column name="ISESSENTIAL" valueNumeric="0"/>
+ <column name="ISESSENTIAL" valueNumeric="1"/>
</insert>
</changeSet>
</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/2019.1.4/Salesorder/update_Salesorder.xml b/.liquibase/Data_alias/basic/2019.1.4/Salesorder/update_Salesorder.xml
index 0b09845c43..ee561df947 100644
--- a/.liquibase/Data_alias/basic/2019.1.4/Salesorder/update_Salesorder.xml
+++ b/.liquibase/Data_alias/basic/2019.1.4/Salesorder/update_Salesorder.xml
@@ -11,6 +11,8 @@
<column name="PAYDATE" type="DATETIME"/>
<column name="DUNNINGDATE" type="DATETIME"/>
<column name="DUNNINGLEVEL" type="CHAR(36)"/>
+ <column name="ORDERTYPE" type="CHAR(36)"/>
+ <column name="ORDERSTATUS" type="TINYINT"/>
</addColumn>
<renameColumn newColumnName="OBJECT_ROWID" oldColumnName="SALESPROJECT_ID" tableName="SALESORDER" columnDataType="CHAR(36)"/>
<update tableName="SALESORDER">
diff --git a/.liquibase/Data_alias/basic/2019.1.4/changelog.xml b/.liquibase/Data_alias/basic/2019.1.4/changelog.xml
index 7599179a43..67cf54897e 100644
--- a/.liquibase/Data_alias/basic/2019.1.4/changelog.xml
+++ b/.liquibase/Data_alias/basic/2019.1.4/changelog.xml
@@ -187,4 +187,5 @@
<include relativeToChangelogFile="true" file="Salesorder/create_ordertype_keyword.xml"/>
<include relativeToChangelogFile="true" file="Salesorder/create_dunninglevel_keyword.xml"/>
<include relativeToChangelogFile="true" file="Salesorder/update_Salesorder.xml"/>
+ <include relativeToChangelogFile="true" file="Salesorder/Salesorder_terms.xml"/>
</databaseChangeLog>
diff --git a/.liquibase/Data_alias/basic/init/struct/create_salesorder.xml b/.liquibase/Data_alias/basic/init/struct/create_salesorder.xml
index 9825fe170a..e5b5409e8b 100644
--- a/.liquibase/Data_alias/basic/init/struct/create_salesorder.xml
+++ b/.liquibase/Data_alias/basic/init/struct/create_salesorder.xml
@@ -10,8 +10,6 @@
</column>
<column name="SALESPROJECT_ID" type="CHAR(36)"/>
<column name="SALESORDER_ID" type="CHAR(36)"/>
- <column name="ORDERTYPE" type="CHAR(36)"/>
- <column name="ORDERSTATUS" type="TINYINT"/>
<column name="HEADER" type="NCLOB"/>
<column name="FOOTER" type="NCLOB"/>
<column name="SALESORDERDATE" type="DATETIME"/>
diff --git a/aliasDefinition/Data_alias/Data_alias.aod b/aliasDefinition/Data_alias/Data_alias.aod
index 5a18b0f65b..904e12a1bb 100644
--- a/aliasDefinition/Data_alias/Data_alias.aod
+++ b/aliasDefinition/Data_alias/Data_alias.aod
@@ -4724,6 +4724,62 @@
<title></title>
<description></description>
</entityFieldDb>
+ <entityFieldDb>
+ <name>PAYMENTTERMS</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="1" />
+ <size v="36" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>DELIVERYTERMS</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="1" />
+ <size v="36" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>PAYMENTADDRESS</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="2005" />
+ <size v="2147483647" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>DELIVERYADDRESS</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="2005" />
+ <size v="2147483647" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
</entityFields>
</entityDb>
<entityDb>
diff --git a/entity/KeywordEntry_entity/KeywordEntry_entity.aod b/entity/KeywordEntry_entity/KeywordEntry_entity.aod
index 7cef34dcac..88ba6e5361 100644
--- a/entity/KeywordEntry_entity/KeywordEntry_entity.aod
+++ b/entity/KeywordEntry_entity/KeywordEntry_entity.aod
@@ -1,616 +1,628 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.10" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.10">
- <name>KeywordEntry_entity</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <documentation>%aditoprj%/entity/KeywordEntry_entity/documentation.adoc</documentation>
- <title>Keyword</title>
- <siblings />
- <grantDelete v="false" />
- <grantDeleteProcess>%aditoprj%/entity/KeywordEntry_entity/grantDeleteProcess.js</grantDeleteProcess>
- <contentTitleProcess>%aditoprj%/entity/KeywordEntry_entity/contentTitleProcess.js</contentTitleProcess>
- <onValidation>%aditoprj%/entity/KeywordEntry_entity/onValidation.js</onValidation>
- <iconId>VAADIN:KEY</iconId>
- <iconIdProcess>%aditoprj%/entity/KeywordEntry_entity/iconIdProcess.js</iconIdProcess>
- <titlePlural>Keywords</titlePlural>
- <recordContainer>db</recordContainer>
- <entityFields>
- <entityProvider>
- <name>#PROVIDER</name>
- <lookupIdfield>KEYID</lookupIdfield>
- <recordContainer>db</recordContainer>
- <dependencies>
- <entityDependency>
- <name>ce10e4d3-7799-4473-a681-a3c6d9f93b02</name>
- <entityName>Notification_entity</entityName>
- <fieldName>StateKeywords</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>0015f4fa-9f54-4d99-8e23-92e36a614d7a</name>
- <entityName>Notification_entity</entityName>
- <fieldName>PrioKeywords</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
- </entityProvider>
- <entityField>
- <name>CONTAINER</name>
- <documentation>%aditoprj%/entity/KeywordEntry_entity/entityfields/container/documentation.adoc</documentation>
- <title>Container</title>
- <groupable v="true" />
- <mandatory v="true" />
- <dropDownProcess>%aditoprj%/entity/KeywordEntry_entity/entityfields/container/dropDownProcess.js</dropDownProcess>
- <textInputAllowed v="true" />
- <state>READONLY</state>
- <stateProcess>%aditoprj%/entity/KeywordEntry_entity/entityfields/container/stateProcess.js</stateProcess>
- </entityField>
- <entityField>
- <name>AB_KEYWORD_ENTRYID</name>
- <title>AB_KEYWORD_ENTRYID (UID)</title>
- <valueProcess>%aditoprj%/entity/KeywordEntry_entity/entityfields/ab_keyword_entryid/valueProcess.js</valueProcess>
- </entityField>
- <entityField>
- <name>KEYID</name>
- <documentation>%aditoprj%/entity/KeywordEntry_entity/entityfields/keyid/documentation.adoc</documentation>
- <title>Key</title>
- <mandatory v="true" />
- <state>READONLY</state>
- <stateProcess>%aditoprj%/entity/KeywordEntry_entity/entityfields/keyid/stateProcess.js</stateProcess>
- <valueProcess>%aditoprj%/entity/KeywordEntry_entity/entityfields/keyid/valueProcess.js</valueProcess>
- <onValidation>%aditoprj%/entity/KeywordEntry_entity/entityfields/keyid/onValidation.js</onValidation>
- </entityField>
- <entityField>
- <name>TITLE</name>
- <title>Title (original language)</title>
- <mandatory v="true" />
- </entityField>
- <entityField>
- <name>SORTING</name>
- <documentation>%aditoprj%/entity/KeywordEntry_entity/entityfields/sorting/documentation.adoc</documentation>
- <title>Sorting</title>
- <mandatory v="false" />
- <state>AUTO</state>
- </entityField>
- <entityField>
- <name>ISACTIVE</name>
- <title>Active</title>
- <contentType>BOOLEAN</contentType>
- <dropDownProcess>%aditoprj%/entity/KeywordEntry_entity/entityfields/isactive/dropDownProcess.js</dropDownProcess>
- <valueProcess>%aditoprj%/entity/KeywordEntry_entity/entityfields/isactive/valueProcess.js</valueProcess>
- </entityField>
- <entityField>
- <name>ISESSENTIAL</name>
- <documentation>%aditoprj%/entity/KeywordEntry_entity/entityfields/isessential/documentation.adoc</documentation>
- <title>Relational</title>
- <contentType>BOOLEAN</contentType>
- <dropDownProcess>%aditoprj%/entity/KeywordEntry_entity/entityfields/isessential/dropDownProcess.js</dropDownProcess>
- <state>READONLY</state>
- <valueProcess>%aditoprj%/entity/KeywordEntry_entity/entityfields/isessential/valueProcess.js</valueProcess>
- </entityField>
- <entityParameter>
- <name>ContainerName_param</name>
- <expose v="true" />
- <documentation>%aditoprj%/entity/KeywordEntry_entity/entityfields/containername_param/documentation.adoc</documentation>
- </entityParameter>
- <entityProvider>
- <name>SpecificContainerKeywords</name>
- <lookupIdfield>KEYID</lookupIdfield>
- <recordContainer>db</recordContainer>
- <dependencies>
- <entityDependency>
- <name>bb48a3ee-f340-4fd4-8c80-ef73b765ab58</name>
- <entityName>Organisation_entity</entityName>
- <fieldName>KeywordContactStates</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>4b1d1def-36d3-45e9-9ed5-eaef12d1ec82</name>
- <entityName>Activity_entity</entityName>
- <fieldName>KeywordDirections</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>42219987-4eff-4429-a22c-93e8a9c55c45</name>
- <entityName>Contract_entity</entityName>
- <fieldName>ContractPayments</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>2712e2b3-f17f-4a9c-9752-2383f62eb2b8</name>
- <entityName>Contract_entity</entityName>
- <fieldName>ContractStates</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>bd68f269-457c-487d-a1b2-e045d98f74b7</name>
- <entityName>Contract_entity</entityName>
- <fieldName>ContractTypes</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>b88b5cc8-c29e-4110-b86e-d1d0050460e5</name>
- <entityName>Offer_entity</entityName>
- <fieldName>KeywordCurrencies</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>57c746ee-a8c0-484a-8c73-6301609b76b1</name>
- <entityName>Order_entity</entityName>
- <fieldName>KeywordCurrencies</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>bf014596-954b-4c7d-9304-8283c9bcc7ae</name>
- <entityName>Productprice_entity</entityName>
- <fieldName>KeywordCurrencies</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>f5dcbf08-3765-4a9d-8b42-cb1219c87f57</name>
- <entityName>Offeritem_entity</entityName>
- <fieldName>KeywordProductGroupcodes</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>53bcaa07-94eb-4e81-9e9e-c5748156dad5</name>
- <entityName>Orderitem_entity</entityName>
- <fieldName>KeywordProductGroupcodes</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>c404b010-1634-4160-adca-7edf1535ee26</name>
- <entityName>Product_entity</entityName>
- <fieldName>KeywordProductGroupcodes</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>3575fdd7-3dd6-4318-b0d2-32d1df821076</name>
- <entityName>Forecast_entity</entityName>
- <fieldName>KeywordProductGroupcodes</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>5a21cbe2-4eb0-4968-80fa-b98a64599230</name>
- <entityName>Offer_entity</entityName>
- <fieldName>KeywordOfferStates</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>8696e561-b263-4c7c-b753-c5da44b48055</name>
- <entityName>Organisation_entity</entityName>
- <fieldName>KeywordOrganisationTypes</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>0d54d283-f158-4b91-8f6d-026954ed9c50</name>
- <entityName>Person_entity</entityName>
- <fieldName>KeywordGenders</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>8d28f08b-675d-4bcf-9318-a508d45ca69e</name>
- <entityName>Task_entity</entityName>
- <fieldName>KeywordStates</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>b069ef7d-07a0-460c-a8e7-cde5861c96c2</name>
- <entityName>Productprice_entity</entityName>
- <fieldName>KeywordPricelists</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>7f134ef1-cff5-4cf4-9d2a-e288c7904c28</name>
- <entityName>Offeritem_entity</entityName>
- <fieldName>KeywordQuantityUnits</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>c3c3b430-a14f-46b4-909a-9b53cef35413</name>
- <entityName>Orderitem_entity</entityName>
- <fieldName>KeywordQuantityUnits</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>a1983efd-92f9-4a6b-8805-d2977fcde0c8</name>
- <entityName>Product_entity</entityName>
- <fieldName>KeywordQuantityUnits</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>026021cd-cd64-400d-8bd5-f6d044af1ad8</name>
- <entityName>Member_entity</entityName>
- <fieldName>KeywordMemberRoles</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>356e23f9-eb05-4e18-b0b5-cbc7c8716dba</name>
- <entityName>SalesprojectSource_entity</entityName>
- <fieldName>KeywordSources</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>36a72192-902f-431b-8f43-0bef311678f7</name>
- <entityName>Order_entity</entityName>
- <fieldName>KeywordStates</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>e2041dea-8647-49e9-aacf-4481b75b76ff</name>
- <entityName>Stock_entity</entityName>
- <fieldName>KeywordWarehouses</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>403c40a4-f747-4e47-ad60-07334724d6fb</name>
- <entityName>KeywordAttribute_entity</entityName>
- <fieldName>KeywordAttributeTypes</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>078bbd52-87fa-44cc-9902-04af935b5fbc</name>
- <entityName>Attribute_entity</entityName>
- <fieldName>KeywordAttributeTypes</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>718fe5a2-c75f-49ed-b67e-fc4fbf63ff1d</name>
- <entityName>Salesproject_entity</entityName>
- <fieldName>KeywordProbabilties</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>a44375e9-917c-4db8-9aa8-de0625caf78f</name>
- <entityName>Activity_entity</entityName>
- <fieldName>KeywordCategories</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>f442a641-4dff-4860-bf4c-cfddc054e075</name>
- <entityName>Offer_entity</entityName>
- <fieldName>KeywordProbabilities</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>fa831dac-3287-422a-8f28-504fc525876a</name>
- <entityName>Communication_entity</entityName>
- <fieldName>KeywordMediums</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>04b28ce6-a144-4c19-ac2d-4cfbc3568700</name>
- <entityName>Organisation_entity</entityName>
- <fieldName>KeywordPricePolitics</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>f024df05-2faf-4447-9eed-ae31b329d542</name>
- <entityName>Competition_entity</entityName>
- <fieldName>KeywordPricePolitics</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>60840c28-9875-4e3e-8099-5ca208d58bbe</name>
- <entityName>Organisation_entity</entityName>
- <fieldName>KeywordWeaknesses</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>854148e2-2532-4562-b393-832819e8d462</name>
- <entityName>Organisation_entity</entityName>
- <fieldName>KeywordStrenghts</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>613d5861-0494-45f9-a839-a705347a68da</name>
- <entityName>Competition_entity</entityName>
- <fieldName>KeywordWeaknesses</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>119d79d0-9e04-4dd0-80bb-0bc32eaae775</name>
- <entityName>Competition_entity</entityName>
- <fieldName>KeywordStrenghts</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>6e2d164c-1ac7-4ed0-ad8f-7bfda1328493</name>
- <entityName>Salesproject_entity</entityName>
- <fieldName>KeywordStates</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>3ca6d3c7-83d2-4761-bab4-50d2baecdbd6</name>
- <entityName>Competition_entity</entityName>
- <fieldName>KeywordPhases</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>1053a90d-574a-4ca2-b41d-42b513db0fd2</name>
- <entityName>Task_entity</entityName>
- <fieldName>KeywordPriorities</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>bf9f7a07-dfb9-44d0-8f9b-d3814053683e</name>
- <entityName>Competition_entity</entityName>
- <fieldName>KeywordStates</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>ef8b9397-6292-42de-806e-5aaf3e3db5f3</name>
- <entityName>Salesproject_entity</entityName>
- <fieldName>KeywordWonLost</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>5d9e0e48-ece8-4b8e-ab72-beef77b5dcc3</name>
- <entityName>Task_entity</entityName>
- <fieldName>KeywordProgress</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>36aa04c1-5361-4e40-a036-0546db596973</name>
- <entityName>Offer_entity</entityName>
- <fieldName>KeywordDeliveryTerm</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>7e12cbd6-3a2c-4bd8-bc66-5001c282b690</name>
- <entityName>Offer_entity</entityName>
- <fieldName>KeywordPaymentTerm</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>77be3cca-8b50-4810-9549-3fd3e6fdf220</name>
- <entityName>Person_entity</entityName>
- <fieldName>KeywordContactStates</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>7945545b-f1e6-446d-84c3-ef68486652f4</name>
- <entityName>Contact_entity</entityName>
- <fieldName>KeywordContactStates</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>740a9696-d394-48ea-bcbf-a5484a093bde</name>
- <entityName>SalesprojectMilestone_entity</entityName>
- <fieldName>Keywords</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>b5c39776-509e-4758-8d05-a64eac4e7f38</name>
- <entityName>CampaignStep_entity</entityName>
- <fieldName>KeywordStates</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>13d739cb-2b97-44a0-bed0-b6868b0e579e</name>
- <entityName>CampaignCost_entity</entityName>
- <fieldName>KeywordCampaignManagementCostCategory</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>63bd7284-e9a0-4576-afe8-299d412e8def</name>
- <entityName>ClassificationAdmin_entity</entityName>
- <fieldName>KeywordClassificationTypes</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>3a81e886-0d83-47f0-9ec7-c864ffc57cda</name>
- <entityName>Classification_entity</entityName>
- <fieldName>KeywordClassificationTypes</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>995646a8-ccec-4962-8c81-05a54903c433</name>
- <entityName>CommRestriction_Entity</entityName>
- <fieldName>CommRestrictionMedium</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>eb7c17de-3057-45c5-96c0-f863551cc049</name>
- <entityName>BulkMailRecipient_entity</entityName>
- <fieldName>StatusKeyword</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>3ab18dc8-b702-49d9-9cbc-4b8d8ffaea2e</name>
- <entityName>DSGVO_entity</entityName>
- <fieldName>KeywordDSGVOPurpose</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>86501073-4e62-42ef-ba15-e9f6a2eb3495</name>
- <entityName>DSGVO_entity</entityName>
- <fieldName>KeywordDSGVOStatuoritysource</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>ae2c4712-5513-4c0d-911a-532f50483c76</name>
- <entityName>DSGVO_entity</entityName>
- <fieldName>KeywordDSGVOType</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>44f84932-2a27-4e11-833b-def950c064d9</name>
- <entityName>SupportTicket_entity</entityName>
- <fieldName>KeywordTickettype</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>10ba6c44-779c-4ba8-9277-e9583af03ed5</name>
- <entityName>SupportTicket_entity</entityName>
- <fieldName>KeywordTaskState</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>e1b87370-aa15-4540-99c1-7bd63f0f3263</name>
- <entityName>SupportTicket_entity</entityName>
- <fieldName>KeywordTaskPriority</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>d8c587cc-47db-4e08-a6ac-92ec1d91acb5</name>
- <entityName>BulkMail_entity</entityName>
- <fieldName>StatusKeyword</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>41fd8fd4-7285-4493-9a56-cc0c44353057</name>
- <entityName>DSGVOInfo_entity</entityName>
- <fieldName>KeywordDeadline</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>1cbfe51f-43c3-4e99-895f-673097915249</name>
- <entityName>DSGVOInfo_entity</entityName>
- <fieldName>KeywordTransmission</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>718da6a7-229b-4075-a8ff-b0458c770e7b</name>
- <entityName>DSGVOInfo_entity</entityName>
- <fieldName>KeywordGuarantee</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>2694515c-eda4-44aa-9826-d430aa8a8089</name>
- <entityName>Order_entity</entityName>
- <fieldName>KeywordOrderTypes</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>72ae7a5c-acc9-4e59-8110-f5b544f47f15</name>
- <entityName>Order_entity</entityName>
- <fieldName>KeywordDunningLevels</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
- <children>
- <entityParameter>
- <name>OnlyActives_param</name>
- <valueProcess>%aditoprj%/entity/KeywordEntry_entity/entityfields/specificcontainerkeywords/children/onlyactives_param/valueProcess.js</valueProcess>
- <expose v="true" />
- </entityParameter>
- <entityParameter>
- <name>ContainerName_param</name>
- <expose v="true" />
- </entityParameter>
- </children>
- </entityProvider>
- <entityField>
- <name>TITLE_TRANSLATED</name>
- <valueProcess>%aditoprj%/entity/KeywordEntry_entity/entityfields/title_translated/valueProcess.js</valueProcess>
- </entityField>
- <entityParameter>
- <name>OnlyActives_param</name>
- <valueProcess>%aditoprj%/entity/KeywordEntry_entity/entityfields/onlyactives_param/valueProcess.js</valueProcess>
- <expose v="true" />
- <description>PARAMETER</description>
- </entityParameter>
- <entityConsumer>
- <name>KeywordAttributeRelations</name>
- <dependency>
- <name>dependency</name>
- <entityName>KeywordAttributeRelation_entity</entityName>
- <fieldName>AttributesForKeywordEntry</fieldName>
- </dependency>
- <children>
- <entityParameter>
- <name>KeywordEntryId_param</name>
- <valueProcess>%aditoprj%/entity/KeywordEntry_entity/entityfields/keywordattributerelations/children/keywordentryid_param/valueProcess.js</valueProcess>
- <expose v="true" />
- </entityParameter>
- </children>
- </entityConsumer>
- <entityConsumer>
- <name>KeywordAttributeRelationsReadOnly</name>
- <documentation>%aditoprj%/entity/KeywordEntry_entity/entityfields/keywordattributerelationsreadonly/documentation.adoc</documentation>
- <state>READONLY</state>
- <dependency>
- <name>dependency</name>
- <entityName>KeywordAttributeRelation_entity</entityName>
- <fieldName>AttributesForKeywordEntry</fieldName>
- </dependency>
- <children>
- <entityParameter>
- <name>KeywordEntryId_param</name>
- <valueProcess>%aditoprj%/entity/KeywordEntry_entity/entityfields/keywordattributerelationsreadonly/children/keywordentryid_param/valueProcess.js</valueProcess>
- </entityParameter>
- </children>
- </entityConsumer>
- <entityParameter>
- <name>ExcludedKeyIdsSubquery_param</name>
- <expose v="true" />
- <documentation>%aditoprj%/entity/KeywordEntry_entity/entityfields/excludedkeyidssubquery_param/documentation.adoc</documentation>
- <description>PARAMETER</description>
- </entityParameter>
- <entityParameter>
- <name>WhitelistIds_param</name>
- <expose v="true" />
- <documentation>%aditoprj%/entity/KeywordEntry_entity/entityfields/whitelistids_param/documentation.adoc</documentation>
- </entityParameter>
- <entityField>
- <name>expanded</name>
- <valueProcess>%aditoprj%/entity/KeywordEntry_entity/entityfields/expanded/valueProcess.js</valueProcess>
- </entityField>
- <entityActionField>
- <name>openAdminView</name>
- <title>Open admin view</title>
- <onActionProcess>%aditoprj%/entity/KeywordEntry_entity/entityfields/openadminview/onActionProcess.js</onActionProcess>
- <iconId>VAADIN:CURLY_BRACKETS</iconId>
- <stateProcess>%aditoprj%/entity/KeywordEntry_entity/entityfields/openadminview/stateProcess.js</stateProcess>
- </entityActionField>
- </entityFields>
- <recordContainers>
- <dbRecordContainer>
- <name>db</name>
- <alias>Data_alias</alias>
- <isPageable v="false" />
- <conditionProcess>%aditoprj%/entity/KeywordEntry_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
- <orderClauseProcess>%aditoprj%/entity/KeywordEntry_entity/recordcontainers/db/orderClauseProcess.js</orderClauseProcess>
- <onDBDelete>%aditoprj%/entity/KeywordEntry_entity/recordcontainers/db/onDBDelete.js</onDBDelete>
- <linkInformation>
- <linkInformation>
- <name>52acbfe0-57f4-4614-83af-9882e168f431</name>
- <tableName>AB_KEYWORD_ENTRY</tableName>
- <primaryKey>AB_KEYWORD_ENTRYID</primaryKey>
- <isUIDTable v="true" />
- <readonly v="false" />
- </linkInformation>
- </linkInformation>
- <recordFieldMappings>
- <dbRecordFieldMapping>
- <name>TITLE.value</name>
- <recordfield>AB_KEYWORD_ENTRY.TITLE</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>SORTING.value</name>
- <recordfield>AB_KEYWORD_ENTRY.SORTING</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>ISESSENTIAL.value</name>
- <recordfield>AB_KEYWORD_ENTRY.ISESSENTIAL</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>ISACTIVE.value</name>
- <recordfield>AB_KEYWORD_ENTRY.ISACTIVE</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>AB_KEYWORD_ENTRYID.value</name>
- <recordfield>AB_KEYWORD_ENTRY.AB_KEYWORD_ENTRYID</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>KEYID.value</name>
- <recordfield>AB_KEYWORD_ENTRY.KEYID</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>CONTAINER.value</name>
- <recordfield>AB_KEYWORD_ENTRY.CONTAINER</recordfield>
- </dbRecordFieldMapping>
- </recordFieldMappings>
- </dbRecordContainer>
- </recordContainers>
-</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.3.10" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.10">
+ <name>KeywordEntry_entity</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <documentation>%aditoprj%/entity/KeywordEntry_entity/documentation.adoc</documentation>
+ <title>Keyword</title>
+ <siblings />
+ <grantDelete v="false" />
+ <grantDeleteProcess>%aditoprj%/entity/KeywordEntry_entity/grantDeleteProcess.js</grantDeleteProcess>
+ <contentTitleProcess>%aditoprj%/entity/KeywordEntry_entity/contentTitleProcess.js</contentTitleProcess>
+ <onValidation>%aditoprj%/entity/KeywordEntry_entity/onValidation.js</onValidation>
+ <iconId>VAADIN:KEY</iconId>
+ <iconIdProcess>%aditoprj%/entity/KeywordEntry_entity/iconIdProcess.js</iconIdProcess>
+ <titlePlural>Keywords</titlePlural>
+ <recordContainer>db</recordContainer>
+ <entityFields>
+ <entityProvider>
+ <name>#PROVIDER</name>
+ <lookupIdfield>KEYID</lookupIdfield>
+ <recordContainer>db</recordContainer>
+ <dependencies>
+ <entityDependency>
+ <name>ce10e4d3-7799-4473-a681-a3c6d9f93b02</name>
+ <entityName>Notification_entity</entityName>
+ <fieldName>StateKeywords</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>0015f4fa-9f54-4d99-8e23-92e36a614d7a</name>
+ <entityName>Notification_entity</entityName>
+ <fieldName>PrioKeywords</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ </dependencies>
+ </entityProvider>
+ <entityField>
+ <name>CONTAINER</name>
+ <documentation>%aditoprj%/entity/KeywordEntry_entity/entityfields/container/documentation.adoc</documentation>
+ <title>Container</title>
+ <groupable v="true" />
+ <mandatory v="true" />
+ <dropDownProcess>%aditoprj%/entity/KeywordEntry_entity/entityfields/container/dropDownProcess.js</dropDownProcess>
+ <textInputAllowed v="true" />
+ <state>READONLY</state>
+ <stateProcess>%aditoprj%/entity/KeywordEntry_entity/entityfields/container/stateProcess.js</stateProcess>
+ </entityField>
+ <entityField>
+ <name>AB_KEYWORD_ENTRYID</name>
+ <title>AB_KEYWORD_ENTRYID (UID)</title>
+ <valueProcess>%aditoprj%/entity/KeywordEntry_entity/entityfields/ab_keyword_entryid/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>KEYID</name>
+ <documentation>%aditoprj%/entity/KeywordEntry_entity/entityfields/keyid/documentation.adoc</documentation>
+ <title>Key</title>
+ <mandatory v="true" />
+ <state>READONLY</state>
+ <stateProcess>%aditoprj%/entity/KeywordEntry_entity/entityfields/keyid/stateProcess.js</stateProcess>
+ <valueProcess>%aditoprj%/entity/KeywordEntry_entity/entityfields/keyid/valueProcess.js</valueProcess>
+ <onValidation>%aditoprj%/entity/KeywordEntry_entity/entityfields/keyid/onValidation.js</onValidation>
+ </entityField>
+ <entityField>
+ <name>TITLE</name>
+ <title>Title (original language)</title>
+ <mandatory v="true" />
+ </entityField>
+ <entityField>
+ <name>SORTING</name>
+ <documentation>%aditoprj%/entity/KeywordEntry_entity/entityfields/sorting/documentation.adoc</documentation>
+ <title>Sorting</title>
+ <mandatory v="false" />
+ <state>AUTO</state>
+ </entityField>
+ <entityField>
+ <name>ISACTIVE</name>
+ <title>Active</title>
+ <contentType>BOOLEAN</contentType>
+ <dropDownProcess>%aditoprj%/entity/KeywordEntry_entity/entityfields/isactive/dropDownProcess.js</dropDownProcess>
+ <valueProcess>%aditoprj%/entity/KeywordEntry_entity/entityfields/isactive/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>ISESSENTIAL</name>
+ <documentation>%aditoprj%/entity/KeywordEntry_entity/entityfields/isessential/documentation.adoc</documentation>
+ <title>Relational</title>
+ <contentType>BOOLEAN</contentType>
+ <dropDownProcess>%aditoprj%/entity/KeywordEntry_entity/entityfields/isessential/dropDownProcess.js</dropDownProcess>
+ <state>READONLY</state>
+ <valueProcess>%aditoprj%/entity/KeywordEntry_entity/entityfields/isessential/valueProcess.js</valueProcess>
+ </entityField>
+ <entityParameter>
+ <name>ContainerName_param</name>
+ <expose v="true" />
+ <documentation>%aditoprj%/entity/KeywordEntry_entity/entityfields/containername_param/documentation.adoc</documentation>
+ </entityParameter>
+ <entityProvider>
+ <name>SpecificContainerKeywords</name>
+ <lookupIdfield>KEYID</lookupIdfield>
+ <recordContainer>db</recordContainer>
+ <dependencies>
+ <entityDependency>
+ <name>bb48a3ee-f340-4fd4-8c80-ef73b765ab58</name>
+ <entityName>Organisation_entity</entityName>
+ <fieldName>KeywordContactStates</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>4b1d1def-36d3-45e9-9ed5-eaef12d1ec82</name>
+ <entityName>Activity_entity</entityName>
+ <fieldName>KeywordDirections</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>42219987-4eff-4429-a22c-93e8a9c55c45</name>
+ <entityName>Contract_entity</entityName>
+ <fieldName>ContractPayments</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>2712e2b3-f17f-4a9c-9752-2383f62eb2b8</name>
+ <entityName>Contract_entity</entityName>
+ <fieldName>ContractStates</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>bd68f269-457c-487d-a1b2-e045d98f74b7</name>
+ <entityName>Contract_entity</entityName>
+ <fieldName>ContractTypes</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>b88b5cc8-c29e-4110-b86e-d1d0050460e5</name>
+ <entityName>Offer_entity</entityName>
+ <fieldName>KeywordCurrencies</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>57c746ee-a8c0-484a-8c73-6301609b76b1</name>
+ <entityName>Order_entity</entityName>
+ <fieldName>KeywordCurrencies</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>bf014596-954b-4c7d-9304-8283c9bcc7ae</name>
+ <entityName>Productprice_entity</entityName>
+ <fieldName>KeywordCurrencies</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>f5dcbf08-3765-4a9d-8b42-cb1219c87f57</name>
+ <entityName>Offeritem_entity</entityName>
+ <fieldName>KeywordProductGroupcodes</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>53bcaa07-94eb-4e81-9e9e-c5748156dad5</name>
+ <entityName>Orderitem_entity</entityName>
+ <fieldName>KeywordProductGroupcodes</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>c404b010-1634-4160-adca-7edf1535ee26</name>
+ <entityName>Product_entity</entityName>
+ <fieldName>KeywordProductGroupcodes</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>3575fdd7-3dd6-4318-b0d2-32d1df821076</name>
+ <entityName>Forecast_entity</entityName>
+ <fieldName>KeywordProductGroupcodes</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>5a21cbe2-4eb0-4968-80fa-b98a64599230</name>
+ <entityName>Offer_entity</entityName>
+ <fieldName>KeywordOfferStates</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>8696e561-b263-4c7c-b753-c5da44b48055</name>
+ <entityName>Organisation_entity</entityName>
+ <fieldName>KeywordOrganisationTypes</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>0d54d283-f158-4b91-8f6d-026954ed9c50</name>
+ <entityName>Person_entity</entityName>
+ <fieldName>KeywordGenders</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>8d28f08b-675d-4bcf-9318-a508d45ca69e</name>
+ <entityName>Task_entity</entityName>
+ <fieldName>KeywordStates</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>b069ef7d-07a0-460c-a8e7-cde5861c96c2</name>
+ <entityName>Productprice_entity</entityName>
+ <fieldName>KeywordPricelists</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>7f134ef1-cff5-4cf4-9d2a-e288c7904c28</name>
+ <entityName>Offeritem_entity</entityName>
+ <fieldName>KeywordQuantityUnits</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>c3c3b430-a14f-46b4-909a-9b53cef35413</name>
+ <entityName>Orderitem_entity</entityName>
+ <fieldName>KeywordQuantityUnits</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>a1983efd-92f9-4a6b-8805-d2977fcde0c8</name>
+ <entityName>Product_entity</entityName>
+ <fieldName>KeywordQuantityUnits</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>026021cd-cd64-400d-8bd5-f6d044af1ad8</name>
+ <entityName>Member_entity</entityName>
+ <fieldName>KeywordMemberRoles</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>356e23f9-eb05-4e18-b0b5-cbc7c8716dba</name>
+ <entityName>SalesprojectSource_entity</entityName>
+ <fieldName>KeywordSources</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>36a72192-902f-431b-8f43-0bef311678f7</name>
+ <entityName>Order_entity</entityName>
+ <fieldName>KeywordStates</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>e2041dea-8647-49e9-aacf-4481b75b76ff</name>
+ <entityName>Stock_entity</entityName>
+ <fieldName>KeywordWarehouses</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>403c40a4-f747-4e47-ad60-07334724d6fb</name>
+ <entityName>KeywordAttribute_entity</entityName>
+ <fieldName>KeywordAttributeTypes</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>078bbd52-87fa-44cc-9902-04af935b5fbc</name>
+ <entityName>Attribute_entity</entityName>
+ <fieldName>KeywordAttributeTypes</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>718fe5a2-c75f-49ed-b67e-fc4fbf63ff1d</name>
+ <entityName>Salesproject_entity</entityName>
+ <fieldName>KeywordProbabilties</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>a44375e9-917c-4db8-9aa8-de0625caf78f</name>
+ <entityName>Activity_entity</entityName>
+ <fieldName>KeywordCategories</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>f442a641-4dff-4860-bf4c-cfddc054e075</name>
+ <entityName>Offer_entity</entityName>
+ <fieldName>KeywordProbabilities</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>fa831dac-3287-422a-8f28-504fc525876a</name>
+ <entityName>Communication_entity</entityName>
+ <fieldName>KeywordMediums</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>04b28ce6-a144-4c19-ac2d-4cfbc3568700</name>
+ <entityName>Organisation_entity</entityName>
+ <fieldName>KeywordPricePolitics</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>f024df05-2faf-4447-9eed-ae31b329d542</name>
+ <entityName>Competition_entity</entityName>
+ <fieldName>KeywordPricePolitics</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>60840c28-9875-4e3e-8099-5ca208d58bbe</name>
+ <entityName>Organisation_entity</entityName>
+ <fieldName>KeywordWeaknesses</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>854148e2-2532-4562-b393-832819e8d462</name>
+ <entityName>Organisation_entity</entityName>
+ <fieldName>KeywordStrenghts</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>613d5861-0494-45f9-a839-a705347a68da</name>
+ <entityName>Competition_entity</entityName>
+ <fieldName>KeywordWeaknesses</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>119d79d0-9e04-4dd0-80bb-0bc32eaae775</name>
+ <entityName>Competition_entity</entityName>
+ <fieldName>KeywordStrenghts</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>6e2d164c-1ac7-4ed0-ad8f-7bfda1328493</name>
+ <entityName>Salesproject_entity</entityName>
+ <fieldName>KeywordStates</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>3ca6d3c7-83d2-4761-bab4-50d2baecdbd6</name>
+ <entityName>Competition_entity</entityName>
+ <fieldName>KeywordPhases</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>1053a90d-574a-4ca2-b41d-42b513db0fd2</name>
+ <entityName>Task_entity</entityName>
+ <fieldName>KeywordPriorities</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>bf9f7a07-dfb9-44d0-8f9b-d3814053683e</name>
+ <entityName>Competition_entity</entityName>
+ <fieldName>KeywordStates</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>ef8b9397-6292-42de-806e-5aaf3e3db5f3</name>
+ <entityName>Salesproject_entity</entityName>
+ <fieldName>KeywordWonLost</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>5d9e0e48-ece8-4b8e-ab72-beef77b5dcc3</name>
+ <entityName>Task_entity</entityName>
+ <fieldName>KeywordProgress</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>36aa04c1-5361-4e40-a036-0546db596973</name>
+ <entityName>Offer_entity</entityName>
+ <fieldName>KeywordDeliveryTerm</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>7e12cbd6-3a2c-4bd8-bc66-5001c282b690</name>
+ <entityName>Offer_entity</entityName>
+ <fieldName>KeywordPaymentTerm</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>77be3cca-8b50-4810-9549-3fd3e6fdf220</name>
+ <entityName>Person_entity</entityName>
+ <fieldName>KeywordContactStates</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>7945545b-f1e6-446d-84c3-ef68486652f4</name>
+ <entityName>Contact_entity</entityName>
+ <fieldName>KeywordContactStates</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>740a9696-d394-48ea-bcbf-a5484a093bde</name>
+ <entityName>SalesprojectMilestone_entity</entityName>
+ <fieldName>Keywords</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>b5c39776-509e-4758-8d05-a64eac4e7f38</name>
+ <entityName>CampaignStep_entity</entityName>
+ <fieldName>KeywordStates</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>13d739cb-2b97-44a0-bed0-b6868b0e579e</name>
+ <entityName>CampaignCost_entity</entityName>
+ <fieldName>KeywordCampaignManagementCostCategory</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>63bd7284-e9a0-4576-afe8-299d412e8def</name>
+ <entityName>ClassificationAdmin_entity</entityName>
+ <fieldName>KeywordClassificationTypes</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>3a81e886-0d83-47f0-9ec7-c864ffc57cda</name>
+ <entityName>Classification_entity</entityName>
+ <fieldName>KeywordClassificationTypes</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>995646a8-ccec-4962-8c81-05a54903c433</name>
+ <entityName>CommRestriction_Entity</entityName>
+ <fieldName>CommRestrictionMedium</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>eb7c17de-3057-45c5-96c0-f863551cc049</name>
+ <entityName>BulkMailRecipient_entity</entityName>
+ <fieldName>StatusKeyword</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>3ab18dc8-b702-49d9-9cbc-4b8d8ffaea2e</name>
+ <entityName>DSGVO_entity</entityName>
+ <fieldName>KeywordDSGVOPurpose</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>86501073-4e62-42ef-ba15-e9f6a2eb3495</name>
+ <entityName>DSGVO_entity</entityName>
+ <fieldName>KeywordDSGVOStatuoritysource</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>ae2c4712-5513-4c0d-911a-532f50483c76</name>
+ <entityName>DSGVO_entity</entityName>
+ <fieldName>KeywordDSGVOType</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>44f84932-2a27-4e11-833b-def950c064d9</name>
+ <entityName>SupportTicket_entity</entityName>
+ <fieldName>KeywordTickettype</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>10ba6c44-779c-4ba8-9277-e9583af03ed5</name>
+ <entityName>SupportTicket_entity</entityName>
+ <fieldName>KeywordTaskState</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>e1b87370-aa15-4540-99c1-7bd63f0f3263</name>
+ <entityName>SupportTicket_entity</entityName>
+ <fieldName>KeywordTaskPriority</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>d8c587cc-47db-4e08-a6ac-92ec1d91acb5</name>
+ <entityName>BulkMail_entity</entityName>
+ <fieldName>StatusKeyword</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>41fd8fd4-7285-4493-9a56-cc0c44353057</name>
+ <entityName>DSGVOInfo_entity</entityName>
+ <fieldName>KeywordDeadline</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>1cbfe51f-43c3-4e99-895f-673097915249</name>
+ <entityName>DSGVOInfo_entity</entityName>
+ <fieldName>KeywordTransmission</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>718da6a7-229b-4075-a8ff-b0458c770e7b</name>
+ <entityName>DSGVOInfo_entity</entityName>
+ <fieldName>KeywordGuarantee</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>2694515c-eda4-44aa-9826-d430aa8a8089</name>
+ <entityName>Order_entity</entityName>
+ <fieldName>KeywordOrderTypes</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>72ae7a5c-acc9-4e59-8110-f5b544f47f15</name>
+ <entityName>Order_entity</entityName>
+ <fieldName>KeywordDunningLevels</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>ea9260e9-b5e8-457c-ae84-45c4692348ce</name>
+ <entityName>Order_entity</entityName>
+ <fieldName>KeywordPaymentTerms</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>5d296f68-0a8f-429c-b630-e3ca88874945</name>
+ <entityName>Order_entity</entityName>
+ <fieldName>KeywordDeliveryTerms</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ </dependencies>
+ <children>
+ <entityParameter>
+ <name>OnlyActives_param</name>
+ <valueProcess>%aditoprj%/entity/KeywordEntry_entity/entityfields/specificcontainerkeywords/children/onlyactives_param/valueProcess.js</valueProcess>
+ <expose v="true" />
+ </entityParameter>
+ <entityParameter>
+ <name>ContainerName_param</name>
+ <expose v="true" />
+ </entityParameter>
+ </children>
+ </entityProvider>
+ <entityField>
+ <name>TITLE_TRANSLATED</name>
+ <valueProcess>%aditoprj%/entity/KeywordEntry_entity/entityfields/title_translated/valueProcess.js</valueProcess>
+ </entityField>
+ <entityParameter>
+ <name>OnlyActives_param</name>
+ <valueProcess>%aditoprj%/entity/KeywordEntry_entity/entityfields/onlyactives_param/valueProcess.js</valueProcess>
+ <expose v="true" />
+ <description>PARAMETER</description>
+ </entityParameter>
+ <entityConsumer>
+ <name>KeywordAttributeRelations</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>KeywordAttributeRelation_entity</entityName>
+ <fieldName>AttributesForKeywordEntry</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>KeywordEntryId_param</name>
+ <valueProcess>%aditoprj%/entity/KeywordEntry_entity/entityfields/keywordattributerelations/children/keywordentryid_param/valueProcess.js</valueProcess>
+ <expose v="true" />
+ </entityParameter>
+ </children>
+ </entityConsumer>
+ <entityConsumer>
+ <name>KeywordAttributeRelationsReadOnly</name>
+ <documentation>%aditoprj%/entity/KeywordEntry_entity/entityfields/keywordattributerelationsreadonly/documentation.adoc</documentation>
+ <state>READONLY</state>
+ <dependency>
+ <name>dependency</name>
+ <entityName>KeywordAttributeRelation_entity</entityName>
+ <fieldName>AttributesForKeywordEntry</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>KeywordEntryId_param</name>
+ <valueProcess>%aditoprj%/entity/KeywordEntry_entity/entityfields/keywordattributerelationsreadonly/children/keywordentryid_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ </children>
+ </entityConsumer>
+ <entityParameter>
+ <name>ExcludedKeyIdsSubquery_param</name>
+ <expose v="true" />
+ <documentation>%aditoprj%/entity/KeywordEntry_entity/entityfields/excludedkeyidssubquery_param/documentation.adoc</documentation>
+ <description>PARAMETER</description>
+ </entityParameter>
+ <entityParameter>
+ <name>WhitelistIds_param</name>
+ <expose v="true" />
+ <documentation>%aditoprj%/entity/KeywordEntry_entity/entityfields/whitelistids_param/documentation.adoc</documentation>
+ </entityParameter>
+ <entityField>
+ <name>expanded</name>
+ <valueProcess>%aditoprj%/entity/KeywordEntry_entity/entityfields/expanded/valueProcess.js</valueProcess>
+ </entityField>
+ <entityActionField>
+ <name>openAdminView</name>
+ <title>Open admin view</title>
+ <onActionProcess>%aditoprj%/entity/KeywordEntry_entity/entityfields/openadminview/onActionProcess.js</onActionProcess>
+ <iconId>VAADIN:CURLY_BRACKETS</iconId>
+ <stateProcess>%aditoprj%/entity/KeywordEntry_entity/entityfields/openadminview/stateProcess.js</stateProcess>
+ </entityActionField>
+ </entityFields>
+ <recordContainers>
+ <dbRecordContainer>
+ <name>db</name>
+ <alias>Data_alias</alias>
+ <isPageable v="false" />
+ <conditionProcess>%aditoprj%/entity/KeywordEntry_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
+ <orderClauseProcess>%aditoprj%/entity/KeywordEntry_entity/recordcontainers/db/orderClauseProcess.js</orderClauseProcess>
+ <onDBDelete>%aditoprj%/entity/KeywordEntry_entity/recordcontainers/db/onDBDelete.js</onDBDelete>
+ <linkInformation>
+ <linkInformation>
+ <name>52acbfe0-57f4-4614-83af-9882e168f431</name>
+ <tableName>AB_KEYWORD_ENTRY</tableName>
+ <primaryKey>AB_KEYWORD_ENTRYID</primaryKey>
+ <isUIDTable v="true" />
+ <readonly v="false" />
+ </linkInformation>
+ </linkInformation>
+ <recordFieldMappings>
+ <dbRecordFieldMapping>
+ <name>TITLE.value</name>
+ <recordfield>AB_KEYWORD_ENTRY.TITLE</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>SORTING.value</name>
+ <recordfield>AB_KEYWORD_ENTRY.SORTING</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>ISESSENTIAL.value</name>
+ <recordfield>AB_KEYWORD_ENTRY.ISESSENTIAL</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>ISACTIVE.value</name>
+ <recordfield>AB_KEYWORD_ENTRY.ISACTIVE</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>AB_KEYWORD_ENTRYID.value</name>
+ <recordfield>AB_KEYWORD_ENTRY.AB_KEYWORD_ENTRYID</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>KEYID.value</name>
+ <recordfield>AB_KEYWORD_ENTRY.KEYID</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>CONTAINER.value</name>
+ <recordfield>AB_KEYWORD_ENTRY.CONTAINER</recordfield>
+ </dbRecordFieldMapping>
+ </recordFieldMappings>
+ </dbRecordContainer>
+ </recordContainers>
+</entity>
diff --git a/entity/Order_entity/Order_entity.aod b/entity/Order_entity/Order_entity.aod
index fb5b685663..068826b48e 100644
--- a/entity/Order_entity/Order_entity.aod
+++ b/entity/Order_entity/Order_entity.aod
@@ -44,6 +44,7 @@
<outputFormat>dd.MM.yyyy</outputFormat>
<inputFormat>dd.MM.yyyy</inputFormat>
<mandatory v="true" />
+ <stateProcess>%aditoprj%/entity/Order_entity/entityfields/salesorderdate/stateProcess.js</stateProcess>
<valueProcess>%aditoprj%/entity/Order_entity/entityfields/salesorderdate/valueProcess.js</valueProcess>
</entityField>
<entityField>
@@ -496,11 +497,13 @@
<name>DUNNINGDATE</name>
<title>Dunning date</title>
<contentType>DATE</contentType>
+ <stateProcess>%aditoprj%/entity/Order_entity/entityfields/dunningdate/stateProcess.js</stateProcess>
</entityField>
<entityField>
<name>DUNNINGLEVEL</name>
<title>Dunning level</title>
<consumer>KeywordDunningLevels</consumer>
+ <stateProcess>%aditoprj%/entity/Order_entity/entityfields/dunninglevel/stateProcess.js</stateProcess>
</entityField>
<entityField>
<name>PAYDATE</name>
@@ -610,6 +613,54 @@
<name>ObjectType_param</name>
<expose v="true" />
</entityParameter>
+ <entityField>
+ <name>PAYMENTTERMS</name>
+ <title>Payment term</title>
+ <consumer>KeywordPaymentTerms</consumer>
+ <valueProcess>%aditoprj%/entity/Order_entity/entityfields/paymentterms/valueProcess.js</valueProcess>
+ <displayValueProcess>%aditoprj%/entity/Order_entity/entityfields/paymentterms/displayValueProcess.js</displayValueProcess>
+ </entityField>
+ <entityField>
+ <name>DELIVERYTERMS</name>
+ <title>Delivery specification</title>
+ <consumer>KeywordDeliveryTerms</consumer>
+ <valueProcess>%aditoprj%/entity/Order_entity/entityfields/deliveryterms/valueProcess.js</valueProcess>
+ <displayValueProcess>%aditoprj%/entity/Order_entity/entityfields/deliveryterms/displayValueProcess.js</displayValueProcess>
+ </entityField>
+ <entityField>
+ <name>DELIVERYADDRESS</name>
+ </entityField>
+ <entityField>
+ <name>PAYMENTADDRESS</name>
+ </entityField>
+ <entityConsumer>
+ <name>KeywordPaymentTerms</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>KeywordEntry_entity</entityName>
+ <fieldName>SpecificContainerKeywords</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>ContainerName_param</name>
+ <valueProcess>%aditoprj%/entity/Order_entity/entityfields/keywordpaymentterms/children/containername_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ </children>
+ </entityConsumer>
+ <entityConsumer>
+ <name>KeywordDeliveryTerms</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>KeywordEntry_entity</entityName>
+ <fieldName>SpecificContainerKeywords</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>ContainerName_param</name>
+ <valueProcess>%aditoprj%/entity/Order_entity/entityfields/keyworddeliveryterms/children/containername_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ </children>
+ </entityConsumer>
</entityFields>
<recordContainers>
<dbRecordContainer>
@@ -623,35 +674,28 @@
<onDBDelete>%aditoprj%/entity/Order_entity/recordcontainers/db/onDBDelete.js</onDBDelete>
<linkInformation>
<linkInformation>
- <name>39d6d76d-8c8f-40aa-b2ed-4684de5d0050</name>
+ <name>43290f18-46fb-4d1f-b653-60f39f1fe3fb</name>
<tableName>SALESORDER</tableName>
<primaryKey>SALESORDERID</primaryKey>
<isUIDTable v="true" />
<readonly v="false" />
</linkInformation>
<linkInformation>
- <name>c67be87c-ef41-4b01-bc74-95c46a101536</name>
+ <name>3f8c21b4-a81e-4405-8b4f-346ff724b8a5</name>
<tableName>CONTACT</tableName>
<primaryKey>CONTACTID</primaryKey>
<isUIDTable v="false" />
<readonly v="true" />
</linkInformation>
<linkInformation>
- <name>6c333196-ff8c-4fef-a85f-0fee8e408661</name>
- <tableName>SALESPROJECT</tableName>
- <primaryKey>SALESPROJECTID</primaryKey>
- <isUIDTable v="false" />
- <readonly v="true" />
- </linkInformation>
- <linkInformation>
- <name>04cf409d-daeb-41be-ba24-9b7779ac4231</name>
+ <name>0131be90-6232-4dda-9036-bbde951eded5</name>
<tableName>PERSON</tableName>
<primaryKey>PERSONID</primaryKey>
<isUIDTable v="false" />
<readonly v="true" />
</linkInformation>
<linkInformation>
- <name>a807abec-8815-4b57-a039-d53d24b90331</name>
+ <name>0efeab02-efaf-4155-9312-0aee1f7f5535</name>
<tableName>ORGANISATION</tableName>
<primaryKey>ORGANISATIONID</primaryKey>
<isUIDTable v="false" />
@@ -791,6 +835,18 @@
<name>OBJECT_TYPE.value</name>
<recordfield>SALESORDER.OBJECT_TYPE</recordfield>
</dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>PAYMENTTERMS.value</name>
+ <recordfield>SALESORDER.PAYMENTTERMS</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>DELIVERYTERMS.value</name>
+ <recordfield>SALESORDER.DELIVERYTERMS</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>DELIVERYADDRESS.value</name>
+ <recordfield>SALESORDER.DELIVERYADDRESS</recordfield>
+ </dbRecordFieldMapping>
</recordFieldMappings>
</dbRecordContainer>
<indexRecordContainer>
diff --git a/entity/Order_entity/entityfields/activities/children/presetlinks_param/valueProcess.js b/entity/Order_entity/entityfields/activities/children/presetlinks_param/valueProcess.js
index 79d0000b63..9dbbef1ab1 100644
--- a/entity/Order_entity/entityfields/activities/children/presetlinks_param/valueProcess.js
+++ b/entity/Order_entity/entityfields/activities/children/presetlinks_param/valueProcess.js
@@ -12,7 +12,7 @@ if (contactId)
if (vars.get("$field.OBJECT_ROWID"))
{
- links.push(["$field.OBJECT_TYPE", vars.get("$field.OBJECT_ROWID")]);
+ links.push([vars.get("$field.OBJECT_TYPE"), vars.get("$field.OBJECT_ROWID")]);
}
result.object(links);
\ No newline at end of file
diff --git a/entity/Order_entity/entityfields/currency/displayValueProcess.js b/entity/Order_entity/entityfields/currency/displayValueProcess.js
index 76d0d8a1e7..c82b4d7480 100644
--- a/entity/Order_entity/entityfields/currency/displayValueProcess.js
+++ b/entity/Order_entity/entityfields/currency/displayValueProcess.js
@@ -3,8 +3,4 @@ import("system.vars");
import("Keyword_lib");
import("KeywordRegistry_basic");
-if (vars.exists("$param.OrderCurrency_param"))
-{
- var currency = KeywordUtils.getViewValue($KeywordRegistry.currency(), vars.get("$param.OrderCurrency_param"));
- result.string(currency);
-}
\ No newline at end of file
+result.string(KeywordUtils.getViewValue($KeywordRegistry.currency(), vars.get("$field.CURRENCY")));
diff --git a/entity/Order_entity/entityfields/currency/valueProcess.js b/entity/Order_entity/entityfields/currency/valueProcess.js
index 97b32dfd7d..428b8d7716 100644
--- a/entity/Order_entity/entityfields/currency/valueProcess.js
+++ b/entity/Order_entity/entityfields/currency/valueProcess.js
@@ -1,7 +1,13 @@
-import("system.result");
-import("system.vars");
-
-if (vars.exists("$param.OrderCurrency_param"))
-{
- result.string(vars.get("$param.OrderCurrency_param"));
-}
\ No newline at end of file
+import("system.neon");
+import("system.result");
+import("system.vars");
+import("KeywordRegistry_basic");
+
+if (vars.exists("$param.OrderCurrency_param") && vars.get("$param.OrderCurrency_param"))
+{
+ result.string(vars.get("$param.OrderCurrency_param"));
+}
+else if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && !vars.get("$this.value"))
+{
+ result.string($KeywordRegistry.currency$eur());
+}
diff --git a/entity/Order_entity/entityfields/deliveryterms/displayValueProcess.js b/entity/Order_entity/entityfields/deliveryterms/displayValueProcess.js
new file mode 100644
index 0000000000..cfacf44952
--- /dev/null
+++ b/entity/Order_entity/entityfields/deliveryterms/displayValueProcess.js
@@ -0,0 +1,6 @@
+import("system.result");
+import("system.vars");
+import("Keyword_lib");
+import("KeywordRegistry_basic");
+
+result.string(KeywordUtils.getViewValue($KeywordRegistry.deliveryTerm(), vars.get("$field.DELIVERYTERMS")));
diff --git a/entity/Order_entity/entityfields/deliveryterms/valueProcess.js b/entity/Order_entity/entityfields/deliveryterms/valueProcess.js
new file mode 100644
index 0000000000..9d4288fee2
--- /dev/null
+++ b/entity/Order_entity/entityfields/deliveryterms/valueProcess.js
@@ -0,0 +1,31 @@
+import("Keyword_lib");
+import("KeywordRegistry_basic");
+import("AttributeRegistry_basic");
+import("system.neon");
+import("system.result");
+import("system.vars");
+import("Attribute_lib");
+import("Contact_lib");
+
+if (vars.exists("$param.OfferDeliveryTerm_param") && vars.get("$param.OfferDeliveryTerm_param"))
+{
+ result.string(vars.get("$param.OfferDeliveryTerm_param"));
+}
+else if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
+{
+ var presetValue = "";
+ var contactIds = ContactUtils.getPersOrgIds(vars.getString("$field.CONTACT_ID"))
+ if (contactIds.length >= 3 && contactIds[2])
+ {
+ var orgContactId = ContactUtils.getOrgContactId(contactIds[2]);
+ if (orgContactId)
+ {
+ presetValue = AttributeRelationUtils.getAttribute($AttributeRegistry.deliveryTerm(), orgContactId);
+ }
+ }
+
+ if (presetValue)
+ result.string(presetValue);
+ else
+ result.string(KeywordUtils.getFirst($KeywordRegistry.deliveryTerm()));
+}
\ No newline at end of file
diff --git a/entity/Order_entity/entityfields/dunningdate/stateProcess.js b/entity/Order_entity/entityfields/dunningdate/stateProcess.js
new file mode 100644
index 0000000000..df7975c62d
--- /dev/null
+++ b/entity/Order_entity/entityfields/dunningdate/stateProcess.js
@@ -0,0 +1,9 @@
+import("system.result");
+import("system.vars");
+import("system.neon");
+import("KeywordRegistry_basic")
+
+if(vars.get("$field.ORDERTYPE") == $KeywordRegistry.orderType$invoice())
+ result.string(neon.COMPONENTSTATE_AUTO);
+else
+ result.string(neon.COMPONENTSTATE_INVISIBLE);
\ No newline at end of file
diff --git a/entity/Order_entity/entityfields/dunninglevel/stateProcess.js b/entity/Order_entity/entityfields/dunninglevel/stateProcess.js
new file mode 100644
index 0000000000..df7975c62d
--- /dev/null
+++ b/entity/Order_entity/entityfields/dunninglevel/stateProcess.js
@@ -0,0 +1,9 @@
+import("system.result");
+import("system.vars");
+import("system.neon");
+import("KeywordRegistry_basic")
+
+if(vars.get("$field.ORDERTYPE") == $KeywordRegistry.orderType$invoice())
+ result.string(neon.COMPONENTSTATE_AUTO);
+else
+ result.string(neon.COMPONENTSTATE_INVISIBLE);
\ No newline at end of file
diff --git a/entity/Order_entity/entityfields/keyworddeliveryterms/children/containername_param/valueProcess.js b/entity/Order_entity/entityfields/keyworddeliveryterms/children/containername_param/valueProcess.js
new file mode 100644
index 0000000000..25f4733023
--- /dev/null
+++ b/entity/Order_entity/entityfields/keyworddeliveryterms/children/containername_param/valueProcess.js
@@ -0,0 +1,4 @@
+import("system.result");
+import("KeywordRegistry_basic");
+
+result.string($KeywordRegistry.deliveryTerm());
\ No newline at end of file
diff --git a/entity/Order_entity/entityfields/keywordpaymentterms/children/containername_param/valueProcess.js b/entity/Order_entity/entityfields/keywordpaymentterms/children/containername_param/valueProcess.js
new file mode 100644
index 0000000000..f56caab574
--- /dev/null
+++ b/entity/Order_entity/entityfields/keywordpaymentterms/children/containername_param/valueProcess.js
@@ -0,0 +1,4 @@
+import("system.result");
+import("KeywordRegistry_basic");
+
+result.string($KeywordRegistry.paymentTerm());
\ No newline at end of file
diff --git a/entity/Order_entity/entityfields/language/valueProcess.js b/entity/Order_entity/entityfields/language/valueProcess.js
index d2dcc59e62..be56fdb1a4 100644
--- a/entity/Order_entity/entityfields/language/valueProcess.js
+++ b/entity/Order_entity/entityfields/language/valueProcess.js
@@ -1,7 +1,12 @@
-import("system.result");
-import("system.vars");
-
-if (vars.exists("$param.OrderLanguage_param"))
-{
- result.string(vars.get("$param.OrderLanguage_param"));
+import("system.neon");
+import("system.result");
+import("system.vars");
+
+if (vars.exists("$param.OrderLanguage_param") && vars.get("$param.OrderLanguage_param"))
+{
+ result.string(vars.get("$param.OrderLanguage_param"));
+}
+else if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && !vars.get("$this.value"))
+{
+ result.string("deu");
}
\ No newline at end of file
diff --git a/entity/Order_entity/entityfields/newactivity/onActionProcess.js b/entity/Order_entity/entityfields/newactivity/onActionProcess.js
index 03bcfb1a67..d56c51af47 100644
--- a/entity/Order_entity/entityfields/newactivity/onActionProcess.js
+++ b/entity/Order_entity/entityfields/newactivity/onActionProcess.js
@@ -12,7 +12,8 @@ if (contactId)
if (vars.get("$field.OBJECT_ROWID"))
{
- links.push(["$field.OBJECT_TYPE", vars.get("$field.OBJECT_ROWID")]);
+ links.push([vars.get("$field.OBJECT_TYPE"), vars.get("$field.OBJECT_ROWID")]);
}
+
ActivityUtils.createNewActivity(vars.get("$field.SALESORDERID"), links);
\ No newline at end of file
diff --git a/entity/Order_entity/entityfields/newtask/onActionProcess.js b/entity/Order_entity/entityfields/newtask/onActionProcess.js
index 1f7b450c69..8420e8850a 100644
--- a/entity/Order_entity/entityfields/newtask/onActionProcess.js
+++ b/entity/Order_entity/entityfields/newtask/onActionProcess.js
@@ -12,6 +12,7 @@ if (contactId)
if (vars.get("$field.OBJECT_ROWID"))
{
- links.push(["$field.OBJECT_TYPE", vars.get("$field.OBJECT_ROWID")]);
+ links.push([vars.get("$field.OBJECT_TYPE"), vars.get("$field.OBJECT_ROWID")]);
}
+
TaskUtils.createNewTask(vars.get("$field.SALESORDERID"), links);
\ No newline at end of file
diff --git a/entity/Order_entity/entityfields/ordertype/valueProcess.js b/entity/Order_entity/entityfields/ordertype/valueProcess.js
index ae532d35c2..321a7e6424 100644
--- a/entity/Order_entity/entityfields/ordertype/valueProcess.js
+++ b/entity/Order_entity/entityfields/ordertype/valueProcess.js
@@ -1,14 +1,14 @@
-import("Keyword_lib");
-import("KeywordRegistry_basic");
-import("AttributeRegistry_basic");
-import("system.neon");
-import("system.result");
-import("system.vars");
-import("Attribute_lib");
-import("Contact_lib");
-
-if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
-{
-
- result.string(KeywordUtils.getFirst($KeywordRegistry.orderType()));
+import("Keyword_lib");
+import("KeywordRegistry_basic");
+import("AttributeRegistry_basic");
+import("system.neon");
+import("system.result");
+import("system.vars");
+import("Attribute_lib");
+import("Contact_lib");
+
+if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.get("$this.value") == null)
+{
+
+ result.string(KeywordUtils.getFirst($KeywordRegistry.orderType()));
}
\ No newline at end of file
diff --git a/entity/Order_entity/entityfields/paymentterms/displayValueProcess.js b/entity/Order_entity/entityfields/paymentterms/displayValueProcess.js
new file mode 100644
index 0000000000..720b4205ef
--- /dev/null
+++ b/entity/Order_entity/entityfields/paymentterms/displayValueProcess.js
@@ -0,0 +1,6 @@
+import("system.result");
+import("system.vars");
+import("Keyword_lib");
+import("KeywordRegistry_basic");
+
+result.string(KeywordUtils.getViewValue($KeywordRegistry.paymentTerm(), vars.get("$field.PAYMENTTERMS")));
diff --git a/entity/Order_entity/entityfields/paymentterms/valueProcess.js b/entity/Order_entity/entityfields/paymentterms/valueProcess.js
new file mode 100644
index 0000000000..98081578fa
--- /dev/null
+++ b/entity/Order_entity/entityfields/paymentterms/valueProcess.js
@@ -0,0 +1,31 @@
+import("Keyword_lib");
+import("Contact_lib");
+import("AttributeRegistry_basic");
+import("KeywordRegistry_basic");
+import("system.neon");
+import("system.result");
+import("system.vars");
+import("Attribute_lib");
+
+if (vars.exists("$param.OfferPaymentTerm_param") && vars.get("$param.OfferPaymentTerm_param"))
+{
+ result.string(vars.get("$param.OfferPaymentTerm_param"));
+}
+else if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
+{
+ var presetValue = "";
+ var contactIds = ContactUtils.getPersOrgIds(vars.getString("$field.CONTACT_ID"))
+ if (contactIds.length >= 3 && contactIds[2])
+ {
+ var orgContactId = ContactUtils.getOrgContactId(contactIds[2]);
+ if (orgContactId)
+ {
+ presetValue = AttributeRelationUtils.getAttribute($AttributeRegistry.paymentTerm(), orgContactId);
+ }
+ }
+
+ if (presetValue)
+ result.string(presetValue);
+ else
+ result.string(KeywordUtils.getFirst($KeywordRegistry.paymentTerm()));
+}
\ No newline at end of file
diff --git a/entity/Order_entity/entityfields/salesorderdate/stateProcess.js b/entity/Order_entity/entityfields/salesorderdate/stateProcess.js
new file mode 100644
index 0000000000..b55e051d86
--- /dev/null
+++ b/entity/Order_entity/entityfields/salesorderdate/stateProcess.js
@@ -0,0 +1,9 @@
+import("system.result");
+import("system.vars");
+import("system.neon");
+import("KeywordRegistry_basic")
+
+if(vars.get("$field.ORDERTYPE") == $KeywordRegistry.orderType$confirmation())
+ result.string(neon.COMPONENTSTATE_INVISIBLE);
+else
+ result.string(neon.COMPONENTSTATE_AUTO);
\ No newline at end of file
diff --git a/entity/Order_entity/entityfields/tasks/children/presetlinks_param/valueProcess.js b/entity/Order_entity/entityfields/tasks/children/presetlinks_param/valueProcess.js
index 79d0000b63..5750b425e9 100644
--- a/entity/Order_entity/entityfields/tasks/children/presetlinks_param/valueProcess.js
+++ b/entity/Order_entity/entityfields/tasks/children/presetlinks_param/valueProcess.js
@@ -12,7 +12,8 @@ if (contactId)
if (vars.get("$field.OBJECT_ROWID"))
{
- links.push(["$field.OBJECT_TYPE", vars.get("$field.OBJECT_ROWID")]);
+ links.push([vars.get("$field.OBJECT_TYPE"), vars.get("$field.OBJECT_ROWID")]);
}
+
result.object(links);
\ No newline at end of file
diff --git a/entity/Order_entity/recordcontainers/db/fromClauseProcess.js b/entity/Order_entity/recordcontainers/db/fromClauseProcess.js
index c0acd1b6df..923c8a9a9e 100644
--- a/entity/Order_entity/recordcontainers/db/fromClauseProcess.js
+++ b/entity/Order_entity/recordcontainers/db/fromClauseProcess.js
@@ -3,5 +3,4 @@ import("system.result");
result.string("SALESORDER \n\
left join CONTACT on CONTACT.CONTACTID = SALESORDER.CONTACT_ID \n\
left join ORGANISATION on ORGANISATION.ORGANISATIONID = CONTACT.ORGANISATION_ID \n\
- left join PERSON on PERSON.PERSONID = CONTACT.PERSON_ID \n\
- left join SALESPROJECT on SALESPROJECTID = SALESORDER.OBJECT_ROWID");
\ No newline at end of file
+ left join PERSON on PERSON.PERSONID = CONTACT.PERSON_ID");
\ No newline at end of file
diff --git a/entity/Order_entity/recordcontainers/db/onDBDelete.js b/entity/Order_entity/recordcontainers/db/onDBDelete.js
index 775affb953..2a29a4332a 100644
--- a/entity/Order_entity/recordcontainers/db/onDBDelete.js
+++ b/entity/Order_entity/recordcontainers/db/onDBDelete.js
@@ -1,4 +1,4 @@
import("system.vars");
import("system.db");
-db.deleteData("SALESORDERITEM", "SALESORDERITEM.SALESORDER_ID = '" + vars.getString("$field.OFFER_ID") + "'");
\ No newline at end of file
+db.deleteData("SALESORDERITEM", "SALESORDERITEM.SALESORDER_ID = '" + vars.getString("$field.SALESORDERID") + "'");
\ No newline at end of file
diff --git a/neonView/OrderEdit_view/OrderEdit_view.aod b/neonView/OrderEdit_view/OrderEdit_view.aod
index f066e7be58..06a9e22990 100644
--- a/neonView/OrderEdit_view/OrderEdit_view.aod
+++ b/neonView/OrderEdit_view/OrderEdit_view.aod
@@ -1,99 +1,107 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
- <name>OrderEdit_view</name>
- <title>Receipt</title>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <icon>VAADIN:CART</icon>
- <quickEntry v="2" />
- <layout>
- <boxLayout>
- <name>layout</name>
- </boxLayout>
- </layout>
- <children>
- <genericViewTemplate>
- <name>Edit</name>
- <editMode v="true" />
- <entityField>#ENTITY</entityField>
- <fields>
- <entityFieldLink>
- <name>17536f17-4160-4027-8486-07321692147d</name>
- <entityField>OrderCode_VersNr_fieldgroup</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>0f63ee93-c4bb-41e9-a38d-c52bb07f5a11</name>
- <entityField>ORDERTYPE</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>1b323e80-820d-402a-98d2-f3649ec8e91f</name>
- <entityField>CONTACT_ID</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>b21c6438-0283-4f99-80ec-1c43e1630598</name>
- <entityField>ORDERSTATUS</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>64cb7376-3a7c-4ce9-99e8-e70bc91b41d0</name>
- <entityField>CURRENCY</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>7ab3eb65-b713-4251-9eb1-3119432565f5</name>
- <entityField>LANGUAGE</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>c9efcb50-ed61-453b-baa3-02071d99e4b0</name>
- <entityField>OBJECT_ROWID</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>acb42613-102e-42cc-984f-5820b36ad2a8</name>
- <entityField>OBJECT_TYPE</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>cf2fd509-eaa5-4b35-8775-063f31dafc2c</name>
- <entityField>OFFER_ID</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>ed71986f-303c-4118-a895-51ec31ba8775</name>
- <entityField>HEADER</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>c4b3c8ed-4625-4785-abc6-c726171ff7f4</name>
- <entityField>FOOTER</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>97eca233-7383-4fb6-97ff-d722e422befa</name>
- <entityField>SALESORDERDATE</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>31ed9eba-66a1-4114-a1fe-61ef475d532d</name>
- <entityField>PAID</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>cdd4504c-3af2-414f-9f1a-d8ab646487f1</name>
- <entityField>PAYDATE</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>236a3654-dce9-4786-ae13-9b1babd5f75f</name>
- <entityField>PAYDUEDATE</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>9f25be07-768a-4598-a766-c78beb9ac650</name>
- <entityField>DUNNINGDATE</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>658b9f0b-fcd8-49f9-87ba-6d867e6b6e26</name>
- <entityField>DUNNINGLEVEL</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>c14ed3d5-0442-4b3e-8410-2a3285a2e8fd</name>
- <entityField>CANCELLATION</entityField>
- </entityFieldLink>
- </fields>
- </genericViewTemplate>
- <neonViewReference>
- <name>72e2cb25-23e0-4f52-87a3-7c1bd80e99ec</name>
- <entityField>Attributes</entityField>
- <view>AttributeRelationMultiEdit_view</view>
- </neonViewReference>
- </children>
-</neonView>
+<?xml version="1.0" encoding="UTF-8"?>
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
+ <name>OrderEdit_view</name>
+ <title>Receipt</title>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <icon>VAADIN:CART</icon>
+ <quickEntry v="2" />
+ <layout>
+ <boxLayout>
+ <name>layout</name>
+ </boxLayout>
+ </layout>
+ <children>
+ <genericViewTemplate>
+ <name>Edit</name>
+ <editMode v="true" />
+ <entityField>#ENTITY</entityField>
+ <fields>
+ <entityFieldLink>
+ <name>17536f17-4160-4027-8486-07321692147d</name>
+ <entityField>OrderCode_VersNr_fieldgroup</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>0f63ee93-c4bb-41e9-a38d-c52bb07f5a11</name>
+ <entityField>ORDERTYPE</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>1b323e80-820d-402a-98d2-f3649ec8e91f</name>
+ <entityField>CONTACT_ID</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>c9efcb50-ed61-453b-baa3-02071d99e4b0</name>
+ <entityField>OBJECT_ROWID</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>acb42613-102e-42cc-984f-5820b36ad2a8</name>
+ <entityField>OBJECT_TYPE</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>b21c6438-0283-4f99-80ec-1c43e1630598</name>
+ <entityField>ORDERSTATUS</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>64cb7376-3a7c-4ce9-99e8-e70bc91b41d0</name>
+ <entityField>CURRENCY</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>7ab3eb65-b713-4251-9eb1-3119432565f5</name>
+ <entityField>LANGUAGE</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>b42c6333-d6ac-4628-b7b4-509fea676276</name>
+ <entityField>DELIVERYTERMS</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>09f67f92-e6d1-4439-92fa-2b2741b3de5b</name>
+ <entityField>PAYMENTTERMS</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>f79c4c09-8082-4c88-83f5-a26aaf425c12</name>
+ <entityField>OFFER_ID</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>ed71986f-303c-4118-a895-51ec31ba8775</name>
+ <entityField>HEADER</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>c4b3c8ed-4625-4785-abc6-c726171ff7f4</name>
+ <entityField>FOOTER</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>97eca233-7383-4fb6-97ff-d722e422befa</name>
+ <entityField>SALESORDERDATE</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>31ed9eba-66a1-4114-a1fe-61ef475d532d</name>
+ <entityField>PAID</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>cdd4504c-3af2-414f-9f1a-d8ab646487f1</name>
+ <entityField>PAYDATE</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>236a3654-dce9-4786-ae13-9b1babd5f75f</name>
+ <entityField>PAYDUEDATE</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>9f25be07-768a-4598-a766-c78beb9ac650</name>
+ <entityField>DUNNINGDATE</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>658b9f0b-fcd8-49f9-87ba-6d867e6b6e26</name>
+ <entityField>DUNNINGLEVEL</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>8333aea5-0be3-47ac-94c3-f6f8485ba7e0</name>
+ <entityField>CANCELLATION</entityField>
+ </entityFieldLink>
+ </fields>
+ </genericViewTemplate>
+ <neonViewReference>
+ <name>72e2cb25-23e0-4f52-87a3-7c1bd80e99ec</name>
+ <entityField>Attributes</entityField>
+ <view>AttributeRelationMultiEdit_view</view>
+ </neonViewReference>
+ </children>
+</neonView>
diff --git a/neonView/OrderPreview_view/OrderPreview_view.aod b/neonView/OrderPreview_view/OrderPreview_view.aod
index ae2390dde9..be3f5bdc73 100644
--- a/neonView/OrderPreview_view/OrderPreview_view.aod
+++ b/neonView/OrderPreview_view/OrderPreview_view.aod
@@ -1,82 +1,94 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
- <name>OrderPreview_view</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <layout>
- <headerFooterLayout>
- <name>layout</name>
- <header>Header</header>
- </headerFooterLayout>
- </layout>
- <children>
- <cardViewTemplate>
- <name>Header</name>
- <iconField>IMAGE</iconField>
- <titleField>OrderCode_VersNr_fieldgroup</titleField>
- <descriptionField>CONTACT_ID</descriptionField>
- <favoriteAction1>newActivity</favoriteAction1>
- <entityField>#ENTITY</entityField>
- </cardViewTemplate>
- <genericViewTemplate>
- <name>Details</name>
- <editMode v="false" />
- <showDrawer v="true" />
- <drawerCaption>Details</drawerCaption>
- <entityField>#ENTITY</entityField>
- <fields>
- <entityFieldLink>
- <name>d7bb0f49-34db-4485-9908-598e83f3e73b</name>
- <entityField>ORDERDATE</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>8d780ff6-9ca0-4067-b2b1-6e092c62253e</name>
- <entityField>STATUS</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>49e446b5-015e-45ad-9417-c5c50f9756f1</name>
- <entityField>LANGUAGE</entityField>
- </entityFieldLink>
- </fields>
- </genericViewTemplate>
- <genericViewTemplate>
- <name>Prices</name>
- <showDrawer v="true" />
- <drawerCaption>Prices</drawerCaption>
- <entityField>#ENTITY</entityField>
- <fields>
- <entityFieldLink>
- <name>d7ca2b66-5e7a-4951-a89b-fbeab0f4f798</name>
- <entityField>NET</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>c50dec3f-5468-4196-be88-a413ae3947de</name>
- <entityField>VAT</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>43972a26-67f7-4fb5-9107-111731d326af</name>
- <entityField>TotalGross</entityField>
- </entityFieldLink>
- </fields>
- </genericViewTemplate>
- <genericViewTemplate>
- <name>Info</name>
- <showDrawer v="true" />
- <entityField>#ENTITY</entityField>
- <fields>
- <entityFieldLink>
- <name>3317b73e-68e8-41a8-a678-89c7c7c8513e</name>
- <entityField>SALESPROJECT_ID</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>ca9602d9-03fe-450b-9349-949bf206b4bf</name>
- <entityField>OFFER_ID</entityField>
- </entityFieldLink>
- </fields>
- </genericViewTemplate>
- <neonViewReference>
- <name>2e68ece3-d98d-49c4-92f9-3e3675ba5cb2</name>
- <entityField>MainDocuments</entityField>
- <view>DocumentList_view</view>
- </neonViewReference>
- </children>
-</neonView>
+<?xml version="1.0" encoding="UTF-8"?>
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
+ <name>OrderPreview_view</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <layout>
+ <headerFooterLayout>
+ <name>layout</name>
+ <header>Header</header>
+ </headerFooterLayout>
+ </layout>
+ <children>
+ <cardViewTemplate>
+ <name>Header</name>
+ <iconField>IMAGE</iconField>
+ <titleField>OrderCode_VersNr_fieldgroup</titleField>
+ <descriptionField>CONTACT_ID</descriptionField>
+ <favoriteAction1>newActivity</favoriteAction1>
+ <entityField>#ENTITY</entityField>
+ </cardViewTemplate>
+ <genericViewTemplate>
+ <name>Details</name>
+ <editMode v="false" />
+ <showDrawer v="true" />
+ <drawerCaption>Details</drawerCaption>
+ <entityField>#ENTITY</entityField>
+ <fields>
+ <entityFieldLink>
+ <name>d7bb0f49-34db-4485-9908-598e83f3e73b</name>
+ <entityField>ORDERDATE</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>8d780ff6-9ca0-4067-b2b1-6e092c62253e</name>
+ <entityField>STATUS</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>49e446b5-015e-45ad-9417-c5c50f9756f1</name>
+ <entityField>LANGUAGE</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>fecf7457-825d-40a3-b330-bace7ed75ddc</name>
+ <entityField>DUNNINGDATE</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>9ed18271-5060-4538-867a-d5f0744fc078</name>
+ <entityField>DUNNINGLEVEL</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>f4fa76f2-41c2-48ec-84ee-e901c03a072f</name>
+ <entityField>SALESORDERDATE</entityField>
+ </entityFieldLink>
+ </fields>
+ </genericViewTemplate>
+ <genericViewTemplate>
+ <name>Prices</name>
+ <showDrawer v="true" />
+ <drawerCaption>Prices</drawerCaption>
+ <entityField>#ENTITY</entityField>
+ <fields>
+ <entityFieldLink>
+ <name>d7ca2b66-5e7a-4951-a89b-fbeab0f4f798</name>
+ <entityField>NET</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>c50dec3f-5468-4196-be88-a413ae3947de</name>
+ <entityField>VAT</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>43972a26-67f7-4fb5-9107-111731d326af</name>
+ <entityField>TotalGross</entityField>
+ </entityFieldLink>
+ </fields>
+ </genericViewTemplate>
+ <genericViewTemplate>
+ <name>Info</name>
+ <showDrawer v="true" />
+ <entityField>#ENTITY</entityField>
+ <fields>
+ <entityFieldLink>
+ <name>3317b73e-68e8-41a8-a678-89c7c7c8513e</name>
+ <entityField>SALESPROJECT_ID</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>ca9602d9-03fe-450b-9349-949bf206b4bf</name>
+ <entityField>OFFER_ID</entityField>
+ </entityFieldLink>
+ </fields>
+ </genericViewTemplate>
+ <neonViewReference>
+ <name>2e68ece3-d98d-49c4-92f9-3e3675ba5cb2</name>
+ <entityField>MainDocuments</entityField>
+ <view>DocumentList_view</view>
+ </neonViewReference>
+ </children>
+</neonView>
diff --git a/process/KeywordRegistry_basic/process.js b/process/KeywordRegistry_basic/process.js
index 3889cb795a..86ecfcad15 100644
--- a/process/KeywordRegistry_basic/process.js
+++ b/process/KeywordRegistry_basic/process.js
@@ -192,4 +192,9 @@ $KeywordRegistry.callAnswerMode$accepted = function(){return $KeywordRegistry._a
$KeywordRegistry.callAnswerMode$missed = function(){return $KeywordRegistry._autoPad("MISSED");};
$KeywordRegistry.orderType = function(){return "OrderType";};
+$KeywordRegistry.orderType$confirmation = function(){return $KeywordRegistry._autoPad("ORDTYPECONF");};
+$KeywordRegistry.orderType$deliverynote = function(){return $KeywordRegistry._autoPad("ORDTYPENOTE");};
+$KeywordRegistry.orderType$invoice = function(){return $KeywordRegistry._autoPad("ORDTYPEINVO");};
+$KeywordRegistry.orderType$credit = function(){return $KeywordRegistry._autoPad("ORDTYPECRED");};
+$KeywordRegistry.orderType$cancellation = function(){return $KeywordRegistry._autoPad("ORDTYPECANC");};
$KeywordRegistry.dunningLevel = function(){return "DunningLevel";};
\ No newline at end of file
--
GitLab