diff --git a/entity/Order_entity/Order_entity.aod b/entity/Order_entity/Order_entity.aod
index 9bf430570e1b8a7671a6f1a0f09a851d2f1c0b6f..7057c8de989497e0765409ed452c11de835ab4a3 100644
--- a/entity/Order_entity/Order_entity.aod
+++ b/entity/Order_entity/Order_entity.aod
@@ -1110,10 +1110,6 @@
<name>DELIVERYTERMS.displayValue</name>
<expression>%aditoprj%/entity/Order_entity/recordcontainers/db/recordfieldmappings/deliveryterms.displayvalue/expression.js</expression>
</dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>PAYMENTADDRESS.displayValue</name>
- <expression>%aditoprj%/entity/Order_entity/recordcontainers/db/recordfieldmappings/paymentaddress.displayvalue/expression.js</expression>
- </dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>CONTACT_ID.displayValue</name>
<expression>%aditoprj%/entity/Order_entity/recordcontainers/db/recordfieldmappings/contact_id.displayvalue/expression.js</expression>
diff --git a/entity/Order_entity/recordcontainers/db/recordfieldmappings/paymentaddress.displayvalue/expression.js b/entity/Order_entity/recordcontainers/db/recordfieldmappings/paymentaddress.displayvalue/expression.js
deleted file mode 100644
index 5a7acbd700d6dd4b64b58393933ae340e19cf4e4..0000000000000000000000000000000000000000
--- a/entity/Order_entity/recordcontainers/db/recordfieldmappings/paymentaddress.displayvalue/expression.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import("system.result");
-import("Keyword_lib");
-import("KeywordRegistry_basic");
-
-var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.paymentTerm(), "SALESORDER.PAYMENTTERMS");
-result.string(sql);
\ No newline at end of file
diff --git a/neonView/OrderMain_view/OrderMain_view.aod b/neonView/OrderMain_view/OrderMain_view.aod
index 0573784b4dfc67febbf7cd9cd0078653f4ee75bc..31513c92e55ea8e667e1d862495fb21a360d762f 100644
--- a/neonView/OrderMain_view/OrderMain_view.aod
+++ b/neonView/OrderMain_view/OrderMain_view.aod
@@ -20,14 +20,14 @@
<view>OrderitemFilter_view</view>
</neonViewReference>
<neonViewReference>
- <name>7ec102f5-fb45-44a7-9bbf-0eba7f1536d7</name>
- <entityField>Activities</entityField>
- <view>ActivityFilter_view</view>
+ <name>1e0af6a9-9bb6-47b5-944b-636d21ac74d2</name>
+ <entityField>AttributeTree</entityField>
+ <view>AttributeRelationTree_view</view>
</neonViewReference>
<neonViewReference>
- <name>351a9b5d-a050-4fb9-b3e4-402dcd84b331</name>
- <entityField>Tasks</entityField>
- <view>TaskFilter_view</view>
+ <name>106a79b1-332d-47b0-8c24-431d21bdea1e</name>
+ <entityField>#ENTITY</entityField>
+ <view>OrderClassification_view</view>
</neonViewReference>
<neonViewReference>
<name>92918210-a64f-49c8-8a04-c82c7a2a0a51</name>
@@ -35,9 +35,9 @@
<view>OrderDetail_view</view>
</neonViewReference>
<neonViewReference>
- <name>1e0af6a9-9bb6-47b5-944b-636d21ac74d2</name>
- <entityField>AttributeTree</entityField>
- <view>AttributeRelationTree_view</view>
+ <name>bfad682f-f033-4813-87fc-7cce05f3a962</name>
+ <entityField>#ENTITY</entityField>
+ <view>OrderLink_view</view>
</neonViewReference>
<neonViewReference>
<name>b3014999-da86-45ae-86ae-feb738d62906</name>
@@ -45,19 +45,19 @@
<view>DocumentFilter_view</view>
</neonViewReference>
<neonViewReference>
- <name>b0dea506-7dd9-4de9-9ebe-ecad9965c300</name>
- <entityField>LogHistories</entityField>
- <view>LogHistoryFilter_view</view>
+ <name>7ec102f5-fb45-44a7-9bbf-0eba7f1536d7</name>
+ <entityField>Activities</entityField>
+ <view>ActivityFilter_view</view>
</neonViewReference>
<neonViewReference>
- <name>bfad682f-f033-4813-87fc-7cce05f3a962</name>
- <entityField>#ENTITY</entityField>
- <view>OrderLink_view</view>
+ <name>351a9b5d-a050-4fb9-b3e4-402dcd84b331</name>
+ <entityField>Tasks</entityField>
+ <view>TaskFilter_view</view>
</neonViewReference>
<neonViewReference>
- <name>106a79b1-332d-47b0-8c24-431d21bdea1e</name>
- <entityField>#ENTITY</entityField>
- <view>OrderClassification_view</view>
+ <name>b0dea506-7dd9-4de9-9ebe-ecad9965c300</name>
+ <entityField>LogHistories</entityField>
+ <view>LogHistoryFilter_view</view>
</neonViewReference>
</children>
</neonView>
diff --git a/neonView/OrderPreview_view/OrderPreview_view.aod b/neonView/OrderPreview_view/OrderPreview_view.aod
index f6f42dd3083a38197aa497e53c8c3a31481619cd..4410f85e3c3ee5128dd63dca8f4372984fcda1e9 100644
--- a/neonView/OrderPreview_view/OrderPreview_view.aod
+++ b/neonView/OrderPreview_view/OrderPreview_view.aod
@@ -24,6 +24,10 @@
<drawerCaption>Details</drawerCaption>
<entityField>#ENTITY</entityField>
<fields>
+ <entityFieldLink>
+ <name>0ee64080-2459-4a56-b4b9-cab2cac0f8c3</name>
+ <entityField>SALESORDERDATE</entityField>
+ </entityFieldLink>
<entityFieldLink>
<name>d7bb0f49-34db-4485-9908-598e83f3e73b</name>
<entityField>ORDERDATE</entityField>
@@ -96,8 +100,12 @@
<entityField>#ENTITY</entityField>
<fields>
<entityFieldLink>
- <name>3317b73e-68e8-41a8-a678-89c7c7c8513e</name>
- <entityField>SALESPROJECT_ID</entityField>
+ <name>5039cdab-f324-4559-ac24-390b95cf31c3</name>
+ <entityField>OBJECT_ROWID</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>6cd53fd8-1c8a-4871-826d-129917751a54</name>
+ <entityField>OBJECT_TYPE</entityField>
</entityFieldLink>
<entityFieldLink>
<name>ca9602d9-03fe-450b-9349-949bf206b4bf</name>