Address added into Organisation and Person views

entity/Address_entity/Address_entity.aod

@@ -42,6 +42,7 @@
       <title>Country</title>
       <consumer>Countries</consumer>
       <mandatory v="true" />
+      <valueProcess>%aditoprj%/entity/Address_entity/entityfields/country/valueProcess.js</valueProcess>
       <displayValueProcess>%aditoprj%/entity/Address_entity/entityfields/country/displayValueProcess.js</displayValueProcess>
     </entityField>
     <entityField>

entity/Address_entity/entityfields/country/valueProcess.js

+import("system.util");
+import("system.result");
+import("system.neon");
+import("system.vars");
+
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && !vars.get("$this.value"))
+{
+    result.string("DE");
+}
\ No newline at end of file

entity/AnyContact_entity/AnyContact_entity.aod

@@ -30,7 +30,9 @@
     </entityProvider>
     <entityField>
       <name>ADDRESS_ID</name>
+      <title>standard address</title>
       <searchable v="false" />
+      <displayValueProcess>%aditoprj%/entity/AnyContact_entity/entityfields/address_id/displayValueProcess.js</displayValueProcess>
     </entityField>
     <entityField>
       <name>LANGUAGE</name>
@@ -160,6 +162,11 @@ See ContactUtils.getRelationTypeByPersOrg for possible values</description>
     <entityField>
       <name>PERSON_SALUTATION</name>
     </entityField>
+    <entityField>
+      <name>PERSON_FULL_NAME</name>
+      <title>Person</title>
+      <valueProcess>%aditoprj%/entity/AnyContact_entity/entityfields/person_full_name/valueProcess.js</valueProcess>
+    </entityField>
   </entityFields>
   <recordContainers>
     <dbRecordContainer>

entity/AnyContact_entity/entityfields/address_id/displayValueProcess.js

+import("system.db");
+import("system.vars");
+import("system.result");
+import("PostalAddress_lib");
+
+var addrId = vars.get("$field.ADDRESS_ID");
+var addr = AddressUtils.getFormattedOnlineAddressById(addrId);
+result.string(addr);
\ No newline at end of file

entity/AnyContact_entity/entityfields/person_full_name/valueProcess.js

+import("system.vars");
+import("system.result");
+import("Util_lib");
+import("Contact_lib");
+
+var contact = new Contact();
+contact.salutation = vars.get("$field.PERSON_SALUTATION");
+contact.title = vars.get("$field.PERSON_TITLE");
+contact.firstname = vars.get("$field.PERSON_FIRSTNAME");
+contact.middlename = vars.get("$field.PERSON_MIDDLENAME");
+contact.lastname = vars.get("$field.PERSON_LASTNAME");
+
+var renderer = new ContactTitleRenderer(contact, null);
+result.string(renderer.asString());
\ No newline at end of file

entity/Countries_Entity/Countries_Entity.aod

@@ -15,7 +15,6 @@
     <entityProvider>
       <name>ISO2_NAME</name>
       <fieldType>DEPENDENCY_IN</fieldType>
-      <recordContainer>db</recordContainer>
       <dependencies>
         <entityDependency>
           <name>83e8a2e6-aa80-4b35-a0ad-8dad483ed428</name>
@@ -108,6 +107,7 @@
     <dbRecordContainer>
       <name>db</name>
       <alias>Data_alias</alias>
+      <orderClauseProcess>%aditoprj%/entity/Countries_Entity/recordcontainers/db/orderClauseProcess.js</orderClauseProcess>
       <linkInformation>
         <linkInformation>
           <name>cc219004-43fd-4a3f-bee0-be5e732c61f1</name>

entity/Countries_Entity/recordcontainers/db/orderClauseProcess.js

+import("system.result");
+import("system.db");
+
+result.object({"case AB_COUNTRYINFO.ISO2 when 'DE' then 2500 when 'AT' then 2490 when 'CH' then 2480 else 100 end": db.DESCENDING
+              ,"AB_COUNTRYINFO.NAME_LATIN": db.ASCENDING});
\ No newline at end of file

entity/Countries_Entity/titleProcess.js

 import("system.result");
 import("system.vars");
-result.string(vars.get("$field.NAME"))
+result.string(vars.get("$field.NAME_TRANSLATED"));
\ No newline at end of file

entity/Organisation_entity/entityfields/address_id/displayValueProcess.js

@@ -2,18 +2,7 @@ import("system.db");
 import("system.vars");
 import("system.result");
 import("PostalAddress_lib");
-import("Sql_lib");
 
 var addrId = vars.get("$field.ADDRESS_ID");
