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
deleted file mode 100644
index 533e63b2b5a456695be61dd1f4cec0f63fda49bf..0000000000000000000000000000000000000000
--- a/.liquibase/Data_alias/basic/2019.1.4/Salesorder/Salesorder_terms.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?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/update_Salesorder.xml b/.liquibase/Data_alias/basic/2019.1.4/Salesorder/update_Salesorder.xml
index ee561df9479083f007ccd69641d221caaeac5b6a..ea7efbd9835a54a7e55a2c90af6f6f80091ca2ed 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
@@ -13,6 +13,12 @@
<column name="DUNNINGLEVEL" type="CHAR(36)"/>
<column name="ORDERTYPE" type="CHAR(36)"/>
<column name="ORDERSTATUS" type="TINYINT"/>
+ <column name="PAYMENTTERMS" type="CHAR(36)"/>
+ <column name="DELIVERYTERMS" type="CHAR(36)"/>
+ <column name="DELIVERYADDRESS" type="NCLOB"/>
+ <column name="PAYMENTADDRESS" type="NCLOB"/>
+ <column name="NOTICE" type="NCLOB"/>
+ <column name="DUNNINGTEXT" type="NCLOB"/>
</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 016ca81ebdc8505aa95eeb055e7f3202c832ac52..d4bc2d5982724c87887af2cb493edd31c63bcb3e 100644
--- a/.liquibase/Data_alias/basic/2019.1.4/changelog.xml
+++ b/.liquibase/Data_alias/basic/2019.1.4/changelog.xml
@@ -189,7 +189,6 @@
<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"/>
<include relativeToChangelogFile="true" file="Salesproject_Phase_LongNames.xml"/>
<include relativeToChangelogFile="true" file="Salesorder_Payment_DayNumber.xml"/>
</databaseChangeLog>
diff --git a/aliasDefinition/Data_alias/Data_alias.aod b/aliasDefinition/Data_alias/Data_alias.aod
index 024d2d6126d15ff7dc762cd45ef82d1514e27e39..32af81859078c0ba75ca52d39143c5d65da14c03 100644
--- a/aliasDefinition/Data_alias/Data_alias.aod
+++ b/aliasDefinition/Data_alias/Data_alias.aod
@@ -4794,6 +4794,34 @@
<title></title>
<description></description>
</entityFieldDb>
+ <entityFieldDb>
+ <name>NOTICE</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>DUNNINGTEXT</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/Order_entity/Order_entity.aod b/entity/Order_entity/Order_entity.aod
index f3e8ded76aa7d1ef0a566664bd1783720cbe0491..e4080f760e773e948d51475224c87b0a7fcf1536 100644
--- a/entity/Order_entity/Order_entity.aod
+++ b/entity/Order_entity/Order_entity.aod
@@ -43,7 +43,6 @@
<resolution>DAY</resolution>
<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>
<displayValueProcess>%aditoprj%/entity/Order_entity/entityfields/salesorderdate/displayValueProcess.js</displayValueProcess>
@@ -269,6 +268,7 @@
</entityConsumer>
<entityField>
<name>ADDRESS</name>
+ <contentType>LONG_TEXT</contentType>
<valueProcess>%aditoprj%/entity/Order_entity/entityfields/address/valueProcess.js</valueProcess>
</entityField>
<entityConsumer>
@@ -468,6 +468,7 @@
<name>ORDERTYPE</name>
<title>Order Type</title>
<consumer>KeywordOrderTypes</consumer>
+ <mandatory v="true" />
<usePermissions v="true" />
<valueProcess>%aditoprj%/entity/Order_entity/entityfields/ordertype/valueProcess.js</valueProcess>
<displayValueProcess>%aditoprj%/entity/Order_entity/entityfields/ordertype/displayValueProcess.js</displayValueProcess>
@@ -625,6 +626,7 @@
<name>PAYMENTTERMS</name>
<title>Payment term</title>
<consumer>KeywordPaymentTerms</consumer>
+ <mandatory v="true" />
<valueProcess>%aditoprj%/entity/Order_entity/entityfields/paymentterms/valueProcess.js</valueProcess>
<displayValueProcess>%aditoprj%/entity/Order_entity/entityfields/paymentterms/displayValueProcess.js</displayValueProcess>
</entityField>
@@ -632,18 +634,24 @@
<name>DELIVERYTERMS</name>
<title>Delivery specification</title>
<consumer>KeywordDeliveryTerms</consumer>
+ <mandatory v="true" />
<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>
+ <title>Delivery address</title>
+ <contentType>LONG_TEXT</contentType>
+ <valueProcess>%aditoprj%/entity/Order_entity/entityfields/deliveryaddress/valueProcess.js</valueProcess>
</entityField>
<entityField>
<name>PAYMENTADDRESS</name>
<title>Payment address</title>
<consumer>PossibleAddresses</consumer>
+ <mandatory v="true" />
<valueProcess>%aditoprj%/entity/Order_entity/entityfields/paymentaddress/valueProcess.js</valueProcess>
<displayValueProcess>%aditoprj%/entity/Order_entity/entityfields/paymentaddress/displayValueProcess.js</displayValueProcess>
+ <onValueChange>%aditoprj%/entity/Order_entity/entityfields/paymentaddress/onValueChange.js</onValueChange>
</entityField>
<entityConsumer>
<name>KeywordPaymentTerms</name>
@@ -687,6 +695,17 @@
</entityParameter>
</children>
</entityConsumer>
+ <entityField>
+ <name>NOTICE</name>
+ <title>Notice</title>
+ <contentType>LONG_TEXT</contentType>
+ </entityField>
+ <entityField>
+ <name>DUNNINGTEXT</name>
+ <title>Dunning text</title>
+ <contentType>LONG_TEXT</contentType>
+ <valueProcess>%aditoprj%/entity/Order_entity/entityfields/dunningtext/valueProcess.js</valueProcess>
+ </entityField>
</entityFields>
<recordContainers>
<dbRecordContainer>
@@ -873,6 +892,18 @@
<name>DELIVERYADDRESS.value</name>
<recordfield>SALESORDER.DELIVERYADDRESS</recordfield>
</dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>PAYMENTADDRESS.value</name>
+ <recordfield>SALESORDER.PAYMENTADDRESS</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>NOTICE.value</name>
+ <recordfield>SALESORDER.NOTICE</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>DUNNINGTEXT.value</name>
+ <recordfield>SALESORDER.DUNNINGTEXT</recordfield>
+ </dbRecordFieldMapping>
</recordFieldMappings>
</dbRecordContainer>
<indexRecordContainer>
diff --git a/entity/Order_entity/entityfields/deliveryaddress/valueProcess.js b/entity/Order_entity/entityfields/deliveryaddress/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..71e0850b60445661a78a5b32900a6113f43318d4
--- /dev/null
+++ b/entity/Order_entity/entityfields/deliveryaddress/valueProcess.js
@@ -0,0 +1,7 @@
+import("system.result");
+import("system.vars");
+
+if (vars.exists("$param.OfferAddress_param"))
+{
+ result.string(vars.get("$param.OfferAddress_param"));
+}
\ No newline at end of file
diff --git a/entity/Order_entity/entityfields/dunningtext/valueProcess.js b/entity/Order_entity/entityfields/dunningtext/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..09aaffb4130def69b9f334577425015ae6a5d326
--- /dev/null
+++ b/entity/Order_entity/entityfields/dunningtext/valueProcess.js
@@ -0,0 +1,14 @@
+import("system.vars");
+import("system.result");
+import("system.neon");
+import("Date_lib");
+
+
+if (vars.get("$this.value") == null){
+
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && !vars.get("$this.value")|| neon.OPERATINGSTATE_NEW ){
+
+ result.string("Bitte zahlen Sie den ausstehenden Betrag, dies ist die erste/zweite Mahnung.")
+}
+
+}
\ No newline at end of file
diff --git a/entity/Order_entity/entityfields/object_rowid/displayValueProcess.js b/entity/Order_entity/entityfields/object_rowid/displayValueProcess.js
index 8946bb43f89fb25fd1cb96ccdd34a37c23ec64ad..8b080bceea92c146a676b0f33cc7cb87d4e86b9d 100644
--- a/entity/Order_entity/entityfields/object_rowid/displayValueProcess.js
+++ b/entity/Order_entity/entityfields/object_rowid/displayValueProcess.js
@@ -1,11 +1,11 @@
-import("system.neon");
-import("system.vars");
-import("system.db");
-import("system.result");
-import("Context_lib");
-
-if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && !vars.get("$this.value")) {
- result.string("");
-} else if (vars.exists("$field.OBJECT_TYPE") && vars.get("$field.OBJECT_TYPE")) {
- result.string(db.cell(ContextUtils.getNameSql(vars.get("$field.OBJECT_TYPE"), vars.get("$field.OBJECT_ROWID"))));
+import("system.neon");
+import("system.vars");
+import("system.db");
+import("system.result");
+import("Context_lib");
+
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && !vars.get("$field.OBJECT_ROWID")) {
+ result.string("");
+} else if (vars.exists("$field.OBJECT_TYPE") && vars.get("$field.OBJECT_TYPE")) {
+ result.string(db.cell(ContextUtils.getNameSql(vars.get("$field.OBJECT_TYPE"), vars.get("$field.OBJECT_ROWID"))));
}
\ No newline at end of file
diff --git a/entity/Order_entity/entityfields/paydate/stateProcess.js b/entity/Order_entity/entityfields/paydate/stateProcess.js
index ba1ab918f2bffa0d2007c8f587b06f4dd89e6917..06c04cf66aa819b67a042c1d7f3855ce4b9efa63 100644
--- a/entity/Order_entity/entityfields/paydate/stateProcess.js
+++ b/entity/Order_entity/entityfields/paydate/stateProcess.js
@@ -3,7 +3,7 @@ import("system.vars");
import("system.neon");
import("KeywordRegistry_basic")
-if(vars.get("$field.ORDERTYPE") == $KeywordRegistry.orderType$confirmation()|| neon.OPERATINGSTATE_NEW)
+if(vars.get("$field.ORDERTYPE") != $KeywordRegistry.orderType$confirmation()|| neon.OPERATINGSTATE_NEW)
result.string(neon.COMPONENTSTATE_AUTO);
else
result.string(neon.COMPONENTSTATE_INVISIBLE);
\ No newline at end of file
diff --git a/entity/Order_entity/entityfields/paymentaddress/displayValueProcess.js b/entity/Order_entity/entityfields/paymentaddress/displayValueProcess.js
index 698ddd21921ba4623f9eeae0c1a61f579da714f5..bc302ac9cd5c63db1fb2607c3d9353be2d4a4562 100644
--- a/entity/Order_entity/entityfields/paymentaddress/displayValueProcess.js
+++ b/entity/Order_entity/entityfields/paymentaddress/displayValueProcess.js
@@ -2,4 +2,4 @@ import("system.vars");
import("PostalAddress_lib");
import("system.result");
-result.string(AddressUtils.getFormattedOnlineAddressById(vars.get("$this.value")))
\ No newline at end of file
+result.string(AddressUtils.getFormattedOnlineAddressById(vars.get("$field.PAYMENTADDRESS")))
\ No newline at end of file
diff --git a/entity/Order_entity/entityfields/paymentaddress/onValueChange.js b/entity/Order_entity/entityfields/paymentaddress/onValueChange.js
new file mode 100644
index 0000000000000000000000000000000000000000..85516732cda451b9f73f976fb11d8a456530e20a
--- /dev/null
+++ b/entity/Order_entity/entityfields/paymentaddress/onValueChange.js
@@ -0,0 +1,11 @@
+import("system.vars");
+import("system.neon");
+import("PostalAddress_lib");
+import("Entity_lib");
+
+var newAddressId = vars.get("local.value");
+
+if (newAddressId)
+{
+ neon.setFieldValue("$field.DELIVERYADDRESS", AddressUtils.getAddressById(newAddressId));
+}
\ No newline at end of file
diff --git a/entity/Order_entity/recordcontainers/db/onDBInsert.js b/entity/Order_entity/recordcontainers/db/onDBInsert.js
index f40d760016e5a464f44ba9ed7913fa09a9bba9e5..b00eb184dec0a9a4de10b1b49bb1af6becaac17d 100644
--- a/entity/Order_entity/recordcontainers/db/onDBInsert.js
+++ b/entity/Order_entity/recordcontainers/db/onDBInsert.js
@@ -1,6 +1,7 @@
+import("system.logging");
import("system.neon");
import("system.vars");
import("Offer_lib");
if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.exists("$param.OfferOriginal_Id_param"))
- OfferUtils.copyOfferItems(vars.getString("$param.OfferOriginal_Id_param"), vars.get("$field.OFFER_ID"));
+ OfferUtils.copyOfferItems(vars.getString("$param.OfferOriginal_Id_param"), vars.get("$local.rowdata")["SALESORDER.OFFER_ID"]);
diff --git a/neonContext/Order/Order.aod b/neonContext/Order/Order.aod
index f367524c112b5fcfb91b963b53d2eb43e2407d80..b44f93dd8716710edca0bd5695f231dd3225b6a4 100644
--- a/neonContext/Order/Order.aod
+++ b/neonContext/Order/Order.aod
@@ -1,39 +1,43 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<neonContext xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonContext/1.1.0">
- <name>Order</name>
- <title>Receipt</title>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <icon>VAADIN:FILE_TEXT_O</icon>
- <mainview>OrderMain_view</mainview>
- <filterview>OrderFilter_view</filterview>
- <editview>OrderEdit_view</editview>
- <preview>OrderPreview_view</preview>
- <lookupview>OrderFilter_view</lookupview>
- <entity>Order_entity</entity>
- <references>
- <neonViewReference>
- <name>e9de537a-43e9-4ea3-9da4-0a4812954543</name>
- <view>OrderDetail_view</view>
- </neonViewReference>
- <neonViewReference>
- <name>dba88ac9-716e-4907-8bc7-9a623fbad1e1</name>
- <view>OrderFilter_view</view>
- </neonViewReference>
- <neonViewReference>
- <name>53966f88-a6e9-4b41-8c71-2ebbbaf2e568</name>
- <view>OrderMain_view</view>
- </neonViewReference>
- <neonViewReference>
- <name>1015ce77-7be5-4d70-8b35-2953a5b25a2a</name>
- <view>OrderPreview_view</view>
- </neonViewReference>
- <neonViewReference>
- <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>
+<?xml version="1.0" encoding="UTF-8"?>
+<neonContext xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonContext/1.1.0">
+ <name>Order</name>
+ <title>Receipt</title>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <icon>VAADIN:FILE_TEXT_O</icon>
+ <mainview>OrderMain_view</mainview>
+ <filterview>OrderFilter_view</filterview>
+ <editview>OrderEdit_view</editview>
+ <preview>OrderPreview_view</preview>
+ <lookupview>OrderFilter_view</lookupview>
+ <entity>Order_entity</entity>
+ <references>
+ <neonViewReference>
+ <name>e9de537a-43e9-4ea3-9da4-0a4812954543</name>
+ <view>OrderDetail_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>dba88ac9-716e-4907-8bc7-9a623fbad1e1</name>
+ <view>OrderFilter_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>53966f88-a6e9-4b41-8c71-2ebbbaf2e568</name>
+ <view>OrderMain_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>1015ce77-7be5-4d70-8b35-2953a5b25a2a</name>
+ <view>OrderPreview_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <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>
+ <neonViewReference>
+ <name>e8fb5f3b-e166-4ee3-9752-e20d9aec0e75</name>
+ <view>OrderClassification_view</view>
+ </neonViewReference>
+ </references>
+</neonContext>
diff --git a/neonView/OrderClassification_view/OrderClassification_view.aod b/neonView/OrderClassification_view/OrderClassification_view.aod
new file mode 100644
index 0000000000000000000000000000000000000000..d1a503a89dd905eda504d80bbbd8cd4c226de2d6
--- /dev/null
+++ b/neonView/OrderClassification_view/OrderClassification_view.aod
@@ -0,0 +1,39 @@
+<?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>OrderClassification_view</name>
+ <title>Classifications</title>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <layout>
+ <boxLayout>
+ <name>layout</name>
+ </boxLayout>
+ </layout>
+ <children>
+ <genericViewTemplate>
+ <name>Classifications</name>
+ <entityField>#ENTITY</entityField>
+ <fields>
+ <entityFieldLink>
+ <name>6c01c691-c587-438c-9c92-77682c4fd34e</name>
+ <entityField>PAYMENTTERMS</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>16f9e458-eab5-4ed1-954c-0f2f8cb474e3</name>
+ <entityField>DELIVERYTERMS</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>aed251c9-caa6-462f-9b22-6a87f5998b4e</name>
+ <entityField>PAYMENTADDRESS</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>52dd0767-3a92-4d13-9f72-1bd9e7745b79</name>
+ <entityField>DELIVERYADDRESS</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>7c486c49-22e2-4d61-ac86-b599adbf9522</name>
+ <entityField>NOTICE</entityField>
+ </entityFieldLink>
+ </fields>
+ </genericViewTemplate>
+ </children>
+</neonView>
diff --git a/neonView/OrderDetail_view/OrderDetail_view.aod b/neonView/OrderDetail_view/OrderDetail_view.aod
index f36623d6b0d778341e1a8f310563d5d531ea6670..9817a8568ba45df6dc3b0a0615a48c421c3a3f70 100644
--- a/neonView/OrderDetail_view/OrderDetail_view.aod
+++ b/neonView/OrderDetail_view/OrderDetail_view.aod
@@ -1,29 +1,33 @@
-<?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>OrderDetail_view</name>
- <title>Details</title>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <layout>
- <noneLayout>
- <name>layout</name>
- </noneLayout>
- </layout>
- <children>
- <genericViewTemplate>
- <name>Details</name>
- <showDrawer v="true" />
- <drawerCaption>Detail</drawerCaption>
- <entityField>#ENTITY</entityField>
- <fields>
- <entityFieldLink>
- <name>8bf2a10e-e7e9-4f33-98cf-4ded02bf68a9</name>
- <entityField>HEADER</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>d6f2774b-34c2-4db8-9730-e98b4c83503a</name>
- <entityField>FOOTER</entityField>
- </entityFieldLink>
- </fields>
- </genericViewTemplate>
- </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>OrderDetail_view</name>
+ <title>Texts</title>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <layout>
+ <noneLayout>
+ <name>layout</name>
+ </noneLayout>
+ </layout>
+ <children>
+ <genericViewTemplate>
+ <name>Details</name>
+ <showDrawer v="true" />
+ <drawerCaption>Detail</drawerCaption>
+ <entityField>#ENTITY</entityField>
+ <fields>
+ <entityFieldLink>
+ <name>8bf2a10e-e7e9-4f33-98cf-4ded02bf68a9</name>
+ <entityField>HEADER</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>d6f2774b-34c2-4db8-9730-e98b4c83503a</name>
+ <entityField>FOOTER</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>6c1b2311-f15f-4d03-9301-0839b504d24a</name>
+ <entityField>DUNNINGTEXT</entityField>
+ </entityFieldLink>
+ </fields>
+ </genericViewTemplate>
+ </children>
+</neonView>
diff --git a/neonView/OrderEdit_view/OrderEdit_view.aod b/neonView/OrderEdit_view/OrderEdit_view.aod
index 0bca583226cd36ac275b40677a32248207b8ac87..aa76c8d05ac3c759054fcde7fd92ed962d4d779f 100644
--- a/neonView/OrderEdit_view/OrderEdit_view.aod
+++ b/neonView/OrderEdit_view/OrderEdit_view.aod
@@ -88,6 +88,10 @@
<name>658b9f0b-fcd8-49f9-87ba-6d867e6b6e26</name>
<entityField>DUNNINGLEVEL</entityField>
</entityFieldLink>
+ <entityFieldLink>
+ <name>d745c24f-009b-4f95-97e6-e55c53860261</name>
+ <entityField>DUNNINGTEXT</entityField>
+ </entityFieldLink>
<entityFieldLink>
<name>8333aea5-0be3-47ac-94c3-f6f8485ba7e0</name>
<entityField>CANCELLATION</entityField>
@@ -96,6 +100,14 @@
<name>21860875-55d6-4686-9e1d-6b45963878ff</name>
<entityField>PAYMENTADDRESS</entityField>
</entityFieldLink>
+ <entityFieldLink>
+ <name>73687971-85f9-4120-98b2-e93f7f906ebb</name>
+ <entityField>DELIVERYADDRESS</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>330d2d02-145b-42b7-937e-7830fc2b83b0</name>
+ <entityField>NOTICE</entityField>
+ </entityFieldLink>
</fields>
</genericViewTemplate>
<neonViewReference>
diff --git a/neonView/OrderMain_view/OrderMain_view.aod b/neonView/OrderMain_view/OrderMain_view.aod
index 73c37a7cb5143e26264f23f48ca4a4d7983ed248..81dd7971b36af9358418a1d87f2f384c504bde92 100644
--- a/neonView/OrderMain_view/OrderMain_view.aod
+++ b/neonView/OrderMain_view/OrderMain_view.aod
@@ -54,5 +54,10 @@
<entityField>#ENTITY</entityField>
<view>OrderLink_view</view>
</neonViewReference>
+ <neonViewReference>
+ <name>106a79b1-332d-47b0-8c24-431d21bdea1e</name>
+ <entityField>#ENTITY</entityField>
+ <view>OrderClassification_view</view>
+ </neonViewReference>
</children>
</neonView>