diff --git a/.liquibase/Data_alias/basic/2019.1.4/changelog.xml b/.liquibase/Data_alias/basic/2019.1.4/changelog.xml
index 4d84cd9089f31098e0c1443f095bb25b2869378c..07d89011e69991fecbcd8089265e513ba7ab6ae2 100644
--- a/.liquibase/Data_alias/basic/2019.1.4/changelog.xml
+++ b/.liquibase/Data_alias/basic/2019.1.4/changelog.xml
@@ -176,6 +176,8 @@
<include relativeToChangelogFile="true" file="Salesprojectmilestone_add_parent.xml"/>
<include relativeToChangelogFile="true" file="Salesproject_Phase_LongNames.xml"/>
+ <include relativeToChangelogFile="true" file="create_ordertype_keyword.xml"/>
+ <include relativeToChangelogFile="true" file="create_dunninglevel_keyword.xml"/>
</databaseChangeLog>
diff --git a/.liquibase/Data_alias/basic/2019.1.4/create_dunninglevel_keyword.xml b/.liquibase/Data_alias/basic/2019.1.4/create_dunninglevel_keyword.xml
new file mode 100644
index 0000000000000000000000000000000000000000..aa62c603a6ad757a723aa10ead2ca5c1631e2901
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2019.1.4/create_dunninglevel_keyword.xml
@@ -0,0 +1,23 @@
+<?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="9c7ad936-eb94-4e61-b0f8-99e8c88f510c">
+ <insert tableName="AB_KEYWORD_ENTRY">
+ <column name="AB_KEYWORD_ENTRYID" value="b5087465-4a80-4f2e-8515-7598fea11f56"/>
+ <column name="KEYID" value="3148b773-73b8-43dd-8830-123470ffd91a"/>
+ <column name="TITLE" value="1"/>
+ <column name="CONTAINER" value="DunningLevel"/>
+ <column name="SORTING" valueNumeric="0"/>
+ <column name="ISACTIVE" valueNumeric="1"/>
+ <column name="ISESSENTIAL" valueNumeric="0"/>
+ </insert>
+ <insert tableName="AB_KEYWORD_ENTRY">
+ <column name="AB_KEYWORD_ENTRYID" value="460f37dd-2589-499f-89be-7184ff5e0c8a"/>
+ <column name="KEYID" value="937cda17-d0a8-4814-858b-f32ec53ed33f"/>
+ <column name="TITLE" value="2"/>
+ <column name="CONTAINER" value="DunningLevel"/>
+ <column name="SORTING" valueNumeric="1"/>
+ <column name="ISACTIVE" valueNumeric="1"/>
+ <column name="ISESSENTIAL" valueNumeric="0"/>
+ </insert>
+ </changeSet>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/2019.1.4/create_ordertype_keyword.xml b/.liquibase/Data_alias/basic/2019.1.4/create_ordertype_keyword.xml
new file mode 100644
index 0000000000000000000000000000000000000000..e84df1905ea1f6827919e9aa5685d58d7c5d0e23
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2019.1.4/create_ordertype_keyword.xml
@@ -0,0 +1,50 @@
+<?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="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="TITLE" value="Order confirmation"/>
+ <column name="CONTAINER" value="OrderType"/>
+ <column name="SORTING" valueNumeric="0"/>
+ <column name="ISACTIVE" valueNumeric="1"/>
+ <column name="ISESSENTIAL" valueNumeric="0"/>
+ </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="TITLE" value="Delivery note"/>
+ <column name="CONTAINER" value="OrderType"/>
+ <column name="SORTING" valueNumeric="1"/>
+ <column name="ISACTIVE" valueNumeric="1"/>
+ <column name="ISESSENTIAL" valueNumeric="0"/>
+ </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="TITLE" value="Invoice"/>
+ <column name="CONTAINER" value="OrderType"/>
+ <column name="SORTING" valueNumeric="2"/>
+ <column name="ISACTIVE" valueNumeric="1"/>
+ <column name="ISESSENTIAL" valueNumeric="0"/>
+ </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="TITLE" value="Credit"/>
+ <column name="CONTAINER" value="OrderType"/>
+ <column name="SORTING" valueNumeric="2"/>
+ <column name="ISACTIVE" valueNumeric="1"/>
+ <column name="ISESSENTIAL" valueNumeric="0"/>
+ </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="TITLE" value="Cancellation"/>
+ <column name="CONTAINER" value="OrderType"/>
+ <column name="SORTING" valueNumeric="2"/>
+ <column name="ISACTIVE" valueNumeric="1"/>
+ <column name="ISESSENTIAL" valueNumeric="0"/>
+ </insert>
+ </changeSet>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/init/struct/create_salesorder.xml b/.liquibase/Data_alias/basic/init/struct/create_salesorder.xml
index e5b5409e8b77e821c09c4692af22005f7f400f1c..b99f8dd61bd2d68f93f6279fd9022d1d6e68c772 100644
--- a/.liquibase/Data_alias/basic/init/struct/create_salesorder.xml
+++ b/.liquibase/Data_alias/basic/init/struct/create_salesorder.xml
@@ -1,6 +1,6 @@
<?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="j.hoermann" id="c8469998-9763-4300-87af-925af8c8ea5a">
+<changeSet author="m.mansour" id="c2f89ee9-0c4c-4961-935a-b399381c720d">
<createTable tableName="SALESORDER">
<column name="SALESORDERID" type="CHAR(36)">
<constraints primaryKey="true" primaryKeyName="PK_SALESORDER_SALESORDERID"/>
@@ -10,6 +10,15 @@
</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="CANCELLATION " type="TINYINT"/>
+ <column name="UNPAID" type="INTEGER"/>
+ <column name="PAID" type="INTEGER"/>
+ <column name="PAYDUEDATE" type="DATETIME"/>
+ <column name="PAYDATE" type="DATETIME"/>
+ <column name="DUNNINGDATE" type="DATETIME"/>
+ <column name="DUNNINGLEVEL" type="CHAR(36)"/>
<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 1868441ecbfe756775e74f9e41440e412489d7ba..5b823a647db73d697aecf78b5a5877ae9c32d057 100644
--- a/aliasDefinition/Data_alias/Data_alias.aod
+++ b/aliasDefinition/Data_alias/Data_alias.aod
@@ -4596,6 +4596,132 @@
</customBooleanProperty>
</customProperties>
</entityFieldDb>
+ <entityFieldDb>
+ <name>PAYDUEDATE</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="93" />
+ <size v="29" />
+ <scale v="9" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>CANCELLATION</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="5" />
+ <size v="5" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>PAYDATE</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="93" />
+ <size v="29" />
+ <scale v="9" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>UNPAID</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="4" />
+ <size v="10" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>DUNNINGLEVEL</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>DUNNINGDATE</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="93" />
+ <size v="29" />
+ <scale v="9" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>ORDERTYPE</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>PAID</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="4" />
+ <size v="10" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>ORDERSTATUS</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="5" />
+ <size v="5" />
+ <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 1f316b8732ddf06934dd7dce7c313f1e9a745e09..9e95c8bc3ee542a3bbf503c9ac3ac25547f2a02f 100644
--- a/entity/KeywordEntry_entity/KeywordEntry_entity.aod
+++ b/entity/KeywordEntry_entity/KeywordEntry_entity.aod
@@ -456,6 +456,18 @@
<fieldName>KeywordTransmission</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>
diff --git a/entity/Order_entity/Order_entity.aod b/entity/Order_entity/Order_entity.aod
index 6181f04db534cb2ab56c6985c2a03d8dc579df9e..b15cf9a7261b8bd3b2cef8daa48c60fe4ae2c0d6 100644
--- a/entity/Order_entity/Order_entity.aod
+++ b/entity/Order_entity/Order_entity.aod
@@ -478,6 +478,79 @@
<iconId>VAADIN:CURLY_BRACKETS</iconId>
<stateProcess>%aditoprj%/entity/Order_entity/entityfields/openadminview/stateProcess.js</stateProcess>
</entityActionField>
+ <entityField>
+ <name>ORDERTYPE</name>
+ <title>Order Type</title>
+ <consumer>KeywordOrderTypes</consumer>
+ </entityField>
+ <entityField>
+ <name>ORDERSTATUS</name>
+ <title>Sent</title>
+ <contentType>BOOLEAN</contentType>
+ <dropDownProcess>%aditoprj%/entity/Order_entity/entityfields/orderstatus/dropDownProcess.js</dropDownProcess>
+ </entityField>
+ <entityField>
+ <name>PAID</name>
+ <title>Paid</title>
+ </entityField>
+ <entityField>
+ <name>Unpaid</name>
+ <valueProcess>%aditoprj%/entity/Order_entity/entityfields/unpaid/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>CANCELLATION</name>
+ <title>Cancelled</title>
+ <contentType>BOOLEAN</contentType>
+ <dropDownProcess>%aditoprj%/entity/Order_entity/entityfields/cancellation/dropDownProcess.js</dropDownProcess>
+ </entityField>
+ <entityField>
+ <name>DUNNINGDATE</name>
+ <title>Dunning date</title>
+ <contentType>DATE</contentType>
+ </entityField>
+ <entityField>
+ <name>DUNNINGLEVEL</name>
+ <title>Dunning level</title>
+ <consumer>KeywordDunningLevels</consumer>
+ </entityField>
+ <entityField>
+ <name>PAYDATE</name>
+ <title>Pay date</title>
+ <contentType>DATE</contentType>
+ </entityField>
+ <entityField>
+ <name>PAYDUEDATE</name>
+ <title>Pay due date</title>
+ <contentType>DATE</contentType>
+ </entityField>
+ <entityConsumer>
+ <name>KeywordOrderTypes</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/keywordordertypes/children/containername_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ </children>
+ </entityConsumer>
+ <entityConsumer>
+ <name>KeywordDunningLevels</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/keyworddunninglevels/children/containername_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ </children>
+ </entityConsumer>
</entityFields>
<recordContainers>
<dbRecordContainer>
@@ -619,6 +692,38 @@
<name>CONTACT_PERSON_ID.displayValue</name>
<expression>%aditoprj%/entity/Order_entity/recordcontainers/db/recordfieldmappings/contact_person_id.displayvalue/expression.js</expression>
</dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>CANCELLATION.value</name>
+ <recordfield>SALESORDER.CANCELLATION</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>DUNNINGDATE.value</name>
+ <recordfield>SALESORDER.DUNNINGDATE</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>DUNNINGLEVEL.value</name>
+ <recordfield>SALESORDER.DUNNINGLEVEL</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>ORDERSTATUS.value</name>
+ <recordfield>SALESORDER.ORDERSTATUS</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>ORDERTYPE.value</name>
+ <recordfield>SALESORDER.ORDERTYPE</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>PAID.value</name>
+ <recordfield>SALESORDER.PAID</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>PAYDATE.value</name>
+ <recordfield>SALESORDER.PAYDATE</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>PAYDUEDATE.value</name>
+ <recordfield>SALESORDER.PAYDUEDATE</recordfield>
+ </dbRecordFieldMapping>
</recordFieldMappings>
</dbRecordContainer>
</recordContainers>
diff --git a/entity/Order_entity/entityfields/cancellation/dropDownProcess.js b/entity/Order_entity/entityfields/cancellation/dropDownProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..eb7b41eef018d34f85906aa931250cb812ff3392
--- /dev/null
+++ b/entity/Order_entity/entityfields/cancellation/dropDownProcess.js
@@ -0,0 +1,7 @@
+import("system.translate");
+import("system.result");
+
+result.object([
+["1", translate.text("Yes")]
+,["0", translate.text("No")]
+]);
\ No newline at end of file
diff --git a/entity/Order_entity/entityfields/keyworddunninglevels/children/containername_param/valueProcess.js b/entity/Order_entity/entityfields/keyworddunninglevels/children/containername_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..00fd383bd950dc0282404b55e6b84ef608fb6729
--- /dev/null
+++ b/entity/Order_entity/entityfields/keyworddunninglevels/children/containername_param/valueProcess.js
@@ -0,0 +1,4 @@
+import("system.result");
+import("Keyword_lib");
+import("KeywordRegistry_basic");
+result.string($KeywordRegistry.dunningLevel());
\ No newline at end of file
diff --git a/entity/Order_entity/entityfields/keywordordertypes/children/containername_param/valueProcess.js b/entity/Order_entity/entityfields/keywordordertypes/children/containername_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..e04adaf628833a255b6442e9e0469423719ac8eb
--- /dev/null
+++ b/entity/Order_entity/entityfields/keywordordertypes/children/containername_param/valueProcess.js
@@ -0,0 +1,4 @@
+import("system.result");
+import("Keyword_lib");
+import("KeywordRegistry_basic");
+result.string($KeywordRegistry.orderType());
\ No newline at end of file
diff --git a/entity/Order_entity/entityfields/orderstatus/dropDownProcess.js b/entity/Order_entity/entityfields/orderstatus/dropDownProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..eb7b41eef018d34f85906aa931250cb812ff3392
--- /dev/null
+++ b/entity/Order_entity/entityfields/orderstatus/dropDownProcess.js
@@ -0,0 +1,7 @@
+import("system.translate");
+import("system.result");
+
+result.object([
+["1", translate.text("Yes")]
+,["0", translate.text("No")]
+]);
\ No newline at end of file
diff --git a/entity/Order_entity/entityfields/unpaid/valueProcess.js b/entity/Order_entity/entityfields/unpaid/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..1439939a0c2a0926465ff2792b803ac15eadfb3b
--- /dev/null
+++ b/entity/Order_entity/entityfields/unpaid/valueProcess.js
@@ -0,0 +1,7 @@
+import("system.result");
+import("system.vars");
+import("system.eMath");
+
+result.string(eMath.subDec(
+ vars.get("$field.TotalGross"),
+ vars.get("$field.PAID")));
\ No newline at end of file
diff --git a/neonContext/Order/Order.aod b/neonContext/Order/Order.aod
index d4e54824f96757373a0e44b20dd6037ce53cbe3c..f367524c112b5fcfb91b963b53d2eb43e2407d80 100644
--- a/neonContext/Order/Order.aod
+++ b/neonContext/Order/Order.aod
@@ -31,5 +31,9 @@
<name>26c6c56a-7e5a-4101-884a-41f522f071ae</name>
<view>OrderEdit_view</view>
</neonViewReference>
+ <neonViewReference>
+ <name>ac222647-40b8-43e3-a054-edfc3d69106b</name>
+ <view>OrderLink_view</view>
+ </neonViewReference>
</references>
</neonContext>
diff --git a/neonView/OrderEdit_view/OrderEdit_view.aod b/neonView/OrderEdit_view/OrderEdit_view.aod
index 793b7e2d1fa89ac8302e2622542c1cf5a95e113c..5b0773ec4807f859095dcde0e5df405b1fabd997 100644
--- a/neonView/OrderEdit_view/OrderEdit_view.aod
+++ b/neonView/OrderEdit_view/OrderEdit_view.aod
@@ -21,16 +21,16 @@
<entityField>OrderCode_VersNr_fieldgroup</entityField>
</entityFieldLink>
<entityFieldLink>
- <name>1b323e80-820d-402a-98d2-f3649ec8e91f</name>
- <entityField>CONTACT_ID</entityField>
+ <name>0f63ee93-c4bb-41e9-a38d-c52bb07f5a11</name>
+ <entityField>ORDERTYPE</entityField>
</entityFieldLink>
<entityFieldLink>
- <name>767a9e6e-596b-4903-aa86-7bc0f66cd037</name>
- <entityField>STATUS</entityField>
+ <name>1b323e80-820d-402a-98d2-f3649ec8e91f</name>
+ <entityField>CONTACT_ID</entityField>
</entityFieldLink>
<entityFieldLink>
- <name>c1d37263-7cb1-4d0c-9701-be9b44f904e5</name>
- <entityField>ORDERDATE</entityField>
+ <name>b21c6438-0283-4f99-80ec-1c43e1630598</name>
+ <entityField>ORDERSTATUS</entityField>
</entityFieldLink>
<entityFieldLink>
<name>64cb7376-3a7c-4ce9-99e8-e70bc91b41d0</name>
@@ -44,6 +44,10 @@
<name>ac6f81a2-5012-461a-bcf1-4534182b0973</name>
<entityField>SALESPROJECT_ID</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>
@@ -52,6 +56,30 @@
<name>c4b3c8ed-4625-4785-abc6-c726171ff7f4</name>
<entityField>FOOTER</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>
diff --git a/neonView/OrderLink_view/OrderLink_view.aod b/neonView/OrderLink_view/OrderLink_view.aod
new file mode 100644
index 0000000000000000000000000000000000000000..316a6a1de5339b1571d9e9b5fc05697b9c196cb9
--- /dev/null
+++ b/neonView/OrderLink_view/OrderLink_view.aod
@@ -0,0 +1,27 @@
+<?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>OrderLink_view</name>
+ <title>Links</title>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <layout>
+ <boxLayout>
+ <name>layout</name>
+ </boxLayout>
+ </layout>
+ <children>
+ <genericViewTemplate>
+ <name>Links</name>
+ <entityField>#ENTITY</entityField>
+ <fields>
+ <entityFieldLink>
+ <name>3a8b8210-72d3-4b58-b964-0a1058909346</name>
+ <entityField>OFFER_ID</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>71e18993-a011-45f2-bb3c-053e8d032c25</name>
+ <entityField>SALESPROJECT_ID</entityField>
+ </entityFieldLink>
+ </fields>
+ </genericViewTemplate>
+ </children>
+</neonView>
diff --git a/neonView/OrderMain_view/OrderMain_view.aod b/neonView/OrderMain_view/OrderMain_view.aod
index c2fdb43306e435bd72dbd1b955a191a75a33b43c..73c37a7cb5143e26264f23f48ca4a4d7983ed248 100644
--- a/neonView/OrderMain_view/OrderMain_view.aod
+++ b/neonView/OrderMain_view/OrderMain_view.aod
@@ -49,5 +49,10 @@
<entityField>LogHistoryConsumer</entityField>
<view>LogHistoryFilter_view</view>
</neonViewReference>
+ <neonViewReference>
+ <name>bfad682f-f033-4813-87fc-7cce05f3a962</name>
+ <entityField>#ENTITY</entityField>
+ <view>OrderLink_view</view>
+ </neonViewReference>
</children>
</neonView>
diff --git a/process/KeywordRegistry_basic/process.js b/process/KeywordRegistry_basic/process.js
index e4c9934419bf9850878b94534026dea4bdacdefb..76cff9d714969d6e48f00f25965a8d60beb929c2 100644
--- a/process/KeywordRegistry_basic/process.js
+++ b/process/KeywordRegistry_basic/process.js
@@ -155,4 +155,6 @@ $KeywordRegistry.bulkMailRecipientStatus$failed = function(){return "EMAILFAILED
$KeywordRegistry.bulkMailStatus = function(){return "BulkMailStatus";};
$KeywordRegistry.bulkMailStatus$notSent = function(){return "BULKMAILNOTSENT ";};
$KeywordRegistry.bulkMailStatus$beingSent = function(){return "BULKMAILBEINGSENT ";};
-$KeywordRegistry.bulkMailStatus$sent = function(){return "BULKMAILSENT ";};
\ No newline at end of file
+$KeywordRegistry.bulkMailStatus$sent = function(){return "BULKMAILSENT ";};
+$KeywordRegistry.orderType = function(){return "OrderType";};
+$KeywordRegistry.dunningLevel = function(){return "DunningLevel";};
\ No newline at end of file
diff --git a/process/OfferOrder_lib/process.js b/process/OfferOrder_lib/process.js
index 134d0c80cf3fed4d900d1830b8cc2d5f8f3532d6..bd665cf48f54d85e87eac8f24a3efe1e9cad57a8 100644
--- a/process/OfferOrder_lib/process.js
+++ b/process/OfferOrder_lib/process.js
@@ -196,7 +196,7 @@ ItemUtils.prototype.roundPrice = function(pPrice) {
* @param {String} currency opt currency for price list to use
* @param {String} contactId opt contactid for price list to use (custom price list)
* @param {String[][]} additionalProductInfo additional product info, which has to be copied from the product. (e.g. INFO field is only used by offer)
- * has to be in the form: [[["identifier1", "DESTINATION-DB-SUBSELECT-OR-FIELD"], ["identifier2", "BRODUCT-DB-SUBSELECT-OR-FIELD"]], ...]
+ * has to be in the form: [[["identifier1", "DESTINATION-DB-FIELD"], ["identifier2", "PRODUCT-DB-SUBSELECT-OR-FIELD"]], ...]
*
* @return {String[]} Array of inserted ItemIDs
*