-var addr = "";
-if (addrId) 
-{
-    var select = "select ADDRESS.COUNTRY, ADDRESS.ADDRESS, ADDRESS.BUILDINGNO, ADDRESS.ZIP, ADDRESS.CITY from ADDRESS ";
-    var addrData = db.array(db.ROW, 
-        SqlCondition.begin()
-        .andPrepare("ADDRESS.ADDRESSID", addrId)
-        .buildSql(select));
-        
-    addr = AddressUtils.formatOneline.apply(this, addrData);
-}
+var addr = AddressUtils.getFormattedOnlineAddressById(addrId);
 result.string(addr);
\ No newline at end of file

entity/Person_entity/entityfields/address_id/displayValueProcess.js

@@ -2,18 +2,7 @@ import("system.db");
 import("system.vars");
 import("system.result");
 import("PostalAddress_lib");
-import("Sql_lib");
 
 var addrId = vars.get("$field.ADDRESS_ID");
-var addr = "";
-if (addrId) 
-{
-    var select = "select ADDRESS.COUNTRY, ADDRESS.ADDRESS, ADDRESS.BUILDINGNO, ADDRESS.ZIP, ADDRESS.CITY from ADDRESS ";
-    var addrData = db.array(db.ROW, 
-        SqlCondition.begin()
-        .andPrepare("ADDRESS.ADDRESSID", addrId)
-        .buildSql(select));
-        
-    addr = AddressUtils.formatOneline.apply(this, addrData);
-}
+var addr = AddressUtils.getFormattedOnlineAddressById(addrId);
 result.string(addr);
\ No newline at end of file

language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod

@@ -2550,6 +2550,12 @@
     <entry>
       <key>Filetype</key>
     </entry>
+    <entry>
+      <key>Special price list</key>
+    </entry>
+    <entry>
+      <key>New attribute</key>
+    </entry>
   </keyValueMap>
   <font name="Dialog" style="0" size="11" />
   <sqlModels>

language/_____LANGUAGE_de/_____LANGUAGE_de.aod

@@ -370,7 +370,7 @@
     </entry>
     <entry>
       <key>standard address</key>
-      <value>Standardadresse</value>
+      <value>Standard-Adresse</value>
     </entry>
     <entry>
       <key>Create receipt</key>
@@ -2994,6 +2994,9 @@
     <entry>
       <key>Parent Attribute</key>
     </entry>
+    <entry>
+      <key>Special price list1</key>
+    </entry>
   </keyValueMap>
   <font name="Dialog" style="0" size="11" />
 </language>

language/_____LANGUAGE_en/_____LANGUAGE_en.aod

@@ -2578,7 +2578,10 @@
       <key>Filetype</key>
     </entry>
     <entry>
-      <key>Entrydate (Month)</key>
+      <key>Special price list</key>
+    </entry>
+    <entry>
+      <key>New attribute</key>
     </entry>
   </keyValueMap>
   <font name="Dialog" style="0" size="11" />

neonView/AddressEdit_view/AddressEdit_view.aod

@@ -21,10 +21,6 @@
           <name>d8a7a16b-9d7f-44d7-bbb1-b0404d5b8b8f</name>
           <entityField>COUNTRY</entityField>
         </entityFieldLink>
-        <entityFieldLink>
-          <name>e7804363-405d-429d-91c9-23de9685cc9a</name>
-          <entityField>STATE</entityField>
-        </entityFieldLink>
         <entityFieldLink>
           <name>c70668f3-6722-4a90-86d6-0d89be06dbe1</name>
           <entityField>ADDRESS</entityField>
@@ -41,6 +37,10 @@
           <name>fafca9d6-c6dd-4b66-b1ff-1d6ba451827b</name>
           <entityField>CITY</entityField>
         </entityFieldLink>
+        <entityFieldLink>
+          <name>e7804363-405d-429d-91c9-23de9685cc9a</name>
+          <entityField>STATE</entityField>
+        </entityFieldLink>
       </fields>
     </genericViewTemplate>
   </children>

neonView/AddressFilter_view/AddressFilter_view.aod

@@ -17,6 +17,10 @@
           <name>852583d4-1883-4b36-963f-6f3a4df63a89</name>
           <entityField>ADDR_TYPE</entityField>
         </neonTableColumn>
+        <neonTableColumn>
+          <name>10e9e08f-db9b-4789-a4b4-b2a0a750b069</name>
+          <entityField>COUNTRY</entityField>
+        </neonTableColumn>
         <neonTableColumn>
           <name>32b8b6f0-bdbc-4a4b-b98c-0a22861b0e6c</name>
           <entityField>ADDRESS</entityField>
@@ -33,10 +37,6 @@
           <name>57247c5c-6498-420b-b288-68ca316cf7f2</name>
           <entityField>CITY</entityField>
         </neonTableColumn>
-        <neonTableColumn>
-          <name>10e9e08f-db9b-4789-a4b4-b2a0a750b069</name>
-          <entityField>COUNTRY</entityField>
-        </neonTableColumn>
         <neonTableColumn>
           <name>9a965a25-a8aa-4777-865e-138624f2d848</name>
           <entityField>STATE</entityField>

