Merge branch '#1067374-LeadimportAttribute' into '2020.2'

#1067374-LeadimportAttribute Revert #1066477 und add cases

See merge request xrm/basic!467

process/Leadimport_lib/process.js

@@ -448,18 +448,28 @@ LeadImportUtils.insertAttr = function(pDataFields, pDataTypes, pFieldDef, pLeadV
                 DataValues["OBJECT_TYPE"] = pObjectID;
                 DataValues["AB_ATTRIBUTE_ID"] = attrdata[1][0];
                 DataValues["OBJECT_ROWID"] = pContactId;
+                
                 switch(attrdata[1][1].trim())//type
                 {
-                    case AttributeTypes.COMBO():
-                        value = AttributeUtil.getPossibleListValues(attrdata[1][0], attrdata[1][1]).filter(function (attrbute) { return attrbute[1] == value});
-
-                        type = AttributeTypes.COMBO.databaseField;
-                        break;
+                    case "COMBO":
+                            value = newSelect("AB_ATTRIBUTEID")
+                            .from("AB_ATTRIBUTE")
+                            .whereIfSet("AB_ATTRIBUTE.ATTRIBUTE_PARENT_ID", attrdata[1][0])
+                            .and("AB_ATTRIBUTE.ATTRIBUTE_NAME", value)
+                            .cell();
+                            type = "ID_VALUE";
+                            break;
+                        case "TEXT":
+                            type = "CHAR_VALUE";
+                            break;
+                        case "BOOLEAN":
+                            type = "INT_VALUE";
+                            break;
                 //other cases can be added here
                 }
                 if (value.length && type != "")
                 {
-                    DataValues[type] = value[0][0];
+                    DataValues[type] = value;
                     LeadImportUtils.insertTable(pDataFields, pDataTypes, DataValues, "AB_ATTRIBUTERELATION", pUser, pDate);
                 }
             }