Merge branch '#1065718-LeadimportAdressenFix' into '2020.2.0'

#1065718-LeadimportAdressenFix Privatadresse nur bei Privatperson

See merge request xrm/basic!432

process/Leadimport_lib/process.js

@@ -611,20 +611,30 @@ LeadImportUtils.insertPers = function(pDataFields, pDataTypes,  pFieldDef, pFiel
     ContactValues["CONTACTPOSITION"] = ContactInfoUtils.getContactPosition(pLeadValues);
     
     if (pOrgId == "")//private
+    {
         ContactValues["ORGANISATION_ID"] = 0;
+        ContactValues["ADDRESS_ID"] = util.getNewUUID();
+    }
     else
+    {
         ContactValues["ORGANISATION_ID"] = pOrgId;
+        ContactValues["ADDRESS_ID"] = 0
+    }
+        
     
     var contactId =  LeadImportUtils.insertTable(pDataFields, pDataTypes, ContactValues, "CONTACT", pUser, pDate);
     
     //Address
-    var AddrValues = LeadImportUtils.setValues(pDataFields["ADDRESS"], pFieldDef, pFieldValues);
-    AddrValues["ADDRESSID"] = ContactValues["ADDRESS_ID"];
-    AddrValues["ADDR_TYPE"] = "HOMEADDR";
-    AddrValues["CONTACT_ID"] = contactId;
-    LeadImportUtils.insertTable(pDataFields, pDataTypes, AddrValues, "ADDRESS", pUser, pDate);
-
-    var entityFieldValues = LeadImportUtils.getEntityFieldsPers(PersValues, ContactValues, AddrValues);
+    if (ContactValues["ADDRESS_ID"])
+    {
+        var AddrValues = LeadImportUtils.setValues(pDataFields["ADDRESS"], pFieldDef, pFieldValues);
+        AddrValues["ADDRESSID"] = ContactValues["ADDRESS_ID"];
+        AddrValues["ADDR_TYPE"] = "HOMEADDR";
+        AddrValues["CONTACT_ID"] = contactId;
+        LeadImportUtils.insertTable(pDataFields, pDataTypes, AddrValues, "ADDRESS", pUser, pDate);
+    }
+    
+    var entityFieldValues = LeadImportUtils.getEntityFieldsPers(PersValues, ContactValues);
     
     return new Array(persid, contactId, entityFieldValues);
 }
@@ -850,12 +860,11 @@ LeadImportUtils.getEntityFieldsOrg = function(pOrgDataFields, pContactDataFields
  * maps the DB-Field to the ENTITY-Field
  * 
  * @param {Object} pPersDataFields the the PERSON values; 
- * @param {Object} pContactDataFields the CONTACT values; 
- * @param {Object} pAddressDataFields the ADDRESS values; 
+ * @param {Object} pContactDataFields the CONTACT values;
  * 
  * @return {Object} the mapping
  */
-LeadImportUtils.getEntityFieldsPers = function(pPersDataFields, pContactDataFields, pAddressDataFields)
+LeadImportUtils.getEntityFieldsPers = function(pPersDataFields, pContactDataFields)
 {
     var EntityPersFieldObj = {};
     EntityPersFieldObj["CONTACTID"] = pContactDataFields["CONTACTID"];