neonView/AddressList_view/AddressList_view.aod

@@ -22,10 +22,6 @@
           <name>dfaa01a1-0b11-4f92-aa18-89f12ebb2db5</name>
           <entityField>COUNTRY</entityField>
         </neonTableColumn>
-        <neonTableColumn>
-          <name>17039f2e-4253-4242-bcc4-b75483adfbd0</name>
-          <entityField>STATE</entityField>
-        </neonTableColumn>
         <neonTableColumn>
           <name>4e5e6a4f-f43e-4861-a912-fb05e576f960</name>
           <entityField>ADDRESS</entityField>
@@ -42,6 +38,10 @@
           <name>12727b21-0359-4430-a9c2-54eb48e2e864</name>
           <entityField>CITY</entityField>
         </neonTableColumn>
+        <neonTableColumn>
+          <name>17039f2e-4253-4242-bcc4-b75483adfbd0</name>
+          <entityField>STATE</entityField>
+        </neonTableColumn>
       </columns>
     </titledListViewTemplate>
   </children>

neonView/AdressMultiEdit_view/AdressMultiEdit_view.aod

@@ -16,6 +16,10 @@
           <name>b210372e-dfd3-4cec-bc2e-84b72aebb2b6</name>
           <entityField>ADDR_TYPE</entityField>
         </neonTableColumn>
+        <neonTableColumn>
+          <name>d8a7a26b-9d7f-44d7-bbb1-b0404d5b8b2f</name>
+          <entityField>COUNTRY</entityField>
+        </neonTableColumn>
         <neonTableColumn>
           <name>c20668f3-6722-4a90-86d6-0d29be06dbe1</name>
           <entityField>ADDRESS</entityField>
@@ -32,10 +36,6 @@
           <name>fafca2d6-c2dd-4b66-b1ff-1d6ba451827b</name>
           <entityField>CITY</entityField>
         </neonTableColumn>
-        <neonTableColumn>
-          <name>d8a7a26b-9d7f-44d7-bbb1-b0404d5b8b2f</name>
-          <entityField>COUNTRY</entityField>
-        </neonTableColumn>
         <neonTableColumn>
           <name>945bd8e7-9d0d-4e32-8908-24d8dfb74463</name>
           <entityField>STATE</entityField>

neonView/AnyContactLookup_view/AnyContactLookup_view.aod

@@ -20,13 +20,9 @@
           <name>ca59a64a-adce-49c3-93ad-2978c81809f8</name>
           <entityField>ORGANISATION_NAME</entityField>
         </neonTableColumn>
-        <neonTableColumn>
-          <name>814b3f18-106a-443e-8415-762669f862e6</name>
-          <entityField>PERSON_FIRSTNAME</entityField>
-        </neonTableColumn>
         <neonTableColumn>
           <name>4b05d812-aa6c-49a5-afa3-ea5cd99560ef</name>
-          <entityField>PERSON_LASTNAME</entityField>
+          <entityField>PERSON_FULL_NAME</entityField>
           <width v="75" />
           <expandRatio v="100" />
         </neonTableColumn>
@@ -38,6 +34,10 @@
           <name>16174be3-c8fb-46a8-8f73-f6b8d8fad963</name>
           <entityField>STANDARD_EMAIL_COMMUNICATION</entityField>
         </neonTableColumn>
+        <neonTableColumn>
+          <name>c7d50d7a-11da-491c-a4be-7d5f75d335f0</name>
+          <entityField>ADDRESS_ID</entityField>
+        </neonTableColumn>
       </columns>
     </tableViewTemplate>
   </children>

neonView/OrganisationFilter_view/OrganisationFilter_view.aod

@@ -63,6 +63,10 @@
           <name>213d7434-cac6-42d8-aa3a-d893dc77b7b3</name>
           <entityField>STANDARD_PHONE_COMMUNICATION</entityField>
         </neonTableColumn>
+        <neonTableColumn>
+          <name>067eeef9-9a98-483b-9b4f-67bcc46eca3a</name>
+          <entityField>ADDRESS_ID</entityField>
+        </neonTableColumn>
       </columns>
     </tableViewTemplate>
   </children>

neonView/OrganisationLookup_view/OrganisationLookup_view.aod

@@ -28,6 +28,10 @@
           <name>44f2a229-3288-448e-9f74-b29751ab3c49</name>
           <entityField>STANDARD_EMAIL_COMMUNICATION</entityField>
         </neonTableColumn>
+        <neonTableColumn>
+          <name>6e0191b5-468b-41f6-b87e-732bb1c0ded8</name>
+          <entityField>ADDRESS_ID</entityField>
+        </neonTableColumn>
       </columns>
     </tableViewTemplate>
   </children>