diff --git a/entity/Offer_entity/Offer_entity.aod b/entity/Offer_entity/Offer_entity.aod
index 98ed5ca48930d5bc1279c9a6168420fc5e7f0d22..c75d5629ea6f0ef9d2dafecc3698b77b6bc68615 100644
--- a/entity/Offer_entity/Offer_entity.aod
+++ b/entity/Offer_entity/Offer_entity.aod
@@ -35,14 +35,6 @@
       <contentType>DATE</contentType>
       <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/date_new/valueProcess.js</valueProcess>
     </entityField>
-    <entityField>
-      <name>LANGUAGE</name>
-      <tableName>OFFER</tableName>
-      <columnName>LANGUAGE</columnName>
-      <caption>Language</caption>
-      <mandatory v="true" />
-      <possibleItemsProcess>%aditoprj%/entity/Offer_entity/entityfields/language/possibleItemsProcess.js</possibleItemsProcess>
-    </entityField>
     <entityField>
       <name>OFFERCODE</name>
       <tableName>OFFER</tableName>
@@ -218,6 +210,15 @@
         </entityDependency>
       </dependencies>
     </entityIncomingField>
+    <entityField>
+      <name>LANGUAGE</name>
+      <tableName>OFFER</tableName>
+      <columnName>LANGUAGE</columnName>
+      <caption>Language</caption>
+      <mandatory v="true" />
+      <outgoingField></outgoingField>
+      <possibleItemsProcess>%aditoprj%/entity/Offer_entity/entityfields/language/possibleItemsProcess.js</possibleItemsProcess>
+    </entityField>
   </entityFields>
   <linkInformation>
     <linkInformation>
diff --git a/entity/Offer_entity/entityfields/relation_id/onValueChange.js b/entity/Offer_entity/entityfields/relation_id/onValueChange.js
index b5114f0629a5559a1d22ca88393dd79967bbd4d5..4c3220606c52acb4eb2ee09d69427060bbd987e8 100644
--- a/entity/Offer_entity/entityfields/relation_id/onValueChange.js
+++ b/entity/Offer_entity/entityfields/relation_id/onValueChange.js
@@ -7,5 +7,5 @@ if(relid != "")
 {
     var relData = db.array(db.ROW, "select LANGUAGE from RELATION where RELATIONID = '" + relid + "'");
     
-    vars.set("$field.LANGUAGE", relData[0]);
+    if(relData[0] != "")    vars.set("$field.LANGUAGE", relData[0]);
 }
\ No newline at end of file
diff --git a/neonView/OfferEdit_view/OfferEdit_view.aod b/neonView/OfferEdit_view/OfferEdit_view.aod
index fc6c2ad73511b9fbd4d8510cbf2ccb4c47bdedce..52ce916b3967bd083b6ce3291df7efae957241b0 100644
--- a/neonView/OfferEdit_view/OfferEdit_view.aod
+++ b/neonView/OfferEdit_view/OfferEdit_view.aod
@@ -26,7 +26,7 @@
           <entityField>OFFERDATE</entityField>
         </entityFieldLink>
         <entityFieldLink>
-          <name>ca883d2e-f391-4681-b9f7-72040d4b9669</name>
+          <name>7ab3eb65-b713-4251-9eb1-3119432565f5</name>
           <entityField>LANGUAGE</entityField>
         </entityFieldLink>
         <entityFieldLink>
diff --git a/neonView/OfferPreview_view/OfferPreview_view.aod b/neonView/OfferPreview_view/OfferPreview_view.aod
index c9b1bb992940cd5becb6ce76339038340b54a6b9..7563c1e23ea6ef95705a23c4372f7c696536aebd 100644
--- a/neonView/OfferPreview_view/OfferPreview_view.aod
+++ b/neonView/OfferPreview_view/OfferPreview_view.aod
@@ -29,7 +29,7 @@
           <entityField>STATUS</entityField>
         </entityFieldLink>
         <entityFieldLink>
-          <name>7a145c84-dc49-4af2-870f-44960dd89d12</name>
+          <name>423cf3fa-49d7-4c48-bd8f-1fc05a14cb1a</name>
           <entityField>LANGUAGE</entityField>
         </entityFieldLink>
         <entityFieldLink>