Merge origin/master

entity/Address_entity/Address_entity.aod

@@ -42,6 +42,7 @@
       <title>Country</title>
       <mandatory v="true" />
       <outgoingField>Countries_dfo</outgoingField>
+      <displayValueProcess>%aditoprj%/entity/Address_entity/entityfields/country/displayValueProcess.js</displayValueProcess>
     </entityField>
     <entityField>
       <name>DATE_EDIT</name>

entity/Address_entity/entityfields/country/displayValueProcess.js

+import("system.vars");
+import("system.db");
+import("system.translate");
+import("system.result");
+import("Sql_lib");
+
+//TODO: temporary testing code
+var isoCode = vars.get("$field.COUNTRY");
+var countryName  = db.cell(SqlCondition.begin().andPrepare("COUNTRYINFO.ISO2", isoCode).buildSelect("select COUNTRYINFO.NAME_LATIN from COUNTRYINFO"));
+countryName = translate.text(countryName);
+result.string(countryName);
\ No newline at end of file

entity/Countries_Entity/Countries_Entity.aod

@@ -22,6 +22,12 @@
           <fieldName>Countries_dfo</fieldName>
           <isOutgoing v="false" />
         </entityDependency>
+        <entityDependency>
+          <name>8e8d1ace-3cbb-4ed7-b029-f486805605ef</name>
+          <entityName>Org_entity</entityName>
+          <fieldName>Countries_dfo</fieldName>
+          <isOutgoing v="false" />
+        </entityDependency>
       </dependencies>
       <children>
         <entityParameter>

entity/Org_entity/Org_entity.aod

@@ -73,8 +73,10 @@
     <entityField>
       <name>LANGUAGE</name>
       <title>Language</title>
+      <outgoingField>Countries_dfo</outgoingField>
       <possibleItemsProcess>%aditoprj%/entity/Org_entity/entityfields/language/possibleItemsProcess.js</possibleItemsProcess>
       <selectionMode>SINGLE</selectionMode>
+      <displayValueProcess>%aditoprj%/entity/Org_entity/entityfields/language/displayValueProcess.js</displayValueProcess>
     </entityField>
     <entityField>
       <name>ORG_ID</name>
@@ -456,6 +458,15 @@
       <onActionProcess>%aditoprj%/entity/Org_entity/entityfields/orgreport/onActionProcess.js</onActionProcess>
       <iconId>VAADIN:FILE_TEXT_O</iconId>
     </entityActionField>
+    <entityOutgoingField>
+      <name>Countries_dfo</name>
+      <fieldType>DEPENDENCY_OUT</fieldType>
+      <dependency>
+        <name>dependency</name>
+        <entityName>Countries_Entity</entityName>
+        <fieldName>ISO2_NAME</fieldName>
+      </dependency>
+    </entityOutgoingField>
   </entityFields>
   <recordContainers>
     <dbRecordContainer>

entity/Org_entity/entityfields/language/displayValueProcess.js

+import("system.vars");
+import("system.db");
+import("system.translate");
+import("system.result");
+import("Sql_lib");
+
+//TODO: temporary testing code
+var isoCode = vars.get("$field.LANGUAGE");
+var countryName  = db.cell(SqlCondition.begin().andPrepare("COUNTRYINFO.ISO2", isoCode).buildSelect("select COUNTRYINFO.NAME_LATIN from COUNTRYINFO"));
+countryName = translate.text(countryName);
+result.string(countryName);
\ No newline at end of file