Merge branch 'cherry-pick-42dd4194' into 'stable2019.3'

QuickEntry fix

See merge request xrm/basic!67

entity/Address_entity/Address_entity.aod

@@ -116,6 +116,10 @@
           <name>OrganisationId_param</name>
           <expose v="false" />
         </entityParameter>
+        <entityParameter>
+          <name>ContactIds_param</name>
+          <expose v="false" />
+        </entityParameter>
       </children>
     </entityProvider>
     <entityParameter>
@@ -160,6 +164,10 @@
           <name>OrganisationId_param</name>
           <expose v="false" />
         </entityParameter>
+        <entityParameter>
+          <name>ContactIds_param</name>
+          <expose v="false" />
+        </entityParameter>
       </children>
     </entityProvider>
     <entityProvider>
@@ -196,6 +204,10 @@
           <name>OrganisationId_param</name>
           <expose v="false" />
         </entityParameter>
+        <entityParameter>
+          <name>ContactIds_param</name>
+          <expose v="false" />
+        </entityParameter>
       </children>
     </entityProvider>
     <entityField>
@@ -262,6 +274,10 @@
           <name>ContactId_param</name>
           <expose v="true" />
         </entityParameter>
+        <entityParameter>
+          <name>ContactIds_param</name>
+          <expose v="false" />
+        </entityParameter>
       </children>
     </entityProvider>
     <entityParameter>
@@ -451,6 +467,12 @@
           <isConsumer v="false" />
         </entityDependency>
       </dependencies>
+      <children>
+        <entityParameter>
+          <name>ContactType_param</name>
+          <expose v="false" />
+        </entityParameter>
+      </children>
     </entityProvider>
     <entityParameter>
       <name>ContactIds_param</name>

entity/Address_entity/entityfields/addr_type/valueProcess.js

@@ -4,7 +4,7 @@ import("system.vars");
 import("Contact_lib");
 import("KeywordRegistry_basic");
 
-if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.exists("$param.ContactType_param"))
+if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.exists("$param.ContactType_param") && vars.get("$this.value") == null)
 {
     if (vars.get("$param.ContactType_param") == Contact.TYPES.Organisation)
         result.string($KeywordRegistry.addressType$office());

entity/Address_entity/entityfields/contact_id/valueProcess.js

 import("system.result");
 import("system.neon");
 import("system.vars");
+import("Keyword_lib");
+import("KeywordRegistry_basic");
 
 if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
 {
-    if(vars.exists("$param.ContactId_param") && vars.getString("$param.ContactId_param"))
+    var contactId = vars.exists("$param.ContactId_param") ? vars.getString("$param.ContactId_param") : "";
+    if (vars.exists("$param.ContactIds_param") && vars.getString("$param.ContactIds_param"))
     {
-        result.string(vars.getString("$param.ContactId_param"));    
+        var addrType = vars.get("$field.ADDR_TYPE");
+        var isOrgType = KeywordUtils.getAttributeRelation(addrType, $KeywordRegistry.addressType(), "organisation");
+        var contactIds = vars.get("$param.ContactIds_param");
+        
+        result.string(isOrgType ? contactId : JSON.parse(contactIds)[0]);
+    }
+    else if (contactId)
+    {
+        result.string(contactId);    
     }
 }

entity/Address_entity/recordcontainers/db/onDBInsert.js

+import("KeywordRegistry_basic");
 import("DataPrivacy_lib");
 import("system.vars");
 import("StandardObject_lib");
 import("Keyword_lib");
 
 var rowdata = vars.get("$local.rowdata");
-
 var addrType = rowdata["ADDRESS.ADDR_TYPE"];
-var contacts = vars.get("$param.ContactIds_param");
-if (contacts)
+
+var typeParam = vars.get("$param.ContactType_param");
+
+if (!typeParam && vars.exists("$param.ContactIds_param") && vars.getString("$param.ContactIds_param"))
 {
-    contacts = JSON.parse(contacts);
+    var isOrgType = KeywordUtils.getAttributeRelation(addrType, $KeywordRegistry.addressType(), "organisation");
+    typeParam = isOrgType ? "organisation" : "contact";
 }
 
-var typeParam = vars.get("$param.ContactType_param");
 var scopeType = null
 if (typeParam === "contact")
     scopeType = "Person"

entity/Person_entity/Person_entity.aod

@@ -108,6 +108,7 @@
     <entityField>
       <name>CONTACTID</name>
       <title>CONTACTID (UID)</title>
+      <state>INVISIBLE</state>
     </entityField>
     <entityProvider>
       <name>OrganisationRelated</name>

entity/QuickEntry_entity/QuickEntry_entity.aod

@@ -35,7 +35,6 @@
         </entityParameter>
         <entityParameter>
           <name>ContactType_param</name>
-          <valueProcess>%aditoprj%/entity/QuickEntry_entity/entityfields/adresses/children/contacttype_param/valueProcess.js</valueProcess>
         </entityParameter>
       </children>
     </entityConsumer>

entity/QuickEntry_entity/entityfields/activities/children/insertlinks_param/valueProcess.js

@@ -4,9 +4,9 @@ import("system.result");
 var links = [
     ["Organisation", vars.get("$field.UID")]
 ];
-//var contactLinks = vars.get("$field.Contacts.insertedRows").map(function (row)
-//{
-//    return ["Person", row["#UID"]];
-//});
+var contactLinks = vars.get("$field.Contacts.insertedRows").map(function (row)
+{
+    return ["Person", row["CONTACTID"]];
+});
 
 result.string(JSON.stringify(links.concat(contactLinks)));
\ No newline at end of file

entity/QuickEntry_entity/entityfields/adresses/children/contactids_param/valueProcess.js

 import("system.vars");
 import("system.result");
 
-result.string(JSON.stringify(vars.get("$field.Contacts.insertedRows"), null, "\t"));
\ No newline at end of file
+var contacts = vars.get("$field.Contacts.insertedRows").map(function (row)
+{
+    return row["CONTACTID"];
+});
+result.string(JSON.stringify(contacts));

entity/QuickEntry_entity/entityfields/adresses/children/contacttype_param/valueProcess.js

-import("system.result");
-
-result.string("organisation");
\ No newline at end of file

neonView/AttributeLookup_view/AttributeLookup_view.aod

@@ -13,7 +13,7 @@
       <entityField>#ENTITY</entityField>
       <columns>
         <neonTableColumn>
-          <name>9a69a2af-3186-4180-a665-016c30f1fbdc</name>
+          <name>20f27051-1ef2-411a-865c-2a711ed39dde</name>
           <entityField>FULL_ATTRIBUTE_NAME</entityField>
         </neonTableColumn>
       </columns>

neonView/PersonMultiEdit_view/PersonMultiEdit_view.aod

@@ -32,6 +32,10 @@
           <name>e85a4676-806a-41f2-87c6-12cf58bfe896</name>
           <entityField>LANGUAGE</entityField>
         </neonTableColumn>
+        <neonTableColumn>
+          <name>b70ccea4-672f-4326-9435-97456b39d376</name>
+          <entityField>CONTACTID</entityField>
+        </neonTableColumn>
       </columns>
     </genericMultipleViewTemplate>
   </children>