diff --git a/entity/Order_entity/Order_entity.aod b/entity/Order_entity/Order_entity.aod
index 6c5316dbfc6dfb7f6003c07199f9ca77b60be793..bfbbbc2ee17ab039a9cc90350dc19a069c6320bb 100644
--- a/entity/Order_entity/Order_entity.aod
+++ b/entity/Order_entity/Order_entity.aod
@@ -1007,12 +1007,6 @@
           <name>HEADER.value</name>
           <recordfield>SALESORDER.HEADER</recordfield>
         </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>LANGUAGE.value</name>
-          <recordfield>SALESORDER.ISOLANGUAGE</recordfield>
-          <isFilterable v="true" />
-          <isLookupFilter v="true" />
-        </dbRecordFieldMapping>
         <dbRecordFieldMapping>
           <name>NET.value</name>
           <recordfield>SALESORDER.NET</recordfield>
@@ -1163,6 +1157,12 @@
         <dbRecordFieldMapping>
           <name>ISOLANGUAGE.value</name>
           <recordfield>SALESORDER.ISOLANGUAGE</recordfield>
+          <isFilterable v="true" />
+          <isLookupFilter v="false" />
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>ISOLANGUAGE.displayValue</name>
+          <expression>%aditoprj%/entity/Order_entity/recordcontainers/db/recordfieldmappings/isolanguage.displayvalue/expression.js</expression>
         </dbRecordFieldMapping>
       </recordFieldMappings>
     </dbRecordContainer>
diff --git a/neonView/OrderPreview_view/OrderPreview_view.aod b/neonView/OrderPreview_view/OrderPreview_view.aod
index 1d208446c7efd329a562e157b4c102310c0efbc3..f778b8a8339ca412ddcaebba6909eb6a9ed06a85 100644
--- a/neonView/OrderPreview_view/OrderPreview_view.aod
+++ b/neonView/OrderPreview_view/OrderPreview_view.aod
@@ -37,8 +37,8 @@
           <entityField>ORDERTYPE</entityField>
         </entityFieldLink>
         <entityFieldLink>
-          <name>49e446b5-015e-45ad-9417-c5c50f9756f1</name>
-          <entityField>LANGUAGE</entityField>
+          <name>1be56d96-0a47-4895-a73f-2e01855da628</name>
+          <entityField>ISOLANGUAGE</entityField>
         </entityFieldLink>
         <entityFieldLink>
           <name>fecf7457-825d-40a3-b330-bace7ed75ddc</name>